From 337c02c0f0186c52e2bd4307c6018295a1d2b137 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 8 Nov 2015 18:16:20 +0100 Subject: [PATCH 001/531] Don't compile pcgrandom on Windows There it isn't needed. --- src/util/srp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/srp.cpp b/src/util/srp.cpp index b4af58d6..e3812ee5 100644 --- a/src/util/srp.cpp +++ b/src/util/srp.cpp @@ -496,6 +496,7 @@ static void calculate_H_AMK(SRP_HashAlgorithm alg, unsigned char *dest, const mp hash_final(alg, &ctx, dest); } +#ifndef WIN32 struct srp_pcgrandom { unsigned long long int m_state; @@ -521,7 +522,7 @@ static void srp_pcgrandom_seed(srp_pcgrandom *r, unsigned long long int state, r->m_state += state; srp_pcgrandom_next(r); } - +#endif static SRP_Result fill_buff() { From 330f94ed73b66f7f3404bb61fae574a00c539938 Mon Sep 17 00:00:00 2001 From: pilzadam Date: Sat, 24 Oct 2015 20:51:12 +0200 Subject: [PATCH 002/531] Translated using Weblate (German) Currently translated at 36.2% (273 of 753 strings) --- po/de/minetest.po | 71 +++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 2d157c67..e535c69a 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-05 02:00+0200\n" -"Last-Translator: est31 \n" -"Language-Team: German \n" +"PO-Revision-Date: 2015-10-24 20:51+0200\n" +"Last-Translator: pilzadam \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,17 +48,16 @@ msgid "Loading..." msgstr "Lädt…" #: builtin/mainmenu/common.lua -#, fuzzy msgid "Protocol version mismatch. " -msgstr "Serverprotokollversionsfehler " +msgstr "Protokollversionsfehler. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Server erfordert Protokollversion $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Server unterstützt Protokollversionen $1 bis $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -68,11 +67,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Wir unterstützen nur Protokollversion $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Wir unterstützen Protokollversionen zwischen $1 und $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -426,27 +425,25 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Keine Beschreibung vorhanden)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Durchsuchen" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Tasten ändern" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "MP deaktivieren" +msgstr "Deaktiviert" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Ändern" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" msgstr "Aktiviert" @@ -461,33 +458,33 @@ msgid "Games" msgstr "Spiele" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "Optional kann die lacunarity mit einem weiteren Komma angehängt werden." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Bitte geben Sie eine mit Kommata getrennte Liste von Flags an." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Bitte geben Sie eine gültige Zahl ein." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Bitte geben Sie eine gültige Zahl ein." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Mögliche Werte sind: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Standardwert" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Auswählen" +msgstr "Pfad auswählen" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -495,15 +492,15 @@ msgstr "Einstellungen" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Zeige technische Namen" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Der Wert muss größer als $1 sein." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Der Wert muss kleiner als $1 sein." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -1161,16 +1158,16 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = Parallax Mapping mit Stufeninformation (schneller).\n" +"1 = Relief Mapping (langsamer, genauer)." #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "3D-Wolken" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D mode" -msgstr "Flugmodus" +msgstr "3D Modus" #: src/settings_translation_file.cpp msgid "" @@ -1182,20 +1179,34 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"3D Unterstützung.\n" +"Aktuell verfügbar:\n" +"- none: Keine 3D Ausgabe.\n" +"- anaglyph: türkis / magenta-farbenes 3D.\n" +"- interlaced: gerade / ungerade zeilenbasierte Polarisation.\n" +"- topbottom: Teile Bildschirm horizontal.\n" +"- sidebyside: Teile Bildschirm vertikal." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Ein festgelegter Weltgenerator Seed für neue Welten. Leer lassen für " +"zufällige Erzeugung.\n" +"Wird überschrieben, wenn die Welt im Menü erstellt wird." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Eine Nachricht, die an alle verbundenen Klienten versendet wird, wenn der " +"Server abstürzt." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Eine Nachricht, die an alle verbundene Klienten gesendet wird, wenn der " +"Server herunterfährt." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" From 25526551bb455d0828926dce9839fa331c2a2086 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Sat, 24 Oct 2015 21:58:23 +0200 Subject: [PATCH 003/531] Translated using Weblate (French) Currently translated at 35.4% (267 of 753 strings) --- po/fr/minetest.po | 83 ++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 1b8cdc6b..032fcb8c 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-07-17 22:49+0200\n" +"PO-Revision-Date: 2015-10-24 21:58+0200\n" "Last-Translator: Jean-Patrick G. \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -43,7 +43,7 @@ msgstr "Rejoindre" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Le serveur a demandé une re-connexion :" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -51,15 +51,15 @@ msgstr "Chargement..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "La version du protocole ne correspond pas. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Le serveur requiert une version du protocole $1 " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Le serveur supporte les versions du protocole entre $1 et $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -68,11 +68,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Nous supportons seulement la version du procotole $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Nous supportons seulement les versions du protocole entre $1 et $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -101,6 +101,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Échec du chargement du mod \"$1\" car il contient des caractères non-" +"autorisés. Seulement les caractères [a-z0-9_] sont autorisés." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -418,72 +420,72 @@ msgstr "Démarrer" #: builtin/mainmenu/tab_settings.lua msgid "\"" -msgstr "" +msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Aucune description du paramètre)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Naviguer" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Changer les touches" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Désactiver le pack de mods" +msgstr "Désactivé" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Modifier" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "activé" +msgstr "Activé" #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Format : , , (, , ), , " +", " #: builtin/mainmenu/tab_settings.lua msgid "Games" msgstr "Jeux" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "Éventuellement, la lacunarité peut être jointe par une virgule leader." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Veuillez séparer les drapeaux par des virgules." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Veuillez entrer un nombre entier valide." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Veuillez entrer un nombre valide." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Les valeurs possibles sont : " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Réinitialiser" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Sélectionner" +msgstr "Sélectionner un chemin" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -491,15 +493,15 @@ msgstr "Réglages" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Montrer les noms techniques" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "La valeur doit être plus grande que $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "La valeur doit être inférieure à $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -527,7 +529,7 @@ msgstr "Pas d'information disponible" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Aucun" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -538,9 +540,8 @@ msgid "Texturepacks" msgstr "Packs de textures" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Erreur de connexion (perte de connexion ?)" +msgstr "Connexion perdue." #: src/client.cpp msgid "Done!" @@ -1183,10 +1184,12 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Un message qui sera affiché à tous les joueurs quand le serveur s'arrête." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Un message qui sera affiché à tous les joueurs quand le serveur s'arrête." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1194,7 +1197,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Accélération en l'air" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1210,12 +1213,15 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Adresse où se connecter.\n" +"Laisser vide pour démarrer un serveur local.\n" +"Le champ de l'adresse dans le menu peut réécrire ce paramètre." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "" +msgstr "Ajuster le DPI de votre écran (non-X11 / Android seulement)." #: src/settings_translation_file.cpp msgid "" @@ -1229,7 +1235,7 @@ msgstr "Avancé" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Toujours voler et être rapide" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" @@ -1242,7 +1248,7 @@ msgstr "Filtrage anisotrope" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Annoncer le serveur" #: src/settings_translation_file.cpp msgid "" @@ -1250,10 +1256,13 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Annoncer à la liste des serveurs.\n" +"Si vous voulez annoncer votre adresse IPv6, utilisez serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Demander de se reconnecter après coupure de connexion" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." From d0567e92f5d47bfc336e5dc98049c2c74e5fbdc6 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 24 Oct 2015 21:36:54 +0200 Subject: [PATCH 004/531] Translated using Weblate (German) Currently translated at 52.3% (394 of 753 strings) --- po/de/minetest.po | 302 +++++++++++++++++++--------------------------- 1 file changed, 121 insertions(+), 181 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index e535c69a..109e43e6 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-24 20:51+0200\n" +"PO-Revision-Date: 2015-10-24 21:36+0200\n" "Last-Translator: pilzadam \n" "Language-Team: German " "\n" @@ -1214,15 +1214,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Beschleunigung in der Luft" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Reichweite aktiver Blöcke" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Reichweite aktiver Objekte" #: src/settings_translation_file.cpp msgid "" @@ -1230,18 +1230,23 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Adresse, mit der verbunden werden soll.\n" +"Leer lassen, um einen lokalen Server zu starten.\n" +"Die Adresse im Menü überschreibt diese Einstellung." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "" +msgstr "DPI des Bildschirms (nicht für X11/Android) z.B. für 4K Bildschirme." #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Ändert die Gammakodierung der Lichttabellen. Kleinere Werte sind heller.\n" +"Diese Einstellung ist klientenseitig und wird vom Server ignoriert." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1249,20 +1254,19 @@ msgstr "Erweitert" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Immer schnell fliegen" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Umgebungsverdeckungs Gamma" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" msgstr "Anisotroper Filter" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Server anmelden" #: src/settings_translation_file.cpp msgid "" @@ -1270,173 +1274,162 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Meldet den Server in der Serverliste.\n" +"Wenn ein IPv6 Server angemeldet werden soll, muss serverlist_url auf " +"v6.servers.minetest.net. gesetzt werden." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Zum Neuverbinden nach Absturz auffordern" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Automatisch bei der Serverliste melden." #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "Rückwärts" +msgstr "Rückwärtstaste" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Grundlegend" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" msgstr "Bilinearer Filter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" msgstr "Bind-Adresse" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bits pro Pixel (Farbtiefe) im Vollbildmodus." #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "Mehrspieler" +msgstr "Innerhalb des Spielers bauen" #: src/settings_translation_file.cpp msgid "Bumpmapping" -msgstr "Bumpmappen" +msgstr "Bumpmapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Kameraglättung" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Kammeraglättung im Filmmodus" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Kameraaktualisierung-Umschalttaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Tasten ändern" +msgstr "Chattaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Tasten ändern" +msgstr "Chat-umschalttaste" #: src/settings_translation_file.cpp +#, fuzzy msgid "Chunk size" -msgstr "" +msgstr "Block größe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Kreativmodus" +msgstr "Filmmodus" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Kreativmodus" +msgstr "Filmmodustaste" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Säubere transparente Texturen" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Klient und Server" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Klettergeschwindigkeit" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Wolkenhöhe" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Wolkenradius" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D-Wolken" +msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Wolken sind ein klientenseitiger Effekt." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Hauptmenü" +msgstr "Wolken im Menü" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Gefärbter Nebel" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Kommagetrennte Liste der vertrauten Mods, denen es erlaubt ist,\n" +"unsichere Funktionen zu verwenden, wenn Modsicherheit eingeschaltet ist." #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Befehl" +msgstr "Befehlstaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" msgstr "Verbundenes Glas" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Zum Server verbinden ..." +msgstr "Externen Medienserver verwenden" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Verbindet Glas, wenn der Block dies unterstützt." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Konsole" +msgstr "Konsolendurchsichtigkeit" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Konsole" +msgstr "Konsolenfarbe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Konsole" +msgstr "Konsolentaste" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Kontinuierliche Vorwärtsbewegung" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Kontinuierliches Vorwärtsbewegen (nur zum Testen verwendet)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Strg" +msgstr "Steuerung" #: src/settings_translation_file.cpp msgid "" @@ -1444,16 +1437,21 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Verändert Länge des Tag-Nacht-Zyklus.\n" +"Beispiele: 72 = 10 Minuten, 360 = 4 Minuten, 1 = 24 Stunden, 0 = Keine " +"Veränderung." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen V6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Verändert die Größe der Wüsten und Strände in Mapgenerator V6.\n" +"Wenn Schneebiome aktiviert sind, wird diese Einstellung ignoriert." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Absturzmeldung" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1465,24 +1463,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Fadenkreuzfarbe" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Fadenkreuzfarbe (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Schleichgeschwindigkeit" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Schaden einschalten" +msgstr "Schaden" #: src/settings_translation_file.cpp msgid "Debug info toggle key" @@ -1490,35 +1487,35 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Debugausgabelevel" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Taktung dedizierter Server" #: src/settings_translation_file.cpp msgid "Default acceleration" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "Spiel ändern" +msgstr "Standardspiel" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Standardspiel beim erstellen einer neuen Welt.\n" +"Diese Einstellung wird nicht genutzt, wenn die Welt im Menü erstellt wird." #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Neues Passwort" +msgstr "Standardpasswort" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Standardprivilegien" #: src/settings_translation_file.cpp msgid "" @@ -1538,7 +1535,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Verzögerung beim zeigen von Tooltipps, in Millisekunden." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" @@ -1567,9 +1564,8 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Partikel aktivieren" +msgstr "Anti-cheat deaktivieren" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" @@ -1580,14 +1576,12 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" msgstr "2×Sprungtaste zum Fliegen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "2×Sprungtaste zum Fliegen" +msgstr "Doppelttippen der Sprungtaste schaltet Flugmodus um." #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1602,9 +1596,8 @@ msgid "Enable a bit lower water surface, so it doesn't " msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Online-Mod-Archiv" +msgstr "Aktiviere Modsicherheit" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." @@ -1661,9 +1654,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Schaden einschalten" +msgstr "Aktiviert Minimap." #: src/settings_translation_file.cpp msgid "" @@ -1696,9 +1688,8 @@ msgid "Fall bobbing" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "no" +msgstr "Ersatzschriftart" #: src/settings_translation_file.cpp msgid "Fallback font shadow" @@ -1757,18 +1748,16 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Kein Filter" +msgstr "Filter" #: src/settings_translation_file.cpp msgid "Fixed map seed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fly key" -msgstr "Flugmodus" +msgstr "Flugtaste" #: src/settings_translation_file.cpp msgid "Flying" @@ -1807,9 +1796,8 @@ msgid "Font size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Vorwärts" +msgstr "Vorwärtstaste" #: src/settings_translation_file.cpp msgid "Freetype fonts" @@ -1848,9 +1836,8 @@ msgid "GUI scaling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "GUI-Skalierfaktor" +msgstr "GUI-Skalierfilter" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" @@ -1861,7 +1848,6 @@ msgid "Gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "Normalmaps generieren" @@ -1875,7 +1861,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Grafik" #: src/settings_translation_file.cpp msgid "Gravity" @@ -1950,9 +1936,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If disabled " -msgstr "MP deaktivieren" +msgstr "Wenn deaktiviert " #: src/settings_translation_file.cpp msgid "" @@ -1962,9 +1947,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If enabled, " -msgstr "Aktiviert" +msgstr "Wenn aktiviert, " #: src/settings_translation_file.cpp msgid "" @@ -2002,7 +1986,6 @@ msgid "Ignore world errors" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" msgstr "Spiel" @@ -2023,9 +2006,8 @@ msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Inventar" +msgstr "Inventartaste" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -2040,9 +2022,8 @@ msgid "Item entity TTL" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Springen" +msgstr "Sprungtaste" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2274,9 +2255,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Alt" +msgstr "Linkstaste" #: src/settings_translation_file.cpp msgid "" @@ -2346,14 +2326,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Hauptmenü" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Hauptmenü" +msgstr "Hauptmenü-Skript" #: src/settings_translation_file.cpp msgid "" @@ -2416,28 +2394,24 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Weltgenerator" +msgstr "Weltgenerator Debugging" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Weltgenerator" +msgstr "Weltgenerator Flags" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Weltgenerator" +msgstr "Weltgeneratorname" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Weltgenerator" +msgstr "Weltgenerator v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2460,9 +2434,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Weltgenerator" +msgstr "Weltgenerator v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2521,9 +2494,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Weltgenerator" +msgstr "Weltgenerator v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2677,9 +2649,8 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" -msgstr "Menü" +msgstr "Menüs" #: src/settings_translation_file.cpp msgid "Mesh cache" @@ -2717,7 +2688,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" msgstr "Mip-Mapping" @@ -2785,7 +2755,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "Netzwerk" #: src/settings_translation_file.cpp msgid "" @@ -2810,7 +2780,6 @@ msgid "Noclip key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" msgstr "Blöcke hervorheben" @@ -2863,7 +2832,6 @@ msgid "Parallax Occlusion" msgstr "Parallax Oklusion" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" msgstr "Parallax Oklusion" @@ -2915,9 +2883,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Spielername zu lang." +msgstr "Spielername" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -2942,9 +2909,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Texturen laden ..." +msgstr "Texturen vorgenerieren" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." @@ -2974,9 +2940,8 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Weite Sicht" +msgstr "Sichtweitentaste" #: src/settings_translation_file.cpp msgid "Remote media" @@ -2991,9 +2956,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Alt Gr" +msgstr "Rechtstaste" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3033,9 +2997,8 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Druck" +msgstr "Bildschirmfoto" #: src/settings_translation_file.cpp msgid "Screenshot folder" @@ -3043,7 +3006,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "Sicherheit" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" @@ -3062,44 +3025,36 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Einzelspieler starten" +msgstr "Server / Einzelspieler" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Server" +msgstr "Server URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Serverport" +msgstr "Serveradresse" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Serverport" +msgstr "Serverbeschreibung" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Server" +msgstr "Servername" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Serverport" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Öffentliche Serverliste" +msgstr "Serverliste URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Öffentliche Serverliste" +msgstr "Serverlistendatei" #: src/settings_translation_file.cpp msgid "" @@ -3155,9 +3110,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "Besseres Licht" +msgstr "Geglättetes Licht" #: src/settings_translation_file.cpp msgid "" @@ -3174,13 +3128,12 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Schleichen" +msgstr "Schleichtaste" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "Sound" #: src/settings_translation_file.cpp msgid "" @@ -3212,9 +3165,8 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Texturpakete" +msgstr "Texturpfad" #: src/settings_translation_file.cpp msgid "" @@ -3297,7 +3249,6 @@ msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "Trilinearer Filter" @@ -3341,9 +3292,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "Taste drücken" +msgstr "Benutztaste" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -3354,9 +3304,8 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Ehemalige Hauptentwickler" +msgstr "Nützlich für Entwickler." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3395,14 +3344,12 @@ msgid "Viewing range minimum" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Tonlautstärke" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Wehende Blätter" +msgstr "Gehgeschwindigkeit" #: src/settings_translation_file.cpp msgid "Wanted FPS" @@ -3417,39 +3364,32 @@ msgid "Water surface level of the world." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "Wehende Blätter" +msgstr "Wehende Blöcke" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" msgstr "Wehende Blätter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" -msgstr "Wogende Pflanzen" +msgstr "Wehende Pflanzen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "Wasserwellen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "Wasserwellen" +msgstr "Wasserwellenhöhe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "Wasserwellen" +msgstr "Wasserwellenlänge" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Wasserwellen" +msgstr "Wasserwellengeschwindigkeit" #: src/settings_translation_file.cpp msgid "" From b046023b78e39f4e40785d95e30a6793a6936bc4 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 24 Oct 2015 23:09:05 +0200 Subject: [PATCH 005/531] Translated using Weblate (German) Currently translated at 54.1% (408 of 753 strings) --- po/de/minetest.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 109e43e6..1cd51424 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-24 21:36+0200\n" -"Last-Translator: pilzadam \n" +"PO-Revision-Date: 2015-10-24 23:09+0200\n" +"Last-Translator: PilzAdam \n" "Language-Team: German " "\n" "Language: de\n" @@ -815,7 +815,7 @@ msgstr "Schleichen" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" -msgstr "Kinomodus" +msgstr "Filmmodus umschalten" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1605,7 +1605,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Schaltet zufällige Steuerung ein (nur zum Testen verwendet)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." @@ -1717,7 +1717,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Schnell bewegen" #: src/settings_translation_file.cpp msgid "" @@ -1761,7 +1761,7 @@ msgstr "Flugtaste" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Fliegen" #: src/settings_translation_file.cpp msgid "Fog" @@ -1919,11 +1919,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "IPv6 Server" #: src/settings_translation_file.cpp msgid "IPv6 support." @@ -2011,11 +2011,11 @@ msgstr "Inventartaste" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Maus umkehren" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Kehrt die vertikale Mausbewegung um." #: src/settings_translation_file.cpp msgid "Item entity TTL" @@ -2240,7 +2240,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Sprache" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -2717,11 +2717,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "Maussensitivität" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "Faktor für die Maussensitivität." #: src/settings_translation_file.cpp msgid "" @@ -2937,7 +2937,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "Zufällige Steuerung" #: src/settings_translation_file.cpp msgid "Range select key" @@ -2949,7 +2949,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "Serverport" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." @@ -2977,7 +2977,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "" +msgstr "Speichere Welt vom Server" #: src/settings_translation_file.cpp msgid "" @@ -3158,7 +3158,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Strict protocol checking" -msgstr "" +msgstr "Strikte Protokollversionsprüfung" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" From 6a15211bc2969e07315659667d6c83ae08515939 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sun, 25 Oct 2015 00:01:38 +0200 Subject: [PATCH 006/531] Translated using Weblate (German) Currently translated at 61.6% (464 of 753 strings) --- po/de/minetest.po | 121 +++++++++++++++++++++++++++++----------------- 1 file changed, 76 insertions(+), 45 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 1cd51424..ddcdfe39 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-24 23:09+0200\n" +"PO-Revision-Date: 2015-10-25 00:01+0200\n" "Last-Translator: PilzAdam \n" "Language-Team: German " "\n" @@ -1495,7 +1495,7 @@ msgstr "Taktung dedizierter Server" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Standardbeschleunigung" #: src/settings_translation_file.cpp msgid "Default game" @@ -1532,6 +1532,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" +"Setzt die maximale Distanz, in der Spieler übertragen werden, in Blöcken (0 =" +" unbegrenzt)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." @@ -1550,6 +1552,8 @@ msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"Die Beschreibung des Servers. Wird neuen Klienten und in der Serverlist " +"angezeigt." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" @@ -1569,11 +1573,11 @@ msgstr "Anti-cheat deaktivieren" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Verbiete leere Passwörter" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Domainname des Servers. Wird in der Serverliste angezeigt." #: src/settings_translation_file.cpp msgid "Double tap jump for fly" @@ -1677,11 +1681,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS im Pausenmenü" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" @@ -1727,17 +1731,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Gesichtsfeld" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Gesichtsfeld in Grad." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"Datei in client/serverlist/, die Ihre Serverfavoriten aus dem " +"Mehrspielermenü beinhaltet." #: src/settings_translation_file.cpp msgid "" @@ -1765,7 +1771,7 @@ msgstr "Fliegen" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Nebel" #: src/settings_translation_file.cpp msgid "Fog toggle key" @@ -1773,11 +1779,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Schriftpfad" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Schriftschatten" #: src/settings_translation_file.cpp msgid "Font shadow alpha" @@ -1793,7 +1799,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Schriftgröße" #: src/settings_translation_file.cpp msgid "Forward key" @@ -1801,7 +1807,7 @@ msgstr "Vorwärtstaste" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Freetype Schriften" #: src/settings_translation_file.cpp msgid "" @@ -1821,15 +1827,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Vollbild" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "Vollbild BPP" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Vollbildmodus." #: src/settings_translation_file.cpp msgid "GUI scaling" @@ -1845,7 +1851,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gamma" #: src/settings_translation_file.cpp msgid "Generate normalmaps" @@ -1865,7 +1871,7 @@ msgstr "Grafik" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravitation" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -1881,7 +1887,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "Höhe, in der Wolken auftauchen." #: src/settings_translation_file.cpp msgid "High-precision FPU" @@ -1889,7 +1895,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "Homepage des Servers. Wird in der Serverliste angezeigt." #: src/settings_translation_file.cpp msgid "Horizontal initial window size." @@ -1927,7 +1933,7 @@ msgstr "IPv6 Server" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "IPv6 Unterstützung." #: src/settings_translation_file.cpp msgid "" @@ -1959,6 +1965,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." msgstr "" +"Wenn diese Einstellung aktiviert ist, werden die Anti-Cheat Maßnahmen " +"deaktiviert." #: src/settings_translation_file.cpp msgid "" @@ -1983,7 +1991,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Ignoriere Weltfehler" #: src/settings_translation_file.cpp msgid "In-Game" @@ -2244,7 +2252,7 @@ msgstr "Sprache" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Blätterart" #: src/settings_translation_file.cpp msgid "" @@ -2253,6 +2261,10 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Blätterart:\n" +"- Fancy: Alle Seiten sind sichtbar\n" +"- Simple: Nur die äußeren Seiten sind sichtbar, oder special_tiles\n" +"- Opaque: Blätter sind nicht durchsichtig" #: src/settings_translation_file.cpp msgid "Left key" @@ -2344,7 +2356,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Weltordner" #: src/settings_translation_file.cpp msgid "" @@ -2371,7 +2383,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "Speicherintervall der Welt" #: src/settings_translation_file.cpp msgid "Mapblock limit" @@ -2567,11 +2579,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "Maximale FPS" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "Maximale FPS wenn das Spiel pausiert ist." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" @@ -2915,6 +2927,8 @@ msgstr "Texturen vorgenerieren" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +"Verhindert, dass Mods unsichere Funktionen, wie das Ausführen Shell-" +"Kommandos, benutzen können." #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." @@ -2945,7 +2959,7 @@ msgstr "Sichtweitentaste" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "Externer Medienserver" #: src/settings_translation_file.cpp msgid "Remote port" @@ -2953,7 +2967,7 @@ msgstr "Serverport" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." -msgstr "" +msgstr "Ersetzt das Standardhauptmenü." #: src/settings_translation_file.cpp msgid "Right key" @@ -2961,7 +2975,7 @@ msgstr "Rechtstaste" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "Rechtsklick Wiederholungsrate" #: src/settings_translation_file.cpp msgid "Rollback recording" @@ -2969,11 +2983,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "Runde Minimap" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "" +msgstr "Speichert die Welt vom Server im lokalen Speicher." #: src/settings_translation_file.cpp msgid "Saving map received from server" @@ -2990,11 +3004,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "Bildschirmhöhe" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "Bildschirmbreite" #: src/settings_translation_file.cpp msgid "Screenshot" @@ -3002,7 +3016,7 @@ msgstr "Bildschirmfoto" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "Bildschirmfotoordner" #: src/settings_translation_file.cpp msgid "Security" @@ -3010,7 +3024,7 @@ msgstr "Sicherheit" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" +msgstr "Siehe http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp msgid "Selection box border color (R,G,B)." @@ -3061,6 +3075,8 @@ msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" +"Setzt die Sprache. Leer lassen, um Systemsprache zu verwenden.\n" +"Nach Änderung ist ein Neustart erforderlich." #: src/settings_translation_file.cpp msgid "" @@ -3090,10 +3106,13 @@ msgid "" "video cards.\n" "Thy only work with the OpenGL video backend." msgstr "" +"Shader werden für fortgeschrittene visuelle Effekte benötigt und können die " +"Performanz erhöhen.\n" +"Funktioniert nur mit dem OpenGL Backend." #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" +msgstr "Form der Minimap. Aktiviert = rund, Deaktiviert = rechteckig." #: src/settings_translation_file.cpp msgid "Show debug info" @@ -3101,7 +3120,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Shutdown message" -msgstr "" +msgstr "Herunterfahrnachricht" #: src/settings_translation_file.cpp msgid "" @@ -3118,14 +3137,16 @@ msgid "" "Smooths camera when moving and looking arround.\n" "Useful for recording videos." msgstr "" +"Glättet Kamerabewegungen beim umsehen.\n" +"Nützlich zum aufnehmen von Videos." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "" +msgstr "Glättet Kamerabewegung im Filmmodus. 0 zum ausschalten." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "Glättet Kamerabewegungen. 0 zum ausschalten." #: src/settings_translation_file.cpp msgid "Sneak key" @@ -3142,10 +3163,16 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" +"Spezifiziert die URL von der die Klienten die Medien (Texturen, Sounds, ...) " +"herunterladen.\n" +"$dateiname sollte von $remote_media$dateiname erreichbar sein\n" +"(diese Einstellung sollte also mit einem Schrägstrich enden).\n" +"Dateien, die nicht über diesen Server erreichbar sind, werden auf dem " +"üblichen Weg heruntergeladen (UDP)." #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "" +msgstr "Statischer Startpunkt" #: src/settings_translation_file.cpp #, fuzzy @@ -3177,13 +3204,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." -msgstr "" +msgstr "Netzwerkinterface an dem der Server horchen wird." #: src/settings_translation_file.cpp msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" +"Die Privilegien, die neue Benutzer automatisch bekommen.\n" +"Siehe /privs im Spiel, für eine Liste aller möglichen Privilegien." #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." @@ -3209,10 +3238,12 @@ msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" +"Das Intervall in Sekunden, in dem Rechteklicks wiederholt werden, wenn die " +"rechte Maustaste gedrückt gehalten wird." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "" +msgstr "Diese Schriftart wird von bestimmten Sprachen benutzt." #: src/settings_translation_file.cpp msgid "" @@ -3222,11 +3253,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Time send interval" -msgstr "" +msgstr "Zeit Sendeintervall" #: src/settings_translation_file.cpp msgid "Time speed" -msgstr "" +msgstr "Zeitgeschwindigkeit" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." From 1e6f0e63f8c9e289f8b66ebc5b1d593fc1c1228a Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Sun, 25 Oct 2015 11:08:19 +0100 Subject: [PATCH 007/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 36.9% (278 of 753 strings) --- po/zh_TW/minetest.po | 95 +++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 64 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 9503dc65..5adc93bb 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-09-17 12:48+0200\n" +"PO-Revision-Date: 2015-10-25 11:08+0200\n" "Last-Translator: Jeff Huang \n" -"Language-Team: Chinese (Taiwan) \n" +"Language-Team: Chinese (Taiwan) " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -48,9 +48,8 @@ msgid "Loading..." msgstr "正在載入..." #: builtin/mainmenu/common.lua -#, fuzzy msgid "Protocol version mismatch. " -msgstr "協定版本不符合，伺服器 " +msgstr "協定版本不符合。 " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " @@ -431,16 +430,14 @@ msgid "Change keys" msgstr "變更按鍵" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "停用 MP" +msgstr "已停用" #: builtin/mainmenu/tab_settings.lua msgid "Edit" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" msgstr "已啟用" @@ -451,7 +448,6 @@ msgid "" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" msgstr "遊戲" @@ -480,9 +476,8 @@ msgid "Restore Default" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "選擇" +msgstr "選取路徑" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -1157,7 +1152,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "3D 雲朵" @@ -1261,21 +1255,18 @@ msgid "Automaticaly report to the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "後退" +msgstr "後退鍵" #: src/settings_translation_file.cpp msgid "Basic" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" msgstr "雙線性過濾器" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" msgstr "綁定地址" @@ -1304,28 +1295,24 @@ msgid "Camera update toggle key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "變更按鍵" +msgstr "聊天按鍵" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "變更按鍵" +msgstr "聊天切換按鍵" #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "創造模式" +msgstr "電影模式" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "創造模式" +msgstr "電影模式按鍵" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1348,18 +1335,16 @@ msgid "Cloud radius" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D 雲朵" +msgstr "雲朵" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "主選單" +msgstr "選單中的雲朵" #: src/settings_translation_file.cpp msgid "Colored fog" @@ -1372,38 +1357,32 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "指令" +msgstr "指令按鍵" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "連貫的玻璃" +msgstr "連接玻璃" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "正在連線至伺服器..." +msgstr "連線至外部媒體伺服器" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "終端機" +msgstr "終端機 alpha 值" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "終端機" +msgstr "終端機顏色" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "終端機" +msgstr "終端機按鍵" #: src/settings_translation_file.cpp msgid "Continuous forward" @@ -1414,9 +1393,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Control" +msgstr "控制" #: src/settings_translation_file.cpp msgid "" @@ -1460,9 +1438,8 @@ msgid "DPI" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "啟用傷害" +msgstr "傷害" #: src/settings_translation_file.cpp msgid "Debug info toggle key" @@ -1491,9 +1468,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "舊密碼" +msgstr "預設密碼" #: src/settings_translation_file.cpp msgid "Default privileges" @@ -1546,9 +1522,8 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "啟用粒子" +msgstr "停用反作弊" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" @@ -1559,14 +1534,12 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "輕擊兩次「跳躍」以切換成飛行" +msgstr "輕擊兩次跳躍以飛行" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "輕擊兩次「跳躍」以切換成飛行" +msgstr "輕擊兩次跳躍鍵以切換成飛行模式。" #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1639,9 +1612,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "啟用傷害" +msgstr "啟用小地圖。" #: src/settings_translation_file.cpp msgid "" @@ -1674,9 +1646,8 @@ msgid "Fall bobbing" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "needs_fallback_font" +msgstr "備用字型" #: src/settings_translation_file.cpp msgid "Fallback font shadow" @@ -1735,9 +1706,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "無過濾器" +msgstr "過濾器" #: src/settings_translation_file.cpp msgid "Fixed map seed" @@ -1784,9 +1754,8 @@ msgid "Font size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "前進" +msgstr "前進鍵" #: src/settings_translation_file.cpp msgid "Freetype fonts" @@ -1825,9 +1794,8 @@ msgid "GUI scaling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "圖形使用者介面縮放係數" +msgstr "圖形使用者介面縮放過濾器" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" @@ -1838,7 +1806,6 @@ msgid "Gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "生成一般地圖" From 4f1f652d969388fddf0b3fc1699cba8f44d54c1a Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Sun, 25 Oct 2015 10:46:27 +0100 Subject: [PATCH 008/531] Translated using Weblate (Indonesian) Currently translated at 40.2% (303 of 753 strings) --- po/id/minetest.po | 188 ++++++++++++++++++++++++---------------------- 1 file changed, 100 insertions(+), 88 deletions(-) diff --git a/po/id/minetest.po b/po/id/minetest.po index 362ee8ec..37d56fdf 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-09-06 08:59+0200\n" +"PO-Revision-Date: 2015-10-25 10:46+0200\n" "Last-Translator: Muhammad Rifqi Priyo Susanto " "\n" -"Language-Team: Indonesian \n" +"Language-Team: Indonesian " +"\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -29,7 +29,6 @@ msgid "An error occured:" msgstr "Kesalahan muncul:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Menu Utama" @@ -38,13 +37,12 @@ msgid "Ok" msgstr "Oke" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Sambung" +msgstr "Menyambung ulang" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Server ini meminta penyambungan ulang:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -56,11 +54,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Server memberlakukan protokol versi $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Server mendukung protokol antara versi $1 dan versi $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -70,11 +68,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Kami hanya mendukung protokol versi $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Kami mendukung protokol antara versi $1 dan versi $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -103,6 +101,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Gagal mengaktifkan mod \"$1\" karena terdapat karakter terlarang. Hanya " +"karakter [a-z0-9_] yang dibolehkan." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -424,15 +424,15 @@ msgstr "Mulai Permainan" #: builtin/mainmenu/tab_settings.lua msgid "\"" -msgstr "" +msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Tidak ada keterangan dari pengaturan yang diberikan)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Jelajahi" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -445,18 +445,20 @@ msgstr "Nonaktifkan PM" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Sunting" + +#: builtin/mainmenu/tab_settings.lua +msgid "Enabled" +msgstr "Diaktifkan" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "diaktifkan" - -#: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Format: , , (, , ), , " +", " #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -473,19 +475,19 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Mohon masukkan sebuah bilangan bulat yang sah." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Mohon masukkan sebuah angka yang sah." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Nilai yang mungkin adalah: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Kembalikan ke Bawaan" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -502,11 +504,11 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Nilai harus lebih besar dari $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Nilai harus lebih kecil dari $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -534,7 +536,7 @@ msgstr "Tidak ada informasi tersedia" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Tidak ada" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -545,9 +547,8 @@ msgid "Texturepacks" msgstr "Paket Tekstur" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Koneksi rusak (terlalu lama?)" +msgstr "Koneksi kehabisan waktu." #: src/client.cpp msgid "Done!" @@ -555,11 +556,11 @@ msgstr "Selesai!" #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "Menginisialisasi node" #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "Menginisialisasi node..." #: src/client.cpp msgid "Item textures..." @@ -1171,14 +1172,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "Awan 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D mode" -msgstr "Mode terbang" +msgstr "Mode 3D" #: src/settings_translation_file.cpp msgid "" @@ -1190,20 +1189,30 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"Dukungan 3D.\n" +"Didukung saat ini:\n" +"- none: tidak ada keluaran 3d.\n" +"- anaglyph: 3d berwarna cyan/magenta.\n" +"- interlaced: garis ganjil/genap berdasarkan polarisasi dukungan layar.\n" +"- topbottom: pisahkan layar atas/bawah.\n" +"- sidebyside: pisahkan layar berdampingan." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Seed peta terpilih untuk peta baru, kosongkan untuk nilai acak.\n" +"Akan diganti ketika menciptakan dunia baru dalam menu utama." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "Sebuah pesan yang akan ditampilkan ke semua klien ketika server crash." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Sebuah pesan yang akan ditampilkan ke semua klien ketika server dimatikan." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1211,15 +1220,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Percepatan di udara" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Batas blok aktif" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Batas pengiriman objek aktif" #: src/settings_translation_file.cpp msgid "" @@ -1227,39 +1236,48 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Alamat untuk menghubungkan.\n" +"Biarkan kosong untuk memulai sebuah server lokal.\n" +"Perhatikan bahwa bidang alamat dalam menu utama menimpa pengaturan ini." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Atur konfigurasi dpi ke layar Anda (non X11/Android saja) misalkan untuk " +"layar 4K." #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Sesuaikan encoding gamma untuk tabel cahaya. Angka yang lebih rendah lebih " +"terang.\n" +"Pengaturan ini untuk klien saja dan diabaikan oleh server." #: src/settings_translation_file.cpp msgid "Advanced" -msgstr "" +msgstr "Lanjutan" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Selalu terbang dan bergerak cepat" #: src/settings_translation_file.cpp +#, fuzzy msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Ambient occlusion gamma" #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" -msgstr "Anisotropic Filtering" +msgstr "Anisotropic filtering" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Umumkan server" #: src/settings_translation_file.cpp msgid "" @@ -1267,14 +1285,17 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Mengumumkan kepada daftar server ini.\n" +"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Minta untuk menyambung ulang setelah crash" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Secara otomatis melaporkan ke daftar server." #: src/settings_translation_file.cpp #, fuzzy @@ -1283,21 +1304,20 @@ msgstr "Mundur" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Dasar" #: src/settings_translation_file.cpp #, fuzzy msgid "Bilinear filtering" -msgstr "Bilinear Filter" +msgstr "Bilinear filtering" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "Alamat Sambungan" +msgstr "Alamat sambungan" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bits per pixel (aka color depth) dalam mode layar penuh." #: src/settings_translation_file.cpp msgid "Build inside player" @@ -1309,117 +1329,109 @@ msgstr "Bumpmapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Penghalusan kamera" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Penghalusan kamera dalam mode sinema" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Tombol beralih pembaruan kamera" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Ubah tombol" +msgstr "Tombol obrolan" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Ubah tombol" +msgstr "Tombol beralih obrolan" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Besar chunk" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Mode kreatif" +msgstr "Mode sinema" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Mode kreatif" +msgstr "Tombol mode sinema" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Bersihkan tekstur transparan" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Klien dan Server" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Kecepatan memanjat" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Tinggi awan" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Jari-jari awan" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "Awan 3D" +msgstr "Awan" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Awan adalah efek tiap klien." + +#: src/settings_translation_file.cpp +msgid "Clouds in menu" +msgstr "Awan dalam menu" #: src/settings_translation_file.cpp #, fuzzy -msgid "Clouds in menu" -msgstr "Menu Utama" - -#: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Berwarna kabut" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Daftar yang dengan dipisahkan koma dari mod terpercaya yang diperbolehkan\n" +"untuk mengakses fungsi yang tidak aman bahkan ketika mod security aktif\n" +"(melalui request_insecure_environment())." #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Perintah" +msgstr "Tombol perintah" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Kaca Tersambung" +msgstr "Sambungkan kaca" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Menghubungkan ke server..." +msgstr "Menyambungkan ke server media eksternal" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Sambungkan kaca jika didukung oleh node." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Konsol" +msgstr "Alpha konsol" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Konsol" +msgstr "Warna konsol" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Konsol" +msgstr "Tombol konsol" #: src/settings_translation_file.cpp msgid "Continuous forward" From 56162a647ecde2bc221a2d3eea736cfab3af085a Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 25 Oct 2015 13:14:23 +0100 Subject: [PATCH 009/531] Translated using Weblate (German) Currently translated at 75.5% (569 of 753 strings) --- po/de/minetest.po | 277 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 216 insertions(+), 61 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index ddcdfe39..a2130a15 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 00:01+0200\n" -"Last-Translator: PilzAdam \n" +"PO-Revision-Date: 2015-10-25 13:14+0200\n" +"Last-Translator: Wuzzy \n" "Language-Team: German " "\n" "Language: de\n" @@ -452,15 +452,17 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Format: , , (, , " +"), , , " #: builtin/mainmenu/tab_settings.lua msgid "Games" msgstr "Spiele" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "Optional kann die lacunarity mit einem weiteren Komma angehängt werden." +msgstr "" +"Optional kann zur lacunarity mit einem führendem Komma angehängt werden." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." @@ -1210,7 +1212,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Absolute Grenze der Erzeugungswarteschlangen" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1335,9 +1337,8 @@ msgid "Chat toggle key" msgstr "Chat-umschalttaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chunk size" -msgstr "Block größe" +msgstr "Chunk-Größe" #: src/settings_translation_file.cpp msgid "Cinematic mode" @@ -1455,11 +1456,11 @@ msgstr "Absturzmeldung" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Fadenkreuzundurchsichtigkeit" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Fadenkreuzundurchsichtigkeit (Wert zwischen 0 und 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" @@ -1483,7 +1484,7 @@ msgstr "Schaden" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Debug-Info-Umschalttaste" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1522,12 +1523,16 @@ msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Standard-Timeout für cURL, in Millisekunden angegeben.\n" +"Hat nur eine Wirkung, wenn mit cURL kompiliert wurde." #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"Definiert die Sampling-Schrittgröße der Textur.\n" +"Ein höherer Wert resultiert in weicheren Normal-Maps." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." @@ -1541,11 +1546,11 @@ msgstr "Verzögerung beim zeigen von Tooltipps, in Millisekunden." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Missbilligte Lua-API-Verarbeitung" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Abstiegsgeschwindigkeit" #: src/settings_translation_file.cpp msgid "" @@ -1557,15 +1562,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "Blockanimationen desynchronisieren" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" +msgstr "Detaillierte Mod-Profildaten. Nützlich für Mod-Entwickler." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "Detailliertes Mod-Profiling" #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1589,11 +1594,11 @@ msgstr "Doppelttippen der Sprungtaste schaltet Flugmodus um." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Fallenlassen-Taste" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben." #: src/settings_translation_file.cpp msgid "Enable a bit lower water surface, so it doesn't " @@ -1605,7 +1610,7 @@ msgstr "Aktiviere Modsicherheit" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Spielerschaden und -tod aktivieren." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." @@ -1614,12 +1619,15 @@ msgstr "Schaltet zufällige Steuerung ein (nur zum Testen verwendet)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." msgstr "" +"Blöcke (nodes) bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)." #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"Weiches Licht mit einfacher Ambient-Occlusion aktivieren.\n" +"Für bessere Performanz oder anderes Aussehen deaktivieren." #: src/settings_translation_file.cpp msgid "" @@ -1629,6 +1637,12 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Aktivieren, um alten Clients die Verbindung zu verwehren.\n" +"Ältere Clients sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " +"neuen\n" +"Servern nicht abstürzen, aber sie könnten nicht alle neuen Funktionen, die " +"Sie\n" +"erwarten, unterstützen." #: src/settings_translation_file.cpp msgid "" @@ -1637,6 +1651,11 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Aktiviert die Benutzung eines entfernen Medienservers (falls vom Server " +"angeboten).\n" +"Entfernte Server bieten eine deutlich schnellere Methode, um Medien (z.B. " +"Texturen)\n" +"während des Verbindugsaufbaus zum Server herunterzuladen." #: src/settings_translation_file.cpp msgid "" @@ -1644,6 +1663,9 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Server als IPv6 laufen lassen (oder nicht). Ein IPv6-Server könnte,\n" +"abhängig von der Systemkonfiguration, auf IPv6-Clients eingeschränkt sein.\n" +"Wird ignoriert, wenn bind_address gesetzt ist." #: src/settings_translation_file.cpp msgid "" @@ -1652,10 +1674,17 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"Aktiviert das Bump-Mapping für Texturen. Normal-Maps müssen vom " +"Texturenpaket\n" +"angeboten werden oder müssen automatisch erzeugt werden.\n" +"Shader müssen aktiviert werden, bevor diese Einstellung aktiviert werden " +"kann." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." msgstr "" +"Aktiviert das Zwischenspeichern von 3D-Modellen, dir mittels facedir rotiert " +"werden." #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -1678,6 +1707,8 @@ msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Experimentelle Einstellung, könnte sichtbare Leerräume zwischen\n" +"Blöcken verursachen, wenn auf einen Wert größer 0 gesetzt." #: src/settings_translation_file.cpp msgid "FPS in pause menu" @@ -1697,27 +1728,27 @@ msgstr "Ersatzschriftart" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Rückgriff-Schattenschrift" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Undurchsichtigkeit der Rückgriff-Schattenschrift" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Größe der Rückgriffschrift" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Schnelltaste" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Schnellmodusbeschleunigung" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Schnellmodusgeschwindigkeit" #: src/settings_translation_file.cpp msgid "Fast movement" @@ -1759,7 +1790,7 @@ msgstr "Filter" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Fester Karten-Seed" #: src/settings_translation_file.cpp msgid "Fly key" @@ -1775,7 +1806,7 @@ msgstr "Nebel" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Taste für Nebel umschalten" #: src/settings_translation_file.cpp msgid "Font path" @@ -1787,15 +1818,17 @@ msgstr "Schriftschatten" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Schriftschatten-Undurchsichtigkeit" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Undurchsichtigkeit des Schattens der Schrift (Wert zwischen 0 und 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." msgstr "" +"Abstand des Schattens hinter der Schrift. Wenn 0, wird der Schatten nicht " +"gezeichnet." #: src/settings_translation_file.cpp msgid "Font size" @@ -1839,7 +1872,7 @@ msgstr "Vollbildmodus." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "GUI-Größenfaktor" #: src/settings_translation_file.cpp msgid "GUI scaling filter" @@ -1875,7 +1908,7 @@ msgstr "Gravitation" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "Taste zur Umschaltung der HUD" #: src/settings_translation_file.cpp msgid "" @@ -1891,7 +1924,7 @@ msgstr "Höhe, in der Wolken auftauchen." #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "Hochpräzisions-FPU" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." @@ -1899,7 +1932,7 @@ msgstr "Homepage des Servers. Wird in der Serverliste angezeigt." #: src/settings_translation_file.cpp msgid "Horizontal initial window size." -msgstr "" +msgstr "Anfängliche Fensterbreite." #: src/settings_translation_file.cpp msgid "" @@ -1940,6 +1973,9 @@ msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"Falls die Bildwiederholrate diesen Wert überschreitet,\n" +"wird sie durch Nichtstun begrenzt, um die CPU nicht\n" +"unnötig auszulasten." #: src/settings_translation_file.cpp msgid "If disabled " @@ -1961,6 +1997,8 @@ msgid "" "If enabled, actions are recorded for rollback.\n" "This option is only read when server starts." msgstr "" +"Falls aktiviert, werden Aktionen für die Rollback-Funktion aufgezeichnet.\n" +"Diese Einstellung wird nur beim Starten des Servers gelesen." #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." @@ -1973,10 +2011,15 @@ msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" +"Falls aktiviert, werden ungültige Weltdaten den Server nicht dazu\n" +"veranlassen, sich zu beenden.\n" +"Aktivieren Sie dies nur, wenn Sie wissen, was sie tun." #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." msgstr "" +"Falls aktiviert, können neue Spieler nicht mit einem leeren Passwort\n" +"beitreten." #: src/settings_translation_file.cpp msgid "" @@ -1984,10 +2027,16 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Falls aktiviert, können Sie Blöcke an der Position (Füße u. Augenhöhe), auf " +"der Sie\n" +"stehen, platzieren. Dies ist hilfreich, wenn mit »Nodeboxen« auf engen Raum\n" +"gearbeitet wird." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." msgstr "" +"Falls dies gesetzt ist, werden Spieler immer an der gegebenen\n" +"Position im Spiel einsteigen bzw. nach dem Tod wieder einsteigen." #: src/settings_translation_file.cpp msgid "Ignore world errors" @@ -2000,18 +2049,22 @@ msgstr "Spiel" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." msgstr "" +"Undurchsichtigkeit des Hintergrundes der Chat-Konsole im Spiel\n" +"(Wert zwischen 0 und 255)." #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Hintergrundfarbe (R,G,B) der Chat-Konsole im Spiel." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." msgstr "" +"Zeitintervall des Abspeicherns wichtiger Änderungen in der Welt,\n" +"in Sekunden angegeben." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "" +msgstr "Zeitintervall, in der die Tageszeit zu Clients gesendet wird." #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2035,7 +2088,7 @@ msgstr "Sprungtaste" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "Sprunggeschwindigkeit" #: src/settings_translation_file.cpp msgid "" @@ -2064,6 +2117,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Springen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2071,6 +2127,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um sich schnell im Schnellmodus zu bewegen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2078,6 +2137,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um den Spieler rückwärts zu bewegen.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2085,6 +2147,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um den Spieler vorwärts zu bewegen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2092,6 +2157,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um den Spieler nach links zu bewegen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2099,6 +2167,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um den Spieler nach rechts zu bewegen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2106,6 +2177,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um die Chat-Konsole im Spiel zu öffnen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2113,6 +2187,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um das Chat-Fenster zu öffnen, um Kommandos einzugeben.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2120,6 +2197,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Öffnen des Chat-Fensters.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2127,6 +2207,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Öffnen des Inventars.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2134,6 +2217,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um die Debug-Stacks auszugeben. Für die Entwicklung benutzt.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2143,6 +2229,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Schleichen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2150,6 +2239,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Wechseln der Kamera (Ego-Perspektive oder Dritte-Person-" +"Perspektive).\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2157,6 +2250,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zur Erzeugung von Screenshots.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2164,6 +2260,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten des Kinomodus.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2171,6 +2270,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Wechseln der Anzeige der Kleinkarte.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2178,6 +2280,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten des Schnellmodus.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2185,6 +2290,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten des Flugmodus.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2192,6 +2300,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten des Geistmodus.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2199,6 +2310,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten der Kameraaktualisierung. Nur für die Entwicklung " +"benutzt.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2206,6 +2321,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten der Anzeige der Debug-Informationen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2213,6 +2331,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um die HUD zu verbergen oder wieder anzuzeigen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2220,6 +2341,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um das Chatprotokoll zu verbergen oder wieder anzuzeigen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2227,6 +2351,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten des Nebels.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2234,6 +2361,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Umschalten der Profiler-Anzeige. Für die Entwicklung benutzt.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2241,6 +2371,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2287,14 +2420,24 @@ msgid "" "- info\n" "- verbose" msgstr "" +"Bis zu welcher Dringlichkeitsstufe Protokollmeldungen\n" +"in debug.txt geschrieben werden sollen:\n" +"- (keine Protokollierung)\n" +"- none (Meldungen ohne Einstufung)\n" +"- error (Fehler)\n" +"- warning (Warnung)\n" +"- action (Aktion)\n" +"- info (Information)\n" +"- verbose (geschwätzig)" #: src/settings_translation_file.cpp +#, fuzzy msgid "Limit of emerge queues on disk" -msgstr "" +msgstr "Grenze der Erzeugungswarteschlangen auf dem Festspeicher" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "" +msgstr "Max. Anzahl der Erzeugungswarteschlangen, die erzeugt werden sollen" #: src/settings_translation_file.cpp msgid "" @@ -2304,14 +2447,22 @@ msgid "" "- Downloads performed by main menu (e.g. mod manager).\n" "Only has an effect if compiled with cURL." msgstr "" +"Begrenzt die Anzahl der parallelen HTTP-Anfragen. Betrifft:\n" +"- Medienabholung, falls der Server die remote-media-Einstellung verwendet." +"\n" +"- Herunterladen der Serverliste und Server-Ankündigungsdaten.\n" +"- Downloads, die aus dem Hauptmenü aus getätigt wurden (z.B. Mod-Manager)." +"\n" +"Hat nur eine Wirkung, wenn mit cURL kompiliert." #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "Fließvermögen" #: src/settings_translation_file.cpp +#, fuzzy msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "Weiches Fließvermögen" #: src/settings_translation_file.cpp msgid "Liquid loop max" @@ -2335,11 +2486,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "Hauptmenü-Spiel-Manager" #: src/settings_translation_file.cpp msgid "Main menu mod manager" -msgstr "" +msgstr "Hauptmenü-Mod-Manager" #: src/settings_translation_file.cpp msgid "Main menu script" @@ -2349,10 +2500,14 @@ msgstr "Hauptmenü-Skript" msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" +"Nebel- und Himmelsfarben von der Tageszeit (Sonnenaufgang/Sonnenuntergang)\n" +"und Blickrichtung abhängig machen." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +"DirectX mit LuaJIT zusammenarbeiten lassen. Deaktivieren Sie dies,\n" +"falls es Probleme verursacht." #: src/settings_translation_file.cpp msgid "Map directory" @@ -2379,7 +2534,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "Kartenerzeugungsgrenzwert" #: src/settings_translation_file.cpp msgid "Map save interval" @@ -2387,23 +2542,23 @@ msgstr "Speicherintervall der Welt" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "Mapblock-Grenze" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "" +msgstr "Timeout zum Entladen von Mapblocks" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "" +msgstr "Kartenerzeugerbiomhitzenrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "" +msgstr "Kartenerzeugerbiomluftfeuchtigkeitsübergangsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "" +msgstr "Kartenerzeugerbiomluftfeuchtigkeitsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen debug" @@ -2415,7 +2570,7 @@ msgstr "Weltgenerator Flags" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "" +msgstr "Kartenerzeugerhitzenübergangsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen name" @@ -2427,23 +2582,23 @@ msgstr "Weltgenerator v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "" +msgstr "cave1-Rauschparameter für v5-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "" +msgstr "cave2-Rauschparameter für v5-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "" +msgstr "Faktorrauschparameter für v5-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "" +msgstr "Tiefenrauschparameter für v5-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "" +msgstr "Höhenrauschparameter für v5-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6" @@ -2451,35 +2606,35 @@ msgstr "Weltgenerator v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "" +msgstr "Apfelbaumrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "" +msgstr "Strandfrequenz für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "" +msgstr "Strandrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "" +msgstr "Biomrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "" +msgstr "Höhlenrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "Wüstenrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "" +msgstr "Flags für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "" +msgstr "Höhenauswahlrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" From 81ff738ccdd9a934aec0c4fd0dd4b764336433bd Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Sun, 25 Oct 2015 14:01:46 +0100 Subject: [PATCH 010/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 43.8% (330 of 753 strings) --- po/zh_TW/minetest.po | 136 +++++++++++++------------------------------ 1 file changed, 42 insertions(+), 94 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 5adc93bb..3c4a9089 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 11:08+0200\n" +"PO-Revision-Date: 2015-10-25 14:01+0200\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) " "\n" @@ -1894,9 +1894,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If disabled " -msgstr "停用 MP" +msgstr "若停用 " #: src/settings_translation_file.cpp msgid "" @@ -1906,9 +1905,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If enabled, " -msgstr "已啟用" +msgstr "若啟用， " #: src/settings_translation_file.cpp msgid "" @@ -1946,9 +1944,8 @@ msgid "Ignore world errors" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "遊戲" +msgstr "遊戲中" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -1967,9 +1964,8 @@ msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "物品欄" +msgstr "物品欄按鍵" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -1984,9 +1980,8 @@ msgid "Item entity TTL" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "跳躍" +msgstr "跳躍鍵" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2218,9 +2213,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "左邊選單鍵" +msgstr "左鍵" #: src/settings_translation_file.cpp msgid "" @@ -2290,14 +2284,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "主選單" +msgstr "主選單 mod 管理員" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "主選單" +msgstr "主選單指令稿" #: src/settings_translation_file.cpp msgid "" @@ -2360,28 +2352,24 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "地圖產生器" +msgstr "地圖產生器除錯" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "地圖產生器" +msgstr "地圖產生器旗標" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "地圖產生器" +msgstr "地圖產生器名稱" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "地圖產生器" +msgstr "地圖產生器 v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2404,9 +2392,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "地圖產生器" +msgstr "地圖產生器 v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2465,9 +2452,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "地圖產生器" +msgstr "地圖產生器 v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2621,7 +2607,6 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" msgstr "選單" @@ -2661,7 +2646,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" msgstr "映射貼圖" @@ -2754,7 +2738,6 @@ msgid "Noclip key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" msgstr "突顯節點" @@ -2807,34 +2790,28 @@ msgid "Parallax Occlusion" msgstr "視差遮蔽" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" msgstr "視差遮蔽" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" -msgstr "視差遮蔽" +msgstr "視差遮蔽係數" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "視差遮蔽" +msgstr "視差遮蔽偏差" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "視差遮蔽" +msgstr "視差遮蔽迭代" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "視差遮蔽" +msgstr "視差遮蔽模式" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" -msgstr "視差遮蔽" +msgstr "視差遮蔽強度" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." @@ -2859,9 +2836,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "玩家名稱太長。" +msgstr "玩家名稱" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -2886,9 +2862,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "正在載入材質..." +msgstr "預先載入物品欄材質" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." @@ -2918,9 +2893,8 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "選擇範圍" +msgstr "範圍選擇鍵" #: src/settings_translation_file.cpp msgid "Remote media" @@ -2935,9 +2909,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "右邊選單鍵" +msgstr "右鍵" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -2977,7 +2950,6 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" msgstr "螢幕截圖" @@ -3006,44 +2978,36 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "開始單人遊戲" +msgstr "伺服器／單人遊戲" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "伺服器" +msgstr "伺服器 URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "伺服器埠" +msgstr "伺服器地址" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "伺服器埠" +msgstr "伺服器描述" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "伺服器" +msgstr "伺服器名稱" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "伺服器埠" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "公共伺服器清單" +msgstr "伺服器清單 URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "公共伺服器清單" +msgstr "伺服器清單檔" #: src/settings_translation_file.cpp msgid "" @@ -3099,9 +3063,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "平滑光線" +msgstr "平滑光" #: src/settings_translation_file.cpp msgid "" @@ -3118,9 +3081,8 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "潛行" +msgstr "潛行按鍵" #: src/settings_translation_file.cpp msgid "Sound" @@ -3139,9 +3101,8 @@ msgid "Static spawnpoint" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." -msgstr "生成一般地圖" +msgstr "生成之一般地圖的強度。" #: src/settings_translation_file.cpp msgid "Strength of parallax." @@ -3156,9 +3117,8 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "材質包" +msgstr "材質路徑" #: src/settings_translation_file.cpp msgid "" @@ -3241,7 +3201,6 @@ msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "三線性過濾器" @@ -3285,9 +3244,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "按下按鍵" +msgstr "使用按鍵" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -3298,9 +3256,8 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "先前的核心開發者" +msgstr "對 mod 開發者很有用。" #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3339,14 +3296,12 @@ msgid "Viewing range minimum" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "音量" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "葉子擺動" +msgstr "走路速度" #: src/settings_translation_file.cpp msgid "Wanted FPS" @@ -3361,39 +3316,32 @@ msgid "Water surface level of the world." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "葉子擺動" +msgstr "擺動節點" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" msgstr "葉子擺動" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" msgstr "植物擺動" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "波動的水" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "波動的水" +msgstr "波動的水高度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "波動的水" +msgstr "波動的水長度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "波動的水" +msgstr "波動的水速度" #: src/settings_translation_file.cpp msgid "" From d1ab04146b53f5659ca1b7fc560c0bdc064777bb Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 25 Oct 2015 16:11:35 +0100 Subject: [PATCH 011/531] Translated using Weblate (German) Currently translated at 95.4% (719 of 753 strings) --- po/de/minetest.po | 623 ++++++++++++++++++++++++++++++---------------- 1 file changed, 402 insertions(+), 221 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index a2130a15..b7d72daf 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 13:14+0200\n" +"PO-Revision-Date: 2015-10-25 16:11+0200\n" "Last-Translator: Wuzzy \n" "Language-Team: German " "\n" @@ -21,7 +21,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Es ist ein Fehler in einem Lua-Skript aufgetreten, z.b in einem Mod:" +msgstr "Es ist ein Fehler in einem Lua-Skript aufgetreten, z.B. in einem Mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -45,7 +45,7 @@ msgstr "Der Server hat um eine Wiederverbindung gebeten:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." -msgstr "Lädt…" +msgstr "Lädt …" #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " @@ -62,7 +62,7 @@ msgstr "Server unterstützt Protokollversionen $1 bis $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" -"Versuche die Öffentliche Serverliste neu zu laden bzw. prüfe deine " +"Versuchen Sie, die öffentliche Serverliste neu zu laden und prüfen Sie Ihre " "Internetverbindung." #: builtin/mainmenu/common.lua @@ -100,7 +100,7 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" -"Fehler beim aktivieren der Mod \"$1\": Ungültiger Name. Nur folgende Zeichen " +"Fehler beim Aktivieren der Mod „$1“: Ungültiger Name. Nur folgende Zeichen " "sind erlaubt: [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua @@ -113,7 +113,7 @@ msgstr "Modpacks verstecken" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" -msgstr "Modifikation:" +msgstr "Mod:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp @@ -176,7 +176,7 @@ msgstr "Keine Spiele installiert." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "Bist du sicher, dass du \"$1\" wirklich löschen möchtest?" +msgstr "Sind Sie sich sicher, dass Sie „$1“ löschen wollen?" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" @@ -452,7 +452,7 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" -"Format: , , (, , " +"Format: , , (, , " "), , , " #: builtin/mainmenu/tab_settings.lua @@ -460,6 +460,7 @@ msgid "Games" msgstr "Spiele" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" "Optional kann zur lacunarity mit einem führendem Komma angehängt werden." @@ -470,7 +471,7 @@ msgstr "Bitte geben Sie eine mit Kommata getrennte Liste von Flags an." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "Bitte geben Sie eine gültige Zahl ein." +msgstr "Bitte geben Sie eine gültige ganze Zahl ein." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." @@ -494,7 +495,7 @@ msgstr "Einstellungen" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "Zeige technische Namen" +msgstr "Technische Namen zeigen" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." @@ -817,7 +818,7 @@ msgstr "Schleichen" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" -msgstr "Filmmodus umschalten" +msgstr "Kinomodus umschalten" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -897,11 +898,11 @@ msgstr "Strg" #: src/keycode.cpp msgid "Convert" -msgstr "Konvertierung" +msgstr "Convert" #: src/keycode.cpp msgid "CrSel" -msgstr "Cr Sel" +msgstr "CrSel" #: src/keycode.cpp msgid "Down" @@ -913,7 +914,7 @@ msgstr "Ende" #: src/keycode.cpp msgid "Erase OEF" -msgstr "Verdecke OEF" +msgstr "Erase OEF" #: src/keycode.cpp msgid "Escape" @@ -929,7 +930,7 @@ msgstr "Ausführen" #: src/keycode.cpp msgid "Final" -msgstr "Ziel" +msgstr "Final" #: src/keycode.cpp msgid "Help" @@ -965,7 +966,7 @@ msgstr "Strg links" #: src/keycode.cpp msgid "Left Menu" -msgstr "Alt" +msgstr "Menü links" #: src/keycode.cpp msgid "Left Shift" @@ -997,7 +998,7 @@ msgstr "Bild runter" #: src/keycode.cpp msgid "Nonconvert" -msgstr "Keine konventierung" +msgstr "Nonconvert" #: src/keycode.cpp msgid "Num Lock" @@ -1061,7 +1062,7 @@ msgstr "Ziffernblock 9" #: src/keycode.cpp msgid "OEM Clear" -msgstr "OEM Reinigen" +msgstr "OEM Clear" #: src/keycode.cpp msgid "PA1" @@ -1101,7 +1102,7 @@ msgstr "Strg rechts" #: src/keycode.cpp msgid "Right Menu" -msgstr "Alt Gr" +msgstr "Menü rechts" #: src/keycode.cpp msgid "Right Shift" @@ -1121,7 +1122,7 @@ msgstr "Auswählen" #: src/keycode.cpp msgid "Shift" -msgstr "L. Umsch" +msgstr "Umsch." #: src/keycode.cpp msgid "Sleep" @@ -1160,8 +1161,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" -"0 = Parallax Mapping mit Stufeninformation (schneller).\n" -"1 = Relief Mapping (langsamer, genauer)." +"0 = Parallax-Mapping mit Stufeninformation (schneller).\n" +"1 = Relief-Mapping (langsamer, genauer)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1169,7 +1170,7 @@ msgstr "3D-Wolken" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "3D Modus" +msgstr "3D-Modus" #: src/settings_translation_file.cpp msgid "" @@ -1181,33 +1182,33 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" -"3D Unterstützung.\n" +"3D-Unterstützung.\n" "Aktuell verfügbar:\n" -"- none: Keine 3D Ausgabe.\n" -"- anaglyph: türkis / magenta-farbenes 3D.\n" -"- interlaced: gerade / ungerade zeilenbasierte Polarisation.\n" -"- topbottom: Teile Bildschirm horizontal.\n" -"- sidebyside: Teile Bildschirm vertikal." +"- none: Keine 3D-Ausgabe.\n" +"- anaglyph: Türkises / magenta 3D.\n" +"- interlaced: Gerade / ungerade zeilenbasierte Polarisation.\n" +"- topbottom: Bildschirm horizontal teilen.\n" +"- sidebyside: Bildschirm vertikal teilen." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Ein festgelegter Weltgenerator Seed für neue Welten. Leer lassen für " +"Ein festgelegter Weltgenerator-Seed für neue Welten. Leer lassen für " "zufällige Erzeugung.\n" "Wird überschrieben, wenn die Welt im Menü erstellt wird." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" -"Eine Nachricht, die an alle verbundenen Klienten versendet wird, wenn der " +"Eine Nachricht, die an alle verbundenen Clients versendet wird, wenn der " "Server abstürzt." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" -"Eine Nachricht, die an alle verbundene Klienten gesendet wird, wenn der " +"Eine Nachricht, die an alle verbundene Clients gesendet wird, wenn der " "Server herunterfährt." #: src/settings_translation_file.cpp @@ -1234,13 +1235,13 @@ msgid "" msgstr "" "Adresse, mit der verbunden werden soll.\n" "Leer lassen, um einen lokalen Server zu starten.\n" -"Die Adresse im Menü überschreibt diese Einstellung." +"Die Adresse im Hauptmenü überschreibt diese Einstellung." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "DPI des Bildschirms (nicht für X11/Android) z.B. für 4K Bildschirme." +msgstr "DPI des Bildschirms (nicht für X11/Android) z.B. für 4K-Bildschirme." #: src/settings_translation_file.cpp msgid "" @@ -1248,7 +1249,7 @@ msgid "" "This setting is for the client only and is ignored by the server." msgstr "" "Ändert die Gammakodierung der Lichttabellen. Kleinere Werte sind heller.\n" -"Diese Einstellung ist klientenseitig und wird vom Server ignoriert." +"Diese Einstellung ist clientseitig und wird vom Server ignoriert." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1260,7 +1261,7 @@ msgstr "Immer schnell fliegen" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "Umgebungsverdeckungs Gamma" +msgstr "Umgebungsverdeckungs-Gamma" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1268,7 +1269,7 @@ msgstr "Anisotroper Filter" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "Server anmelden" +msgstr "Server ankündigen" #: src/settings_translation_file.cpp msgid "" @@ -1277,8 +1278,8 @@ msgid "" "minetest.net." msgstr "" "Meldet den Server in der Serverliste.\n" -"Wenn ein IPv6 Server angemeldet werden soll, muss serverlist_url auf " -"v6.servers.minetest.net. gesetzt werden." +"Wenn ein IPv6-Server angemeldet werden soll, muss serverlist_url auf " +"v6.servers.minetest.net gesetzt werden." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1322,11 +1323,11 @@ msgstr "Kameraglättung" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "Kammeraglättung im Filmmodus" +msgstr "Kameraglättung im Kinomodus" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "Kameraaktualisierung-Umschalttaste" +msgstr "Taste zum Umschalten der Kameraaktualisierung" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1334,7 +1335,7 @@ msgstr "Chattaste" #: src/settings_translation_file.cpp msgid "Chat toggle key" -msgstr "Chat-umschalttaste" +msgstr "Taste zum Umschalten des Chatprotokolls" #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1342,19 +1343,19 @@ msgstr "Chunk-Größe" #: src/settings_translation_file.cpp msgid "Cinematic mode" -msgstr "Filmmodus" +msgstr "Kinomodus" #: src/settings_translation_file.cpp msgid "Cinematic mode key" -msgstr "Filmmodustaste" +msgstr "Kinomodustaste" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "Säubere transparente Texturen" +msgstr "Transparente Texturen säubern" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "Klient und Server" +msgstr "Client und Server" #: src/settings_translation_file.cpp msgid "Climbing speed" @@ -1374,7 +1375,7 @@ msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Wolken sind ein klientenseitiger Effekt." +msgstr "Wolken sind ein clientseitiger Effekt." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1389,8 +1390,11 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" -"Kommagetrennte Liste der vertrauten Mods, denen es erlaubt ist,\n" -"unsichere Funktionen zu verwenden, wenn Modsicherheit eingeschaltet ist." +"Kommagetrennte Liste der Mods, denen Sie vertrauen. Vertrauten Mods ist es " +"erlaubt,\n" +"unsichere Funktionen zu verwenden, sogar dann, wenn Modsicherheit " +"eingeschaltet ist\n" +"(mit request_insecure_environment())." #: src/settings_translation_file.cpp msgid "Command key" @@ -1402,7 +1406,7 @@ msgstr "Verbundenes Glas" #: src/settings_translation_file.cpp msgid "Connect to external media server" -msgstr "Externen Medienserver verwenden" +msgstr "Zu externen Medienserver verbinden" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." @@ -1410,7 +1414,7 @@ msgstr "Verbindet Glas, wenn der Block dies unterstützt." #: src/settings_translation_file.cpp msgid "Console alpha" -msgstr "Konsolendurchsichtigkeit" +msgstr "Konsolenundurchsichtigkeit" #: src/settings_translation_file.cpp msgid "Console color" @@ -1447,7 +1451,7 @@ msgid "" "Controls size of deserts and beaches in Mapgen V6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"Verändert die Größe der Wüsten und Strände in Mapgenerator V6.\n" +"Verändert die Größe der Wüsten und Strände in Kartenerzeuger V6.\n" "Wenn Schneebiome aktiviert sind, wird diese Einstellung ignoriert." #: src/settings_translation_file.cpp @@ -1484,7 +1488,7 @@ msgstr "Schaden" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "Debug-Info-Umschalttaste" +msgstr "Taste zum Umschalten der Debug-Info" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1507,8 +1511,9 @@ msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" -"Standardspiel beim erstellen einer neuen Welt.\n" -"Diese Einstellung wird nicht genutzt, wenn die Welt im Menü erstellt wird." +"Standardspiel beim Erstellen einer neuen Welt.\n" +"Diese Einstellung wird nicht genutzt, wenn die Welt im Hauptmenü erstellt " +"wird." #: src/settings_translation_file.cpp msgid "Default password" @@ -1532,21 +1537,21 @@ msgid "" "A higher value results in smoother normal maps." msgstr "" "Definiert die Sampling-Schrittgröße der Textur.\n" -"Ein höherer Wert resultiert in weicheren Normal-Maps." +"Ein höherer Wert resultiert in weichere Normal-Maps." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" -"Setzt die maximale Distanz, in der Spieler übertragen werden, in Blöcken (0 =" -" unbegrenzt)." +"Setzt die maximale Distanz, in der die Spieler übertragen werden, in Blöcken " +"(0 = unbegrenzt)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "Verzögerung beim zeigen von Tooltipps, in Millisekunden." +msgstr "Verzögerung beim Zeigen von Tooltipps, in Millisekunden." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "Missbilligte Lua-API-Verarbeitung" +msgstr "Missbilligte Lua-API-Handhabung" #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1557,7 +1562,7 @@ msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" -"Die Beschreibung des Servers. Wird neuen Klienten und in der Serverlist " +"Die Beschreibung des Servers. Wird neuen Clients und in der Serverliste " "angezeigt." #: src/settings_translation_file.cpp @@ -1574,11 +1579,11 @@ msgstr "Detailliertes Mod-Profiling" #: src/settings_translation_file.cpp msgid "Disable anticheat" -msgstr "Anti-cheat deaktivieren" +msgstr "Anti-Cheat deaktivieren" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "Verbiete leere Passwörter" +msgstr "Leere Passwörter verbieten" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." @@ -1606,7 +1611,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enable mod security" -msgstr "Aktiviere Modsicherheit" +msgstr "Modsicherheit aktivieren" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." @@ -1688,19 +1693,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables minimap." -msgstr "Aktiviert Minimap." +msgstr "Aktiviert die Kleinkarte." #: src/settings_translation_file.cpp msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" +"Aktiviert die spontane Normalmap-Erzeugung (Prägungseffekt).\n" +"Für diese Einstellung muss außerdem Bump-Mapping aktiviert sein." #: src/settings_translation_file.cpp msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"Aktiviert Parralax-Occlusion-Mapping.\n" +"Hierfür müssen Shader aktiviert sein." #: src/settings_translation_file.cpp msgid "" @@ -1724,7 +1733,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fallback font" -msgstr "Ersatzschriftart" +msgstr "Rückgriffschrift" #: src/settings_translation_file.cpp msgid "Fallback font shadow" @@ -1783,6 +1792,11 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" +"Gefilterte Texturen können RGB-Werte mit transparenten Nachbarn,\n" +"die PNG-Optimierer üblicherweise verwerfen, mischen. Manchmal\n" +"resultiert dies in einer dunklen oder hellen Kante bei transparenten\n" +"Texturen. Aktivieren Sie diesen Filter, um dies beim Laden der\n" +"Texturen aufzuräumen." #: src/settings_translation_file.cpp msgid "Filtering" @@ -1840,23 +1854,29 @@ msgstr "Vorwärtstaste" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "Freetype Schriften" +msgstr "FreeType-Schriften" #: src/settings_translation_file.cpp msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"Von wie weit weg Blöcke für Clients erzeugt werden,\n" +"in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"Von wie weit weg Blöcke zu Clients gesendet werden,\n" +"in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" +"Von wie weit weg Clients über Objekte bescheid wissen,\n" +"in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp msgid "Full screen" @@ -1864,7 +1884,7 @@ msgstr "Vollbild" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "Vollbild BPP" +msgstr "Vollbildfarbtiefe" #: src/settings_translation_file.cpp msgid "Fullscreen mode." @@ -1880,7 +1900,7 @@ msgstr "GUI-Skalierfilter" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "GUI-Skalierungsfilter txr2img" #: src/settings_translation_file.cpp msgid "Gamma" @@ -1917,6 +1937,13 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +"Handhabung für missbilligte Lua-API-Aufrufe:\n" +"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release)." +"\n" +"- log: Imitieren, und den Backtrace des missbilligten Funktionsaufrufs " +"protokollieren (Standard für Debug).\n" +"- error: Bei Verwendung eines missbilligten Funktionsaufrufs abbrechen (" +"empfohlen für Mod-Entwickler)." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -1955,6 +1982,9 @@ msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" +"Wie lange der Server warten wird, bevor nicht mehr verwendete Mapblocks\n" +"entladen werden. Ein höher Wert führt zu besserer Performanz, aber auch\n" +"zur Benutzung von mehr Arbeitsspeicher." #: src/settings_translation_file.cpp msgid "IPv6" @@ -1962,11 +1992,11 @@ msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "IPv6 Server" +msgstr "IPv6-Server" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "IPv6 Unterstützung." +msgstr "IPv6-Unterstützung." #: src/settings_translation_file.cpp msgid "" @@ -2003,7 +2033,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." msgstr "" -"Wenn diese Einstellung aktiviert ist, werden die Anti-Cheat Maßnahmen " +"Wenn diese Einstellung aktiviert ist, werden die Anti-Cheat-Maßnahmen " "deaktiviert." #: src/settings_translation_file.cpp @@ -2029,7 +2059,7 @@ msgid "" msgstr "" "Falls aktiviert, können Sie Blöcke an der Position (Füße u. Augenhöhe), auf " "der Sie\n" -"stehen, platzieren. Dies ist hilfreich, wenn mit »Nodeboxen« auf engen Raum\n" +"stehen, platzieren. Dies ist hilfreich, wenn mit „Nodeboxen“ auf engen Raum\n" "gearbeitet wird." #: src/settings_translation_file.cpp @@ -2040,7 +2070,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "Ignoriere Weltfehler" +msgstr "Weltfehler ignorieren" #: src/settings_translation_file.cpp msgid "In-Game" @@ -2064,7 +2094,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "Zeitintervall, in der die Tageszeit zu Clients gesendet wird." +msgstr "Zeitintervall, in der die Tageszeit an Clients gesendet wird." #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2080,7 +2110,7 @@ msgstr "Kehrt die vertikale Mausbewegung um." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "Item-Entity-TTL" #: src/settings_translation_file.cpp msgid "Jump key" @@ -2096,6 +2126,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2103,6 +2136,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zum Fallenlassen des ausgewählten Gegenstandes.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2110,6 +2146,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2385,7 +2424,7 @@ msgstr "Sprache" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "Blätterart" +msgstr "Blätterstil" #: src/settings_translation_file.cpp msgid "" @@ -2394,10 +2433,11 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" -"Blätterart:\n" +"Blätterstil:\n" "- Fancy: Alle Seiten sind sichtbar\n" -"- Simple: Nur die äußeren Seiten sind sichtbar, oder special_tiles\n" -"- Opaque: Blätter sind nicht durchsichtig" +"- Simple: Nur die äußeren Seiten sind sichtbar, oder special_tiles werden " +"benutzt\n" +"- Opaque: Blätter sind undurchsichtig" #: src/settings_translation_file.cpp msgid "Left key" @@ -2408,6 +2448,9 @@ msgid "" "Length of a server tick and the interval at which objects are generally " "updated over network." msgstr "" +"Länge eines Serverticks und dem Zeitintervall, in dem Objekte über das " +"Netzwerk üblicherweise\n" +"aktualisiert werden." #: src/settings_translation_file.cpp msgid "" @@ -2448,11 +2491,10 @@ msgid "" "Only has an effect if compiled with cURL." msgstr "" "Begrenzt die Anzahl der parallelen HTTP-Anfragen. Betrifft:\n" -"- Medienabholung, falls der Server die remote-media-Einstellung verwendet." +"- Medienabholung, falls der Server die remote_media-Einstellung verwendet." "\n" "- Herunterladen der Serverliste und Server-Ankündigungsdaten.\n" -"- Downloads, die aus dem Hauptmenü aus getätigt wurden (z.B. Mod-Manager)." -"\n" +"- Downloads, die vom Hauptmenü aus getätigt wurden (z.B. Mod-Manager).\n" "Hat nur eine Wirkung, wenn mit cURL kompiliert." #: src/settings_translation_file.cpp @@ -2466,11 +2508,11 @@ msgstr "Weiches Fließvermögen" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "" +msgstr "Max. Flüssigkeitsiterationen" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" -msgstr "" +msgstr "Aufräumzeit für Flüssigkeitswarteschlange" #: src/settings_translation_file.cpp msgid "Liquid sink" @@ -2478,11 +2520,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "Flüssigkeitsaktualisierungsintervall in Sekunden." #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "" +msgstr "Flüssigkeitsaktualisierungs-Tick" #: src/settings_translation_file.cpp msgid "Main menu game manager" @@ -2534,7 +2576,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "Kartenerzeugungsgrenzwert" +msgstr "Kartenerzeugungsgrenze" #: src/settings_translation_file.cpp msgid "Map save interval" @@ -2562,11 +2604,11 @@ msgstr "Kartenerzeugerbiomluftfeuchtigkeitsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen debug" -msgstr "Weltgenerator Debugging" +msgstr "Kartenerzeuger-Debugging" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "Weltgenerator Flags" +msgstr "Kartenerzeuger-Flags" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -2574,11 +2616,11 @@ msgstr "Kartenerzeugerhitzenübergangsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen name" -msgstr "Weltgeneratorname" +msgstr "Kartenerzeugername" #: src/settings_translation_file.cpp msgid "Mapgen v5" -msgstr "Weltgenerator v5" +msgstr "Kartenerzeuger v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2602,7 +2644,7 @@ msgstr "Höhenrauschparameter für v5-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6" -msgstr "Weltgenerator v6" +msgstr "Kartenerzeuger v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2638,75 +2680,75 @@ msgstr "Höhenauswahlrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "" +msgstr "Luftfeuchtigkeitsrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "" +msgstr "Schlammrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "" +msgstr "Steilheitsrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "" +msgstr "Geländehöhenrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "" +msgstr "Basisgeländerauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "" +msgstr "Baumrauschparameter für v6-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7" -msgstr "Weltgenerator v7" +msgstr "Kartenerzeuger v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "" +msgstr "cave1-Rauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "" +msgstr "cave2-Rauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" -msgstr "" +msgstr "Ausfülltiefenrauschen für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "" +msgstr "Flags für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "" +msgstr "Höhenauswahlrauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "" +msgstr "Berghöhenrauschenparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "" +msgstr "Bergrauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "" +msgstr "Gratrauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "" +msgstr "Wassergratrauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "" +msgstr "Geländehöhenrauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "" +msgstr "Basisgeländerauschparameter für v7-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" @@ -2714,23 +2756,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Max block generate distance" -msgstr "" +msgstr "Max. Distanz für Blockerzeugung" #: src/settings_translation_file.cpp msgid "Max block send distance" -msgstr "" +msgstr "Max. Distanz für Blockübertragung" #: src/settings_translation_file.cpp msgid "Max liquids processed per step." -msgstr "" +msgstr "Max. Flüssigkeiten, die pro Step verarbeitet werden." #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" -msgstr "" +msgstr "Max. clearobjects-Zusatzblöcke" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" -msgstr "" +msgstr "Max. Pakete pro Iteration" #: src/settings_translation_file.cpp msgid "Maximum FPS" @@ -2738,41 +2780,51 @@ msgstr "Maximale FPS" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "Maximale FPS wenn das Spiel pausiert ist." +msgstr "Maximale FPS, wenn das Spiel pausiert ist." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "" +msgstr "Maximal zwangsgeladene Blöcke" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "Max. Breite der Schnellzugriffsleiste" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." msgstr "" +"Maximale Anzahl der Blöcke, welche in die Ladewarteschlange gesetzt werden " +"können." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Maximale Anzahl der Blöcke, die in die Erzeugungswarteschlage gesetzt werden." +"\n" +"Feld frei lassen, um automatisch einen geeigneten Wert zu bestimmen." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Maximale Anzahl der Blöcke, die in die Warteschlange zum Laden aus\n" +"einer Datei gesetzt werden können.\n" +"Feld frei lassen, um automatisch einen geeigneten Wert zu bestimmen." #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "" +msgstr "Maximale Anzahl der zwangsgeladenen Mapblocks." #: src/settings_translation_file.cpp msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" +"Maximale Anzahl der Mapblocks, die der Client im Speicher vorhalten soll.\n" +"Auf -1 setzen, um keine Obergrenze zu verwenden." #: src/settings_translation_file.cpp msgid "" @@ -2780,6 +2832,13 @@ msgid "" "try reducing it, but don't reduce it to a number below double of targeted\n" "client number." msgstr "" +"Maximale Anzahl der Pakete, die pro Sende-Step gesendet werden. Falls Sie " +"eine\n" +"langsame Verbindung haben, probieren Sie es damit, diesen Wert zu reduzieren," +"\n" +"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Clients, die " +"Sie\n" +"anstreben." #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." @@ -2787,33 +2846,38 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "" +msgstr "Maximale Anzahl der statisch gespeicherten Objekte in einem Block." #: src/settings_translation_file.cpp msgid "" "Maximum proportion of current window to be used for hotbar.\n" "Useful if there's something to be displayed right or left of hotbar." msgstr "" +"Maximales Verhältnis zum aktuellen Fenster, das für die\n" +"Schnellzugriffsleiste verwendet werden soll. Nützlich, wenn es\n" +"etwas gibt, was links oder rechts von ihr angezeigt werden soll." #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "" +msgstr "Maximale Anzahl der Blöcke, die gleichzeitig pro Client gesendet werden" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "" +msgstr "Maximale Gesamtzahl der gleichzeitig gesendeten Blöcke" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" +"Maximale Zeit in ms, die das Herunterladen einer Datei (z.B. eine Mod) " +"dauern darf." #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "Maximale Benutzerzahl" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "" +msgstr "Maximale Objekte pro Block" #: src/settings_translation_file.cpp msgid "Menus" @@ -2821,31 +2885,34 @@ msgstr "Menüs" #: src/settings_translation_file.cpp msgid "Mesh cache" -msgstr "" +msgstr "3D-Modell-Zwischenspeicher" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "Meldung des Tages (message of the day)" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." msgstr "" +"Die Meldung des Tages, die frisch verbundenen Spielern angezeigt werden soll." +"\n" +"Auf Englisch bekannt als »message of the day« oder »MOTD«." #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Kleinkarte" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Kleinkartentaste" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "Abtasthöhe der Kleinkarte" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" -msgstr "" +msgstr "Minimale Texturengröße für Filter" #: src/settings_translation_file.cpp msgid "" @@ -2853,6 +2920,10 @@ msgid "" "The amount of rendered stuff is dynamically set according to this. and " "viewing range min and max." msgstr "" +"Minimal gewünschte Bildwiederholrate.\n" +"Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch " +"angepasst; auch\n" +"die minimale und maximale Sichtweite werden angepasst." #: src/settings_translation_file.cpp msgid "Mipmapping" @@ -2860,7 +2931,7 @@ msgstr "Mip-Mapping" #: src/settings_translation_file.cpp msgid "Mod profiling" -msgstr "" +msgstr "Mod-Profiling" #: src/settings_translation_file.cpp msgid "Modstore details URL" @@ -2876,19 +2947,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Monospace font path" -msgstr "" +msgstr "Pfad der Festbreitenschrift" #: src/settings_translation_file.cpp msgid "Monospace font size" -msgstr "" +msgstr "Größe der Festbreitenschrift" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "Maussensitivität" +msgstr "Mausempfindlichkeit" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "Faktor für die Maussensitivität." +msgstr "Faktor für die Mausempfindlichkeit." #: src/settings_translation_file.cpp msgid "" @@ -2907,6 +2978,9 @@ msgid "" "Name of map generator to be used when creating a new world.\n" "Creating a world in the main menu will override this." msgstr "" +"Name des Kartengenerators, der für die Erstellung neuer Welten\n" +"verwendet werden soll. Mit der Erstellung einer Welt im Hauptmenü\n" +"wird diese Einstellung überschrieben." #: src/settings_translation_file.cpp msgid "" @@ -2914,11 +2988,17 @@ msgid "" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"Name des Spielers.\n" +"Wenn ein Server gestartet wird, werden Clients mit diesem Namen zu Admins.\n" +"Wird vom Hauptmenü aus gestartet, wird diese Einstellung überschrieben." #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." msgstr "" +"Name des Servers. Er wird in der Serverliste angezeigt und für frisch " +"verbundene\n" +"Spieler angezeigt." #: src/settings_translation_file.cpp msgid "Network" @@ -2929,14 +3009,17 @@ msgid "" "Network port to listen (UDP).\n" "This value will be overridden when starting from the main menu." msgstr "" +"Netzwerkport (UDP), auf dem gelauscht werden soll.\n" +"Dieser Wert wird überschrieben, wenn vom Hauptmenü\n" +"aus gestartet wird." #: src/settings_translation_file.cpp msgid "New style water" -msgstr "" +msgstr "Wasser im neuen Stil" #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "Neue Benutzer müssen dieses Passwort eingeben." #: src/settings_translation_file.cpp msgid "Noclip" @@ -2953,14 +3036,16 @@ msgstr "Blöcke hervorheben" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +"Rauschparameter für Temperatur-, Luftfeuchtigkeits- und Biomübergänge\n" +"in der Biom-API." #: src/settings_translation_file.cpp msgid "Normalmaps sampling" -msgstr "" +msgstr "Normalmaps-Sampling" #: src/settings_translation_file.cpp msgid "Normalmaps strength" -msgstr "" +msgstr "Normalmaps-Stärke" #: src/settings_translation_file.cpp msgid "Number of emerge threads" @@ -2984,7 +3069,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." -msgstr "" +msgstr "Anzahl der Parallax-Occlusion-Iterationen." #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." @@ -2992,56 +3077,52 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." -msgstr "" +msgstr "Gesamtskalierung des Parallax-Occlusion-Effektes." #: src/settings_translation_file.cpp msgid "Parallax Occlusion" -msgstr "Parallax Oklusion" +msgstr "Parallax-Occlusion" #: src/settings_translation_file.cpp msgid "Parallax occlusion" -msgstr "Parallax Oklusion" +msgstr "Parallax-Occlusion" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" -msgstr "Parallax Oklusion" +msgstr "Parallax-Occlusion-Skalierung" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "Parallax Oklusion" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "Parallax Oklusion" +msgstr "Parallax-Occlusion-Iterationen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "Parallax Oklusion" +msgstr "Parallax-Occlusion-Modus" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" -msgstr "Parallax Oklusion" +msgstr "Parallax-Occlusion-Stärke" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." -msgstr "" +msgstr "Pfad zu einer TrueType- oder Bitmap-Schrift." #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "Pfad, in dem Screenshots abgespeichert werden." #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." msgstr "" +"Pfad der Texturenverzeichnisse. Alle Texturen werden von dort zuerst gesucht." #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "Physik" #: src/settings_translation_file.cpp msgid "" @@ -3055,17 +3136,20 @@ msgstr "Spielername" #: src/settings_translation_file.cpp msgid "Player transfer distance" -msgstr "" +msgstr "Spieler-Übertragungsdistanz" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "Spielerkampf" #: src/settings_translation_file.cpp msgid "" "Port to connect to (UDP).\n" "Note that the port field in the main menu overrides this setting." msgstr "" +"UDP-Port, zu dem sich verbunden werden soll.\n" +"Beachten Sie, dass das Port-Feld im Hauptmenü diese Einstellung\n" +"überschreibt." #: src/settings_translation_file.cpp msgid "" @@ -3074,6 +3158,12 @@ msgid "" "The generated textures can easily exceed your VRAM, causing artifacts in the " "inventory." msgstr "" +"Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n" +"Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel " +"führen.\n" +"Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte im " +"Inventar\n" +"verursachen kann." #: src/settings_translation_file.cpp msgid "Preload inventory textures" @@ -3082,20 +3172,21 @@ msgstr "Texturen vorgenerieren" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" -"Verhindert, dass Mods unsichere Funktionen, wie das Ausführen Shell-" +"Verhindert, dass Mods unsichere Funktionen, wie das Ausführen von Shell-" "Kommandos, benutzen können." #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" +"Profiler-Datenausgabeintervall. 0 = deaktivieren. Nützlich für Entwickler." #: src/settings_translation_file.cpp msgid "Profiler toggle key" -msgstr "" +msgstr "Profiler-Umschalten-Taste" #: src/settings_translation_file.cpp msgid "Profiling print interval" -msgstr "" +msgstr "Profiler-Ausgabeintervall" #: src/settings_translation_file.cpp msgid "" @@ -3103,6 +3194,9 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" +"Radius des Wolkenbereichs; angegeben in Einheiten von 64 Blöcken.\n" +"Werter größer als 26 werden scharfe Schnittkanten an den Ecken des Wolken-\n" +"bereichs erzeugen." #: src/settings_translation_file.cpp msgid "Random input" @@ -3122,7 +3216,7 @@ msgstr "Serverport" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." -msgstr "Ersetzt das Standardhauptmenü." +msgstr "Ersetzt das Standardhauptmenü mit einem benutzerdefinierten Hauptmenü." #: src/settings_translation_file.cpp msgid "Right key" @@ -3130,15 +3224,15 @@ msgstr "Rechtstaste" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "Rechtsklick Wiederholungsrate" +msgstr "Rechtsklick-Wiederholungsrate" #: src/settings_translation_file.cpp msgid "Rollback recording" -msgstr "" +msgstr "Rollback-Aufzeichnung" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "Runde Minimap" +msgstr "Runde Kleinkarte" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." @@ -3167,11 +3261,11 @@ msgstr "Bildschirmbreite" #: src/settings_translation_file.cpp msgid "Screenshot" -msgstr "Bildschirmfoto" +msgstr "Screenshot" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "Bildschirmfotoordner" +msgstr "Screenshot-Verzeichnis" #: src/settings_translation_file.cpp msgid "Security" @@ -3183,15 +3277,15 @@ msgstr "Siehe http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp msgid "Selection box border color (R,G,B)." -msgstr "" +msgstr "Farbe der Auswahlbox (R,G,B)." #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "Auswahlboxfarbe" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "Auswahlboxbreite" #: src/settings_translation_file.cpp msgid "Server / Singleplayer" @@ -3199,7 +3293,7 @@ msgstr "Server / Einzelspieler" #: src/settings_translation_file.cpp msgid "Server URL" -msgstr "Server URL" +msgstr "Server-URL" #: src/settings_translation_file.cpp msgid "Server address" @@ -3219,7 +3313,7 @@ msgstr "Serverport" #: src/settings_translation_file.cpp msgid "Serverlist URL" -msgstr "Serverliste URL" +msgstr "Serverlisten-URL" #: src/settings_translation_file.cpp msgid "Serverlist file" @@ -3238,18 +3332,24 @@ msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"Auf „wahr“ setzen, um sich im Wind wehende Blätter zu aktivieren.\n" +"Dafür müssen Shader aktiviert sein." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" +"Auf „wahr“ setzen, um sich im Wind wehende Pflanzen zu aktivieren.\n" +"Dafür müssen Shader aktiviert sein." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" +"Auf „wahr“ setzen, um Wasserwogen zu aktivieren.\n" +"Dafür müssen Shader aktiviert sein." #: src/settings_translation_file.cpp msgid "Shaders" @@ -3262,16 +3362,17 @@ msgid "" "Thy only work with the OpenGL video backend." msgstr "" "Shader werden für fortgeschrittene visuelle Effekte benötigt und können die " -"Performanz erhöhen.\n" -"Funktioniert nur mit dem OpenGL Backend." +"Performanz\n" +"auf einigen Grafikkarten erhöhen.\n" +"Funktioniert nur mit dem OpenGL-Backend." #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "Form der Minimap. Aktiviert = rund, Deaktiviert = rechteckig." +msgstr "Form der Kleinkarte. Aktiviert = rund, Deaktiviert = rechteckig." #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "Debug-Info zeigen" #: src/settings_translation_file.cpp msgid "Shutdown message" @@ -3282,6 +3383,8 @@ msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" +"Größe der Chunks, die gleichzeitig vom Kartenerzeuger angegeben werden,\n" +"in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp msgid "Smooth lighting" @@ -3292,16 +3395,16 @@ msgid "" "Smooths camera when moving and looking arround.\n" "Useful for recording videos." msgstr "" -"Glättet Kamerabewegungen beim umsehen.\n" -"Nützlich zum aufnehmen von Videos." +"Glättet Kamerabewegungen beim Umsehen.\n" +"Nützlich zum Aufnehmen von Videos." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "Glättet Kamerabewegung im Filmmodus. 0 zum ausschalten." +msgstr "Glättet die Rotation der Kamera im Kinomodus. 0 zum Ausschalten." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "Glättet Kamerabewegungen. 0 zum ausschalten." +msgstr "Glättet die Rotation der Kamera. 0 zum Ausschalten." #: src/settings_translation_file.cpp msgid "Sneak key" @@ -3318,9 +3421,9 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" -"Spezifiziert die URL von der die Klienten die Medien (Texturen, Sounds, ...) " +"Spezifiziert die URL, von der die Clients die Medien (Texturen, Sounds, …) " "herunterladen.\n" -"$dateiname sollte von $remote_media$dateiname erreichbar sein\n" +"$Dateiname sollte von $remote_media$Dateiname mittels cURL erreichbar sein\n" "(diese Einstellung sollte also mit einem Schrägstrich enden).\n" "Dateien, die nicht über diesen Server erreichbar sind, werden auf dem " "üblichen Weg heruntergeladen (UDP)." @@ -3330,13 +3433,12 @@ msgid "Static spawnpoint" msgstr "Statischer Startpunkt" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." -msgstr "Normalmaps generieren" +msgstr "Stärke der generierten Normalmaps." #: src/settings_translation_file.cpp msgid "Strength of parallax." -msgstr "" +msgstr "Stärke von Parallax." #: src/settings_translation_file.cpp msgid "Strict protocol checking" @@ -3344,7 +3446,7 @@ msgstr "Strikte Protokollversionsprüfung" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" -msgstr "" +msgstr "Synchrones SQLite" #: src/settings_translation_file.cpp msgid "Texture path" @@ -3356,22 +3458,29 @@ msgid "" "Set this to be equal to viewing range minimum to disable the auto-adjustment " "algorithm." msgstr "" +"Die erlaubte Anpassungsreichweite für die automatische Render-" +"Reichweitenanpassung.\n" +"Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um " +"den automatischen\n" +"Anpassungsalgorithmus zu deaktivieren." #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." -msgstr "Netzwerkinterface an dem der Server horchen wird." +msgstr "Die Netzwerkschnittstelle, auf die der Server lauscht." #: src/settings_translation_file.cpp msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" -"Die Privilegien, die neue Benutzer automatisch bekommen.\n" -"Siehe /privs im Spiel, für eine Liste aller möglichen Privilegien." +"Die Privilegien, die neue Benutzer automatisch erhalten.\n" +"Siehe /privs im Spiel für eine vollständige Liste aller möglichen " +"Privilegien\n" +"auf Ihrem Server und die Modkonfiguration." #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." -msgstr "" +msgstr "Das Render-Backend für Irrlicht." #: src/settings_translation_file.cpp msgid "" @@ -3380,6 +3489,11 @@ msgid "" "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" "set to the nearest valid value." msgstr "" +"Die Stärke (Dunkelheit) der blockweisen Ambient-Occlusion-Schattierung.\n" +"Niedriger bedeutet dunkler, höher bedeutet heller. Gültige Werte liegen\n" +"zwischen 0.25 und 4.0 inklusive. (Achtung: Punkt als Dezimaltrennzeichen\n" +"verwenden!) Falls der Wert außerhalb liegt, wird er zum nächsten gültigen\n" +"Wert gesetzt." #: src/settings_translation_file.cpp msgid "" @@ -3387,28 +3501,37 @@ msgid "" "capacity until an attempt is made to decrease its size by dumping old queue\n" "items. A value of 0 disables the functionality." msgstr "" +"Die Zeit (in Sekunden), die die Flüssigkeitswarteschlange über die " +"Verarbeitungs-\n" +"kapazität hinauswachsen darf, bevor versucht wird, ihre Größe durch das\n" +"Verwerfen alter Warteschlangeneinträge zu reduzieren. Der Wert 0 " +"deaktiviert\n" +"diese Funktion." #: src/settings_translation_file.cpp msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" -"Das Intervall in Sekunden, in dem Rechteklicks wiederholt werden, wenn die " -"rechte Maustaste gedrückt gehalten wird." +"Das Intervall in Sekunden, in dem Rechtsklicks wiederholt werden, wenn die " +"rechte\n" +"Maustaste gedrückt gehalten wird." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "Diese Schriftart wird von bestimmten Sprachen benutzt." +msgstr "Diese Schrift wird von bestimmten Sprachen benutzt." #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"Zeit in Sekunden, die Item-Entitys (fallengelassene Gegenstände)\n" +"existieren dürfen. Der Wert -1 deaktiviert diese Funktion." #: src/settings_translation_file.cpp msgid "Time send interval" -msgstr "Zeit Sendeintervall" +msgstr "Zeit-Sendeintervall" #: src/settings_translation_file.cpp msgid "Time speed" @@ -3417,6 +3540,8 @@ msgstr "Zeitgeschwindigkeit" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." msgstr "" +"Zeit, nach der der Client nicht benutzte Kartendaten aus\n" +"dem Speicher löscht." #: src/settings_translation_file.cpp msgid "" @@ -3425,57 +3550,69 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" +"Um Verzögerungen zu reduzieren, werden Blockübertragungen verlangsamt, " +"während\n" +"ein Spieler etwas baut. Dies bestimmt, wie lange sie verlangsamt sind, " +"nachdem ein\n" +"Block (node) platziert oder entfernt wurde." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "Kameraauswahltaste" #: src/settings_translation_file.cpp msgid "Tooltip delay" -msgstr "" +msgstr "Tooltip-Verzögerung" #: src/settings_translation_file.cpp msgid "Trilinear filtering" msgstr "Trilinearer Filter" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "True = 256\n" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"True = 256\n" +"False = 128\n" +"Nützlich, um die Kleinkarte performanter auf langsamen Maschinen zu machen." #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "" +msgstr "Vertrauten Mods" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." msgstr "" +"URL der Serverliste, die in der Mehrspieler-Registerkarte angezeigt wird." #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" -msgstr "" +msgstr "Unbegrenze Spielerübertragungsdistanz" #: src/settings_translation_file.cpp msgid "Unload unused server data" -msgstr "" +msgstr "Nicht benutzte Serverdaten entladen" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "Wolken blockförmig statt flach aussehen lassen." #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." -msgstr "" +msgstr "Eine Wolkenanimation für den Hintergrund im Hauptmenü benutzen." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." msgstr "" +"Anisotropische Filterung verwenden, wenn auf Texturen aus einem\n" +"gewissen Blickwinkel heraus geschaut wird." #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." -msgstr "" +msgstr "Bilineare Filterung bei der Skalierung von Texturen benutzen." #: src/settings_translation_file.cpp msgid "Use key" @@ -3484,10 +3621,12 @@ msgstr "Benutztaste" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." msgstr "" +"Map-Mapping benutzen, um Texturen zu skalieren. Kann die Performanz\n" +"leicht erhöhen." #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." -msgstr "" +msgstr "Trilineare Filterung bei der Skalierung von Texturen benutzen." #: src/settings_translation_file.cpp msgid "Useful for mod developers." @@ -3495,19 +3634,19 @@ msgstr "Nützlich für Entwickler." #: src/settings_translation_file.cpp msgid "V-Sync" -msgstr "" +msgstr "Vertikale Synchronisation" #: src/settings_translation_file.cpp msgid "Vertical initial window size." -msgstr "" +msgstr "Anfängliche Fensterhöhe." #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "" +msgstr "Vertikale Bildschirmsynchronisation." #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "Videotreiber" #: src/settings_translation_file.cpp msgid "View bobbing" @@ -3515,19 +3654,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "" +msgstr "Taste »Sichtweite reduzieren«" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "" +msgstr "Taste »Sichtweite erhöhen«" #: src/settings_translation_file.cpp msgid "Viewing range maximum" -msgstr "" +msgstr "Maximale Sichtweite" #: src/settings_translation_file.cpp msgid "Viewing range minimum" -msgstr "" +msgstr "Minimale Sichtweite" #: src/settings_translation_file.cpp msgid "Volume" @@ -3539,15 +3678,15 @@ msgstr "Gehgeschwindigkeit" #: src/settings_translation_file.cpp msgid "Wanted FPS" -msgstr "" +msgstr "Gewünschte Bildwiederholrate" #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "Meeresspiegel" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "Die Höhe des (Meer-)Wassers in der Welt." #: src/settings_translation_file.cpp msgid "Waving Nodes" @@ -3583,6 +3722,10 @@ msgid "" "filtered in software, but some images are generated directly\n" "to hardware (e.g. render-to-texture for nodes in inventory)." msgstr "" +"Falls gui_scaling_filter wahr ist, dann müssen alle GUI-Bilder\n" +"von der Software gefiltert werden, aber einige Bilder werden\n" +"direkt zur Hardware erzeugt (z.B. Rendern in die Textur für\n" +"die Inventarbilder von Blöcken)." #: src/settings_translation_file.cpp msgid "" @@ -3591,6 +3734,11 @@ msgid "" "to the old scaling method, for video drivers that don't\n" "propery support downloading textures back from hardware." msgstr "" +"Falls gui_scaling_filter_txr2img auf »wahr« gesetzt ist, werden\n" +"diese Bilder von der Hardware zur Software für die Skalierung\n" +"kopiert. Falls es auf »falsch« gesetzt ist, wird für alte Videotreiber,\n" +"die das Herunterladen von Texturen zurück von der Hardware\n" +"nicht vernünftig unterstützen." #: src/settings_translation_file.cpp msgid "" @@ -3602,6 +3750,17 @@ msgid "" "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" "enabled." msgstr "" +"Wenn bilineare, trilineare oder anisotropische Filter benutzt werden, " +"können\n" +"niedrigauflösende Texturen verschwommen sein, also werden sie automatisch\n" +"mit Pixelwiederholung vergrößert, um scharfe Pixel zu behalten. Dies setzt " +"die\n" +"minimale Texturengröße für die vergrößerten Texturen; höhere Werte führen\n" +"zu einem schärferen Aussehen, aber erfordern mehr Speicher. Zweierpotenzen\n" +"werden empfohlen. Ein Wert größer als 1 könnte keinen sichtbaren Effekt\n" +"hervorbringen, es sei denn, die bilineare, trilineare oder anisotropische " +"Filterung\n" +"ist aktiviert." #: src/settings_translation_file.cpp msgid "" @@ -3612,62 +3771,84 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"Wo der Kartenerzeuger aufhört.\n" +"Bitte beachten Sie:\n" +"- Begrenzt auf 31000 (größere Werte sind Wirkungslos).\n" +"- Der Kartenerzeuger arbeitet in Gruppen von 80×80×80 Blöcken (5×5×5 " +"MapBlocks).\n" +"- Diese Gruppen haben einen Abstand von (-32, -32) Blöcken vom Ursprung.\n" +"- Nur Gruppen, welche innerhalb der von map_generation_limit definierten " +"Grenze liegen, werden erzeugt." #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." msgstr "" +"Ob FreeType-Schriften benutzt werden.\n" +"Dafür muss Minetest mit FreeType-Unterstüzung kompiliert worden sein." #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "" +msgstr "Ob Blocktexturanimationen pro Mapblock desynchronisiert sein sollten." #: src/settings_translation_file.cpp msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" +"Ob Spieler an Clients ohne Distanzbegrenzung angezeit werden.\n" +"Missbilligt, benutzen Sie die Einstellung »player_transfer_distance« " +"stattdessen." #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." msgstr "" +"Ob es möglich ist, dass sich Spieler gegenseitig Schaden zufügen\n" +"und töten." #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"Ob Clients gefragt werden solle, sich nach einem (Lua-)Absturz\n" +"neu zu verbinden. Auf »wahr« setzen, falls Ihr Server für auto-\n" +"matische Neustarts eingerichtet ist." #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "Ob das Ende des sichtbaren Gebietes im Nebel verschwinden soll." #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +"Ob der Client Debug-Informationen zeigen soll (hat die selbe Wirkung\n" +"wie das Drücken von F5)." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "Breite der Linien der Auswahlbox um Blöcke (nodes)." #: src/settings_translation_file.cpp msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" +"Weltverzeichnis (alles in der Welt wird hier gespeichert).\n" +"Nicht benötigt, wenn vom Hauptmenü aus gestartet wird." #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "cURL-Dateidownload-Zeitüberschreitung" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "cURL-Parallel-Begrenzung" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "cURL-Zeitüberschreitung" #~ msgid "Rendering:" #~ msgstr "Rendering:" From 1c03176078e8b3be97d9209f449b47ae640e3406 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 25 Oct 2015 17:23:58 +0100 Subject: [PATCH 012/531] Translated using Weblate (German) Currently translated at 98.0% (738 of 753 strings) --- po/de/minetest.po | 210 ++++++++++++++++++++++++++-------------------- 1 file changed, 119 insertions(+), 91 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index b7d72daf..b778747f 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 16:11+0200\n" +"PO-Revision-Date: 2015-10-25 17:23+0200\n" "Last-Translator: Wuzzy \n" "Language-Team: German " "\n" @@ -453,7 +453,8 @@ msgid "" ", " msgstr "" "Format: , , (, , " -"), , , " +"), ,\n" +", " #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -818,7 +819,7 @@ msgstr "Schleichen" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" -msgstr "Kinomodus umschalten" +msgstr "Filmmodus umschalten" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1278,7 +1279,7 @@ msgid "" "minetest.net." msgstr "" "Meldet den Server in der Serverliste.\n" -"Wenn ein IPv6-Server angemeldet werden soll, muss serverlist_url auf " +"Wenn ein IPv6-Server angemeldet werden soll, muss serverlist_url auf\n" "v6.servers.minetest.net gesetzt werden." #: src/settings_translation_file.cpp @@ -1323,7 +1324,7 @@ msgstr "Kameraglättung" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "Kameraglättung im Kinomodus" +msgstr "Kameraglättung im Filmmodus" #: src/settings_translation_file.cpp msgid "Camera update toggle key" @@ -1343,11 +1344,11 @@ msgstr "Chunk-Größe" #: src/settings_translation_file.cpp msgid "Cinematic mode" -msgstr "Kinomodus" +msgstr "Filmmodus" #: src/settings_translation_file.cpp msgid "Cinematic mode key" -msgstr "Kinomodustaste" +msgstr "Filmmodustaste" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1451,7 +1452,7 @@ msgid "" "Controls size of deserts and beaches in Mapgen V6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"Verändert die Größe der Wüsten und Strände in Kartenerzeuger V6.\n" +"Verändert die Größe der Wüsten und Strände in Weltgenerator V6.\n" "Wenn Schneebiome aktiviert sind, wird diese Einstellung ignoriert." #: src/settings_translation_file.cpp @@ -1721,7 +1722,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "FPS im Pausenmenü" +msgstr "Bildwiederholrate im Pausenmenü" #: src/settings_translation_file.cpp msgid "FSAA" @@ -1729,7 +1730,7 @@ msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "Auf- und Abbewegung beim Sturz" #: src/settings_translation_file.cpp msgid "Fallback font" @@ -1967,15 +1968,22 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" +"Wie groß das Gebiet ist, in dem Blöcke der Sachen bezüglich des aktiven " +"Blocks unterliegen.\n" +"In Mapblocks (16 Blöcke [nodes]) angegeben.\n" +"In aktiven Blöcken werden Objekte geladen und ABMs ausgeführt." #: src/settings_translation_file.cpp msgid "" "How many blocks are flying in the wire simultaneously for the whole server." msgstr "" +"Wie viele Blöcke gleichzeitig für den gesamten Server auf der Leitung " +"unterwegs sind." #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." msgstr "" +"Wie viele Blöcke gleichzeitig pro Client auf der Leitung unterwegs sind." #: src/settings_translation_file.cpp msgid "" @@ -2299,7 +2307,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste zum Umschalten des Kinomodus.\n" +"Taste zum Umschalten des Filmmodus.\n" "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" "35e3da1b0edf72e" @@ -2448,7 +2456,7 @@ msgid "" "Length of a server tick and the interval at which objects are generally " "updated over network." msgstr "" -"Länge eines Serverticks und dem Zeitintervall, in dem Objekte über das " +"Länge eines Servertakts und dem Zeitintervall, in dem Objekte über das " "Netzwerk üblicherweise\n" "aktualisiert werden." @@ -2474,7 +2482,6 @@ msgstr "" "- verbose (geschwätzig)" #: src/settings_translation_file.cpp -#, fuzzy msgid "Limit of emerge queues on disk" msgstr "Grenze der Erzeugungswarteschlangen auf dem Festspeicher" @@ -2524,7 +2531,7 @@ msgstr "Flüssigkeitsaktualisierungsintervall in Sekunden." #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "Flüssigkeitsaktualisierungs-Tick" +msgstr "Flüssigkeitsaktualisierungstakt" #: src/settings_translation_file.cpp msgid "Main menu game manager" @@ -2592,167 +2599,167 @@ msgstr "Timeout zum Entladen von Mapblocks" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "Kartenerzeugerbiomhitzenrauschparameter" +msgstr "Weltgeneratorbiomhitzenrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "Kartenerzeugerbiomluftfeuchtigkeitsübergangsrauschparameter" +msgstr "Weltgeneratorbiomluftfeuchtigkeitsübergangsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "Kartenerzeugerbiomluftfeuchtigkeitsrauschparameter" +msgstr "Weltgeneratorbiomluftfeuchtigkeitsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen debug" -msgstr "Kartenerzeuger-Debugging" +msgstr "Weltgenerator-Debugging" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "Kartenerzeuger-Flags" +msgstr "Weltgenerator-Flags" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "Kartenerzeugerhitzenübergangsrauschparameter" +msgstr "Weltgeneratorhitzenübergangsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen name" -msgstr "Kartenerzeugername" +msgstr "Weltgeneratorname" #: src/settings_translation_file.cpp msgid "Mapgen v5" -msgstr "Kartenerzeuger v5" +msgstr "Weltgenerator v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "cave1-Rauschparameter für v5-Kartenerzeuger" +msgstr "cave1-Rauschparameter für v5-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "cave2-Rauschparameter für v5-Kartenerzeuger" +msgstr "cave2-Rauschparameter für v5-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "Faktorrauschparameter für v5-Kartenerzeuger" +msgstr "Faktorrauschparameter für v5-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "Tiefenrauschparameter für v5-Kartenerzeuger" +msgstr "Tiefenrauschparameter für v5-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "Höhenrauschparameter für v5-Kartenerzeuger" +msgstr "Höhenrauschparameter für v5-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6" -msgstr "Kartenerzeuger v6" +msgstr "Weltgenerator v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "Apfelbaumrauschparameter für v6-Kartenerzeuger" +msgstr "Apfelbaumrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "Strandfrequenz für v6-Kartenerzeuger" +msgstr "Strandfrequenz für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "Strandrauschparameter für v6-Kartenerzeuger" +msgstr "Strandrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "Biomrauschparameter für v6-Kartenerzeuger" +msgstr "Biomrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "Höhlenrauschparameter für v6-Kartenerzeuger" +msgstr "Höhlenrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "Wüstenrauschparameter für v6-Kartenerzeuger" +msgstr "Wüstenrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "Flags für v6-Kartenerzeuger" +msgstr "Flags für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "Höhenauswahlrauschparameter für v6-Kartenerzeuger" +msgstr "Höhenauswahlrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "Luftfeuchtigkeitsrauschparameter für v6-Kartenerzeuger" +msgstr "Luftfeuchtigkeitsrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "Schlammrauschparameter für v6-Kartenerzeuger" +msgstr "Schlammrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "Steilheitsrauschparameter für v6-Kartenerzeuger" +msgstr "Steilheitsrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "Geländehöhenrauschparameter für v6-Kartenerzeuger" +msgstr "Geländehöhenrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "Basisgeländerauschparameter für v6-Kartenerzeuger" +msgstr "Basisgeländerauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "Baumrauschparameter für v6-Kartenerzeuger" +msgstr "Baumrauschparameter für v6-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7" -msgstr "Kartenerzeuger v7" +msgstr "Weltgenerator v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "cave1-Rauschparameter für v7-Kartenerzeuger" +msgstr "cave1-Rauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "cave2-Rauschparameter für v7-Kartenerzeuger" +msgstr "cave2-Rauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" -msgstr "Ausfülltiefenrauschen für v7-Kartenerzeuger" +msgstr "Ausfülltiefenrauschen für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "Flags für v7-Kartenerzeuger" +msgstr "Flags für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "Höhenauswahlrauschparameter für v7-Kartenerzeuger" +msgstr "Höhenauswahlrauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "Berghöhenrauschenparameter für v7-Kartenerzeuger" +msgstr "Berghöhenrauschenparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "Bergrauschparameter für v7-Kartenerzeuger" +msgstr "Bergrauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "Gratrauschparameter für v7-Kartenerzeuger" +msgstr "Gratrauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "Wassergratrauschparameter für v7-Kartenerzeuger" +msgstr "Wassergratrauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "Geländehöhenrauschparameter für v7-Kartenerzeuger" +msgstr "Geländehöhenrauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "Basisgeländerauschparameter für v7-Kartenerzeuger" +msgstr "Basisgeländerauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "" +msgstr "Geländepersistenzrauschparameter für v7-Weltgenerator" #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -2776,11 +2783,11 @@ msgstr "Max. Pakete pro Iteration" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "Maximale FPS" +msgstr "Maximale Bildwiederholrate" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "Maximale FPS, wenn das Spiel pausiert ist." +msgstr "Maximale Bildwiederholrate, wenn das Spiel pausiert ist." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" @@ -2841,8 +2848,9 @@ msgstr "" "anstreben." #: src/settings_translation_file.cpp +#, fuzzy msgid "Maximum number of players that can connect simultaneously." -msgstr "" +msgstr "Anzahl der Spieler, die sich gleichzeitig verbinden können." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." @@ -2896,7 +2904,7 @@ msgid "Message of the day displayed to players connecting." msgstr "" "Die Meldung des Tages, die frisch verbundenen Spielern angezeigt werden soll." "\n" -"Auf Englisch bekannt als »message of the day« oder »MOTD«." +"Auf Englisch bekannt als „message of the day“ oder „MOTD“." #: src/settings_translation_file.cpp msgid "Minimap" @@ -2935,15 +2943,15 @@ msgstr "Mod-Profiling" #: src/settings_translation_file.cpp msgid "Modstore details URL" -msgstr "" +msgstr "Modspeicher: Details-URL" #: src/settings_translation_file.cpp msgid "Modstore download URL" -msgstr "" +msgstr "Modspeicher: Download-URL" #: src/settings_translation_file.cpp msgid "Modstore mods list URL" -msgstr "" +msgstr "Modspeicher: Listen-URL" #: src/settings_translation_file.cpp msgid "Monospace font path" @@ -2966,12 +2974,18 @@ msgid "" "Multiplier for fall bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Faktor für Auf- und Abbewegung beim Sturz.\n" +"Zum Beispiel: 0 für keine Auf- und Abbewegung, 1.0 für den Standardwert, 2.0 " +"für doppelte Geschwindigkeit." #: src/settings_translation_file.cpp msgid "" "Multiplier for view bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Faktor für Auf- und Abbewegung (grafischer Effekt).\n" +"Zum Beispiel: 0 für keine Auf- und Abbewegung, 1.0 für den Standardwert, 2.0 " +"für doppelte Geschwindigkeit." #: src/settings_translation_file.cpp msgid "" @@ -3023,11 +3037,11 @@ msgstr "Neue Benutzer müssen dieses Passwort eingeben." #: src/settings_translation_file.cpp msgid "Noclip" -msgstr "" +msgstr "Geistmodus" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "" +msgstr "Geistmodustaste" #: src/settings_translation_file.cpp msgid "Node highlighting" @@ -3049,7 +3063,7 @@ msgstr "Normalmaps-Stärke" #: src/settings_translation_file.cpp msgid "Number of emerge threads" -msgstr "" +msgstr "Anzahl der Erzeugerthreads" #: src/settings_translation_file.cpp msgid "" @@ -3059,6 +3073,13 @@ msgid "" "speed greatly\n" "at the cost of slightly buggy caves." msgstr "" +"Anzahl der zu benutzenden Erzeugerthreads. Lassen Sie dieses Feld frei, oder " +"erhöhen Sie\n" +"diese Zahl, um mehrere Threads zu verwenden. Auf Mehrprozessorsystemen wird " +"dies die\n" +"Geschwindigkeit der Kartenerzeugung stark erhöhen auf Kosten von leicht " +"fehlerhaften\n" +"Höhlen." #: src/settings_translation_file.cpp msgid "" @@ -3066,6 +3087,9 @@ msgid "" "This is a trade-off between sqlite transaction overhead and\n" "memory consumption (4096=100MB, as a rule of thumb)." msgstr "" +"Anzahl der zusätzlichen Blöcke, welche mit /clearobjects gleichzeitig\n" +"geladen werden können. Dies ist ein Kompromiss zwischen SQLite-\n" +"Transaktions-Overhead und Speicherverbrauch (Faustregel: 4096=100MB)." #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." @@ -3172,8 +3196,8 @@ msgstr "Texturen vorgenerieren" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" -"Verhindert, dass Mods unsichere Funktionen, wie das Ausführen von Shell-" -"Kommandos, benutzen können." +"Verhindert, dass Mods unsichere Funktionen, wie das Ausführen von\n" +"Shell-Kommandos, benutzen können." #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." @@ -3240,7 +3264,7 @@ msgstr "Speichert die Welt vom Server im lokalen Speicher." #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "Speichere Welt vom Server" +msgstr "Welt vom Server speichern" #: src/settings_translation_file.cpp msgid "" @@ -3250,6 +3274,12 @@ msgid "" "pixels when scaling down, at the cost of blurring some\n" "edge pixels when images are scaled by non-integer sizes." msgstr "" +"GUI mit einem benutzerdefinierten Wert skalieren.\n" +"Benutzt einen Pixelwiederholungs-Anti-Aliasing-Filter, um\n" +"die GUI zu skalieren. Dies wird einige der harten Kanten\n" +"abglätten und Pixel beim Verkleinern mischen, wobei einige\n" +"Kantenpixel verschwommen werden, wenn sie mit nicht-\n" +"ganzzahligen Größen skaliert werden." #: src/settings_translation_file.cpp msgid "Screen height" @@ -3383,7 +3413,7 @@ msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" -"Größe der Chunks, die gleichzeitig vom Kartenerzeuger angegeben werden,\n" +"Größe der Chunks, die gleichzeitig vom Weltgenerator angegeben werden,\n" "in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp @@ -3400,7 +3430,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "Glättet die Rotation der Kamera im Kinomodus. 0 zum Ausschalten." +msgstr "Glättet die Rotation der Kamera im Filmmodus. 0 zum Ausschalten." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." @@ -3426,7 +3456,8 @@ msgstr "" "$Dateiname sollte von $remote_media$Dateiname mittels cURL erreichbar sein\n" "(diese Einstellung sollte also mit einem Schrägstrich enden).\n" "Dateien, die nicht über diesen Server erreichbar sind, werden auf dem " -"üblichen Weg heruntergeladen (UDP)." +"üblichen\n" +"Weg heruntergeladen (UDP)." #: src/settings_translation_file.cpp msgid "Static spawnpoint" @@ -3569,14 +3600,13 @@ msgid "Trilinear filtering" msgstr "Trilinearer Filter" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "True = 256\n" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" -"True = 256\n" -"False = 128\n" +"Wahr = 256\n" +"Falsch = 128\n" "Nützlich, um die Kleinkarte performanter auf langsamen Maschinen zu machen." #: src/settings_translation_file.cpp @@ -3630,7 +3660,7 @@ msgstr "Trilineare Filterung bei der Skalierung von Texturen benutzen." #: src/settings_translation_file.cpp msgid "Useful for mod developers." -msgstr "Nützlich für Entwickler." +msgstr "Nützlich für Mod-Entwickler." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3646,19 +3676,19 @@ msgstr "Vertikale Bildschirmsynchronisation." #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "Videotreiber" +msgstr "Grafiktreiber" #: src/settings_translation_file.cpp msgid "View bobbing" -msgstr "" +msgstr "Auf- und Abbewegung der Ansicht" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "Taste »Sichtweite reduzieren«" +msgstr "Taste „Sichtweite reduzieren“" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "Taste »Sichtweite erhöhen«" +msgstr "Taste „Sichtweite erhöhen“" #: src/settings_translation_file.cpp msgid "Viewing range maximum" @@ -3734,9 +3764,9 @@ msgid "" "to the old scaling method, for video drivers that don't\n" "propery support downloading textures back from hardware." msgstr "" -"Falls gui_scaling_filter_txr2img auf »wahr« gesetzt ist, werden\n" +"Falls gui_scaling_filter_txr2img auf „wahr“ gesetzt ist, werden\n" "diese Bilder von der Hardware zur Software für die Skalierung\n" -"kopiert. Falls es auf »falsch« gesetzt ist, wird für alte Videotreiber,\n" +"kopiert. Falls es auf „falsch“ gesetzt ist, wird für alte Videotreiber,\n" "die das Herunterladen von Texturen zurück von der Hardware\n" "nicht vernünftig unterstützen." @@ -3771,12 +3801,12 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" -"Wo der Kartenerzeuger aufhört.\n" +"Wo der Weltgenerator aufhört.\n" "Bitte beachten Sie:\n" -"- Begrenzt auf 31000 (größere Werte sind Wirkungslos).\n" -"- Der Kartenerzeuger arbeitet in Gruppen von 80×80×80 Blöcken (5×5×5 " +"- Begrenzt auf 31000 (größere Werte sind wirkungslos).\n" +"- Der Weltgenerator arbeitet in Gruppen von 80×80×80 Blöcken (5×5×5 " "MapBlocks).\n" -"- Diese Gruppen haben einen Abstand von (-32, -32) Blöcken vom Ursprung.\n" +"- Diese Gruppen haben einen Abstand von [-32, -32] Blöcken vom Ursprung.\n" "- Nur Gruppen, welche innerhalb der von map_generation_limit definierten " "Grenze liegen, werden erzeugt." @@ -3797,22 +3827,20 @@ msgid "" "Deprecated, use the setting player_transfer_distance instead." msgstr "" "Ob Spieler an Clients ohne Distanzbegrenzung angezeit werden.\n" -"Missbilligt, benutzen Sie die Einstellung »player_transfer_distance« " +"Missbilligt, benutzen Sie die Einstellung „player_transfer_distance“ " "stattdessen." #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "" -"Ob es möglich ist, dass sich Spieler gegenseitig Schaden zufügen\n" -"und töten." +msgstr "Ob sich Spieler gegenseitig Schaden zufügen und töten können." #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" -"Ob Clients gefragt werden solle, sich nach einem (Lua-)Absturz\n" -"neu zu verbinden. Auf »wahr« setzen, falls Ihr Server für auto-\n" +"Ob Clients gefragt werden sollen, sich nach einem (Lua-)Absturz\n" +"neu zu verbinden. Auf „wahr“ setzen, falls Ihr Server für auto-\n" "matische Neustarts eingerichtet ist." #: src/settings_translation_file.cpp From 22ff2c34fbea1dad350c944b044629d5652f4aa9 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sun, 25 Oct 2015 18:19:45 +0100 Subject: [PATCH 013/531] Translated using Weblate (German) Currently translated at 98.1% (739 of 753 strings) --- po/de/minetest.po | 179 +++++++++++++++++++++++----------------------- 1 file changed, 90 insertions(+), 89 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index b778747f..d9647a25 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 17:23+0200\n" -"Last-Translator: Wuzzy \n" +"PO-Revision-Date: 2015-10-25 18:19+0200\n" +"Last-Translator: PilzAdam \n" "Language-Team: German " "\n" "Language: de\n" @@ -21,7 +21,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Es ist ein Fehler in einem Lua-Skript aufgetreten, z.B. in einem Mod:" +msgstr "Es ist ein Fehler in einem Lua-Skript aufgetreten, z.B. in einer Mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -152,7 +152,7 @@ msgstr "Spiel" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Weltgenerator" +msgstr "Kartengenerator" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -334,7 +334,7 @@ msgstr "Adresse/Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" -msgstr "Client" +msgstr "Klient" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" @@ -393,7 +393,7 @@ msgstr "Neu" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "Kein Weltname angegeben oder kein Spiel ausgewählt!" +msgstr "Kein Weltname angegeben oder ausgewählt!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -461,10 +461,10 @@ msgid "Games" msgstr "Spiele" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" -"Optional kann zur lacunarity mit einem führendem Komma angehängt werden." +"Optional kann die Lacunarity, mit einem weiteren Komma abgetrennt, angehängt " +"werden." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." @@ -628,7 +628,7 @@ msgstr "Weiter" #: src/game.cpp msgid "Creating client..." -msgstr "Client erstellen ..." +msgstr "Klienten erstellen..." #: src/game.cpp msgid "Creating server..." @@ -1196,20 +1196,20 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Ein festgelegter Weltgenerator-Seed für neue Welten. Leer lassen für " +"Ein festgelegter Kartengenerator-Seed für neue Welten. Leer lassen für " "zufällige Erzeugung.\n" "Wird überschrieben, wenn die Welt im Menü erstellt wird." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" -"Eine Nachricht, die an alle verbundenen Clients versendet wird, wenn der " +"Eine Nachricht, die an alle verbundenen Klienten versendet wird, wenn der " "Server abstürzt." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" -"Eine Nachricht, die an alle verbundene Clients gesendet wird, wenn der " +"Eine Nachricht, die an alle verbundene Klienten gesendet wird, wenn der " "Server herunterfährt." #: src/settings_translation_file.cpp @@ -1250,7 +1250,7 @@ msgid "" "This setting is for the client only and is ignored by the server." msgstr "" "Ändert die Gammakodierung der Lichttabellen. Kleinere Werte sind heller.\n" -"Diese Einstellung ist clientseitig und wird vom Server ignoriert." +"Diese Einstellung ist klientenseitig und wird vom Server ignoriert." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1356,7 +1356,7 @@ msgstr "Transparente Texturen säubern" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "Client und Server" +msgstr "Klient und Server" #: src/settings_translation_file.cpp msgid "Climbing speed" @@ -1376,7 +1376,7 @@ msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Wolken sind ein clientseitiger Effekt." +msgstr "Wolken sind ein klientenseitiger Effekt." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1452,7 +1452,7 @@ msgid "" "Controls size of deserts and beaches in Mapgen V6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"Verändert die Größe der Wüsten und Strände in Weltgenerator V6.\n" +"Verändert die Größe der Wüsten und Strände in Kartengenerator V6.\n" "Wenn Schneebiome aktiviert sind, wird diese Einstellung ignoriert." #: src/settings_translation_file.cpp @@ -1563,7 +1563,7 @@ msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" -"Die Beschreibung des Servers. Wird neuen Clients und in der Serverliste " +"Die Beschreibung des Servers. Wird neuen Klienten und in der Serverliste " "angezeigt." #: src/settings_translation_file.cpp @@ -1643,8 +1643,8 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" -"Aktivieren, um alten Clients die Verbindung zu verwehren.\n" -"Ältere Clients sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " +"Aktivieren, um alten Klienten die Verbindung zu verwehren.\n" +"Ältere Klienten sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " "neuen\n" "Servern nicht abstürzen, aber sie könnten nicht alle neuen Funktionen, die " "Sie\n" @@ -1670,7 +1670,7 @@ msgid "" "Ignored if bind_address is set." msgstr "" "Server als IPv6 laufen lassen (oder nicht). Ein IPv6-Server könnte,\n" -"abhängig von der Systemkonfiguration, auf IPv6-Clients eingeschränkt sein.\n" +"abhängig von der Systemkonfiguration, auf IPv6-Klienten eingeschränkt sein.\n" "Wird ignoriert, wenn bind_address gesetzt ist." #: src/settings_translation_file.cpp @@ -1694,7 +1694,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables minimap." -msgstr "Aktiviert die Kleinkarte." +msgstr "Aktiviert die Übersichtskarte." #: src/settings_translation_file.cpp msgid "" @@ -1862,21 +1862,21 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" -"Von wie weit weg Blöcke für Clients erzeugt werden,\n" +"Von wie weit weg Blöcke für Klienten erzeugt werden,\n" "in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Blöcke zu Clients gesendet werden,\n" +"Von wie weit weg Blöcke zu Klienten gesendet werden,\n" "in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Clients über Objekte bescheid wissen,\n" +"Von wie weit weg Klienten über Objekte bescheid wissen,\n" "in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp @@ -1983,7 +1983,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." msgstr "" -"Wie viele Blöcke gleichzeitig pro Client auf der Leitung unterwegs sind." +"Wie viele Blöcke gleichzeitig pro Klient auf der Leitung unterwegs sind." #: src/settings_translation_file.cpp msgid "" @@ -2102,7 +2102,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "Zeitintervall, in der die Tageszeit an Clients gesendet wird." +msgstr "Zeitintervall, in der die Tageszeit an Klienten gesendet wird." #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2317,7 +2317,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste zum Wechseln der Anzeige der Kleinkarte.\n" +"Taste zum Wechseln der Anzeige der Übersichtskarte.\n" "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" "35e3da1b0edf72e" @@ -2599,167 +2599,167 @@ msgstr "Timeout zum Entladen von Mapblocks" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "Weltgeneratorbiomhitzenrauschparameter" +msgstr "Kartengeneratorbiomhitzenrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "Weltgeneratorbiomluftfeuchtigkeitsübergangsrauschparameter" +msgstr "Kartengeneratorbiomluftfeuchtigkeitsübergangsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "Weltgeneratorbiomluftfeuchtigkeitsrauschparameter" +msgstr "Kartengeneratorbiomluftfeuchtigkeitsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen debug" -msgstr "Weltgenerator-Debugging" +msgstr "Kartengenerator-Debugging" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "Weltgenerator-Flags" +msgstr "Kartengenerator-Flags" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "Weltgeneratorhitzenübergangsrauschparameter" +msgstr "Kartengeneratorhitzenübergangsrauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen name" -msgstr "Weltgeneratorname" +msgstr "Kartengeneratorname" #: src/settings_translation_file.cpp msgid "Mapgen v5" -msgstr "Weltgenerator v5" +msgstr "Kartengenerator v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "cave1-Rauschparameter für v5-Weltgenerator" +msgstr "cave1-Rauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "cave2-Rauschparameter für v5-Weltgenerator" +msgstr "cave2-Rauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "Faktorrauschparameter für v5-Weltgenerator" +msgstr "Faktorrauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "Tiefenrauschparameter für v5-Weltgenerator" +msgstr "Tiefenrauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "Höhenrauschparameter für v5-Weltgenerator" +msgstr "Höhenrauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6" -msgstr "Weltgenerator v6" +msgstr "Kartengenerator v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "Apfelbaumrauschparameter für v6-Weltgenerator" +msgstr "Apfelbaumrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "Strandfrequenz für v6-Weltgenerator" +msgstr "Strandfrequenz für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "Strandrauschparameter für v6-Weltgenerator" +msgstr "Strandrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "Biomrauschparameter für v6-Weltgenerator" +msgstr "Biomrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "Höhlenrauschparameter für v6-Weltgenerator" +msgstr "Höhlenrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "Wüstenrauschparameter für v6-Weltgenerator" +msgstr "Wüstenrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "Flags für v6-Weltgenerator" +msgstr "Flags für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "Höhenauswahlrauschparameter für v6-Weltgenerator" +msgstr "Höhenauswahlrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "Luftfeuchtigkeitsrauschparameter für v6-Weltgenerator" +msgstr "Luftfeuchtigkeitsrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "Schlammrauschparameter für v6-Weltgenerator" +msgstr "Schlammrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "Steilheitsrauschparameter für v6-Weltgenerator" +msgstr "Steilheitsrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "Geländehöhenrauschparameter für v6-Weltgenerator" +msgstr "Geländehöhenrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "Basisgeländerauschparameter für v6-Weltgenerator" +msgstr "Basisgeländerauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "Baumrauschparameter für v6-Weltgenerator" +msgstr "Baumrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7" -msgstr "Weltgenerator v7" +msgstr "Kartengenerator v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "cave1-Rauschparameter für v7-Weltgenerator" +msgstr "cave1-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "cave2-Rauschparameter für v7-Weltgenerator" +msgstr "cave2-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" -msgstr "Ausfülltiefenrauschen für v7-Weltgenerator" +msgstr "Ausfülltiefenrauschen für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "Flags für v7-Weltgenerator" +msgstr "Flags für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "Höhenauswahlrauschparameter für v7-Weltgenerator" +msgstr "Höhenauswahlrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "Berghöhenrauschenparameter für v7-Weltgenerator" +msgstr "Berghöhenrauschenparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "Bergrauschparameter für v7-Weltgenerator" +msgstr "Bergrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "Gratrauschparameter für v7-Weltgenerator" +msgstr "Gratrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "Wassergratrauschparameter für v7-Weltgenerator" +msgstr "Wassergratrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "Geländehöhenrauschparameter für v7-Weltgenerator" +msgstr "Geländehöhenrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "Basisgeländerauschparameter für v7-Weltgenerator" +msgstr "Basisgeländerauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "Geländepersistenzrauschparameter für v7-Weltgenerator" +msgstr "Geländepersistenzrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -2830,7 +2830,7 @@ msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" -"Maximale Anzahl der Mapblocks, die der Client im Speicher vorhalten soll.\n" +"Maximale Anzahl der Mapblocks, die der Klient im Speicher vorhalten soll.\n" "Auf -1 setzen, um keine Obergrenze zu verwenden." #: src/settings_translation_file.cpp @@ -2843,7 +2843,7 @@ msgstr "" "eine\n" "langsame Verbindung haben, probieren Sie es damit, diesen Wert zu reduzieren," "\n" -"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Clients, die " +"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Klienten, die " "Sie\n" "anstreben." @@ -2867,7 +2867,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "Maximale Anzahl der Blöcke, die gleichzeitig pro Client gesendet werden" +msgstr "Maximale Anzahl der Blöcke, die gleichzeitig pro Klient gesendet werden" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" @@ -2908,15 +2908,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "Kleinkarte" +msgstr "Übersichtskarte" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "Kleinkartentaste" +msgstr "Übersichtskartentaste" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "Abtasthöhe der Kleinkarte" +msgstr "Abtasthöhe der Übersichtskarte" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" @@ -3003,7 +3003,7 @@ msgid "" "When starting from the main menu, this is overridden." msgstr "" "Name des Spielers.\n" -"Wenn ein Server gestartet wird, werden Clients mit diesem Namen zu Admins.\n" +"Wenn ein Server gestartet wird, werden Klienten mit diesem Namen zu Admins.\n" "Wird vom Hauptmenü aus gestartet, wird diese Einstellung überschrieben." #: src/settings_translation_file.cpp @@ -3256,15 +3256,15 @@ msgstr "Rollback-Aufzeichnung" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "Runde Kleinkarte" +msgstr "Runde Übersichtskarte" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "Speichert die Welt vom Server im lokalen Speicher." +msgstr "Speichert die Karte vom Server im lokalen Speicher." #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "Welt vom Server speichern" +msgstr "Karte vom Server speichern" #: src/settings_translation_file.cpp msgid "" @@ -3398,7 +3398,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "Form der Kleinkarte. Aktiviert = rund, Deaktiviert = rechteckig." +msgstr "Form der Übersichtskarte. Aktiviert = rund, Deaktiviert = rechteckig." #: src/settings_translation_file.cpp msgid "Show debug info" @@ -3413,7 +3413,7 @@ msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" -"Größe der Chunks, die gleichzeitig vom Weltgenerator angegeben werden,\n" +"Größe der Chunks, die gleichzeitig vom Kartengenerator angegeben werden,\n" "in Mapblocks (16 Blöcke [nodes]) angegeben." #: src/settings_translation_file.cpp @@ -3451,7 +3451,7 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" -"Spezifiziert die URL, von der die Clients die Medien (Texturen, Sounds, …) " +"Spezifiziert die URL, von der die Klienten die Medien (Texturen, Sounds, …) " "herunterladen.\n" "$Dateiname sollte von $remote_media$Dateiname mittels cURL erreichbar sein\n" "(diese Einstellung sollte also mit einem Schrägstrich enden).\n" @@ -3571,7 +3571,7 @@ msgstr "Zeitgeschwindigkeit" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." msgstr "" -"Zeit, nach der der Client nicht benutzte Kartendaten aus\n" +"Zeit, nach der der Klient nicht benutzte Kartendaten aus\n" "dem Speicher löscht." #: src/settings_translation_file.cpp @@ -3607,7 +3607,8 @@ msgid "" msgstr "" "Wahr = 256\n" "Falsch = 128\n" -"Nützlich, um die Kleinkarte performanter auf langsamen Maschinen zu machen." +"Nützlich, um die Übersichtskarte performanter auf langsamen Maschinen zu " +"machen." #: src/settings_translation_file.cpp msgid "Trusted mods" @@ -3801,10 +3802,10 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" -"Wo der Weltgenerator aufhört.\n" +"Wo der Kartengenerator aufhört.\n" "Bitte beachten Sie:\n" "- Begrenzt auf 31000 (größere Werte sind wirkungslos).\n" -"- Der Weltgenerator arbeitet in Gruppen von 80×80×80 Blöcken (5×5×5 " +"- Der Kartengenerator arbeitet in Gruppen von 80×80×80 Blöcken (5×5×5 " "MapBlocks).\n" "- Diese Gruppen haben einen Abstand von [-32, -32] Blöcken vom Ursprung.\n" "- Nur Gruppen, welche innerhalb der von map_generation_limit definierten " @@ -3826,8 +3827,8 @@ msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" -"Ob Spieler an Clients ohne Distanzbegrenzung angezeit werden.\n" -"Missbilligt, benutzen Sie die Einstellung „player_transfer_distance“ " +"Ob Spieler an Klienten ohne Distanzbegrenzung angezeit werden.\n" +"Veraltet, benutzen Sie die Einstellung „player_transfer_distance“ " "stattdessen." #: src/settings_translation_file.cpp @@ -3839,7 +3840,7 @@ msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" -"Ob Clients gefragt werden sollen, sich nach einem (Lua-)Absturz\n" +"Ob Klienten gefragt werden sollen, sich nach einem (Lua-)Absturz\n" "neu zu verbinden. Auf „wahr“ setzen, falls Ihr Server für auto-\n" "matische Neustarts eingerichtet ist." @@ -3851,7 +3852,7 @@ msgstr "Ob das Ende des sichtbaren Gebietes im Nebel verschwinden soll." msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" -"Ob der Client Debug-Informationen zeigen soll (hat die selbe Wirkung\n" +"Ob der Klienten Debug-Informationen zeigen soll (hat die selbe Wirkung\n" "wie das Drücken von F5)." #: src/settings_translation_file.cpp From ad7c37b58bfe451d73a8d0f8eb94860bea8c3501 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sun, 25 Oct 2015 19:11:24 +0100 Subject: [PATCH 014/531] Translated using Weblate (German) Currently translated at 98.1% (739 of 753 strings) --- po/de/minetest.po | 103 ++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 50 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index d9647a25..75bc7683 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 18:19+0200\n" +"PO-Revision-Date: 2015-10-25 19:11+0200\n" "Last-Translator: PilzAdam \n" "Language-Team: German " "\n" @@ -45,7 +45,7 @@ msgstr "Der Server hat um eine Wiederverbindung gebeten:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." -msgstr "Lädt …" +msgstr "Lädt…" #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " @@ -330,7 +330,7 @@ msgstr "Ausgewähltes Modpack deinstallieren" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" -msgstr "Adresse/Port:" +msgstr "Adresse / Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -355,7 +355,7 @@ msgstr "Entfernen" #: builtin/mainmenu/tab_multiplayer.lua msgid "Name / Password :" -msgstr "Name/Passwort:" +msgstr "Name / Passwort:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" @@ -393,7 +393,7 @@ msgstr "Neu" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "Kein Weltname angegeben oder ausgewählt!" +msgstr "Keine Welt angegeben oder ausgewählt!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -552,11 +552,11 @@ msgstr "Fertig!" #: src/client.cpp msgid "Initializing nodes" -msgstr "Blöcke initialisieren" +msgstr "Initialisiere Blöcke" #: src/client.cpp msgid "Initializing nodes..." -msgstr "Blöcke initialisieren ..." +msgstr "Initialisiere Blöcke..." #: src/client.cpp msgid "Item textures..." @@ -714,7 +714,7 @@ msgstr "MiB/s" #: src/game.cpp msgid "Node definitions..." -msgstr "Node-Definitionen ..." +msgstr "Blockdefinitionen..." #: src/game.cpp src/guiFormSpecMenu.cpp msgid "Proceed" @@ -1222,7 +1222,7 @@ msgstr "Beschleunigung in der Luft" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "Reichweite aktiver Blöcke" +msgstr "Reichweite aktiver Kartenblöcke" #: src/settings_translation_file.cpp msgid "Active object send range" @@ -1543,8 +1543,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" -"Setzt die maximale Distanz, in der die Spieler übertragen werden, in Blöcken " -"(0 = unbegrenzt)." +"Setzt die maximale Distanz, in der die Spieler übertragen werden, in " +"Kartenblöcken (0 = unbegrenzt)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." @@ -1624,8 +1624,7 @@ msgstr "Schaltet zufällige Steuerung ein (nur zum Testen verwendet)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" -"Blöcke (nodes) bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)." +msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)." #: src/settings_translation_file.cpp msgid "" @@ -1862,22 +1861,22 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" -"Von wie weit weg Blöcke für Klienten erzeugt werden,\n" -"in Mapblocks (16 Blöcke [nodes]) angegeben." +"Von wie weit weg Kartenblöcke für Klienten erzeugt werden.\n" +"1 Kartenblock = 16×16×16 Blöcke." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Blöcke zu Klienten gesendet werden,\n" -"in Mapblocks (16 Blöcke [nodes]) angegeben." +"Von wie weit weg Kartenblöcke zu Klienten gesendet werden.\n" +"1 Kartenblock = 16×16×16 Blöcke." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" "Von wie weit weg Klienten über Objekte bescheid wissen,\n" -"in Mapblocks (16 Blöcke [nodes]) angegeben." +"in Kartenblöcken (16 Blöcke) angegeben." #: src/settings_translation_file.cpp msgid "Full screen" @@ -1968,29 +1967,29 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" -"Wie groß das Gebiet ist, in dem Blöcke der Sachen bezüglich des aktiven " -"Blocks unterliegen.\n" -"In Mapblocks (16 Blöcke [nodes]) angegeben.\n" -"In aktiven Blöcken werden Objekte geladen und ABMs ausgeführt." +"Wie groß das Gebiet ist, in dem Kartenblöcke aktiv sind.\n" +"In aktiven Blöcken werden Objekte geladen und ABMs ausgeführt.\n" +"1 Kartenblock = 16×16×16 Blöcke." #: src/settings_translation_file.cpp msgid "" "How many blocks are flying in the wire simultaneously for the whole server." msgstr "" -"Wie viele Blöcke gleichzeitig für den gesamten Server auf der Leitung " +"Wie viele Kartenblöcke gleichzeitig für den gesamten Server auf der Leitung " "unterwegs sind." #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." msgstr "" -"Wie viele Blöcke gleichzeitig pro Klient auf der Leitung unterwegs sind." +"Wie viele Kartenblöcke gleichzeitig pro Klient auf der Leitung unterwegs " +"sind." #: src/settings_translation_file.cpp msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" -"Wie lange der Server warten wird, bevor nicht mehr verwendete Mapblocks\n" +"Wie lange der Server warten wird, bevor nicht mehr verwendete Kartenblöcke\n" "entladen werden. Ein höher Wert führt zu besserer Performanz, aber auch\n" "zur Benutzung von mehr Arbeitsspeicher." @@ -2591,11 +2590,11 @@ msgstr "Speicherintervall der Welt" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "Mapblock-Grenze" +msgstr "Kartenblock-Grenze" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "Timeout zum Entladen von Mapblocks" +msgstr "Timeout zum Entladen von Kartenblöcken" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2763,11 +2762,11 @@ msgstr "Geländepersistenzrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Max block generate distance" -msgstr "Max. Distanz für Blockerzeugung" +msgstr "Max. Distanz für Kartenblockerzeugung" #: src/settings_translation_file.cpp msgid "Max block send distance" -msgstr "Max. Distanz für Blockübertragung" +msgstr "Max. Distanz für Kartenblockübertragung" #: src/settings_translation_file.cpp msgid "Max liquids processed per step." @@ -2775,7 +2774,7 @@ msgstr "Max. Flüssigkeiten, die pro Step verarbeitet werden." #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" -msgstr "Max. clearobjects-Zusatzblöcke" +msgstr "Max. clearobjects-Zusatz-Kartenblöcke" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" @@ -2791,7 +2790,7 @@ msgstr "Maximale Bildwiederholrate, wenn das Spiel pausiert ist." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "Maximal zwangsgeladene Blöcke" +msgstr "Maximal zwangsgeladene Kartenblöcke" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" @@ -2800,16 +2799,16 @@ msgstr "Max. Breite der Schnellzugriffsleiste" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." msgstr "" -"Maximale Anzahl der Blöcke, welche in die Ladewarteschlange gesetzt werden " -"können." +"Maximale Anzahl der Kartenblöcke, welche in die Ladewarteschlange gesetzt " +"werden können." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" -"Maximale Anzahl der Blöcke, die in die Erzeugungswarteschlage gesetzt werden." -"\n" +"Maximale Anzahl der Kartenblöcke, die in die Erzeugungswarteschlage gesetzt " +"werden.\n" "Feld frei lassen, um automatisch einen geeigneten Wert zu bestimmen." #: src/settings_translation_file.cpp @@ -2817,20 +2816,21 @@ msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" -"Maximale Anzahl der Blöcke, die in die Warteschlange zum Laden aus\n" +"Maximale Anzahl der Kartenblöcke, die in die Warteschlange zum Laden aus\n" "einer Datei gesetzt werden können.\n" "Feld frei lassen, um automatisch einen geeigneten Wert zu bestimmen." #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "Maximale Anzahl der zwangsgeladenen Mapblocks." +msgstr "Maximale Anzahl der zwangsgeladenen Kartenblöcke." #: src/settings_translation_file.cpp msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" -"Maximale Anzahl der Mapblocks, die der Klient im Speicher vorhalten soll.\n" +"Maximale Anzahl der Kartenblöcke, die der Klient im Speicher vorhalten soll." +"\n" "Auf -1 setzen, um keine Obergrenze zu verwenden." #: src/settings_translation_file.cpp @@ -2854,7 +2854,8 @@ msgstr "Anzahl der Spieler, die sich gleichzeitig verbinden können." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "Maximale Anzahl der statisch gespeicherten Objekte in einem Block." +msgstr "" +"Maximale Anzahl der statisch gespeicherten Objekte in einem Kartenblock." #: src/settings_translation_file.cpp msgid "" @@ -2867,11 +2868,12 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "Maximale Anzahl der Blöcke, die gleichzeitig pro Klient gesendet werden" +msgstr "" +"Maximale Anzahl der Kartenblöcke, die gleichzeitig pro Klient gesendet werden" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "Maximale Gesamtzahl der gleichzeitig gesendeten Blöcke" +msgstr "Maximale Gesamtzahl der gleichzeitig gesendeten Kartenblöcke" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." @@ -2885,7 +2887,7 @@ msgstr "Maximale Benutzerzahl" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "Maximale Objekte pro Block" +msgstr "Maximale Objekte pro Kartenblock" #: src/settings_translation_file.cpp msgid "Menus" @@ -3087,7 +3089,7 @@ msgid "" "This is a trade-off between sqlite transaction overhead and\n" "memory consumption (4096=100MB, as a rule of thumb)." msgstr "" -"Anzahl der zusätzlichen Blöcke, welche mit /clearobjects gleichzeitig\n" +"Anzahl der zusätzlichen Kartenblöcke, welche mit /clearobjects gleichzeitig\n" "geladen werden können. Dies ist ein Kompromiss zwischen SQLite-\n" "Transaktions-Overhead und Speicherverbrauch (Faustregel: 4096=100MB)." @@ -3413,8 +3415,8 @@ msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" -"Größe der Chunks, die gleichzeitig vom Kartengenerator angegeben werden,\n" -"in Mapblocks (16 Blöcke [nodes]) angegeben." +"Größe der Stücke, die gleichzeitig vom Kartengenerator angegeben werden,\n" +"in Kartenblöcken (16×16×16 Blöcke) angegeben." #: src/settings_translation_file.cpp msgid "Smooth lighting" @@ -3581,11 +3583,11 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" -"Um Verzögerungen zu reduzieren, werden Blockübertragungen verlangsamt, " +"Um Verzögerungen zu reduzieren, werden Kartenblockübertragungen verlangsamt, " "während\n" "ein Spieler etwas baut. Dies bestimmt, wie lange sie verlangsamt sind, " "nachdem ein\n" -"Block (node) platziert oder entfernt wurde." +"Block platziert oder entfernt wurde." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" @@ -3806,7 +3808,7 @@ msgstr "" "Bitte beachten Sie:\n" "- Begrenzt auf 31000 (größere Werte sind wirkungslos).\n" "- Der Kartengenerator arbeitet in Gruppen von 80×80×80 Blöcken (5×5×5 " -"MapBlocks).\n" +"Kartenblöcke).\n" "- Diese Gruppen haben einen Abstand von [-32, -32] Blöcken vom Ursprung.\n" "- Nur Gruppen, welche innerhalb der von map_generation_limit definierten " "Grenze liegen, werden erzeugt." @@ -3820,7 +3822,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "Ob Blocktexturanimationen pro Mapblock desynchronisiert sein sollten." +msgstr "" +"Ob Blocktexturanimationen pro Kartenblock desynchronisiert sein sollten." #: src/settings_translation_file.cpp msgid "" @@ -3857,7 +3860,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "Breite der Linien der Auswahlbox um Blöcke (nodes)." +msgstr "Breite der Linien der Auswahlbox um Blöcke." #: src/settings_translation_file.cpp msgid "" From 5d9901897887ad5f5d37ecb4756832ac7a090272 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sun, 25 Oct 2015 21:15:46 +0100 Subject: [PATCH 015/531] Translated using Weblate (German) Currently translated at 94.0% (708 of 753 strings) --- po/de/minetest.po | 162 +++++++++++++++++++++++++++------------------- 1 file changed, 96 insertions(+), 66 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 75bc7683..be5f3e05 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 19:11+0200\n" +"PO-Revision-Date: 2015-10-25 21:15+0200\n" "Last-Translator: PilzAdam \n" "Language-Team: German " "\n" @@ -532,15 +532,15 @@ msgstr "Keine Informationen vorhanden" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "Keine" +msgstr "Keines" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" -msgstr "Texturpaket auswählen:" +msgstr "Texturenpaket auswählen:" #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" -msgstr "Texturpakete" +msgstr "Texturenpakete" #: src/client.cpp msgid "Connection timed out." @@ -564,11 +564,11 @@ msgstr "Inventarbilder ..." #: src/client.cpp msgid "Loading textures..." -msgstr "Texturen laden ..." +msgstr "Lade Texturen..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "Shader wiederherstellen ..." +msgstr "Shader wiederherstellen..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -576,7 +576,7 @@ msgstr "Verbindungsfehler (Zeitüberschreitung?)" #: src/client/clientlauncher.cpp msgid "Could not find or load game \"" -msgstr "Kann Spiel nicht finden/laden \"" +msgstr "Kann Spiel nicht finden oder laden \"" #: src/client/clientlauncher.cpp msgid "Invalid gamespec." @@ -620,7 +620,7 @@ msgstr "Passwort ändern" #: src/game.cpp msgid "Connecting to server..." -msgstr "Zum Server verbinden ..." +msgstr "Verbinde mit Server..." #: src/game.cpp msgid "Continue" @@ -628,11 +628,11 @@ msgstr "Weiter" #: src/game.cpp msgid "Creating client..." -msgstr "Klienten erstellen..." +msgstr "Erstelle Klienten..." #: src/game.cpp msgid "Creating server..." -msgstr "Server erstellen ..." +msgstr "Erstelle Server..." #: src/game.cpp msgid "" @@ -648,7 +648,7 @@ msgid "" "- Mouse wheel: select item\n" "- T: chat\n" msgstr "" -"Standard-Tastenbelegung:\n" +"Standardsteuerung:\n" "- WASD: bewegen\n" "- Leertaste: springen/klettern\n" "- Umschalt: kriechen/herunterklettern\n" @@ -698,7 +698,7 @@ msgstr "Programm beenden" #: src/game.cpp msgid "Item definitions..." -msgstr "Item-Definitionen ..." +msgstr "Item-Definitionen..." #: src/game.cpp msgid "KiB/s" @@ -706,7 +706,7 @@ msgstr "KiB/s" #: src/game.cpp msgid "Media..." -msgstr "Medien ..." +msgstr "Medien..." #: src/game.cpp msgid "MiB/s" @@ -722,7 +722,7 @@ msgstr "Fortsetzen" #: src/game.cpp msgid "Resolving address..." -msgstr "Adresse auflösen ..." +msgstr "Löse Adresse auf..." #: src/game.cpp msgid "Respawn" @@ -730,7 +730,7 @@ msgstr "Wiederbeleben" #: src/game.cpp msgid "Shutting down..." -msgstr "Herunterfahren ..." +msgstr "Herunterfahren..." #: src/game.cpp msgid "Sound Volume" @@ -795,7 +795,8 @@ msgstr "Taste bereits in Benutzung" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" -"Steuerung (Falls dieses Menü versagt, entfernen Sie Sachen aus minetest.conf)" +"Steuerung (Falls dieses Menü fehlerhaft formatiert ist, entfernen Sie " +"Einstellungen aus minetest.conf)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -1552,7 +1553,7 @@ msgstr "Verzögerung beim Zeigen von Tooltipps, in Millisekunden." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "Missbilligte Lua-API-Handhabung" +msgstr "Veraltete Lua-API-Handhabung" #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1600,7 +1601,7 @@ msgstr "Doppelttippen der Sprungtaste schaltet Flugmodus um." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "Fallenlassen-Taste" +msgstr "Wegwerfen-Taste" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." @@ -1660,7 +1661,7 @@ msgstr "" "angeboten).\n" "Entfernte Server bieten eine deutlich schnellere Methode, um Medien (z.B. " "Texturen)\n" -"während des Verbindugsaufbaus zum Server herunterzuladen." +"während des Verbindungsaufbaus zum Server herunterzuladen." #: src/settings_translation_file.cpp msgid "" @@ -1668,7 +1669,7 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" -"Server als IPv6 laufen lassen (oder nicht). Ein IPv6-Server könnte,\n" +"Server als IPv6 laufen lassen. Ein IPv6-Server könnte,\n" "abhängig von der Systemkonfiguration, auf IPv6-Klienten eingeschränkt sein.\n" "Wird ignoriert, wenn bind_address gesetzt ist." @@ -1679,16 +1680,16 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" -"Aktiviert das Bump-Mapping für Texturen. Normal-Maps müssen vom " +"Aktiviert das Bump-Mapping für Texturen. Normal-Maps müssen im " "Texturenpaket\n" -"angeboten werden oder müssen automatisch erzeugt werden.\n" +"vorhanden sein oder müssen automatisch erzeugt werden.\n" "Shader müssen aktiviert werden, bevor diese Einstellung aktiviert werden " "kann." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." msgstr "" -"Aktiviert das Zwischenspeichern von 3D-Modellen, dir mittels facedir rotiert " +"Aktiviert das Zwischenspeichern von 3D-Modellen, die mittels facedir rotiert " "werden." #: src/settings_translation_file.cpp @@ -1729,23 +1730,23 @@ msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "Auf- und Abbewegung beim Sturz" +msgstr "Kameraschütteln beim Aufprallen" #: src/settings_translation_file.cpp msgid "Fallback font" -msgstr "Rückgriffschrift" +msgstr "Ersatzschriftart" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "Rückgriff-Schattenschrift" +msgstr "Ersatzschriftschatten" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "Undurchsichtigkeit der Rückgriff-Schattenschrift" +msgstr "Undurchsichtigkeit des Ersatzschriftschattens" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "Größe der Rückgriffschrift" +msgstr "Ersatzschriftgröße" #: src/settings_translation_file.cpp msgid "Fast key" @@ -1892,7 +1893,7 @@ msgstr "Vollbildmodus." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "GUI-Größenfaktor" +msgstr "GUI-Skalierung" #: src/settings_translation_file.cpp msgid "GUI scaling filter" @@ -1928,7 +1929,7 @@ msgstr "Gravitation" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "Taste zur Umschaltung der HUD" +msgstr "Taste zum Umschalten des HUD" #: src/settings_translation_file.cpp msgid "" @@ -1937,12 +1938,12 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" -"Handhabung für missbilligte Lua-API-Aufrufe:\n" +"Handhabung für veraltete Lua-API-Aufrufe:\n" "- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release)." "\n" -"- log: Imitieren, und den Backtrace des missbilligten Funktionsaufrufs " +"- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs " "protokollieren (Standard für Debug).\n" -"- error: Bei Verwendung eines missbilligten Funktionsaufrufs abbrechen (" +"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen (" "empfohlen für Mod-Entwickler)." #: src/settings_translation_file.cpp @@ -2012,7 +2013,7 @@ msgid "" msgstr "" "Falls die Bildwiederholrate diesen Wert überschreitet,\n" "wird sie durch Nichtstun begrenzt, um die CPU nicht\n" -"unnötig auszulasten." +"unnötig zu belasten." #: src/settings_translation_file.cpp msgid "If disabled " @@ -2101,7 +2102,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "Zeitintervall, in der die Tageszeit an Klienten gesendet wird." +msgstr "Zeitintervall, in dem die Tageszeit an Klienten gesendet wird." #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2285,8 +2286,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste zum Wechseln der Kamera (Ego-Perspektive oder Dritte-Person-" -"Perspektive).\n" +"Taste zum Wechseln der Kamera (Ego- oder Dritte-Person-Perspektive).\n" "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" "35e3da1b0edf72eb3" @@ -2296,7 +2296,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste zur Erzeugung von Screenshots.\n" +"Taste zur Erzeugung von Bildschirmfotos.\n" "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" "35e3da1b0edf72e" @@ -2377,7 +2377,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste, um die HUD zu verbergen oder wieder anzuzeigen.\n" +"Taste, um das HUD zu verbergen oder wieder anzuzeigen.\n" "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" "35e3da1b0edf72e" @@ -2475,16 +2475,18 @@ msgstr "" "- (keine Protokollierung)\n" "- none (Meldungen ohne Einstufung)\n" "- error (Fehler)\n" -"- warning (Warnung)\n" -"- action (Aktion)\n" -"- info (Information)\n" -"- verbose (geschwätzig)" +"- warning (Warnungen)\n" +"- action (Aktionen)\n" +"- info (Informationen)\n" +"- verbose (Ausführlich)" #: src/settings_translation_file.cpp +#, fuzzy msgid "Limit of emerge queues on disk" msgstr "Grenze der Erzeugungswarteschlangen auf dem Festspeicher" #: src/settings_translation_file.cpp +#, fuzzy msgid "Limit of emerge queues to generate" msgstr "Max. Anzahl der Erzeugungswarteschlangen, die erzeugt werden sollen" @@ -2500,8 +2502,8 @@ msgstr "" "- Medienabholung, falls der Server die remote_media-Einstellung verwendet." "\n" "- Herunterladen der Serverliste und Server-Ankündigungsdaten.\n" -"- Downloads, die vom Hauptmenü aus getätigt wurden (z.B. Mod-Manager).\n" -"Hat nur eine Wirkung, wenn mit cURL kompiliert." +"- Downloads, die vom Hauptmenü aus getätigt werden (z.B. Mod-Manager).\n" +"Hat nur eine Wirkung, wenn mit cURL-Unterstützung kompiliert wurde." #: src/settings_translation_file.cpp msgid "Liquid fluidity" @@ -2597,14 +2599,17 @@ msgid "Mapblock unload timeout" msgstr "Timeout zum Entladen von Kartenblöcken" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen biome heat noise parameters" msgstr "Kartengeneratorbiomhitzenrauschparameter" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen biome humidity blend noise parameters" msgstr "Kartengeneratorbiomluftfeuchtigkeitsübergangsrauschparameter" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen biome humidity noise parameters" msgstr "Kartengeneratorbiomluftfeuchtigkeitsrauschparameter" @@ -2653,6 +2658,7 @@ msgid "Mapgen v6" msgstr "Kartengenerator v6" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 apple trees noise parameters" msgstr "Apfelbaumrauschparameter für v6-Kartengenerator" @@ -2661,18 +2667,22 @@ msgid "Mapgen v6 beach frequency" msgstr "Strandfrequenz für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 beach noise parameters" msgstr "Strandrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 biome noise parameters" msgstr "Biomrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 cave noise parameters" msgstr "Höhlenrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 desert frequency" msgstr "Wüstenrauschparameter für v6-Kartengenerator" @@ -2681,30 +2691,37 @@ msgid "Mapgen v6 flags" msgstr "Flags für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 height select noise parameters" msgstr "Höhenauswahlrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 humidity noise parameters" msgstr "Luftfeuchtigkeitsrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 mud noise parameters" msgstr "Schlammrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 steepness noise parameters" msgstr "Steilheitsrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 terrain altitude noise parameters" msgstr "Geländehöhenrauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 terrain base noise parameters" msgstr "Basisgeländerauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v6 trees noise parameters" msgstr "Baumrauschparameter für v6-Kartengenerator" @@ -2713,14 +2730,17 @@ msgid "Mapgen v7" msgstr "Kartengenerator v7" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 cave1 noise parameters" msgstr "cave1-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 cave2 noise parameters" msgstr "cave2-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 filler depth noise parameters" msgstr "Ausfülltiefenrauschen für v7-Kartengenerator" @@ -2729,34 +2749,42 @@ msgid "Mapgen v7 flags" msgstr "Flags für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 height select noise parameters" msgstr "Höhenauswahlrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 mount height noise parameters" msgstr "Berghöhenrauschenparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 mountain noise parameters" msgstr "Bergrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 ridge noise parameters" msgstr "Gratrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 ridge water noise parameters" msgstr "Wassergratrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 terrain altitude noise parameters" msgstr "Geländehöhenrauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 terrain base noise parameters" msgstr "Basisgeländerauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 terrain persistation noise parameters" msgstr "Geländepersistenzrauschparameter für v7-Kartengenerator" @@ -2770,7 +2798,7 @@ msgstr "Max. Distanz für Kartenblockübertragung" #: src/settings_translation_file.cpp msgid "Max liquids processed per step." -msgstr "Max. Flüssigkeiten, die pro Step verarbeitet werden." +msgstr "Max. Flüssigkeitsblöcke, die pro Schritt verarbeitet werden." #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" @@ -2797,6 +2825,7 @@ msgid "Maximum hotbar width" msgstr "Max. Breite der Schnellzugriffsleiste" #: src/settings_translation_file.cpp +#, fuzzy msgid "Maximum number of blocks that can be queued for loading." msgstr "" "Maximale Anzahl der Kartenblöcke, welche in die Ladewarteschlange gesetzt " @@ -2839,10 +2868,9 @@ msgid "" "try reducing it, but don't reduce it to a number below double of targeted\n" "client number." msgstr "" -"Maximale Anzahl der Pakete, die pro Sende-Step gesendet werden. Falls Sie " +"Maximale Anzahl der Pakete, die pro Sende-Schritt gesendet werden. Falls Sie " "eine\n" -"langsame Verbindung haben, probieren Sie es damit, diesen Wert zu reduzieren," -"\n" +"langsame Verbindung haben, probieren Sie, diesen Wert zu reduzieren,\n" "aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Klienten, die " "Sie\n" "anstreben." @@ -2867,11 +2895,13 @@ msgstr "" "etwas gibt, was links oder rechts von ihr angezeigt werden soll." #: src/settings_translation_file.cpp +#, fuzzy msgid "Maximum simultaneously blocks send per client" msgstr "" "Maximale Anzahl der Kartenblöcke, die gleichzeitig pro Klient gesendet werden" #: src/settings_translation_file.cpp +#, fuzzy msgid "Maximum simultaneously bocks send total" msgstr "Maximale Gesamtzahl der gleichzeitig gesendeten Kartenblöcke" @@ -2976,9 +3006,9 @@ msgid "" "Multiplier for fall bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" -"Faktor für Auf- und Abbewegung beim Sturz.\n" -"Zum Beispiel: 0 für keine Auf- und Abbewegung, 1.0 für den Standardwert, 2.0 " -"für doppelte Geschwindigkeit." +"Faktor für Kameraschütteln beim Sturz.\n" +"Zum Beispiel: 0 für kein Schütteln, 1.0 für den Standardwert, 2.0 für " +"doppelte Geschwindigkeit." #: src/settings_translation_file.cpp msgid "" @@ -3005,7 +3035,8 @@ msgid "" "When starting from the main menu, this is overridden." msgstr "" "Name des Spielers.\n" -"Wenn ein Server gestartet wird, werden Klienten mit diesem Namen zu Admins.\n" +"Wenn ein Server gestartet wird, werden Klienten mit diesem Namen zu " +"Administratoren.\n" "Wird vom Hauptmenü aus gestartet, wird diese Einstellung überschrieben." #: src/settings_translation_file.cpp @@ -3139,7 +3170,7 @@ msgstr "Pfad zu einer TrueType- oder Bitmap-Schrift." #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "Pfad, in dem Screenshots abgespeichert werden." +msgstr "Pfad, in dem Bildschirmfotos abgespeichert werden." #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." @@ -3293,11 +3324,11 @@ msgstr "Bildschirmbreite" #: src/settings_translation_file.cpp msgid "Screenshot" -msgstr "Screenshot" +msgstr "Bildschirmfoto" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "Screenshot-Verzeichnis" +msgstr "Bildschirmfotoordner" #: src/settings_translation_file.cpp msgid "Security" @@ -3415,7 +3446,7 @@ msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" -"Größe der Stücke, die gleichzeitig vom Kartengenerator angegeben werden,\n" +"Größe der Stücke, die gleichzeitig vom Kartengenerator erzeugt werden,\n" "in Kartenblöcken (16×16×16 Blöcke) angegeben." #: src/settings_translation_file.cpp @@ -3463,7 +3494,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "Statischer Startpunkt" +msgstr "Statische Einstiegsposition" #: src/settings_translation_file.cpp msgid "Strength of generated normalmaps." @@ -3585,9 +3616,9 @@ msgid "" msgstr "" "Um Verzögerungen zu reduzieren, werden Kartenblockübertragungen verlangsamt, " "während\n" -"ein Spieler etwas baut. Dies bestimmt, wie lange sie verlangsamt sind, " -"nachdem ein\n" -"Block platziert oder entfernt wurde." +"ein Spieler etwas baut. Diese Einstellung bestimmt, wie lange sie " +"verlangsamt sind,\n" +"nachdem ein Block platziert oder entfernt wurde." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" @@ -3614,7 +3645,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "Vertrauten Mods" +msgstr "Vertrauenswürdige Mods" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." @@ -3623,7 +3654,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" -msgstr "Unbegrenze Spielerübertragungsdistanz" +msgstr "Unbegrenzte Spielerübertragungsdistanz" #: src/settings_translation_file.cpp msgid "Unload unused server data" @@ -3640,7 +3671,7 @@ msgstr "Eine Wolkenanimation für den Hintergrund im Hauptmenü benutzen." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." msgstr "" -"Anisotropische Filterung verwenden, wenn auf Texturen aus einem\n" +"Anisotrope Filterung verwenden, wenn auf Texturen aus einem\n" "gewissen Blickwinkel heraus geschaut wird." #: src/settings_translation_file.cpp @@ -3783,8 +3814,7 @@ msgid "" "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" "enabled." msgstr "" -"Wenn bilineare, trilineare oder anisotropische Filter benutzt werden, " -"können\n" +"Wenn bilineare, trilineare oder anisotrope Filter benutzt werden, können\n" "niedrigauflösende Texturen verschwommen sein, also werden sie automatisch\n" "mit Pixelwiederholung vergrößert, um scharfe Pixel zu behalten. Dies setzt " "die\n" From 51247993035b6e3d205d33470b4c5c45c41a5357 Mon Sep 17 00:00:00 2001 From: Jordi Fornaguera Date: Mon, 26 Oct 2015 07:09:05 +0100 Subject: [PATCH 016/531] Translated using Weblate (Spanish) Currently translated at 32.5% (245 of 753 strings) --- po/es/minetest.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 5d7ac085..8914eddc 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-04 12:36+0200\n" -"Last-Translator: OdnetninI \n" -"Language-Team: Spanish \n" +"PO-Revision-Date: 2015-10-26 07:09+0200\n" +"Last-Translator: Jordi Fornaguera \n" +"Language-Team: Spanish " +"\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +68,7 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Sólo soportamos protocolos versión $1" #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." From e3c3eab101727b1a6ef7a4aaca17871577436d5e Mon Sep 17 00:00:00 2001 From: pilino1234 Date: Mon, 26 Oct 2015 11:41:17 +0100 Subject: [PATCH 017/531] Translated using Weblate (German) Currently translated at 94.1% (709 of 753 strings) --- po/de/minetest.po | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index be5f3e05..14dd62a6 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 21:15+0200\n" -"Last-Translator: PilzAdam \n" +"PO-Revision-Date: 2015-10-26 11:41+0200\n" +"Last-Translator: pilino1234 \n" "Language-Team: German " "\n" "Language: de\n" @@ -2825,11 +2825,8 @@ msgid "Maximum hotbar width" msgstr "Max. Breite der Schnellzugriffsleiste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Maximum number of blocks that can be queued for loading." -msgstr "" -"Maximale Anzahl der Kartenblöcke, welche in die Ladewarteschlange gesetzt " -"werden können." +msgstr "Maximale Anzahl der Kartenblöcke in der Ladewarteschlange." #: src/settings_translation_file.cpp msgid "" From a8a2fe85b2ee07a2e748d994db9d3ea7e0ce7626 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Mon, 26 Oct 2015 14:49:49 +0100 Subject: [PATCH 018/531] Translated using Weblate (Hebrew) Currently translated at 100% (0 of 0 strings) Created new translation. --- po/he/minetest.po | 3405 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3405 insertions(+) create mode 100644 po/he/minetest.po diff --git a/po/he/minetest.po b/po/he/minetest.po new file mode 100644 index 00000000..c1028953 --- /dev/null +++ b/po/he/minetest.po @@ -0,0 +1,3405 @@ +# Hebrew translations for minetest package. +# Copyright (C) 2015 THE minetest'S COPYRIGHT HOLDER +# This file is distributed under the same license as the minetest package. +# Automatically generated, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: minetest\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"PO-Revision-Date: 2015-10-24 20:28+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: he\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: builtin/fstk/ui.lua +msgid "The server has requested a reconnect:" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "Main menu" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "Reconnect" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "An error occured in a Lua script, such as a mod:" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "An error occured:" +msgstr "" + +#: builtin/fstk/ui.lua builtin/mainmenu/store.lua +msgid "Ok" +msgstr "" + +#: builtin/mainmenu/common.lua src/game.cpp +msgid "Loading..." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Try reenabling public serverlist and check your internet connection." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Server supports protocol versions between $1 and $2. " +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Server enforces protocol version $1. " +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "We support protocol versions between version $1 and $2." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "We only support protocol version $1." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Protocol version mismatch. " +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "World:" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Hide Game" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Hide mp content" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Mod:" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua +msgid "Depends:" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua +#: src/guiKeyChangeMenu.cpp +msgid "Save" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Cancel" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Enable MP" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Disable MP" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "enabled" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Enable all" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "" +"Failed to enable mod \"$1\" as it contains disallowed characters. Only " +"chararacters [a-z0-9_] are allowed." +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "World name" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Seed" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Mapgen" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Game" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Create" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "You have no subgames installed." +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Download one from minetest.net" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Warning: The minimal development test is meant for developers." +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Download a subgame, such as minetest_game, from minetest.net" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "A world named \"$1\" already exists" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "No worldname given or no game selected" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "Are you sure you want to delete \"$1\"?" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +msgid "Yes" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "No of course not!" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "Modmgr: failed to delete \"$1\"" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "Modmgr: invalid modpath \"$1\"" +msgstr "" + +#: builtin/mainmenu/dlg_delete_world.lua +msgid "Delete World \"$1\"?" +msgstr "" + +#: builtin/mainmenu/dlg_delete_world.lua +msgid "No" +msgstr "" + +#: builtin/mainmenu/dlg_rename_modpack.lua +msgid "Rename Modpack:" +msgstr "" + +#: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp +msgid "Accept" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: file: \"$1\"" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "" +"\n" +"Install Mod: unsupported filetype \"$1\" or broken archive" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Failed to install $1 to $2" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: unable to find suitable foldername for modpack $1" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: unable to find real modname for: $1" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Unsorted" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Search" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Downloading $1, please wait..." +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Successfully installed:" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Shortname:" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Rating" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "re-Install" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Install" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Close store" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Page $1 of $2" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Credits" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Core Developers" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Active Contributors" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Previous Core Developers" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Previous Contributors" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Installed Mods:" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "No mod description available" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Mod information:" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Rename" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Uninstall selected modpack" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Uninstall selected mod" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Select Mod File:" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua +msgid "Address / Port :" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua +msgid "Name / Password :" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Public Serverlist" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua +#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp +msgid "Delete" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Connect" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Creative mode" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Damage enabled" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "PvP enabled" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp +msgid "Client" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "New" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "Configure" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Start Game" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "Select World:" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_singleplayer.lua +msgid "Creative Mode" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_singleplayer.lua +msgid "Enable Damage" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Public" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +msgid "Name/Password" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Bind Address" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Port" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Server Port" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "No world created or selected!" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Server" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Games" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Disabled" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Enabled" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "The value must be lower than $1." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "\"" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Change keys" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Settings" +msgstr "" + +#: builtin/mainmenu/tab_simple_main.lua +msgid "Start Singleplayer" +msgstr "" + +#: builtin/mainmenu/tab_simple_main.lua +msgid "Config mods" +msgstr "" + +#: builtin/mainmenu/tab_simple_main.lua +msgid "Main" +msgstr "" + +#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp +msgid "Play" +msgstr "" + +#: builtin/mainmenu/tab_singleplayer.lua +msgid "Singleplayer" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "Select texture pack:" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "No information available" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "Texturepacks" +msgstr "" + +#: src/client.cpp +msgid "Connection timed out." +msgstr "" + +#: src/client.cpp +msgid "Loading textures..." +msgstr "" + +#: src/client.cpp +msgid "Rebuilding shaders..." +msgstr "" + +#: src/client.cpp +msgid "Initializing nodes..." +msgstr "" + +#: src/client.cpp +msgid "Initializing nodes" +msgstr "" + +#: src/client.cpp +msgid "Item textures..." +msgstr "" + +#: src/client.cpp +msgid "Done!" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Main Menu" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Player name too long." +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Connection error (timed out?)" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "No world selected and no address provided. Nothing to do." +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Provided world path doesn't exist: " +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Could not find or load game \"" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Invalid gamespec." +msgstr "" + +#: src/fontengine.cpp +msgid "needs_fallback_font" +msgstr "" + +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "Proceed" +msgstr "" + +#: src/game.cpp +msgid "You died." +msgstr "" + +#: src/game.cpp +msgid "Respawn" +msgstr "" + +#: src/game.cpp +msgid "" +"Default Controls:\n" +"No menu visible:\n" +"- single tap: button activate\n" +"- double tap: place/use\n" +"- slide finger: look around\n" +"Menu/Inventory visible:\n" +"- double tap (outside):\n" +" -->close\n" +"- touch stack, touch slot:\n" +" --> move stack\n" +"- touch&drag, tap 2nd finger\n" +" --> place single item to slot\n" +msgstr "" + +#: src/game.cpp +msgid "" +"Default Controls:\n" +"- WASD: move\n" +"- Space: jump/climb\n" +"- Shift: sneak/go down\n" +"- Q: drop item\n" +"- I: inventory\n" +"- Mouse: turn/look\n" +"- Mouse left: dig/punch\n" +"- Mouse right: place/use\n" +"- Mouse wheel: select item\n" +"- T: chat\n" +msgstr "" + +#: src/game.cpp +msgid "Continue" +msgstr "" + +#: src/game.cpp +msgid "Change Password" +msgstr "" + +#: src/game.cpp +msgid "Sound Volume" +msgstr "" + +#: src/game.cpp +msgid "Change Keys" +msgstr "" + +#: src/game.cpp +msgid "Exit to Menu" +msgstr "" + +#: src/game.cpp +msgid "Exit to OS" +msgstr "" + +#: src/game.cpp +msgid "Shutting down..." +msgstr "" + +#: src/game.cpp +msgid "Creating server..." +msgstr "" + +#: src/game.cpp +msgid "Creating client..." +msgstr "" + +#: src/game.cpp +msgid "Resolving address..." +msgstr "" + +#: src/game.cpp +msgid "Connecting to server..." +msgstr "" + +#: src/game.cpp +msgid "Item definitions..." +msgstr "" + +#: src/game.cpp +msgid "Node definitions..." +msgstr "" + +#: src/game.cpp +msgid "Media..." +msgstr "" + +#: src/game.cpp +msgid "KiB/s" +msgstr "" + +#: src/game.cpp +msgid "MiB/s" +msgstr "" + +#: src/game.cpp +msgid "" +"\n" +"Check debug.txt for details." +msgstr "" + +#: src/guiFormSpecMenu.cpp +msgid "Enter " +msgstr "" + +#: src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "\"Use\" = climb down" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Double tap \"jump\" to toggle fly" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Key already in use" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "press key" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Forward" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Backward" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Left" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Right" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Use" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Jump" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Sneak" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Drop" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Inventory" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Chat" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Command" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Console" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fly" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fast" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle Cinematic" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle noclip" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Range select" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp +msgid "Print stacks" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Old Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "New Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Confirm Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Change" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Passwords do not match!" +msgstr "" + +#: src/guiVolumeChange.cpp +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp +msgid "Exit" +msgstr "" + +#: src/keycode.cpp +msgid "Left Button" +msgstr "" + +#: src/keycode.cpp +msgid "Middle Button" +msgstr "" + +#: src/keycode.cpp +msgid "Right Button" +msgstr "" + +#: src/keycode.cpp +msgid "X Button 1" +msgstr "" + +#: src/keycode.cpp +msgid "Back" +msgstr "" + +#: src/keycode.cpp +msgid "Clear" +msgstr "" + +#: src/keycode.cpp +msgid "Return" +msgstr "" + +#: src/keycode.cpp +msgid "Tab" +msgstr "" + +#: src/keycode.cpp +msgid "X Button 2" +msgstr "" + +#: src/keycode.cpp +msgid "Capital" +msgstr "" + +#: src/keycode.cpp +msgid "Control" +msgstr "" + +#: src/keycode.cpp +msgid "Kana" +msgstr "" + +#: src/keycode.cpp +msgid "Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Pause" +msgstr "" + +#: src/keycode.cpp +msgid "Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Convert" +msgstr "" + +#: src/keycode.cpp +msgid "Escape" +msgstr "" + +#: src/keycode.cpp +msgid "Final" +msgstr "" + +#: src/keycode.cpp +msgid "Junja" +msgstr "" + +#: src/keycode.cpp +msgid "Kanji" +msgstr "" + +#: src/keycode.cpp +msgid "Nonconvert" +msgstr "" + +#: src/keycode.cpp +msgid "End" +msgstr "" + +#: src/keycode.cpp +msgid "Home" +msgstr "" + +#: src/keycode.cpp +msgid "Mode Change" +msgstr "" + +#: src/keycode.cpp +msgid "Next" +msgstr "" + +#: src/keycode.cpp +msgid "Prior" +msgstr "" + +#: src/keycode.cpp +msgid "Space" +msgstr "" + +#: src/keycode.cpp +msgid "Down" +msgstr "" + +#: src/keycode.cpp +msgid "Execute" +msgstr "" + +#: src/keycode.cpp +msgid "Print" +msgstr "" + +#: src/keycode.cpp +msgid "Select" +msgstr "" + +#: src/keycode.cpp +msgid "Up" +msgstr "" + +#: src/keycode.cpp +msgid "Help" +msgstr "" + +#: src/keycode.cpp +msgid "Insert" +msgstr "" + +#: src/keycode.cpp +msgid "Snapshot" +msgstr "" + +#: src/keycode.cpp +msgid "Left Windows" +msgstr "" + +#: src/keycode.cpp +msgid "Apps" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 0" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 1" +msgstr "" + +#: src/keycode.cpp +msgid "Right Windows" +msgstr "" + +#: src/keycode.cpp +msgid "Sleep" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 2" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 3" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 4" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 5" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 6" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 7" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad *" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad +" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad -" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad /" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 8" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 9" +msgstr "" + +#: src/keycode.cpp +msgid "Num Lock" +msgstr "" + +#: src/keycode.cpp +msgid "Scroll Lock" +msgstr "" + +#: src/keycode.cpp +msgid "Left Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Right Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Left Control" +msgstr "" + +#: src/keycode.cpp +msgid "Left Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Right Control" +msgstr "" + +#: src/keycode.cpp +msgid "Right Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Comma" +msgstr "" + +#: src/keycode.cpp +msgid "Minus" +msgstr "" + +#: src/keycode.cpp +msgid "Period" +msgstr "" + +#: src/keycode.cpp +msgid "Plus" +msgstr "" + +#: src/keycode.cpp +msgid "Attn" +msgstr "" + +#: src/keycode.cpp +msgid "CrSel" +msgstr "" + +#: src/keycode.cpp +msgid "Erase OEF" +msgstr "" + +#: src/keycode.cpp +msgid "ExSel" +msgstr "" + +#: src/keycode.cpp +msgid "OEM Clear" +msgstr "" + +#: src/keycode.cpp +msgid "PA1" +msgstr "" + +#: src/keycode.cpp +msgid "Zoom" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Build inside player" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, you can place blocks at the position (feet + eye level) where " +"you stand.\n" +"This is helpful when working with nodeboxes in small areas." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Flying" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Player is able to fly without being affected by gravity.\n" +"This requires the " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast movement" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Fast movement (via use key).\n" +"This requires the " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled together with fly mode, player is able to fly through solid " +"nodes.\n" +"This requires the " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Smooths camera when moving and looking arround.\n" +"Useful for recording videos." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera smoothing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera. 0 to disable." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera smoothing in cinematic mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera in cinematic mode. 0 to disable." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Invert mouse" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Invert vertical mouse movement." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity multiplier." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Key use for climbing/descending" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If enabled, " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Double tap jump for fly" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Double-tapping the jump key toggles fly mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Always fly and fast" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If disabled " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Rightclick repetition interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time in seconds it takes between repeated right clicks when holding the " +"right mouse button." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Random input" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable random user input (only used for testing)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Continuous forward" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Continuous forward movement (only used for testing)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Forward key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player forward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Backward key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player backward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Left key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player left.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Right key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player right.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Jump key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for jumping.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Sneak key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for sneaking.\n" +"Also used for climbing down and descending in water if aux1_descends is " +"disabled.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Inventory key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the inventory.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving fast in fast mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Command key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window to type commands.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat console.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Range select key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling unlimited view range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fly key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling flying.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling fast mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling noclip mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling cinematic mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling display of minimap.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for taking screenshots.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Drop item key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for dropping the currently selected item.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "HUD toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the HUD.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the chat.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the fog.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera update toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the camrea update. Only used for development\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Debug info toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of debug info.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the profiler. Used for development.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Toggle camera mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for switching between first- and third-person camera.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range increase key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range decrease key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for printing debug stacks. Used for development.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Network" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Address to connect to.\n" +"Leave this blank to start a local server.\n" +"Note that the address field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Port to connect to (UDP).\n" +"Note that the port field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Saving map received from server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Save the map received by the client on disk." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect to external media server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable usage of remote media server (if provided by server).\n" +"Remote servers offer a significantly faster way to download media (e.g. " +"textures)\n" +"when connecting to the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "URL to the server list displayed in the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist file" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"File in client/serverlist/ that contains your favorite servers displayed in " +"the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Graphics" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-Game" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Basic" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to fog out the end of the visible area." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "New style water" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable a bit lower water surface, so it doesn't " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Leaves style" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Leaves style:\n" +"- Fancy: all faces visible\n" +"- Simple: only outer faces, if defined special_tiles are used\n" +"- Opaque: disable transparency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect glass" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connects glass if supported by node." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooth lighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable smooth lighting with simple ambient occlusion.\n" +"Disable for speed or for different looks." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds are a client side effect." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "3D clouds" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use 3D cloud look instead of flat." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mipmapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use mip mapping to scale textures. May slightly increase performance." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Anisotropic filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use anisotropic filtering when viewing at textures from an angle." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use bilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use trilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clean transparent textures" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Filtered textures can blend RGB values with fully-transparent neighbors,\n" +"which PNG optimizers usually discard, sometimes resulting in a dark or\n" +"light edge to transparent textures. Apply this filter to clean that up\n" +"at texture load time." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimum texture size for filters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" +"can be blurred, so automatically upscale them with nearest-neighbor\n" +"interpolation to preserve crisp pixels. This sets the minimum texture size\n" +"for the upscaled textures; higher values look sharper, but require more\n" +"memory. Powers of 2 are recommended. Setting this higher than 1 may not\n" +"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" +"enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Preload inventory textures" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Pre-generate all item visuals used in the inventory.\n" +"This increases startup time, but runs smoother in-game.\n" +"The generated textures can easily exceed your VRAM, causing artifacts in the " +"inventory." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FSAA" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Experimental option, might cause visible spaces between blocks\n" +"when set to higher number than 0." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shaders" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Shaders allow advanced visul effects and may increase performance on some " +"video cards.\n" +"Thy only work with the OpenGL video backend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables bumpmapping for textures. Normalmaps need to be supplied by the " +"texture pack\n" +"or need to be auto-generated.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Generate normalmaps" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables on the fly normalmap generation (Emboss effect).\n" +"Requires bumpmapping to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps strength" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of generated normalmaps." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps sampling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Defines sampling step of texture.\n" +"A higher value results in smoother normal maps." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables parallax occlusion mapping.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"0 = parallax occlusion with slope information (faster).\n" +"1 = relief mapping (slower, more accurate)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion strength" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of parallax." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Number of parallax occlusion iterations." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion Scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Overall scale of parallax occlusion effect." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion bias" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Overall bias of parallax occlusion effect, usually scale/2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving Nodes" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set to true enables waving water.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water length" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving leaves" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set to true enables waving leaves.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving plants" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set to true enables waving plants.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Advanced" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Wanted FPS" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Minimum wanted FPS.\n" +"The amount of rendered stuff is dynamically set according to this. and " +"viewing range min and max." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If FPS would go higher than this, limit it by sleeping\n" +"to not waste CPU power for no benefit." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FPS in pause menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS when game is paused." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Viewing range maximum" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The allowed adjustment range for the automatic rendering range adjustment.\n" +"Set this to be equal to viewing range minimum to disable the auto-adjustment " +"algorithm." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Viewing range minimum" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical initial window size." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Horizontal initial window size." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Full screen" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fullscreen mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Full screen BPP" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bits per pixel (aka color depth) in fullscreen mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "V-Sync" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical screen synchronization." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Field of view" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Field of view in degrees." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" +"This setting is for the client only and is ignored by the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Path to texture directory. All textures are first searched from here." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Video driver" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The rendering back-end for Irrlicht." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Height on which clouds are appearing." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud radius" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Radius of cloud area stated in number of 64 node cloud squares.\n" +"Values larger than 26 will start to produce sharp cutoffs at cloud area " +"corners." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for view bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fall bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for fall bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "3D mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"3D support.\n" +"Currently supported:\n" +"- none: no 3d output.\n" +"- anaglyph: cyan/magenta color 3d.\n" +"- interlaced: odd/even line based polarisation screen support.\n" +"- topbottom: split screen top/bottom.\n" +"- sidebyside: split screen side by side." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box border color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Width of the selectionbox's lines around nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Desynchronize block animation" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether node texture animations should be desynchronized per mapblock." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum hotbar width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum proportion of current window to be used for hotbar.\n" +"Useful if there's something to be displayed right or left of hotbar." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Node highlighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable selection highlighting for nodes (disables selectionbox)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mesh cache" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables caching of facedir rotated meshes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables minimap." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Round minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shape of the minimap. Enabled = round, disabled = square." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap scan height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"True = 256\n" +"False = 128\n" +"Useable to make minimap smoother on slower machines." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Colored fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Make fog and sky colors depend on daytime (dawn/sunset) and view direction." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ambient occlusion gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The strength (darkness) of node ambient-occlusion shading.\n" +"Lower is darker, Higher is lighter. The valid range of values for this\n" +"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" +"set to the nearest valid value." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Menus" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds in menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use a cloud animation for the main menu background." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Scale gui by a user specified value.\n" +"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" +"This will smooth over some of the rough edges, and blend\n" +"pixels when scaling down, at the cost of blurring some\n" +"edge pixels when images are scaled by non-integer sizes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter is true, all GUI images need to be\n" +"filtered in software, but some images are generated directly\n" +"to hardware (e.g. render-to-texture for nodes in inventory)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter txr2img" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter_txr2img is true, copy those images\n" +"from hardware to software for scaling. When false, fall back\n" +"to the old scaling method, for video drivers that don't\n" +"propery support downloading textures back from hardware." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Tooltip delay" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Delay showing tooltips, stated in milliseconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Freetype fonts" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether freetype fonts are used, requires freetype support to be compiled in." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Path to TrueTypeFont or bitmap." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow offset, if 0 then shadow will not be drawn." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "This font will be used for certain languages." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot folder" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Path to save screenshots at." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "DPI" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " +"screens." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Sound" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Volume" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapblock unload timeout" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Timeout for client to remove unused map data from memory." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapblock limit" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of mapblocks for client to be kept in memory.\n" +"Set to -1 for unlimited amount." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Show debug info" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to show the client debug info (has the same effect as hitting F5)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server / Singleplayer" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the server, to be displayed when players join and in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server description" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Description of server, to be displayed when players join and in the " +"serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Domain name of server, to be displayed in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Homepage of server, to be displayed in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Announce server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Automaticaly report to the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Announce to this serverlist.\n" +"If you want to announce your ipv6 address, use serverlist_url = v6.servers." +"minetest.net." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Network port to listen (UDP).\n" +"This value will be overridden when starting from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bind address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The network interface that the server listens on." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strict protocol checking" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable to disallow old clients from connecting.\n" +"Older clients are compatible in the sense that they will not crash when " +"connecting\n" +"to new servers, but they may not support all new features that you are " +"expecting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote media" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Specifies URL from which client fetches media instead of using UDP.\n" +"$filename should be accessible from $remote_media$filename via cURL\n" +"(obviously, remote_media should end with a slash).\n" +"Files that are not present will be fetched the usual way." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6 server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable/disable running an IPv6 server. An IPv6 server may be restricted\n" +"to IPv6 clients, depending on system configuration.\n" +"Ignored if bind_address is set." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously blocks send per client" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How many blocks are flying in the wire simultaneously per client." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously bocks send total" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How many blocks are flying in the wire simultaneously for the whole server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"To reduce lag, block transfers are slowed down when a player is building " +"something.\n" +"This determines how long they are slowed down after placing or removing a " +"node." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. packets per iteration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of packets sent per send step, if you have a slow connection\n" +"try reducing it, but don't reduce it to a number below double of targeted\n" +"client number." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default game" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Default game when creating a new world.\n" +"This will be overridden when creating a world from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day displayed to players connecting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum users" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of players that can connect simultaneously." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Map directory" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"World directory (everything in the world is stored here).\n" +"Not needed if starting from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Item entity TTL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Time in seconds for item entity (dropped items) to live.\n" +"Setting it to -1 disables the feature." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Damage" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable players getting damage and dying." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fixed map seed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"A chosen map seed for a new map, leave empty for random.\n" +"Will be overridden when creating a new world in the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default password" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "New users need to input this password." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default privileges" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The privileges that new users automatically get.\n" +"See /privs in game for a full list on your server and mod configuration." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unlimited player transfer distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether players are shown to clients without any range limit.\n" +"Deprecated, use the setting player_transfer_distance instead." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Player transfer distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Player versus Player" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to allow players to damage and kill each other." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Static spawnpoint" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If this is set, players will always (re)spawn at the given position." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Disallow empty passwords" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If enabled, new players cannot join with an empty password." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Disable anticheat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If enabled, disable cheat prevention in multiplayer." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Rollback recording" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, actions are recorded for rollback.\n" +"This option is only read when server starts." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shutdown message" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "A message to be displayed to all clients when the server shuts down." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crash message" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "A message to be displayed to all clients when the server crashes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ask to reconnect after crash" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to ask clients to reconnect after a (Lua) crash.\n" +"Set this to true if your server is set up to restart automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active object send range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far clients know about objects, stated in mapblocks (16 nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active block range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How large area of blocks are subject to the active block stuff, stated in " +"mapblocks (16 nodes).\n" +"In active blocks objects are loaded and ABMs run." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block send distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far blocks are sent to clients, stated in mapblocks (16 nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum forceloaded blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of forceloaded mapblocks." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time send interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of sending time of day to clients." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Controls length of day/night cycle.\n" +"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " +"unchanged." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Map save interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of saving important changes in the world, stated in seconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Physics" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default acceleration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Acceleration in air" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode acceleration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Walking speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crouch speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Climbing speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Jumping speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Descending speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid fluidity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid fluidity smoothing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid sink" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Gravity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Deprecated Lua API handling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Handling for deprecated lua api calls:\n" +"- legacy: (try to) mimic old behaviour (default for release).\n" +"- log: mimic and log backtrace of deprecated call (default for debug).\n" +"- error: abort on usage of deprecated call (suggested for mod developers)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mod profiling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profiling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profile data. Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiling print interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler data print interval. 0 = disable. Useful for developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. clearobjects extra blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Number of extra blocks that can be loaded by /clearobjects at once.\n" +"This is a trade-off between sqlite transaction overhead and\n" +"memory consumption (4096=100MB, as a rule of thumb)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unload unused server data" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How much the server will wait before unloading unused mapblocks.\n" +"Higher value is smoother, but will use more RAM." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maxmimum objects per block" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of statically stored objects in a block." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Synchronous SQLite" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Dedicated server step" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Length of a server tick and the interval at which objects are generally " +"updated over network." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ignore world errors" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, invalid world data won't cause the server to shut down.\n" +"Only enable this if you know what you are doing." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid loop max" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max liquids processed per step." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid queue purge time" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time (in seconds) that the liquids queue may grow beyond processing\n" +"capacity until an attempt is made to decrease its size by dumping old queue\n" +"items. A value of 0 disables the functionality." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid update tick" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid update interval in seconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of map generator to be used when creating a new world.\n" +"Creating a world in the main menu will override this." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water surface level of the world." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block generate distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far blocks are generated for clients, stated in mapblocks (16 " +"nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Map generation limit" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Where the map generator stops.\n" +"Please note:\n" +"- Limited to 31000 (setting above has no effect)\n" +"- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n" +"- Those groups have an offset of -32, -32 nodes from the origin.\n" +"- Only groups which are within the map_generation_limit are generated" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Global map generation attributes.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chunk size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " +"nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen debug" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Dump the mapgen debug infos." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Absolute limit of emerge queues" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of blocks that can be queued for loading." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Limit of emerge queues on disk" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of blocks to be queued that are to be loaded from file.\n" +"Set to blank for an appropriate amount to be chosen automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Limit of emerge queues to generate" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of blocks to be queued that are to be generated.\n" +"Set to blank for an appropriate amount to be chosen automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Number of emerge threads" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Number of emerge threads to use. Make this field blank, or increase this " +"number\n" +"to use multiple threads. On multiprocessor systems, this will improve mapgen " +"speed greatly\n" +"at the cost of slightly buggy caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome heat noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noise parameters for biome API temperature, humidity and biome blend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen heat blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome humidity noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome humidity blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 factor noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen V6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 desert frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Controls size of deserts and beaches in Mapgen V6.\n" +"When snowbiomes are enabled 'mgv6_freq_desert' is ignored." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 steepness noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 mud noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 biome noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 cave noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 humidity noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 apple trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen V7.\n" +"'ridges' are the rivers.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with " +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain persistation noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mount height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge water noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mountain noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Security" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable mod security" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Prevent mods from doing insecure things like running shell commands." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trusted mods" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Comma-separated list of trusted mods that are allowed to access insecure\n" +"functions even when mod security is on (via request_insecure_environment())." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Client and Server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Player name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the player.\n" +"When running a server, clients connecting with this name are admins.\n" +"When starting from the main menu, this is overridden." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Language" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set the language. Leave empty to use the system language.\n" +"A restart is required after changing this." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Debug log level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Level of logging to be written to debug.txt:\n" +"- (no logging)\n" +"- none (messages with no level)\n" +"- error\n" +"- warning\n" +"- action\n" +"- info\n" +"- verbose" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6 support." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "cURL timeout" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Default timeout for cURL, stated in milliseconds.\n" +"Only has an effect if compiled with cURL." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "cURL parallel limit" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Limits number of parallel HTTP requests. Affects:\n" +"- Media fetch if server uses remote_media setting.\n" +"- Serverlist download and server announcement.\n" +"- Downloads performed by main menu (e.g. mod manager).\n" +"Only has an effect if compiled with cURL." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "cURL file download timeout" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum time in ms a file download (e.g. a mod download) may take." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "High-precision FPU" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu script" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Replaces the default main menu with a custom one." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu game manager" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu mod manager" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore download URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore mods list URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore details URL" +msgstr "" From 7ebe1f9363e41af5ace38d85735b994f3f7e3fce Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Mon, 26 Oct 2015 15:25:18 +0100 Subject: [PATCH 019/531] Translated using Weblate (French) Currently translated at 56.3% (424 of 753 strings) --- po/fr/minetest.po | 360 ++++++++++++++++++++++++++-------------------- 1 file changed, 203 insertions(+), 157 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 032fcb8c..304da4a9 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-24 21:58+0200\n" +"PO-Revision-Date: 2015-10-26 15:25+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -28,7 +28,6 @@ msgid "An error occured:" msgstr "Une erreur est survenue :" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Menu principal" @@ -37,7 +36,6 @@ msgid "Ok" msgstr "OK" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" msgstr "Rejoindre" @@ -459,9 +457,10 @@ msgid "Games" msgstr "Jeux" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "Éventuellement, la lacunarité peut être jointe par une virgule leader." +msgstr "" +"Éventuellement, l'option \"lacunarity\" peut être jointe par une virgule d" +"'en-tête." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." @@ -907,7 +906,6 @@ msgid "Escape" msgstr "Échap" #: src/keycode.cpp -#, fuzzy msgid "ExSel" msgstr "ExSel" @@ -932,17 +930,14 @@ msgid "Insert" msgstr "Insérer" #: src/keycode.cpp -#, fuzzy msgid "Junja" msgstr "Junja" #: src/keycode.cpp -#, fuzzy msgid "Kana" msgstr "Kana" #: src/keycode.cpp -#, fuzzy msgid "Kanji" msgstr "Kanji" @@ -1052,7 +1047,6 @@ msgid "Numpad 9" msgstr "Pavé num. 9" #: src/keycode.cpp -#, fuzzy msgid "OEM Clear" msgstr "OEM Clear" @@ -1153,16 +1147,16 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = parallax mapping (plus rapide, mais moins détaillé).\n" +"1 = relief mapping (plus lent, mais plus détaillé)." #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "Nuages 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D mode" -msgstr "Voler" +msgstr "Mode écran 3D" #: src/settings_translation_file.cpp msgid "" @@ -1174,12 +1168,22 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"Support 3D.\n" +"Options :\n" +"- aucun : pas de sortie 3D.\n" +"- anaglyphe : couleur 3D bleu turquoise/violet.\n" +"- entrelacé : polarisation basée sur des lignes avec support de l'écran.\n" +"- horizontal : partage de l'écran horizontal.\n" +"- vertical : partage de l'écran vertical." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Une graine de génération de terrain pour un nouveau monde, laisser vide pour " +"une graine aléatoire.\n" +"Sera annulé lors de la création d'un nouveau monde dans le menu." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." @@ -1193,7 +1197,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Limite absolue des files émergentes" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1201,11 +1205,11 @@ msgstr "Accélération en l'air" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Portée des mapblocks actifs" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Portée des objets actifs" #: src/settings_translation_file.cpp msgid "" @@ -1228,6 +1232,8 @@ msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Ajuster la correction gamma. Les valeurs plus basses sont plus claires.\n" +"Ce paramètre s'applique au client seulement et est ignoré par le serveur." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1239,10 +1245,9 @@ msgstr "Toujours voler et être rapide" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Occlusion gamma ambiente" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" msgstr "Filtrage anisotrope" @@ -1266,35 +1271,31 @@ msgstr "Demander de se reconnecter après coupure de connexion" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Déclarer automatiquement votre serveur à la liste publique." #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" msgstr "Reculer" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Principal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" msgstr "Filtrage bilinéaire" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" msgstr "Adresse à assigner" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bits par pixel (profondeur de couleur) en mode plein-écran." #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "Multijoueur" +msgstr "Placement de bloc à la position du joueur" #: src/settings_translation_file.cpp msgid "Bumpmapping" @@ -1302,130 +1303,120 @@ msgstr "Bump mapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Lissage du mouvement de la caméra" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Lissage du mouvement de la caméra en mode cinématique" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Touche de la mise à jour de la caméra" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Changer les touches" +msgstr "Chatter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Changer les touches" +msgstr "Touche de chat" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Taille des chunks" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Mode créatif" +msgstr "Mode cinématique" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Mode créatif" +msgstr "Touche du mode cinématique" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Textures transparentes filtrées" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Client et Serveur" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Vitesse d'ascension du joueur" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Hauteur des nuages" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Niveau de détails des nuages" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "Nuages 3D" +msgstr "Activer les nuages" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Les nuages ont un effet sur le client exclusivement." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Menu principal" +msgstr "Activer les nuages dans le menu" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Brume colorée" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Liste de mods fiables qui sont autorisées à des accès insécurisés\n" +"de fonctions même lorsque l'option de sécurisation des mods est activée (via " +"request_insecure_environment())." #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Commande" +msgstr "Touche de commande" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Verre connecté" +msgstr "Verre unifié" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Connexion au serveur..." +msgstr "Se connecter à un serveur de média externe" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Unifier le verre si le bloc le permet." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Console" +msgstr "Opacité du fond de la console de jeu" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Console" +msgstr "Couleur de la console de jeu" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Console" +msgstr "Touche de console de jeu" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Avancer en continu" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Mouvement avant continuel (seulement utilisé pour des tests)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Contrôle" +msgstr "Touches de contrôle" #: src/settings_translation_file.cpp msgid "" @@ -1433,171 +1424,178 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Durée complet du cycle jour/nuit.\n" +"Exemples : 72 = 20 minutes, 360 = 4 minutes, 1 = 24 heures, 0 = jour ou nuit " +"reste figé(e)." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen V6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Taille des déserts et plages dans Mapgen V6.\n" +"Quand les environnements neigeux sont activés, le paramètre de fréquence des " +"déserts dans Mapgen v6 est ignoré." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Message d'interruption du serveur" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Opacité du réticule" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Opacité du réticule (entre 0 et 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Couleur du réticule" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Couleur du réticule (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Vitesse du joueur en position accroupie" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Activer les dégâts" +msgstr "Activer les dommages" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Touche d'infos de débogage" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Niveau de détails des infos de débogage" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Intervalle de mise à jour des objets sur le serveur" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Vitesse d’accélération par défaut" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "éditer le jeu" +msgstr "Jeu par défaut" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Jeu par défaut lors de la création d'un nouveau monde.\n" +"Sera annulé lors de la création d'un nouveau monde dans le menu." #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Nouveau mot de passe" +msgstr "Mot de passe par défaut" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Privilèges par défaut" #: src/settings_translation_file.cpp msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Temps d'interruption de cURL par défaut, établi en millisecondes.\n" +"Seulement appliqué si Minetest est compilé avec cURL." #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." -msgstr "" +msgstr "Niveau de lissage des normal maps." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" +"Défini la distance maximale d'affichage du joueur en mapblocks (0 = " +"illimité)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Latence d'apparition des infobulles, établie en millisecondes." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Traitement d'API Lua obsolète(s)" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Vitesse de descente du joueur" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." -msgstr "" +msgstr "Description du serveur affichée sur la liste des serveurs." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "Désynchroniser l'animation des blocs par mapblock" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." msgstr "" +"Profil détaillé des données du mod. Utile pour les développeurs de mods." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "Profil détaillé de mod" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Particules" +msgstr "Désactiver l'anti-triche" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Refuser les mots de passe vides" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Nom de domaine du serveur affichée sur la liste des serveurs." #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" msgstr "Double-appui sur \"saut\" pour voler" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Double-appui sur \"saut\" pour voler" +msgstr "Double-appui sur \"saut\" pour voler." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Touche pour jeter" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Afficher les infos de débogage de la génération de terrain." #: src/settings_translation_file.cpp +#, fuzzy msgid "Enable a bit lower water surface, so it doesn't " msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Dépôt de mods en ligne" +msgstr "Activer la sécurisation des mods" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Activer les dommages et la mort des joueurs." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." @@ -1606,12 +1604,16 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." msgstr "" +"Active l'éclairage des blocs pointés (et enlève les bords noirs de " +"sélection)." #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"Active l'éclairage doux avec une occlusion ambiante simple.\n" +"Désactiver pour plus de performances." #: src/settings_translation_file.cpp msgid "" @@ -1621,6 +1623,11 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Activer pour empêcher les anciens clients de se connecter.\n" +"Les anciens clients sont compatibles dans le sens où ils ne s'interrompent " +"pas lors de la connexion\n" +"aux serveurs récents, mais ils peuvent ne pas supporter certaines " +"fonctionnalités." #: src/settings_translation_file.cpp msgid "" @@ -1629,6 +1636,10 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Activer l'usage d'un serveur de média distant (si pourvu par le serveur).\n" +"Les serveurs de média distants offrent un moyen significativement plus " +"rapide de télécharger\n" +"des données média (ex.: textures) lors de la connexion au serveur." #: src/settings_translation_file.cpp msgid "" @@ -1636,6 +1647,10 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Active/désactive l'usage d'un serveur IPv6. Un serveur IPv6 peut être " +"restreint\n" +"aux clients IPv6, selon leur configuration du système.\n" +"Ignoré si bind_address est paramétré." #: src/settings_translation_file.cpp msgid "" @@ -1644,80 +1659,89 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"Active le bumpmapping pour les textures.\n" +"Les normalmaps peuvent être fournies par un pack de textures pour un " +"meilleur effet de relief, ou bien celui-ci est auto-généré.\n" +"Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." -msgstr "" +msgstr "Active la mise en cache des meshnodes." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Activer les dégâts" +msgstr "Active la mini-carte." #: src/settings_translation_file.cpp msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" +"Active la génération automatique des normalmaps.\n" +"Nécessite le bumpmapping pour être activé." #: src/settings_translation_file.cpp msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"Active l'occlusion parallaxe.\n" +"Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Option expérimentale, peut causer un espace vide visible entre les blocs\n" +"quand paramétré avec un nombre supérieur à 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS dans le menu pause" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "Fréquence de mouvement du bras en tombant" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "needs_fallback_font" +msgstr "Police alternative" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Ombre de la police alternative" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Opacité de l'ombre de la police alternative" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Taille de la police alternative" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Touche mode rapide" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Accélération en mode rapide" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Vitesse en mode rapide" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Mouvement rapide" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Fast movement (via use key).\n" "This requires the " @@ -1725,17 +1749,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Champ de vision" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Champ de vision en degrés." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"Fichier localisé dans /client/serverlist contenant vos serveurs favoris dans " +"l'onglet multijoueur." #: src/settings_translation_file.cpp msgid "" @@ -1744,113 +1770,121 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" +"Les textures filtrées peuvent mélangées des valeurs RGB avec des zones 100% " +"transparentes.\n" +"aboutissant parfois à des bords foncés ou clairs sur les textures " +"transparentes.\n" +"Appliquer ce filtre pour nettoyer cela au chargement de la texture." #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Aucun filtrage" +msgstr "Filtrage" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Graine de génération de terrain déterminée" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fly key" -msgstr "Voler" +msgstr "Touche pour voler" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Voler" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Brume" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Touche pour activer/désactiver la brume" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Chemin du fichier de police" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Ombre de la police" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Opacité de l'ombre de la police" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Niveau d'opacité de l'ombre de la police (entre 0 et 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." msgstr "" +"Décalage de l'ombre de la police, si 0 est paramétré alors l'ombre ne " +"s'affichera pas." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Taille de la police" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Avancer" +msgstr "Touche pour avancer" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Polices Freetype" #: src/settings_translation_file.cpp msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"Distance maximale de génération des mapblocks (16^3 blocs) depuis la " +"position du client." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"Distance maximale d'envoi des mapblocks aux clients, établie en mapblocks " +"(16^3 blocs)." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" +"Distance maximale d'envoi de données sur les objets aux clients, établie en " +"mapblocks (16^3 blocs)." #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Plein écran" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "Bits par pixel en plein écran" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Mode plein écran." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Echelle de taille du GUI" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "Taille des menus" +msgstr "Filtrage des images du GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "Filtrage txr2img sur l'échelonnage du GUI" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gamma" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "Normal mapping" @@ -1861,18 +1895,21 @@ msgid "" "default.\n" "Flags starting with " msgstr "" +"Attributs généraux de la génération de terrain.\n" +"Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent les " +"valeurs par défaut. " #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Options graphiques" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravité" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "Touche pour afficher/cacher le HUD" #: src/settings_translation_file.cpp msgid "" @@ -1881,22 +1918,27 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +"Traitement des appels d'API Lua obsolètes :\n" +"- legacy : imite l'ancien comportement (par défaut en mode release).\n" +"- log : imite et registre les appels obsolètes (par défaut en mode debug).\n" +"- error : interruption à l'usage d'un appel obsolète (recommandé pour les " +"développeurs de mods)." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "Hauteur des nuages dans le jeu." #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "FPU de haute précision" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "Adresse web du serveur affichée sur la liste des serveurs." #: src/settings_translation_file.cpp msgid "Horizontal initial window size." -msgstr "" +msgstr "Résolution verticale de la fenêtre de jeu." #: src/settings_translation_file.cpp msgid "" @@ -1919,18 +1961,22 @@ msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" +"Intervalle maximale jusqu'où le serveur va attendre avant de décharger les " +"mapblocks inactifs.\n" +"Une valeur plus grande est plus confortable, mais utilise davantage de " +"mémoire." #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "Serveur IPv6" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "Support IPv6." #: src/settings_translation_file.cpp msgid "" @@ -3522,7 +3568,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "Temps d'interruption de cURL lors d'un téléchargement de fichier" #: src/settings_translation_file.cpp msgid "cURL parallel limit" @@ -3530,7 +3576,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "Temps d'interruption de cURL" #~ msgid "Rendering:" #~ msgstr "Affichage :" From 62583ed4a6605042c59b00489bc8365ebe1bd2f5 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Mon, 26 Oct 2015 12:17:52 +0100 Subject: [PATCH 020/531] Translated using Weblate (German) Currently translated at 98.8% (744 of 753 strings) --- po/de/minetest.po | 126 +++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 79 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 14dd62a6..6e770e3c 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 11:41+0200\n" -"Last-Translator: pilino1234 \n" +"PO-Revision-Date: 2015-10-26 12:17+0200\n" +"Last-Translator: PilzAdam \n" "Language-Team: German " "\n" "Language: de\n" @@ -2423,7 +2423,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "\"Benutzen\"-Taste zum runterklettern" #: src/settings_translation_file.cpp msgid "Language" @@ -2481,14 +2481,12 @@ msgstr "" "- verbose (Ausführlich)" #: src/settings_translation_file.cpp -#, fuzzy msgid "Limit of emerge queues on disk" -msgstr "Grenze der Erzeugungswarteschlangen auf dem Festspeicher" +msgstr "Erzeugungswarteschlangengrenze auf Festspeicher" #: src/settings_translation_file.cpp -#, fuzzy msgid "Limit of emerge queues to generate" -msgstr "Max. Anzahl der Erzeugungswarteschlangen, die erzeugt werden sollen" +msgstr "Limit der Erzeugungswarteschlangen" #: src/settings_translation_file.cpp msgid "" @@ -2507,12 +2505,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "Fließvermögen" +msgstr "Flüssigkeitswiederstand" #: src/settings_translation_file.cpp -#, fuzzy msgid "Liquid fluidity smoothing" -msgstr "Weiches Fließvermögen" +msgstr "Flüssigkeitswiderstandsglättung" #: src/settings_translation_file.cpp msgid "Liquid loop max" @@ -2524,7 +2521,7 @@ msgstr "Aufräumzeit für Flüssigkeitswarteschlange" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "Sinkgeschwindigkeit in Flüssigkeiten" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." @@ -2599,19 +2596,16 @@ msgid "Mapblock unload timeout" msgstr "Timeout zum Entladen von Kartenblöcken" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen biome heat noise parameters" -msgstr "Kartengeneratorbiomhitzenrauschparameter" +msgstr "Biomhitzen-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen biome humidity blend noise parameters" -msgstr "Kartengeneratorbiomluftfeuchtigkeitsübergangsrauschparameter" +msgstr "Biomluftfeuchtigkeitsübergangs-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen biome humidity noise parameters" -msgstr "Kartengeneratorbiomluftfeuchtigkeitsrauschparameter" +msgstr "Biomluftfeuchtigkeits-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen debug" @@ -2623,7 +2617,7 @@ msgstr "Kartengenerator-Flags" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "Kartengeneratorhitzenübergangsrauschparameter" +msgstr "Hitzenübergangs-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen name" @@ -2635,158 +2629,135 @@ msgstr "Kartengenerator v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "cave1-Rauschparameter für v5-Kartengenerator" +msgstr "Höhlen-Rauschparameter 1" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "cave2-Rauschparameter für v5-Kartengenerator" +msgstr "Höhlen-Rauschparameter 2" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "Faktorrauschparameter für v5-Kartengenerator" +msgstr "Faktor-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "Tiefenrauschparameter für v5-Kartengenerator" +msgstr "Fülltiefen-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "Höhenrauschparameter für v5-Kartengenerator" +msgstr "Höhen-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v6" msgstr "Kartengenerator v6" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 apple trees noise parameters" -msgstr "Apfelbaumrauschparameter für v6-Kartengenerator" +msgstr "Apfelbaum-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "Strandfrequenz für v6-Kartengenerator" +msgstr "Standhäufigkeit" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 beach noise parameters" -msgstr "Strandrauschparameter für v6-Kartengenerator" +msgstr "Strand-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 biome noise parameters" -msgstr "Biomrauschparameter für v6-Kartengenerator" +msgstr "Biom-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 cave noise parameters" -msgstr "Höhlenrauschparameter für v6-Kartengenerator" +msgstr "Höhlen-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 desert frequency" -msgstr "Wüstenrauschparameter für v6-Kartengenerator" +msgstr "Wüsten-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "Flags für v6-Kartengenerator" +msgstr "Flags" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 height select noise parameters" -msgstr "Höhenauswahlrauschparameter für v6-Kartengenerator" +msgstr "Höhenauswahl-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 humidity noise parameters" -msgstr "Luftfeuchtigkeitsrauschparameter für v6-Kartengenerator" +msgstr "Luftfeuchtigkeits-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 mud noise parameters" -msgstr "Schlammrauschparameter für v6-Kartengenerator" +msgstr "Schlamm-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 steepness noise parameters" -msgstr "Steilheitsrauschparameter für v6-Kartengenerator" +msgstr "Steilheits-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "Geländehöhenrauschparameter für v6-Kartengenerator" +msgstr "Geländehöhen-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 terrain base noise parameters" -msgstr "Basisgeländerauschparameter für v6-Kartengenerator" +msgstr "Basisgelände-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6 trees noise parameters" -msgstr "Baumrauschparameter für v6-Kartengenerator" +msgstr "Baum-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v7" msgstr "Kartengenerator v7" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 cave1 noise parameters" -msgstr "cave1-Rauschparameter für v7-Kartengenerator" +msgstr "Höhlen-Rauschparameter 1" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 cave2 noise parameters" -msgstr "cave2-Rauschparameter für v7-Kartengenerator" +msgstr "Höhlen-Rauschparameter 2" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 filler depth noise parameters" -msgstr "Ausfülltiefenrauschen für v7-Kartengenerator" +msgstr "Fülltiefen-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "Flags für v7-Kartengenerator" +msgstr "Flags" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 height select noise parameters" -msgstr "Höhenauswahlrauschparameter für v7-Kartengenerator" +msgstr "Höhenauswahl-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 mount height noise parameters" -msgstr "Berghöhenrauschenparameter für v7-Kartengenerator" +msgstr "Berghöhen-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 mountain noise parameters" -msgstr "Bergrauschparameter für v7-Kartengenerator" +msgstr "Berg-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 ridge noise parameters" -msgstr "Gratrauschparameter für v7-Kartengenerator" +msgstr "Fluss-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 ridge water noise parameters" -msgstr "Wassergratrauschparameter für v7-Kartengenerator" +msgstr "Flusswasser-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "Geländehöhenrauschparameter für v7-Kartengenerator" +msgstr "Geländehöhen-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 terrain base noise parameters" -msgstr "Basisgeländerauschparameter für v7-Kartengenerator" +msgstr "Basisgelände-Rauschparameter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "Geländepersistenzrauschparameter für v7-Kartengenerator" +msgstr "Geländepersistenz-Rauschparameter" #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -2892,15 +2863,12 @@ msgstr "" "etwas gibt, was links oder rechts von ihr angezeigt werden soll." #: src/settings_translation_file.cpp -#, fuzzy msgid "Maximum simultaneously blocks send per client" -msgstr "" -"Maximale Anzahl der Kartenblöcke, die gleichzeitig pro Klient gesendet werden" +msgstr "Max. gleichzeitig versendete Kartenblöcke pro Klient" #: src/settings_translation_file.cpp -#, fuzzy msgid "Maximum simultaneously bocks send total" -msgstr "Maximale Gesamtzahl der gleichzeitig gesendeten Kartenblöcke" +msgstr "Max. gleichzeitig versendete Kartenblöcke" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." @@ -3127,7 +3095,7 @@ msgstr "Anzahl der Parallax-Occlusion-Iterationen." #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." -msgstr "" +msgstr "Startwert des Parallax-Occlusion-Effektes, üblicherweise Skalierung/2." #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." @@ -3147,7 +3115,7 @@ msgstr "Parallax-Occlusion-Skalierung" #: src/settings_translation_file.cpp msgid "Parallax occlusion bias" -msgstr "" +msgstr "Parallax-Occlusion-Startwert" #: src/settings_translation_file.cpp msgid "Parallax occlusion iterations" From b48810ee0fc1e74b7f59841a9739563ddeac1628 Mon Sep 17 00:00:00 2001 From: Pavel Sokolov Date: Mon, 26 Oct 2015 13:24:10 +0100 Subject: [PATCH 021/531] Translated using Weblate (Russian) Currently translated at 32.1% (242 of 753 strings) --- po/ru/minetest.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 9d14d7a2..822b9ec7 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-09-07 11:49+0200\n" -"Last-Translator: Alex “XShell” Schekoldin \n" -"Language-Team: Russian \n" +"PO-Revision-Date: 2015-10-26 13:24+0200\n" +"Last-Translator: Pavel Sokolov \n" +"Language-Team: Russian " +"\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.4-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -29,7 +29,6 @@ msgid "An error occured:" msgstr "Произошла ошибка:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Главное меню" From 1167d38e08612c8c0c1b08eedf651bd8ecf0f016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Borovi=C4=8Dka?= Date: Mon, 26 Oct 2015 16:53:14 +0100 Subject: [PATCH 022/531] Translated using Weblate (Czech) Currently translated at 40.5% (305 of 753 strings) --- po/cs/minetest.po | 174 +++++++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 104 deletions(-) diff --git a/po/cs/minetest.po b/po/cs/minetest.po index ad4653a0..00983622 100644 --- a/po/cs/minetest.po +++ b/po/cs/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-09-01 18:04+0200\n" -"Last-Translator: Jakub Vaněk \n" -"Language-Team: Czech \n" +"PO-Revision-Date: 2015-10-26 16:53+0200\n" +"Last-Translator: Honza Borovička \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -28,7 +28,6 @@ msgid "An error occured:" msgstr "Nastala chyba:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Hlavní nabídka" @@ -37,13 +36,12 @@ msgid "Ok" msgstr "OK" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Připojit" +msgstr "Znovu se připojit" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Server vyžaduje znovupřipojení se:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -51,15 +49,16 @@ msgstr "Nahrávám..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Neshoda verze protokolu. " #: builtin/mainmenu/common.lua +#, fuzzy msgid "Server enforces protocol version $1. " msgstr "" #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Server podporuje verze protokolů mezi $1 a $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -69,11 +68,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Podporujeme pouze protokol verze $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Podporujeme verze protokolů mezi $1 a $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -102,6 +101,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Nepodařilo se povolit mod \"$1\" protože obsahuje nepovolené znaky. Povoleny " +"jsou pouze znaky a-z, 0-9." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -390,7 +391,7 @@ msgstr "Nový" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "Nevybrali jste žádný svět!" +msgstr "Žádný svět nebyl vytvořen ani vybrán!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -418,39 +419,39 @@ msgstr "Spustit hru" #: builtin/mainmenu/tab_settings.lua msgid "\"" -msgstr "" +msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Nebyl zadán popis nastavení)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Procházet" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Změnit nastavení kláves" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Zakázat balíček" +msgstr "Zakázaný" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Upravit" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "povoleno" +msgstr "Povolený" #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Formát: , , (, , ), , " +", " #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -462,28 +463,27 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Prosím zadejte čárkami oddělený seznam vlajek." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Prosím zadejte platné celé číslo." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Zadejte prosím platné číslo." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Možné hodnoty jsou: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Obnovit výchozí" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Vybrat" +msgstr "Vyberte cestu" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -491,15 +491,15 @@ msgstr "Nastavení" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Zobrazit technické názvy" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Hodnota musí být větší než $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Hodnota musí být nižší než $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -527,7 +527,7 @@ msgstr "Informace nejsou dostupné" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Žádný" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -538,9 +538,8 @@ msgid "Texturepacks" msgstr "Balíčky textur" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Chyba spojení (vypršel čas?)" +msgstr "Vypršel časový limit připojení." #: src/client.cpp msgid "Done!" @@ -1162,14 +1161,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "3D mraky" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D mode" -msgstr "Létací režim" +msgstr "Režim 3D" #: src/settings_translation_file.cpp msgid "" @@ -1181,6 +1178,13 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"Podpora 3D.\n" +"V současné době podporovány:\n" +"-none: žádné 3d výstup.\n" +"-anaglyf: azurová/purpurová barva 3d.\n" +"-prokládaný: lichá/sudá linie založené polarizace displejem.\n" +"-nahoře a dole: rozdělení obrazovky prvních či posledních položek.\n" +"-vedle sebe: rozdělené obrazovce vedle sebe." #: src/settings_translation_file.cpp msgid "" @@ -1244,7 +1248,6 @@ msgid "Ambient occlusion gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" msgstr "Anizotropní filtrování" @@ -1268,7 +1271,6 @@ msgid "Automaticaly report to the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" msgstr "Vzad" @@ -1277,12 +1279,10 @@ msgid "Basic" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" -msgstr "Bilineární filtr" +msgstr "Bilineární filtrování" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" msgstr "Svázat adresu" @@ -1311,28 +1311,24 @@ msgid "Camera update toggle key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Změnit nastavení kláves" +msgstr "Klávesa chatu" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Změnit nastavení kláves" +msgstr "Klávesa zobrazení chatu" #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Kreativní mód" +msgstr "Plynulý pohyb kamery" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Kreativní mód" +msgstr "Klávesa plynulého pohybu kamery" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1355,18 +1351,16 @@ msgid "Cloud radius" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D mraky" +msgstr "Mraky" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Hlavní nabídka" +msgstr "Mraky v menu" #: src/settings_translation_file.cpp msgid "Colored fog" @@ -1379,38 +1373,32 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Příkaz" +msgstr "Příkazová klávesa" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" msgstr "Propojené sklo" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Připojuji se k serveru..." +msgstr "Připojit se k externímu serveru" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" msgstr "Konzole" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Konzole" +msgstr "Barva konzole" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Konzole" +msgstr "Klávesa konzole" #: src/settings_translation_file.cpp msgid "Continuous forward" @@ -1421,9 +1409,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Control" +msgstr "Ovládání" #: src/settings_translation_file.cpp msgid "" @@ -1467,9 +1454,8 @@ msgid "DPI" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Povolit poškození" +msgstr "Poškození" #: src/settings_translation_file.cpp msgid "Debug info toggle key" @@ -1488,9 +1474,8 @@ msgid "Default acceleration" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "upravit hru" +msgstr "Výchozí hra" #: src/settings_translation_file.cpp msgid "" @@ -1499,9 +1484,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Nové heslo" +msgstr "Výchozí heslo" #: src/settings_translation_file.cpp msgid "Default privileges" @@ -1554,9 +1538,8 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Povolit částice" +msgstr "Zakázat anticheat" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" @@ -1567,14 +1550,12 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" msgstr "Dvojstisk klávesy \"skok\" zapne létání" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Dvojstisk klávesy \"skok\" zapne létání" +msgstr "Dvojstisk klávesy \"skok\" zapne létání." #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1589,9 +1570,8 @@ msgid "Enable a bit lower water surface, so it doesn't " msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Online repozitář modů" +msgstr "Povolit zabezpečení módů" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." @@ -1648,9 +1628,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Povolit poškození" +msgstr "Povolit minimapu." #: src/settings_translation_file.cpp msgid "" @@ -1683,9 +1662,8 @@ msgid "Fall bobbing" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "no" +msgstr "" #: src/settings_translation_file.cpp msgid "Fallback font shadow" @@ -1744,18 +1722,16 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Žádný filtr" +msgstr "Filtrování" #: src/settings_translation_file.cpp msgid "Fixed map seed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fly key" -msgstr "Létací režim" +msgstr "Klávesa létání" #: src/settings_translation_file.cpp msgid "Flying" @@ -1794,7 +1770,6 @@ msgid "Font size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" msgstr "Vpřed" @@ -1835,7 +1810,6 @@ msgid "GUI scaling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" msgstr "Měřítko GUI" @@ -1848,7 +1822,6 @@ msgid "Gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "Generovat normálové mapy" @@ -1937,9 +1910,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If disabled " -msgstr "Zakázat balíček" +msgstr "Je-li zakázáno " #: src/settings_translation_file.cpp msgid "" @@ -1949,9 +1921,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If enabled, " -msgstr "povoleno" +msgstr "Je-li povoleno, " #: src/settings_translation_file.cpp msgid "" @@ -1989,9 +1960,8 @@ msgid "Ignore world errors" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Hra" +msgstr "Ve hře" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -2010,9 +1980,8 @@ msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Inventář" +msgstr "Klávesa inventáře" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -2027,7 +1996,6 @@ msgid "Item entity TTL" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" msgstr "Skok" @@ -2261,9 +2229,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Levá klávesa Menu" +msgstr "Doleva" #: src/settings_translation_file.cpp msgid "" @@ -2333,9 +2300,8 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Hlavní nabídka" +msgstr "" #: src/settings_translation_file.cpp #, fuzzy From 8d33f0887a9e8890837f0905990d7a393e74026a Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Mon, 26 Oct 2015 20:03:59 +0100 Subject: [PATCH 023/531] Translated using Weblate (French) Currently translated at 75.5% (569 of 753 strings) --- po/fr/minetest.po | 385 +++++++++++++++++++++++++++++++--------------- 1 file changed, 264 insertions(+), 121 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 304da4a9..98cfa23c 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 15:25+0200\n" +"PO-Revision-Date: 2015-10-26 20:03+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -1510,7 +1510,7 @@ msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" -"Temps d'interruption de cURL par défaut, établi en millisecondes.\n" +"Délais d'interruption de cURL par défaut, établi en millisecondes.\n" "Seulement appliqué si Minetest est compilé avec cURL." #: src/settings_translation_file.cpp @@ -1522,7 +1522,7 @@ msgstr "Niveau de lissage des normal maps." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" -"Défini la distance maximale d'affichage du joueur en mapblocks (0 = " +"Définit la distance maximale de transfert du joueur en mapblocks (0 = " "illimité)." #: src/settings_translation_file.cpp @@ -1585,7 +1585,6 @@ msgid "Dump the mapgen debug infos." msgstr "Afficher les infos de débogage de la génération de terrain." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable a bit lower water surface, so it doesn't " msgstr "" @@ -1598,6 +1597,7 @@ msgid "Enable players getting damage and dying." msgstr "Activer les dommages et la mort des joueurs." #: src/settings_translation_file.cpp +#, fuzzy msgid "Enable random user input (only used for testing)." msgstr "" @@ -1741,7 +1741,6 @@ msgid "Fast movement" msgstr "Mouvement rapide" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Fast movement (via use key).\n" "This requires the " @@ -1983,11 +1982,13 @@ msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"Si le nombre d'images par seconde veut aller au-delà de cette valeur, il est " +"limité\n" +"pour ne pas gaspiller inutilement les ressources du processeur." #: src/settings_translation_file.cpp -#, fuzzy msgid "If disabled " -msgstr "Désactiver le pack de mods" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1997,29 +1998,35 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If enabled, " -msgstr "activé" +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled, actions are recorded for rollback.\n" "This option is only read when server starts." msgstr "" +"Si activé, les actions sont enregistrés pour une restauration éventuelle.\n" +"Cette option est seulement activé quand le serveur démarre." #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "" +msgstr "Si activé, ceci désactive la détection anti-triche en multijoueur." #: src/settings_translation_file.cpp msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" +"Si activé, les données invalides du monde ne causeront l'interruption du " +"serveur.\n" +"Activer seulement si vous sachez ce que vous faites." #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." msgstr "" +"Si activé, les nouveaux joueurs ne pourront pas se connecter avec un mot de " +"passe vide." #: src/settings_translation_file.cpp msgid "" @@ -2027,61 +2034,65 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Si activé, vous pourrez placer des blocs à la position où vous êtes.\n" +"C'est utile quand vous travaillez avec des modèles nodebox dans des zones " +"exiguës." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." msgstr "" +"Si paramétré, les joueurs vont toujours réapparaître aux coordonnées " +"indiquées." #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Ignorer les erreurs du monde" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Jeu" +msgstr "En jeu" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Opacité de fond de la console du jeu (entre 0 et 255)." #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Couleur de fond de la console du jeu (R,G,B)." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." msgstr "" +"Intervalle de sauvegarde des changements importants dans le monde, établie " +"en secondes." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "" +msgstr "Intervalle d'envoi de l'heure de jeu aux clients." #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Inventaire" +msgstr "Touche pour l'inventaire" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Inverser la souris" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Inverser les mouvements verticaux de la souris." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "Durée d'apparition des items jetés" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Sauter" +msgstr "Touche pour sauter" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "Vitesse de saut du joueur" #: src/settings_translation_file.cpp msgid "" @@ -2089,6 +2100,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour réduire la distance de vue. Modifie la distance de vue minimale." +"\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2096,6 +2111,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour jeter l'objet sélectionné.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2103,6 +2121,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour augmenter la distance de vue. Modifie la distance de vue " +"minimale.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2110,6 +2132,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour sauter.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2117,6 +2142,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour se déplacer rapidement en mode rapide.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2124,6 +2152,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour reculer.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2131,6 +2162,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour avancer.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2138,6 +2172,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour se déplacer à gauche.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2145,6 +2182,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour se déplacer à droite.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2152,6 +2192,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour ouvrir la console de jeu.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2159,6 +2202,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour ouvrir la fenêtre de chat pour entrer des commandes.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2166,6 +2212,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour ouvrir la fenêtre de chat.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2173,6 +2222,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour ouvrir l'inventaire.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2180,6 +2232,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour afficher les infos de débogage. Utilisé pour le développement.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2189,6 +2244,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour se faufiler.\n" +"Utilisé pour descendre si aux1_descends est désactivé.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2196,6 +2255,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour changer de vue entre la 1ère et 3ème personne.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2203,6 +2265,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour prendre des captures d'écran.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2210,6 +2275,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour passer en mode cinématique.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2217,6 +2285,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour afficher/cacher la mini-carte.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2224,6 +2295,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour passer en mode rapide.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2231,6 +2305,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour voler.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2238,6 +2315,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour passer en mode \"sans-collision\".\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2252,6 +2332,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour afficher/cacher les infos de débogage.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2259,6 +2342,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour afficher/cacher le HUD.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2266,6 +2352,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour afficher/cacher la zone de chat.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2273,6 +2362,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour afficher/cacher la brume.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2280,6 +2372,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour afficher/cacher la zone de profilage. Utilisé pour le " +"développement.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2287,18 +2383,21 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche pour activer/désactiver la distance de vue infinie.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "Touche \"utiliser\" pour monter/descendre" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Langue" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Apparence des feuilles d'arbres" #: src/settings_translation_file.cpp msgid "" @@ -2307,17 +2406,20 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Apparence des feuilles d'arbres :\n" +"- Détaillée : tous les faces sont visibles\n" +"- Simple : seulement les faces externes sont visibles\n" +"- Opaque : désactive la transparence entre les feuilles" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Menu gauche" +msgstr "Touche gauche" #: src/settings_translation_file.cpp msgid "" "Length of a server tick and the interval at which objects are generally " "updated over network." -msgstr "" +msgstr "Temps d'intervalle entre la mise à jour des objets sur le réseau." #: src/settings_translation_file.cpp msgid "" @@ -2330,14 +2432,22 @@ msgid "" "- info\n" "- verbose" msgstr "" +"Niveau de détails des infos de débogage écrits dans debug.txt :\n" +"- (pas d'infos)\n" +"- aucun (messages sans niveau)\n" +"- erreur\n" +"- avertissement\n" +"- action\n" +"- info\n" +"- prolixe" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "" +msgstr "Limite de files émergentes sur le disque-dur." #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "" +msgstr "Limite de files émergentes à générer" #: src/settings_translation_file.cpp msgid "" @@ -2347,18 +2457,23 @@ msgid "" "- Downloads performed by main menu (e.g. mod manager).\n" "Only has an effect if compiled with cURL." msgstr "" +"Nombre limite de requête HTTP en parallèle. Affecte :\n" +"- L'obtention de média si le serveur utilise l'option remote_media.\n" +"- Le téléchargement de la liste des serveurs et l'annonce du serveur.\n" +"- Les téléchargements effectués par le menu (ex.: gestionnaire de mods).\n" +"Prend seulement effet si Minetest est compilé avec cURL." #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "Fluidité des liquides" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "Régularité de la fluidité des liquides" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "" +msgstr "Itérations maximum sur la transformation des liquides" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" @@ -2370,38 +2485,40 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "Intervalle entre mise-à-jour des liquides en secondes." #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "" +msgstr "Intervalle entre mise-à-jour des liquides" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "Gestionnaire de jeux du menu" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Menu principal" +msgstr "Gestionnaire de mods du menu" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Menu principal" +msgstr "Script de menu personnalisé" #: src/settings_translation_file.cpp msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" +"Rendre la couleur de la brume et du ciel différente selon l'heure du jour et " +"la direction du regard." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +"Rendre DirectX compatible avec LuaJIT. Désactiver si cela cause des " +"problèmes." #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Chemin du monde" #: src/settings_translation_file.cpp msgid "" @@ -2424,19 +2541,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "Limites de la génération de terrain" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "Intervalle de sauvegarde de la carte" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "Limite de mapblocks" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "" +msgstr "Délais d'interruption du déchargement des mapblocks" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2451,28 +2568,24 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Générateur de carte" +msgstr "Débogage de génération de terrain" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Générateur de carte" +msgstr "Drapeaux de génération de terrain" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Générateur de carte" +msgstr "Nom du générateur de carte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Générateur de carte" +msgstr "Mapgen V5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2495,9 +2608,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Générateur de carte" +msgstr "Mapgen V6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2556,9 +2668,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Générateur de carte" +msgstr "Mapgen V7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2610,15 +2721,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Max block generate distance" -msgstr "" +msgstr "Distance maximale de génération des mapblocks" #: src/settings_translation_file.cpp msgid "Max block send distance" -msgstr "" +msgstr "Distance maximale d'envoi des mapblocks" #: src/settings_translation_file.cpp msgid "Max liquids processed per step." -msgstr "" +msgstr "Maximum de liquides traités par étape de serveur." #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" @@ -2626,15 +2737,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" -msgstr "" +msgstr "Nombre maximum de paquets par itération" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "FPS maximum" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "FPS maximum quand le jeu est en pause." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" @@ -2642,7 +2753,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "Largeur maximale de la barre d'inventaire" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." @@ -2690,59 +2801,62 @@ msgid "" "Maximum proportion of current window to be used for hotbar.\n" "Useful if there's something to be displayed right or left of hotbar." msgstr "" +"Proportion maximale de la fenêtre à utiliser pour la barre d'inventaire.\n" +"Utile quand il y a quelque chose à afficher à gauche ou à droite de la barre." #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "" +msgstr "Nombre maximum de mapblocks simultanés envoyé par client" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "" +msgstr "Nombre maximum total de mapblocks simultanés envoyé" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" +"Délais maximal de temps de téléchargement d'un fichier (ex.: un mod), établi " +"en millisecondes." #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "Joueurs maximum" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "" +msgstr "Nombre maximum d'objets par mapblock" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" -msgstr "Menu" +msgstr "Menus" #: src/settings_translation_file.cpp msgid "Mesh cache" -msgstr "" +msgstr "Mise en cache des meshes" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "Message du jour" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." -msgstr "" +msgstr "Message du jour affiché aux joueurs lors de la connexion." #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Mini-carte" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Touche de la mini-carte" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "Hauteur de scannage de la mini-carte" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" -msgstr "" +msgstr "Taille minimum des textures à filtrer" #: src/settings_translation_file.cpp msgid "" @@ -2750,43 +2864,45 @@ msgid "" "The amount of rendered stuff is dynamically set according to this. and " "viewing range min and max." msgstr "" +"Images par seconde (FPS) minimum.\n" +"Le niveau de rendu est dynamiquement adapté selon ce paramètre et la " +"distance de vue (minimale et maximale)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" msgstr "Mip-mapping" #: src/settings_translation_file.cpp msgid "Mod profiling" -msgstr "" +msgstr "Profilage des mods" #: src/settings_translation_file.cpp msgid "Modstore details URL" -msgstr "" +msgstr "URL des détails du magasin de mods" #: src/settings_translation_file.cpp msgid "Modstore download URL" -msgstr "" +msgstr "URL de téléchargement du magasin de mods" #: src/settings_translation_file.cpp msgid "Modstore mods list URL" -msgstr "" +msgstr "URL de liste des mods du magasin de mods" #: src/settings_translation_file.cpp msgid "Monospace font path" -msgstr "" +msgstr "Chemin de la police Monospace" #: src/settings_translation_file.cpp msgid "Monospace font size" -msgstr "" +msgstr "Taille de la police Monospace" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "Sensibilité de la souris" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "Facteur de sensibilité de la souris." #: src/settings_translation_file.cpp msgid "" @@ -2799,12 +2915,17 @@ msgid "" "Multiplier for view bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Facteur de mouvement de bras.\n" +"Par exemple : 0 = pas de mouvement, 1 = normal, 2 = double." #: src/settings_translation_file.cpp msgid "" "Name of map generator to be used when creating a new world.\n" "Creating a world in the main menu will override this." msgstr "" +"Nom du générateur de terrain à utiliser lorsque de la création d'un nouveau " +"monde.\n" +"Créer un nouveau monde dans le menu va annuler ce paramètre." #: src/settings_translation_file.cpp msgid "" @@ -2812,42 +2933,48 @@ msgid "" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"Nom du joueur.\n" +"Lors qu'un serveur est lancé, les clients se connectant avec ce nom sont " +"administrateurs." #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." msgstr "" +"Nom du serveur, affiché sur liste des serveurs publics et lorsque les " +"joueurs se connectent." #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "Réseau" #: src/settings_translation_file.cpp msgid "" "Network port to listen (UDP).\n" "This value will be overridden when starting from the main menu." msgstr "" +"Port du réseau à écouter (UDP).\n" +"Cette valeur est annulée en commençant depuis le menu." #: src/settings_translation_file.cpp msgid "New style water" -msgstr "" +msgstr "Nouveau style de liquide" #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "Les nouveaux joueurs ont besoin d'entrer ce mot de passe." #: src/settings_translation_file.cpp msgid "Noclip" -msgstr "" +msgstr "Sans collision" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "" +msgstr "Touche mode sans collision" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" -msgstr "Eclairage des nodes" +msgstr "Eclairage des blocs" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -2863,7 +2990,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Number of emerge threads" -msgstr "" +msgstr "Nombre de threads" #: src/settings_translation_file.cpp msgid "" @@ -2873,6 +3000,11 @@ msgid "" "speed greatly\n" "at the cost of slightly buggy caves." msgstr "" +"Nombre de threads à utiliser. Laisser ce champ vide, ou augmenter cette " +"valeur\n" +"pour utiliser le multi-threading. Sur des systèmes multi-processeurs, cela " +"va améliorer grandement\n" +"la génération de terrain au détriment de quelques caves altérées." #: src/settings_translation_file.cpp msgid "" @@ -2880,68 +3012,70 @@ msgid "" "This is a trade-off between sqlite transaction overhead and\n" "memory consumption (4096=100MB, as a rule of thumb)." msgstr "" +"Nombre d'extra-mapblocks qui peuvent être chargés par /clearobjects dans " +"l'immédiat.\n" +"C'est un compromis entre un transfert SQLite plafonné et la consommation " +"mémoire\n" +"(4096 = 100 Mo, comme règle fondamentale)." #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." -msgstr "" +msgstr "Nombre d'itérations sur l'occlusion parallaxe." #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." msgstr "" +"Bias général de l'occlusion parallaxe, habituellement échelle divisée par 2." #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." -msgstr "" +msgstr "Echelle générale de l'occlusion parallaxe." #: src/settings_translation_file.cpp msgid "Parallax Occlusion" msgstr "Occlusion parallaxe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" msgstr "Occlusion parallaxe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" -msgstr "Occlusion parallaxe" +msgstr "Echelle de l'occlusion parallaxe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "Occlusion parallaxe" +msgstr "Bias de l'occlusion parallaxe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "Occlusion parallaxe" +msgstr "Nombre d'itérations sur l'occlusion parallaxe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "Occlusion parallaxe" +msgstr "Mode occlusion parallaxe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" -msgstr "Occlusion parallaxe" +msgstr "Force de l'occlusion parallaxe" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." -msgstr "" +msgstr "Chemin vers police TrueType ou Bitmap." #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "Chemin où les captures d'écran sont sauvegardées." #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." msgstr "" +"Chemin vers le dossier des textures. Toutes les textures sont d'abord " +"cherchées dans ce dossier." #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "Physique" #: src/settings_translation_file.cpp msgid "" @@ -2950,23 +3084,24 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Nom du joueur trop long." +msgstr "Nom du joueur" #: src/settings_translation_file.cpp msgid "Player transfer distance" -msgstr "" +msgstr "Distance de transfert du joueur" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "Mode combat" #: src/settings_translation_file.cpp msgid "" "Port to connect to (UDP).\n" "Note that the port field in the main menu overrides this setting." msgstr "" +"Port où se connecter (UDP).\n" +"Le champ de port dans le menu va annuler ce paramètre." #: src/settings_translation_file.cpp msgid "" @@ -2975,23 +3110,31 @@ msgid "" "The generated textures can easily exceed your VRAM, causing artifacts in the " "inventory." msgstr "" +"Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n" +"Cela augmente le temps de démarrage, mais rend les inventaires plus fluides." +"\n" +"Les textures générées peuvent facilement déborder votre VRAM, causant des " +"bugs dans votre inventaire." #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Chargement des textures..." +msgstr "Pré-chargement des textures d'inventaire" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +"Empêcher les mods d'exécuter des fonctions insécurisées (comme des commandes " +"système)." #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" +"Délais d'affichage des données de profilage. 0 = désactivation.\n" +"Utile pour les développeurs." #: src/settings_translation_file.cpp msgid "Profiler toggle key" -msgstr "" +msgstr "Touche pour le profilage" #: src/settings_translation_file.cpp msgid "Profiling print interval" @@ -3568,7 +3711,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "Temps d'interruption de cURL lors d'un téléchargement de fichier" +msgstr "Délais d'interruption de cURL lors d'un téléchargement de fichier" #: src/settings_translation_file.cpp msgid "cURL parallel limit" @@ -3576,7 +3719,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "Temps d'interruption de cURL" +msgstr "Délais d'interruption de cURL" #~ msgid "Rendering:" #~ msgstr "Affichage :" From 6926a489a55cceeee11ca19ea4a640a04091157a Mon Sep 17 00:00:00 2001 From: ChaosWormz Date: Mon, 26 Oct 2015 16:22:49 +0100 Subject: [PATCH 024/531] Translated using Weblate (Hebrew) Currently translated at 3.3% (25 of 753 strings) --- po/he/minetest.po | 78 ++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/po/he/minetest.po b/po/he/minetest.po index c1028953..12e0cc72 100644 --- a/po/he/minetest.po +++ b/po/he/minetest.po @@ -8,14 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-24 20:28+0200\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2015-10-26 16:22+0200\n" +"Last-Translator: ChaosWormz \n" +"Language-Team: Hebrew " +"\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" @@ -23,11 +25,11 @@ msgstr "" #: builtin/fstk/ui.lua msgid "Main menu" -msgstr "" +msgstr "תפריט ראשי" #: builtin/fstk/ui.lua msgid "Reconnect" -msgstr "" +msgstr "התחבר מחדש" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -35,15 +37,15 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "התרחשה שגיאה:" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" -msgstr "" +msgstr "אישור" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." -msgstr "" +msgstr "טוען..." #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -71,34 +73,36 @@ msgstr "" #: builtin/mainmenu/dlg_config_world.lua msgid "World:" -msgstr "" +msgstr "עולם:" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" -msgstr "" +msgstr "הסתר משחק" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" msgstr "" #: builtin/mainmenu/dlg_config_world.lua +#, fuzzy msgid "Mod:" -msgstr "" +msgstr "מוד:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua +#, fuzzy msgid "Depends:" -msgstr "" +msgstr "תלוי ב:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp msgid "Save" -msgstr "" +msgstr "שמור" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Cancel" -msgstr "" +msgstr "ביטול" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" @@ -109,12 +113,14 @@ msgid "Disable MP" msgstr "" #: builtin/mainmenu/dlg_config_world.lua +#, fuzzy msgid "enabled" -msgstr "" +msgstr "מופעל" #: builtin/mainmenu/dlg_config_world.lua +#, fuzzy msgid "Enable all" -msgstr "" +msgstr "אפשר בכל" #: builtin/mainmenu/dlg_config_world.lua msgid "" @@ -124,7 +130,7 @@ msgstr "" #: builtin/mainmenu/dlg_create_world.lua msgid "World name" -msgstr "" +msgstr "שם העולם" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" @@ -136,11 +142,11 @@ msgstr "" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" -msgstr "" +msgstr "משחק" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" -msgstr "" +msgstr "ליצור" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." @@ -168,15 +174,15 @@ msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "" +msgstr "האם ברצונך למחוק את \"$1\"?" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua msgid "Yes" -msgstr "" +msgstr "כן" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "" +msgstr "לא ברור שלא!" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" @@ -188,19 +194,20 @@ msgstr "" #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" -msgstr "" +msgstr "למחוק עולם \"$1\"?" #: builtin/mainmenu/dlg_delete_world.lua msgid "No" -msgstr "" +msgstr "לא" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" msgstr "" #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp +#, fuzzy msgid "Accept" -msgstr "" +msgstr "קבל" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" @@ -230,7 +237,7 @@ msgstr "" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "" +msgstr "חפש" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." @@ -238,23 +245,23 @@ msgstr "" #: builtin/mainmenu/store.lua msgid "Successfully installed:" -msgstr "" +msgstr "הותקן בהצלחה:" #: builtin/mainmenu/store.lua msgid "Shortname:" -msgstr "" +msgstr "שם קצר:" #: builtin/mainmenu/store.lua msgid "Rating" -msgstr "" +msgstr "דירוג" #: builtin/mainmenu/store.lua msgid "re-Install" -msgstr "" +msgstr "התקן מחדש" #: builtin/mainmenu/store.lua msgid "Install" -msgstr "" +msgstr "החקן" #: builtin/mainmenu/store.lua msgid "Close store" @@ -350,8 +357,9 @@ msgid "PvP enabled" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp +#, fuzzy msgid "Client" -msgstr "" +msgstr "קלינט" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "New" @@ -487,7 +495,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" -msgstr "" +msgstr "הגדרות" #: builtin/mainmenu/tab_simple_main.lua msgid "Start Singleplayer" @@ -507,7 +515,7 @@ msgstr "" #: builtin/mainmenu/tab_singleplayer.lua msgid "Singleplayer" -msgstr "" +msgstr "שחקן יחיד" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" From 7e44515f67a96faf62c76959e53cbf8b90a18ba2 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Mon, 26 Oct 2015 21:18:26 +0100 Subject: [PATCH 025/531] Translated using Weblate (French) Currently translated at 84.1% (634 of 753 strings) --- po/fr/minetest.po | 195 +++++++++++++++++++++++++--------------------- 1 file changed, 105 insertions(+), 90 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 98cfa23c..3e1a146b 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 20:03+0200\n" +"PO-Revision-Date: 2015-10-26 21:18+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -1319,7 +1319,7 @@ msgstr "Chatter" #: src/settings_translation_file.cpp msgid "Chat toggle key" -msgstr "Touche de chat" +msgstr "Afficher le chat" #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1331,7 +1331,7 @@ msgstr "Mode cinématique" #: src/settings_translation_file.cpp msgid "Cinematic mode key" -msgstr "Touche du mode cinématique" +msgstr "Mode cinématique" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1380,7 +1380,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Command key" -msgstr "Touche de commande" +msgstr "Commande" #: src/settings_translation_file.cpp msgid "Connect glass" @@ -1404,7 +1404,7 @@ msgstr "Couleur de la console de jeu" #: src/settings_translation_file.cpp msgid "Console key" -msgstr "Touche de console de jeu" +msgstr "Console du jeu" #: src/settings_translation_file.cpp msgid "Continuous forward" @@ -1471,7 +1471,7 @@ msgstr "Activer les dommages" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "Touche d'infos de débogage" +msgstr "Infos de débogage" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1578,7 +1578,7 @@ msgstr "Double-appui sur \"saut\" pour voler." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "Touche pour jeter" +msgstr "Jeter" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." @@ -1726,7 +1726,7 @@ msgstr "Taille de la police alternative" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "Touche mode rapide" +msgstr "Mode rapide" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" @@ -1785,7 +1785,7 @@ msgstr "Graine de génération de terrain déterminée" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "Touche pour voler" +msgstr "Voler" #: src/settings_translation_file.cpp msgid "Flying" @@ -1797,7 +1797,7 @@ msgstr "Brume" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "Touche pour activer/désactiver la brume" +msgstr "Brume" #: src/settings_translation_file.cpp msgid "Font path" @@ -1827,7 +1827,7 @@ msgstr "Taille de la police" #: src/settings_translation_file.cpp msgid "Forward key" -msgstr "Touche pour avancer" +msgstr "Avancer" #: src/settings_translation_file.cpp msgid "Freetype fonts" @@ -1908,7 +1908,7 @@ msgstr "Gravité" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "Touche pour afficher/cacher le HUD" +msgstr "HUD" #: src/settings_translation_file.cpp msgid "" @@ -2041,8 +2041,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." msgstr "" -"Si paramétré, les joueurs vont toujours réapparaître aux coordonnées " -"indiquées." +"Si établi, les joueurs vont toujours réapparaître aux coordonnées indiquées." #: src/settings_translation_file.cpp msgid "Ignore world errors" @@ -2072,7 +2071,7 @@ msgstr "Intervalle d'envoi de l'heure de jeu aux clients." #: src/settings_translation_file.cpp msgid "Inventory key" -msgstr "Touche pour l'inventaire" +msgstr "Inventaire" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -2088,7 +2087,7 @@ msgstr "Durée d'apparition des items jetés" #: src/settings_translation_file.cpp msgid "Jump key" -msgstr "Touche pour sauter" +msgstr "Sauter" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2244,7 +2243,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche pour se faufiler.\n" +"Touche pour se déplacer lentement.\n" "Utilisé pour descendre si aux1_descends est désactivé.\n" "Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" "5e3da1b0edf72eb3" @@ -2362,7 +2361,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche pour afficher/cacher la brume.\n" +"Touche pour afficher/enlever la brume.\n" "Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" "5e3da1b0edf72eb3" @@ -2383,7 +2382,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche pour activer/désactiver la distance de vue infinie.\n" +"Touche pour activer/désactiver la distance de vue illimitée.\n" "Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" "5e3da1b0edf72eb3" @@ -2413,7 +2412,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Left key" -msgstr "Touche gauche" +msgstr "Gauche" #: src/settings_translation_file.cpp msgid "" @@ -2848,7 +2847,7 @@ msgstr "Mini-carte" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "Touche de la mini-carte" +msgstr "Mini-carte" #: src/settings_translation_file.cpp msgid "Minimap scan height" @@ -2970,7 +2969,7 @@ msgstr "Sans collision" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "Touche mode sans collision" +msgstr "Mode sans collision" #: src/settings_translation_file.cpp msgid "Node highlighting" @@ -3129,16 +3128,17 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" -"Délais d'affichage des données de profilage. 0 = désactivation.\n" +"Délais d’intervalle d'affichage du profilage des données. 0 = désactivation." +"\n" "Utile pour les développeurs." #: src/settings_translation_file.cpp msgid "Profiler toggle key" -msgstr "Touche pour le profilage" +msgstr "Profilage" #: src/settings_translation_file.cpp msgid "Profiling print interval" -msgstr "" +msgstr "Délais d'intervale du profilage" #: src/settings_translation_file.cpp msgid "" @@ -3146,52 +3146,53 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" +"Rayon de l'aire des nuages où se trouve 64 blocs de nuage.\n" +"Les valeurs plus grandes que 26 entraînent une \"coupure\" nette des nuages " +"aux coins de l'aire." #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "Entrée aléatoire" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Distance d'affichage" +msgstr "Distance d'affichage illimitée" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "Média distant" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "Port distant" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." -msgstr "" +msgstr "Remplace le menu par défaut par un menu personnalisé." #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Menu droite" +msgstr "Droite" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "Intervalle de répétition du clic droit" #: src/settings_translation_file.cpp msgid "Rollback recording" -msgstr "" +msgstr "Enregistrement des actions" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "Mini-carte circulaire" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "" +msgstr "Sauvegarde le monde du serveur sur le disque-dur du client." #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "" +msgstr "Sauvegarder le monde du serveur" #: src/settings_translation_file.cpp msgid "" @@ -3204,104 +3205,103 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "Hauteur de la fenêtre" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "Largeur de la fenêtre" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" msgstr "Capture d'écran" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "Dossier des captures d'écran" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "Sécurité" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" +msgstr "Voir http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp msgid "Selection box border color (R,G,B)." -msgstr "" +msgstr "Couleur des bords de sélection (R,G,B)." #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "Couleur des bords de sélection" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "Epaisseur des bords de sélection" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Démarrer la partie solo" +msgstr "Serveur / Partie solo" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Serveur" +msgstr "URL du serveur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Port du serveur" +msgstr "Adresse du serveur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Port du serveur" +msgstr "Description du serveur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Serveur" +msgstr "Nom du serveur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Port du serveur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Liste de serveurs publics" +msgstr "URL de la liste des serveurs publics" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Liste de serveurs publics" +msgstr "Fichier des serveurs publics" #: src/settings_translation_file.cpp msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" +"Défini la langue. Laisser vide pour utiliser celui de votre système.\n" +"Un redémarrage du jeu est nécessaire pour prendre effet." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"Défini sur \"true\" active les feuilles d'arbres mouvantes.\n" +"Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" +"Défini sur \"true\" active les plantes mouvantes.\n" +"Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" +"Défini sur \"true\" active les liquides mouvants.\n" +"Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp msgid "Shaders" @@ -3313,27 +3313,29 @@ msgid "" "video cards.\n" "Thy only work with the OpenGL video backend." msgstr "" +"Les shaders permettent des effets visuels avancés et peut améliorer les " +"performances sur certaines cartes graphiques.\n" +"Fonctionne seulement avec OpenGL." #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" +msgstr "Forme de la mini-carte. Activé = ronde, désactivé = carré." #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "Afficher les infos de débogage" #: src/settings_translation_file.cpp msgid "Shutdown message" -msgstr "" +msgstr "Message d'arrêt du serveur" #: src/settings_translation_file.cpp msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." -msgstr "" +msgstr "Taille des chunks à générer, établie en mapblocks (16^3 blocs)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" msgstr "Lumière douce" @@ -3342,23 +3344,24 @@ msgid "" "Smooths camera when moving and looking arround.\n" "Useful for recording videos." msgstr "" +"Lisse les mouvement de la caméra en se déplaçant et en regardant autour.\n" +"Utile pour enregistrer des vidéos." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "" +msgstr "Lisse la rotation de la caméra en mode cinématique. 0 pour désactiver." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "Lisse la rotation de la caméra. 0 pour désactiver." #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Marcher" +msgstr "Déplacement lent" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "Audio" #: src/settings_translation_file.cpp msgid "" @@ -3367,32 +3370,36 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" +"Spécifie l'URL à laquelle les clients obtiennent les fichiers média au lieu " +"d'utiliser le port UDP.\n" +"$filename doit être accessible depuis $remote_media$filename via cURL (" +"évidemment, remote_media devrait\n" +"se terminer avec un slash).\n" +"Les fichiers qui ne sont pas présents seront obtenus avec le moyen usuel." #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "" +msgstr "Emplacement du spawn" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." -msgstr "Normal mapping" +msgstr "Force des normalmaps autogénérés." #: src/settings_translation_file.cpp msgid "Strength of parallax." -msgstr "" +msgstr "Force de l'occlusion parallaxe." #: src/settings_translation_file.cpp msgid "Strict protocol checking" -msgstr "" +msgstr "Vérification stricte du protocole" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" -msgstr "" +msgstr "SQLite synchronisé" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Packs de textures" +msgstr "Chemin des textures" #: src/settings_translation_file.cpp msgid "" @@ -3400,20 +3407,25 @@ msgid "" "Set this to be equal to viewing range minimum to disable the auto-adjustment " "algorithm." msgstr "" +"Distance d'affichage maximum.\n" +"Définir cette valeur égale à la distance de vue minimum pour désactiver\n" +"l'auto-ajustement dynamique de la distance d'affichage." #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." -msgstr "" +msgstr "L'interface réseau que le serveur écoute." #: src/settings_translation_file.cpp msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" +"Les privilèges que les nouveaux joueurs obtiennent automatiquement.\n" +"Entrer /privs dans le jeu pour voir une liste complète des privilèges." #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." -msgstr "" +msgstr "Le pilote vidéo pour Irrlicht." #: src/settings_translation_file.cpp msgid "" @@ -3435,24 +3447,28 @@ msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" +"L'intervalle en secondes entre des clics droits répétés lors de l'appui sur " +"le bouton droit de la souris." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "" +msgstr "Cette police sera utilisée pour certaines langues." #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"Durée d'apparition des objets jetés.\n" +"Définir ceci à -1 pour désactiver cette fonctionnalité." #: src/settings_translation_file.cpp msgid "Time send interval" -msgstr "" +msgstr "Intervalle d'envoi du temps" #: src/settings_translation_file.cpp msgid "Time speed" -msgstr "" +msgstr "Vitesse du temps" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." @@ -3468,7 +3484,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "Changer de caméra" #: src/settings_translation_file.cpp msgid "Tooltip delay" @@ -3519,9 +3535,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "appuyez sur une touche" +msgstr "Utiliser" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -3558,11 +3573,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "" +msgstr "Réduire la distance d'affichage" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "" +msgstr "Augmenter la distance d'affichage" #: src/settings_translation_file.cpp msgid "Viewing range maximum" From 4ebf720650c568617b6c70feeef7bd24d3fbcf26 Mon Sep 17 00:00:00 2001 From: Jan Zabel Date: Tue, 27 Oct 2015 00:27:17 +0100 Subject: [PATCH 026/531] Translated using Weblate (German) Currently translated at 98.6% (743 of 753 strings) --- po/de/minetest.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 6e770e3c..be260d6d 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 12:17+0200\n" -"Last-Translator: PilzAdam \n" +"PO-Revision-Date: 2015-10-27 00:27+0200\n" +"Last-Translator: Jan Zabel \n" "Language-Team: German " "\n" "Language: de\n" @@ -903,8 +903,9 @@ msgid "Convert" msgstr "Convert" #: src/keycode.cpp +#, fuzzy msgid "CrSel" -msgstr "CrSel" +msgstr "Cursorauswahl" #: src/keycode.cpp msgid "Down" From 04c4f7a8d0975834d0dfb86b2d86b5863913b36f Mon Sep 17 00:00:00 2001 From: Mahmut Elmas Date: Mon, 26 Oct 2015 21:07:00 +0100 Subject: [PATCH 027/531] Translated using Weblate (Turkish) Currently translated at 33.0% (249 of 753 strings) --- po/tr/minetest.po | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/po/tr/minetest.po b/po/tr/minetest.po index 898dda88..b1055dc2 100644 --- a/po/tr/minetest.po +++ b/po/tr/minetest.po @@ -7,26 +7,26 @@ msgstr "" "Project-Id-Version: 0.1.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-07-14 16:48+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Turkish \n" +"PO-Revision-Date: 2015-10-26 21:06+0200\n" +"Last-Translator: Mahmut Elmas \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" "X-Poedit-Language: Turkish\n" "X-Poedit-Basepath: \n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Lua scriptte bir hata meydana geldi:" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "Bir hata oluştu:" #: builtin/fstk/ui.lua #, fuzzy @@ -38,13 +38,12 @@ msgid "Ok" msgstr "Tamam" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" msgstr "Bağlan" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Bu sunucu yeniden bağlanma isteğinde bulundu:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -52,27 +51,29 @@ msgstr "Yükleniyor..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Protokol sürümü uyumsuz. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Sunucu protokol sürümü $1 istiyor. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Bu sunucu $1 ve $2 arası tüm protokol sürümlerini destekler. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Sunucu listesini tekrar etkinleştirmeyi deneyin ve internet bağlantınızı " +"kontrol edin." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Yalnızca $1 protokol sürümü desteklenmektedir." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Yalnızca $1 ve $2 arası protokol sürümleri desteklenmektedir." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -101,6 +102,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Geçersiz karakterler içerdiği için \"$1\" modu etkinleştirilemiyor. İzin " +"verilen karakterler [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -288,9 +291,8 @@ msgid "Previous Contributors" msgstr "Katkı sağlayanlar" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "Ana geliştiriciler" +msgstr "İlk geliştiriciler" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -418,31 +420,29 @@ msgstr "Oyunu Başlat" #: builtin/mainmenu/tab_settings.lua msgid "\"" -msgstr "" +msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Açıklama bilgisi verilmedi)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Seç" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Tuşları değiştir" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" msgstr "Paketi Kapat" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Düzenle" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" msgstr "Etkinleştirildi" @@ -453,7 +453,6 @@ msgid "" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" msgstr "Oyun" From 7167e86ab1f6db61007dac9cb88b4b8be31869bf Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Tue, 27 Oct 2015 15:21:00 +0100 Subject: [PATCH 028/531] Translated using Weblate (French) Currently translated at 96.4% (726 of 753 strings) --- po/fr/minetest.po | 255 +++++++++++++++++++++++++++++++--------------- 1 file changed, 171 insertions(+), 84 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 3e1a146b..e4423d1d 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 21:18+0200\n" +"PO-Revision-Date: 2015-10-27 15:21+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -672,6 +672,15 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Touches par défaut :\n" +"Sans menu visible :\n" +"- un seul appui : touche d'activation\n" +"- double-appui : placement / utilisation\n" +"- Glissement du doigt : regarder autour\n" +"Menu visible :\n" +"- double-appui (en dehors) : fermeture\n" +"- objet(s) dans l'inventaire : déplacement\n" +"- appui et glissement : placement d'un seul item par slot\n" #: src/game.cpp msgid "Exit to Menu" @@ -1522,7 +1531,7 @@ msgstr "Niveau de lissage des normal maps." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" -"Définit la distance maximale de transfert du joueur en mapblocks (0 = " +"Défini la distance maximale de transfert du joueur en mapblocks (0 = " "illimité)." #: src/settings_translation_file.cpp @@ -1597,9 +1606,8 @@ msgid "Enable players getting damage and dying." msgstr "Activer les dommages et la mort des joueurs." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Active l'entrée aléatoire du joueur (seulement utilisé pour des tests)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." @@ -1945,6 +1953,9 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" +"Largeur des aires de mapblocks qui sont sujets à être gardé actifs, établie " +"en mapblocks (16^3 blocs).\n" +"Les mapblocks actifs sont chargés et les ABMs y sont actifs." #: src/settings_translation_file.cpp msgid "" @@ -2324,6 +2335,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Touche de mise à jour de la caméra. Seulement utilisé pour le développement." +"\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" +"5e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2442,7 +2457,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "Limite de files émergentes sur le disque-dur." +msgstr "Limite de files émergentes sur le disque" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" @@ -2476,11 +2491,11 @@ msgstr "Itérations maximum sur la transformation des liquides" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" -msgstr "" +msgstr "Délais de nettoyage d'une file" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "Facteur d'écoulement des liquides" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." @@ -2556,15 +2571,15 @@ msgstr "Délais d'interruption du déchargement des mapblocks" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "" +msgstr "Mapgen : paramètres de dispersion de la température" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "" +msgstr "Mapgen : paramètres de mélange de l'humidité" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "" +msgstr "Mapgen : paramètres de dispersion de l'humidité" #: src/settings_translation_file.cpp msgid "Mapgen debug" @@ -2576,7 +2591,7 @@ msgstr "Drapeaux de génération de terrain" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "" +msgstr "Mapgen : paramètres de mélange de la température" #: src/settings_translation_file.cpp msgid "Mapgen name" @@ -2612,31 +2627,31 @@ msgstr "Mapgen V6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion des arbres à pommes" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "" +msgstr "Mapgen V6 : fréquence des plages" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion des plages" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion des biomes" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion des caves" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "Mapgen V6 : fréquence des déserts" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "" +msgstr "Mapgen V6 : drapeaux" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" @@ -2644,11 +2659,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion de l'humidité" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion de la vase" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" @@ -2656,7 +2671,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion de l'altitude du terrain" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" @@ -2664,7 +2679,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion des arbres" #: src/settings_translation_file.cpp msgid "Mapgen v7" @@ -2684,7 +2699,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "" +msgstr "Mapgen V7 : drapeaux" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" @@ -2696,19 +2711,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de dispersion des montagnes" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de dispersion des crêtes" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de dispersion des crêtes de rivières" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de dispersion de l'altitude de terrain" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" @@ -2732,7 +2747,7 @@ msgstr "Maximum de liquides traités par étape de serveur." #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" -msgstr "" +msgstr "Maximum d'extra-mapblocks par clearobjects" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" @@ -2748,7 +2763,7 @@ msgstr "FPS maximum quand le jeu est en pause." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "" +msgstr "Maximum de mapblocks chargés de force" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" @@ -2756,29 +2771,36 @@ msgstr "Largeur maximale de la barre d'inventaire" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." -msgstr "" +msgstr "Nombre maximum de mapblocks qui peuvent être listés pour chargement." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Nombre maximum de mapblocks à lister qui doivent être générés.\n" +"Laisser ce champ vide pour un montant approprié défini automatiquement." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Nombre maximum de mapblocks à lister qui doivent être générés depuis un " +"fichier.\n" +"Laisser ce champ vide pour un montant approprié défini automatiquement." #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "" +msgstr "Nombre maximum de mapblocks chargés de force." #: src/settings_translation_file.cpp msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" +"Nombre maximum de mapblocks gardés dans la mémoire du client.\n" +"Définir à -1 pour un montant illimité." #: src/settings_translation_file.cpp msgid "" @@ -2786,14 +2808,19 @@ msgid "" "try reducing it, but don't reduce it to a number below double of targeted\n" "client number." msgstr "" +"Nombre maximum de paquets envoyés par étape d'envoi. Si vous avez une " +"connexion lente,\n" +"essayez de réduire cette valeur, mais réduisez pas cette valeur en-dessous " +"du double du nombre\n" +"de clients maximum sur le serveur." #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "" +msgstr "Nombre maximum de joueurs qui peuvent être connectés en même temps." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "" +msgstr "Nombre maximum d'objets sauvegardés dans un mapblock (= 16^3 blocs)." #: src/settings_translation_file.cpp msgid "" @@ -2908,6 +2935,8 @@ msgid "" "Multiplier for fall bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Facteur de mouvement de bras en tombant.\n" +"Exemples : 0 = aucun mouvement, 1 = normal, 2 = double." #: src/settings_translation_file.cpp msgid "" @@ -2978,14 +3007,15 @@ msgstr "Eclairage des blocs" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +"Paramètres de mélange pour la température, humidité et mélange de biomes." #: src/settings_translation_file.cpp msgid "Normalmaps sampling" -msgstr "" +msgstr "Échantillonnage de normalmaps" #: src/settings_translation_file.cpp msgid "Normalmaps strength" -msgstr "" +msgstr "Force des normalmaps" #: src/settings_translation_file.cpp msgid "Number of emerge threads" @@ -3202,6 +3232,12 @@ msgid "" "pixels when scaling down, at the cost of blurring some\n" "edge pixels when images are scaled by non-integer sizes." msgstr "" +"Mise à l'échelle du GUI par une valeur spécifique de l'utilisateur.\n" +"Cela va lisser certains bords grossiers, et mélanger les pixels en réduisant " +"l'échelle\n" +"au détriment d'un effet de flou sur des pixels en bordure quand les images " +"sont\n" +"misent à l'échelle par des valeurs non-entières." #: src/settings_translation_file.cpp msgid "Screen height" @@ -3276,7 +3312,7 @@ msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" -"Défini la langue. Laisser vide pour utiliser celui de votre système.\n" +"Détermine la langue. Laisser vide pour utiliser celui de votre système.\n" "Un redémarrage du jeu est nécessaire pour prendre effet." #: src/settings_translation_file.cpp @@ -3284,7 +3320,7 @@ msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" -"Défini sur \"true\" active les feuilles d'arbres mouvantes.\n" +"Mettre sur \"true\" active les feuilles d'arbres mouvantes.\n" "Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp @@ -3292,7 +3328,7 @@ msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" -"Défini sur \"true\" active les plantes mouvantes.\n" +"Mettre sur \"true\" active les plantes mouvantes.\n" "Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp @@ -3300,7 +3336,7 @@ msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" -"Défini sur \"true\" active les liquides mouvants.\n" +"Mettre sur \"true\" active les liquides mouvants.\n" "Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp @@ -3434,6 +3470,12 @@ msgid "" "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" "set to the nearest valid value." msgstr "" +"Force (obscurité) de l'ombrage des blocs avec l'occlusion ambiante.\n" +"Les valeurs plus basses sont plus sombres, les valeurs plus hautes sont plus " +"claires.\n" +"Une gamme valide de valeurs pour ceci se situe entre 0.25 et 4.0. Si la " +"valeur est en dehors\n" +"de cette gamme alors elle sera définie à la plus proche des valeurs valides." #: src/settings_translation_file.cpp msgid "" @@ -3441,6 +3483,11 @@ msgid "" "capacity until an attempt is made to decrease its size by dumping old queue\n" "items. A value of 0 disables the functionality." msgstr "" +"Le temps (en secondes) où la file des liquides peut s'agrandir au-delà de " +"sa\n" +"capacité de traitement jusqu'à ce qu'une tentative est faite pour réduire sa " +"taille en vidant\n" +"l'ancienne file d'items. Une valeur de 0 désactive cette fonctionnalité." #: src/settings_translation_file.cpp msgid "" @@ -3459,7 +3506,7 @@ msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" -"Durée d'apparition des objets jetés.\n" +"Durée de visibilité des objets jetés.\n" "Définir ceci à -1 pour désactiver cette fonctionnalité." #: src/settings_translation_file.cpp @@ -3473,6 +3520,8 @@ msgstr "Vitesse du temps" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." msgstr "" +"Temps de délais pour le client pour supprimer les données de la carte de sa " +"mémoire." #: src/settings_translation_file.cpp msgid "" @@ -3481,6 +3530,11 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" +"Pour réduire le lag, le transfert des mapblocks sont ralentis quand un " +"joueur\n" +"est en train de construire quelque chose.\n" +"Cela détermine la durée du ralentissement après placement ou destruction " +"d'un bloc." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" @@ -3488,10 +3542,9 @@ msgstr "Changer de caméra" #: src/settings_translation_file.cpp msgid "Tooltip delay" -msgstr "" +msgstr "Délais d'apparition des infobulles" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "Filtrage trilinéaire" @@ -3501,38 +3554,42 @@ msgid "" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"True = 256\n" +"False = 128\n" +"Utile pour rendre la mini-carte plus fluide sur des ordinateurs peu " +"performants." #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "" +msgstr "Mods sécurisés" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" +msgstr "URL de la liste des serveurs affichée dans l'onglet multijoueur." #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" -msgstr "" +msgstr "Distance de transfert du joueur illimitée" #: src/settings_translation_file.cpp msgid "Unload unused server data" -msgstr "" +msgstr "Décharger les données de serveur inutiles" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "Activation des nuages 3D au lieu des nuages 2D (plats)." #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." -msgstr "" +msgstr "Mouvement des nuages dans le menu." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" +msgstr "Utilisation du filtrage anisotrope." #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." -msgstr "" +msgstr "Utilisation du filtrage bilinéaire." #: src/settings_translation_file.cpp msgid "Use key" @@ -3540,36 +3597,35 @@ msgstr "Utiliser" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." -msgstr "" +msgstr "Utilisation du mip-mapping. Peut impacter les performances." #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." -msgstr "" +msgstr "Utilisation du filtrage trilinéaire." #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Anciens développeurs" +msgstr "Utile pour les développeurs de mods." #: src/settings_translation_file.cpp msgid "V-Sync" -msgstr "" +msgstr "Synchronisation verticale" #: src/settings_translation_file.cpp msgid "Vertical initial window size." -msgstr "" +msgstr "Largeur initiale de la fenêtre de jeu." #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "" +msgstr "Synchronisation verticale de la fenêtre de jeu." #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "Pilote vidéo" #: src/settings_translation_file.cpp msgid "View bobbing" -msgstr "" +msgstr "Mouvement du bras" #: src/settings_translation_file.cpp msgid "View range decrease key" @@ -3581,68 +3637,59 @@ msgstr "Augmenter la distance d'affichage" #: src/settings_translation_file.cpp msgid "Viewing range maximum" -msgstr "" +msgstr "Distance de vue maximum" #: src/settings_translation_file.cpp msgid "Viewing range minimum" -msgstr "" +msgstr "Distance de vue minimum" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Volume du son" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Feuilles mouvantes" +msgstr "Vitesse de marche" #: src/settings_translation_file.cpp msgid "Wanted FPS" -msgstr "" +msgstr "FPS minimum" #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "Niveau de l'eau" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "Niveau de la surface de l'eau dans le monde." #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "Feuilles mouvantes" +msgstr "Environnement mouvant" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" -msgstr "Feuilles mouvantes" +msgstr "Feuilles d'arbres mouvantes" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" msgstr "Plantes mouvantes" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "Liquides mouvants" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "Liquides mouvants" +msgstr "Hauteur des liquides mouvants" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "Liquides mouvants" +msgstr "Durée du mouvement des liquides" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Liquides mouvants" +msgstr "Vitesse de mouvement des liquides" #: src/settings_translation_file.cpp msgid "" @@ -3650,6 +3697,9 @@ msgid "" "filtered in software, but some images are generated directly\n" "to hardware (e.g. render-to-texture for nodes in inventory)." msgstr "" +"Quand gui_scaling_filter est activé, tous les images du GUI sont\n" +"filtrées dans Minetest, mais quelques images sont générées directement\n" +"par le matériel (ex.: textures des blocs dans l'inventaire)." #: src/settings_translation_file.cpp msgid "" @@ -3658,6 +3708,11 @@ msgid "" "to the old scaling method, for video drivers that don't\n" "propery support downloading textures back from hardware." msgstr "" +"Quand gui_scaling_filter_txr2img est activé, cela copie les images depuis\n" +"votre matériel vers Minetest pour mise à l'échelle. Si désactivé, retour à " +"la méthode par défaut\n" +"pour les pilotes vidéo qui ne supportent pas le chargement des textures " +"depuis le matériel." #: src/settings_translation_file.cpp msgid "" @@ -3669,6 +3724,19 @@ msgid "" "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" "enabled." msgstr "" +"En utilisant le filtrage bilinéaire / trilinéaire / anisotrope, les textures " +"de basse résolution\n" +"peuvent être floues en agrandissat automatiquement les textures avec une " +"interpolation précise\n" +"pour préserver les pixels hasardeux.\n" +"\n" +"Ceci détermine la taille de la texture minimale pour les textures agrandie. " +"Les valeurs plus hautes rendent\n" +"les textures plus détaillées, mais nécessitent plus de mémoire.\n" +"Les valeurs en puissance de 2 sont recommandées. Définir une valeur " +"supérieure à 1 peut ne pas\n" +"avoir un effet visible sauf le filtrage bilinéaire / trilinéaire / " +"anisotrope est activé." #: src/settings_translation_file.cpp msgid "" @@ -3679,50 +3747,69 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"Limite de la génération de terrain.\n" +"Notes :\n" +"- Limite absolue à 31000 (une valeur supérieure n'a aucun effet).\n" +"- La génération de terrain fonctionne par groupes de 80^3 blocs (= 5^3 " +"mapblocks).\n" +"- Ces groupes ont un décalage de -32, -32 blocs depuis leur origine.\n" +"- Seuls les groupes intégrant les limites définies par map_generation_limit " +"sont générées" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." msgstr "" +"Détermine l'utilisation des polices Freetype. Nécessite une compilation avec " +"le support Freetype." #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "" +msgstr "Détermine la désynchronisation des textures animées par mapblock." #: src/settings_translation_file.cpp msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" +"Détermine l'exposition illimitée des noms de joueurs aux autres clients.\n" +"Obsolète : utiliser l'option player_transfer_distance à la place." #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "" +msgstr "Détermine la possibilité des joueurs de tuer d'autres joueurs." #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"Détermine la possibilité des clients de se re-connecter après une " +"interruption de serveur.\n" +"Activé-le si votre serveur est paramétré pour redémarrer automatiquement." #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "Détermine la visibilité de la brume au bout de l'aire visible." #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +"Détermine la visibilité des infos de débogage du client (même effet que " +"taper F5)." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "Épaisseur des bordures de sélection autour des blocs." #: src/settings_translation_file.cpp msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" +"Chemin du monde (tout ce qui relatif au monde est enregistré ici).\n" +"Inutile si démarré depuis le menu." #: src/settings_translation_file.cpp msgid "cURL file download timeout" @@ -3730,7 +3817,7 @@ msgstr "Délais d'interruption de cURL lors d'un téléchargement de fichier" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "Limite parallèle de cURL" #: src/settings_translation_file.cpp msgid "cURL timeout" From 037221c84d0c7cc18d1c41c3ec3d206150a2975f Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:46:43 +0100 Subject: [PATCH 029/531] Translated using Weblate (Spanish) Currently translated at 32.5% (245 of 753 strings) --- po/es/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 8914eddc..e9a547d7 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 07:09+0200\n" -"Last-Translator: Jordi Fornaguera \n" +"PO-Revision-Date: 2015-10-27 16:46+0200\n" +"Last-Translator: PilzAdam \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -606,7 +606,7 @@ msgstr "La ruta del mundo especificada no existe: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "no" #: src/game.cpp #, fuzzy From 54634fa8b3ddde57958f051c50da0ab7fd716fe6 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:45:01 +0100 Subject: [PATCH 030/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 43.8% (330 of 753 strings) --- po/zh_TW/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 3c4a9089..d4047d46 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 14:01+0200\n" -"Last-Translator: Jeff Huang \n" +"PO-Revision-Date: 2015-10-27 16:45+0200\n" +"Last-Translator: PilzAdam \n" "Language-Team: Chinese (Taiwan) " "\n" "Language: zh_TW\n" @@ -589,7 +589,7 @@ msgstr "提供的世界路徑不存在： " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "yes" #: src/game.cpp msgid "" From 45b8b381f0a40ddbcf01f3eaf86f688708247d6d Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:44:05 +0100 Subject: [PATCH 031/531] Translated using Weblate (Dutch) Currently translated at 31.3% (236 of 753 strings) --- po/nl/minetest.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/nl/minetest.po b/po/nl/minetest.po index 5ffb1c6c..fcc22bb6 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-09-06 07:40+0200\n" -"Last-Translator: E. Kastelijn \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2015-10-27 16:44+0200\n" +"Last-Translator: PilzAdam \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -598,7 +598,7 @@ msgstr "Het gespecificeerde wereld-pad bestaat niet: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "no" #: src/game.cpp msgid "" From b41032fa566495c717372b14acf0fdc9227e6ac0 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Tue, 27 Oct 2015 21:53:13 +0100 Subject: [PATCH 032/531] Translated using Weblate (French) Currently translated at 98.2% (740 of 753 strings) --- po/fr/minetest.po | 276 +++++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 126 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index e4423d1d..d4e98878 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-27 15:21+0200\n" +"PO-Revision-Date: 2015-10-27 21:53+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -53,11 +53,11 @@ msgstr "La version du protocole ne correspond pas. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "Le serveur requiert une version du protocole $1 " +msgstr "Le serveur impose une version du protocole $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "Le serveur supporte les versions du protocole entre $1 et $2. " +msgstr "Le serveur supporte les versions de protocole entre $1 et $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -66,7 +66,7 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "Nous supportons seulement la version du procotole $1." +msgstr "Nous supportons seulement la version du protocole $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." @@ -100,7 +100,8 @@ msgid "" "chararacters [a-z0-9_] are allowed." msgstr "" "Échec du chargement du mod \"$1\" car il contient des caractères non-" -"autorisés. Seulement les caractères [a-z0-9_] sont autorisés." +"autorisés.\n" +"Seulement les caractères [a-z0-9_] sont autorisés." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -137,7 +138,7 @@ msgstr "Créer" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "Téléchargez un sous-jeu, comme minetest_game, depuis minetest.net" +msgstr "Téléchargez un jeu, comme minetest_game, depuis minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -149,7 +150,7 @@ msgstr "Jeu" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Générateur de carte" +msgstr "Générateur de terrain" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -169,7 +170,7 @@ msgstr "Nom du monde" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "Vous n'avez pas de sous-jeux installés." +msgstr "Vous n'avez pas de jeux installés." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -177,11 +178,11 @@ msgstr "Êtes-vous sûr de vouloir supprimer \"$1\" ?" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "Modmgr : n'a pas pu supprimer \"$1\"" +msgstr "Le gestionnaire de mods n'a pas pu supprimer \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "Modmgr : chemin de mod invalide \"$1\"" +msgstr "Gestionnaire de mods : chemin de mod invalide \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" @@ -213,29 +214,31 @@ msgid "" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"Installer un mod : type de fichier non supporté \"$1\" ou archive cassée" +"Installation d'un mod : type de fichier non supporté \"$1\" ou archive " +"endommagée" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" -msgstr "N'a pas pu installer $1 à $2" +msgstr "Échec de l'installation de $1 vers $2" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" -msgstr "Installer un mod : fichier : \"$1\"" +msgstr "Installation d'un mod : fichier : \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" -msgstr "Installer un mod : impossible de trouver le vrai nom du mod pour : $1" +msgstr "" +"Installation d'un mod : impossible de trouver le vrai nom du mod pour : $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" -"Installer un mod : impossible de trouver un nom de dossier valide pour le " +"Installation un mod : impossible de trouver un nom de dossier valide pour le " "pack de mods $1" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "Fermer le store" +msgstr "Fermer le magasin" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." @@ -247,7 +250,7 @@ msgstr "Installer" #: builtin/mainmenu/store.lua msgid "Page $1 of $2" -msgstr "Page $1 sur $2" +msgstr "Page $1 de $2" #: builtin/mainmenu/store.lua msgid "Rating" @@ -259,7 +262,7 @@ msgstr "Rechercher" #: builtin/mainmenu/store.lua msgid "Shortname:" -msgstr "Nom :" +msgstr "Nom court :" #: builtin/mainmenu/store.lua msgid "Successfully installed:" @@ -267,11 +270,11 @@ msgstr "Installé avec succès :" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "Non trié" +msgstr "Non-trié" #: builtin/mainmenu/store.lua msgid "re-Install" -msgstr "Réinstaller" +msgstr "Ré-installer" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" @@ -299,7 +302,7 @@ msgstr "Mods installés :" #: builtin/mainmenu/tab_mods.lua msgid "Mod information:" -msgstr "Information du mod :" +msgstr "Informations du mod :" #: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua msgid "Mods" @@ -422,7 +425,7 @@ msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "(Aucune description du paramètre)" +msgstr "(Aucune description donnée de l'option)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" @@ -464,7 +467,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "Veuillez séparer les drapeaux par des virgules." +msgstr "Veuillez séparer les drapeaux par des virgules dans la liste." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." @@ -496,7 +499,7 @@ msgstr "Montrer les noms techniques" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "La valeur doit être plus grande que $1." +msgstr "La valeur doit être supérieure à $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." @@ -512,7 +515,7 @@ msgstr "Menu principal" #: builtin/mainmenu/tab_simple_main.lua msgid "Start Singleplayer" -msgstr "Démarrer la partie solo" +msgstr "Démarrer une partie solo" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -548,15 +551,15 @@ msgstr "Terminé !" #: src/client.cpp msgid "Initializing nodes" -msgstr "Initialisation des nodes" +msgstr "Initialisation des blocs" #: src/client.cpp msgid "Initializing nodes..." -msgstr "Initialisation des nodes..." +msgstr "Initialisation des blocs..." #: src/client.cpp msgid "Item textures..." -msgstr "Textures d'objets..." +msgstr "Textures d'items..." #: src/client.cpp msgid "Loading textures..." @@ -564,7 +567,7 @@ msgstr "Chargement des textures..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "Construction des shaders..." +msgstr "Reconstruction des shaders..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -595,7 +598,6 @@ msgid "Provided world path doesn't exist: " msgstr "Le chemin du monde spécifié n'existe pas : " #: src/fontengine.cpp -#, fuzzy msgid "needs_fallback_font" msgstr "needs_fallback_font" @@ -605,7 +607,7 @@ msgid "" "Check debug.txt for details." msgstr "" "\n" -"Voir debug.txt pour plus d'information." +"Voir debug.txt pour plus d'informations." #: src/game.cpp msgid "Change Keys" @@ -613,7 +615,7 @@ msgstr "Changer les touches" #: src/game.cpp msgid "Change Password" -msgstr "Changer mot de passe" +msgstr "Changer votre mot de passe" #: src/game.cpp msgid "Connecting to server..." @@ -648,7 +650,7 @@ msgstr "" "Contrôles:\n" "- ZQSD : se déplacer\n" "- Espace : sauter/grimper\n" -"- Maj. : marcher prudemment/descendre\n" +"- Maj. : marcher lentement/descendre\n" "- A : lâcher l'objet en main\n" "- I : inventaire\n" "- Souris : tourner/regarder\n" @@ -677,10 +679,10 @@ msgstr "" "- un seul appui : touche d'activation\n" "- double-appui : placement / utilisation\n" "- Glissement du doigt : regarder autour\n" -"Menu visible :\n" +"Menu / Inventaire visible :\n" "- double-appui (en dehors) : fermeture\n" "- objet(s) dans l'inventaire : déplacement\n" -"- appui et glissement : placement d'un seul item par slot\n" +"- appui, glissement et appui : placement d'un seul item par slot\n" #: src/game.cpp msgid "Exit to Menu" @@ -692,7 +694,7 @@ msgstr "Quitter le jeu" #: src/game.cpp msgid "Item definitions..." -msgstr "Définitions d'objets..." +msgstr "Définitions des items..." #: src/game.cpp msgid "KiB/s" @@ -720,7 +722,7 @@ msgstr "Résolution de l'adresse..." #: src/game.cpp msgid "Respawn" -msgstr "Ressusciter" +msgstr "Réapparaître" #: src/game.cpp msgid "Shutting down..." @@ -744,7 +746,7 @@ msgstr "ok" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" -msgstr "\"Use\" = descendre (escalade)" +msgstr "\"Use\" = descendre" #: src/guiKeyChangeMenu.cpp msgid "Backward" @@ -768,7 +770,7 @@ msgstr "Double-appui sur \"saut\" pour voler" #: src/guiKeyChangeMenu.cpp msgid "Drop" -msgstr "Jeter" +msgstr "Lâcher" #: src/guiKeyChangeMenu.cpp msgid "Forward" @@ -796,11 +798,11 @@ msgstr "Gauche" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp msgid "Print stacks" -msgstr "Imprimer stacks" +msgstr "Afficher les stacks" #: src/guiKeyChangeMenu.cpp msgid "Range select" -msgstr "Distance d'affichage" +msgstr "Distance de vue" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Right" @@ -808,7 +810,7 @@ msgstr "Droite" #: src/guiKeyChangeMenu.cpp msgid "Sneak" -msgstr "Marcher" +msgstr "Marcher lentement" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" @@ -840,7 +842,7 @@ msgstr "Changer" #: src/guiPasswordChange.cpp msgid "Confirm Password" -msgstr "Confirmer mot de passe" +msgstr "Confirmer le mot de passe" #: src/guiPasswordChange.cpp msgid "New Password" @@ -872,7 +874,7 @@ msgstr "Attente" #: src/keycode.cpp msgid "Back" -msgstr "Retour en arrière" +msgstr "Retour" #: src/keycode.cpp msgid "Capital" @@ -991,9 +993,8 @@ msgid "Next" msgstr "Suivant" #: src/keycode.cpp -#, fuzzy msgid "Nonconvert" -msgstr "Nonconvert" +msgstr "Non converti" #: src/keycode.cpp msgid "Num Lock" @@ -1101,7 +1102,7 @@ msgstr "Menu droite" #: src/keycode.cpp msgid "Right Shift" -msgstr "Shift droite" +msgstr "Shift droit" #: src/keycode.cpp msgid "Right Windows" @@ -1156,7 +1157,7 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" -"0 = parallax mapping (plus rapide, mais moins détaillé).\n" +"0 = occlusion parallaxe (plus rapide, mais moins détaillé).\n" "1 = relief mapping (plus lent, mais plus détaillé)." #: src/settings_translation_file.cpp @@ -1179,11 +1180,11 @@ msgid "" msgstr "" "Support 3D.\n" "Options :\n" -"- aucun : pas de sortie 3D.\n" -"- anaglyphe : couleur 3D bleu turquoise/violet.\n" -"- entrelacé : polarisation basée sur des lignes avec support de l'écran.\n" -"- horizontal : partage de l'écran horizontal.\n" -"- vertical : partage de l'écran vertical." +"- aucun : pas de sortie 3D.\n" +"- anaglyphe : couleur 3D bleu turquoise/violet.\n" +"- entrelacé : polarisation basée sur des lignes avec support de l'écran.\n" +"- horizontal : partage de l'écran horizontal.\n" +"- vertical : partage de l'écran vertical." #: src/settings_translation_file.cpp msgid "" @@ -1197,12 +1198,12 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" -"Un message qui sera affiché à tous les joueurs quand le serveur s'arrête." +"Un message qui sera affiché à tous les joueurs quand le serveur s'interrompt." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" -"Un message qui sera affiché à tous les joueurs quand le serveur s'arrête." +"Un message qui sera affiché à tous les joueurs quand le serveur s’interrompt." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1218,7 +1219,7 @@ msgstr "Portée des mapblocks actifs" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "Portée des objets actifs" +msgstr "Portée des objets actifs envoyés" #: src/settings_translation_file.cpp msgid "" @@ -1228,7 +1229,7 @@ msgid "" msgstr "" "Adresse où se connecter.\n" "Laisser vide pour démarrer un serveur local.\n" -"Le champ de l'adresse dans le menu peut réécrire ce paramètre." +"Le champ de l'adresse dans le menu peut annuler cette option." #: src/settings_translation_file.cpp msgid "" @@ -1270,17 +1271,17 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" -"Annoncer à la liste des serveurs.\n" +"Annoncer à la liste des serveurs publics.\n" "Si vous voulez annoncer votre adresse IPv6, utilisez serverlist_url = " "v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "Demander de se reconnecter après coupure de connexion" +msgstr "Demander de se reconnecter après une coupure de connexion" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "Déclarer automatiquement votre serveur à la liste publique." +msgstr "Déclarer automatiquement votre serveur à la liste des serveurs publics." #: src/settings_translation_file.cpp msgid "Backward key" @@ -1320,7 +1321,7 @@ msgstr "Lissage du mouvement de la caméra en mode cinématique" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "Touche de la mise à jour de la caméra" +msgstr "Touche de mise à jour de la caméra" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1352,7 +1353,7 @@ msgstr "Client et Serveur" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "Vitesse d'ascension du joueur" +msgstr "Vitesse d'escalade du joueur" #: src/settings_translation_file.cpp msgid "Cloud height" @@ -1364,7 +1365,7 @@ msgstr "Niveau de détails des nuages" #: src/settings_translation_file.cpp msgid "Clouds" -msgstr "Activer les nuages" +msgstr "Nuages" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." @@ -1372,7 +1373,7 @@ msgstr "Les nuages ont un effet sur le client exclusivement." #: src/settings_translation_file.cpp msgid "Clouds in menu" -msgstr "Activer les nuages dans le menu" +msgstr "Nuages dans le menu" #: src/settings_translation_file.cpp msgid "Colored fog" @@ -1413,7 +1414,7 @@ msgstr "Couleur de la console de jeu" #: src/settings_translation_file.cpp msgid "Console key" -msgstr "Console du jeu" +msgstr "Console de jeu" #: src/settings_translation_file.cpp msgid "Continuous forward" @@ -1421,7 +1422,7 @@ msgstr "Avancer en continu" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "Mouvement avant continuel (seulement utilisé pour des tests)." +msgstr "Mouvement avant permanent (seulement utilisé pour des tests)." #: src/settings_translation_file.cpp msgid "Controls" @@ -1444,7 +1445,7 @@ msgid "" msgstr "" "Taille des déserts et plages dans Mapgen V6.\n" "Quand les environnements neigeux sont activés, le paramètre de fréquence des " -"déserts dans Mapgen v6 est ignoré." +"déserts dans Mapgen V6 est ignoré." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1476,7 +1477,7 @@ msgstr "DPI" #: src/settings_translation_file.cpp msgid "Damage" -msgstr "Activer les dommages" +msgstr "Dégâts" #: src/settings_translation_file.cpp msgid "Debug info toggle key" @@ -1526,12 +1527,14 @@ msgstr "" msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." -msgstr "Niveau de lissage des normal maps." +msgstr "" +"Niveau de lissage des normal maps.\n" +"Une valeur plus grande lisse davantage les normal maps." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" -"Défini la distance maximale de transfert du joueur en mapblocks (0 = " +"Détermine la distance maximale de transfert du joueur en mapblocks (0 = " "illimité)." #: src/settings_translation_file.cpp @@ -1554,7 +1557,7 @@ msgstr "Description du serveur affichée sur la liste des serveurs." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "Désynchroniser l'animation des blocs par mapblock" +msgstr "Désynchroniser les textures animées par mapblock" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." @@ -1563,7 +1566,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "Profil détaillé de mod" +msgstr "Profil détaillé des mods" #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1575,7 +1578,7 @@ msgstr "Refuser les mots de passe vides" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "Nom de domaine du serveur affichée sur la liste des serveurs." +msgstr "Nom de domaine du serveur affichée sur la liste des serveurs publics." #: src/settings_translation_file.cpp msgid "Double tap jump for fly" @@ -1587,7 +1590,7 @@ msgstr "Double-appui sur \"saut\" pour voler." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "Jeter" +msgstr "Lâcher" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." @@ -1596,6 +1599,10 @@ msgstr "Afficher les infos de débogage de la génération de terrain." #: src/settings_translation_file.cpp msgid "Enable a bit lower water surface, so it doesn't " msgstr "" +"Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas le " +"bloc complètement.\n" +"Note : cette fonctionnalité est assez expérimentale et l'éclairage doux ne " +"fonctionne pas dessus. " #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1603,7 +1610,7 @@ msgstr "Activer la sécurisation des mods" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "Activer les dommages et la mort des joueurs." +msgstr "Active les dégâts et la mort des joueurs." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." @@ -1612,7 +1619,7 @@ msgstr "Active l'entrée aléatoire du joueur (seulement utilisé pour des tests #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." msgstr "" -"Active l'éclairage des blocs pointés (et enlève les bords noirs de " +"Active l'éclairage des blocs pointés (et supprime les bordures noires de " "sélection)." #: src/settings_translation_file.cpp @@ -1621,7 +1628,7 @@ msgid "" "Disable for speed or for different looks." msgstr "" "Active l'éclairage doux avec une occlusion ambiante simple.\n" -"Désactiver pour plus de performances." +"Désactiver pour davantage de performances." #: src/settings_translation_file.cpp msgid "" @@ -1657,7 +1664,7 @@ msgid "" msgstr "" "Active/désactive l'usage d'un serveur IPv6. Un serveur IPv6 peut être " "restreint\n" -"aux clients IPv6, selon leur configuration du système.\n" +"aux clients IPv6, selon leur configuration système.\n" "Ignoré si bind_address est paramétré." #: src/settings_translation_file.cpp @@ -1669,7 +1676,8 @@ msgid "" msgstr "" "Active le bumpmapping pour les textures.\n" "Les normalmaps peuvent être fournies par un pack de textures pour un " -"meilleur effet de relief, ou bien celui-ci est auto-généré.\n" +"meilleur effet de relief,\n" +"ou bien celui-ci est auto-généré.\n" "Nécessite les shaders pour être activé." #: src/settings_translation_file.cpp @@ -1685,7 +1693,7 @@ msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" -"Active la génération automatique des normalmaps.\n" +"Active la génération à la volée des normalmaps.\n" "Nécessite le bumpmapping pour être activé." #: src/settings_translation_file.cpp @@ -1706,7 +1714,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "FPS dans le menu pause" +msgstr "FPS maximum sur le menu pause" #: src/settings_translation_file.cpp msgid "FSAA" @@ -1714,7 +1722,7 @@ msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "Fréquence de mouvement du bras en tombant" +msgstr "Fréquence du mouvement du bras en tombant" #: src/settings_translation_file.cpp msgid "Fallback font" @@ -1753,6 +1761,8 @@ msgid "" "Fast movement (via use key).\n" "This requires the " msgstr "" +"Mouvement rapide (via la touche utiliser).\n" +"Nécessite le privilège \"fast\" sur un serveur. " #: src/settings_translation_file.cpp msgid "Field of view" @@ -1777,7 +1787,7 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" -"Les textures filtrées peuvent mélangées des valeurs RGB avec des zones 100% " +"Les textures filtrées peuvent mélanger des valeurs RGB avec des zones 100% " "transparentes.\n" "aboutissant parfois à des bords foncés ou clairs sur les textures " "transparentes.\n" @@ -1826,7 +1836,7 @@ msgstr "Niveau d'opacité de l'ombre de la police (entre 0 et 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." msgstr "" -"Décalage de l'ombre de la police, si 0 est paramétré alors l'ombre ne " +"Décalage de l'ombre de la police, si 0 est choisi alors l'ombre ne " "s'affichera pas." #: src/settings_translation_file.cpp @@ -1869,7 +1879,7 @@ msgstr "Plein écran" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "Bits par pixel en plein écran" +msgstr "Bits par pixel en mode plein écran" #: src/settings_translation_file.cpp msgid "Fullscreen mode." @@ -1877,7 +1887,7 @@ msgstr "Mode plein écran." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "Echelle de taille du GUI" +msgstr "Taille du GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter" @@ -1885,7 +1895,7 @@ msgstr "Filtrage des images du GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "Filtrage txr2img sur l'échelonnage du GUI" +msgstr "Filtrage txr2img du GUI" #: src/settings_translation_file.cpp msgid "Gamma" @@ -1903,7 +1913,7 @@ msgid "" "Flags starting with " msgstr "" "Attributs généraux de la génération de terrain.\n" -"Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent les " +"Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent leurs " "valeurs par défaut. " #: src/settings_translation_file.cpp @@ -1953,25 +1963,25 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" -"Largeur des aires de mapblocks qui sont sujets à être gardé actifs, établie " +"Largeur des aires de mapblocks qui sont sujets à être gardés actifs, établie " "en mapblocks (16^3 blocs).\n" "Les mapblocks actifs sont chargés et les ABMs y sont actifs." #: src/settings_translation_file.cpp msgid "" "How many blocks are flying in the wire simultaneously for the whole server." -msgstr "" +msgstr "Nombre maximum de mapblocks simultanés envoyés sur le serveur." #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." -msgstr "" +msgstr "Nombre maximum de mapblocks simultanés envoyés par client." #: src/settings_translation_file.cpp msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" -"Intervalle maximale jusqu'où le serveur va attendre avant de décharger les " +"Délais maximum jusqu'où le serveur va attendre avant de décharger les " "mapblocks inactifs.\n" "Une valeur plus grande est plus confortable, mais utilise davantage de " "mémoire." @@ -1993,13 +2003,13 @@ msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" -"Si le nombre d'images par seconde veut aller au-delà de cette valeur, il est " -"limité\n" +"Si le nombre d'images par seconde (FPS) veut aller au-delà de cette valeur, " +"il est limité\n" "pour ne pas gaspiller inutilement les ressources du processeur." #: src/settings_translation_file.cpp msgid "If disabled " -msgstr "" +msgstr "Si désactivé " #: src/settings_translation_file.cpp msgid "" @@ -2007,10 +2017,12 @@ msgid "" "nodes.\n" "This requires the " msgstr "" +"Si activé avec le mode vol, le joueur sera capable de traverser les blocs " +"solides. " #: src/settings_translation_file.cpp msgid "If enabled, " -msgstr "" +msgstr "Si activé, " #: src/settings_translation_file.cpp msgid "" @@ -2022,14 +2034,14 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "Si activé, ceci désactive la détection anti-triche en multijoueur." +msgstr "Si activé, cela désactive la détection anti-triche en multijoueur." #: src/settings_translation_file.cpp msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" -"Si activé, les données invalides du monde ne causeront l'interruption du " +"Si activé, les données invalides du monde ne causeront pas l'interruption du " "serveur.\n" "Activer seulement si vous sachez ce que vous faites." @@ -2051,8 +2063,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." -msgstr "" -"Si établi, les joueurs vont toujours réapparaître aux coordonnées indiquées." +msgstr "Détermine les coordonnées où les joueurs vont toujours réapparaître." #: src/settings_translation_file.cpp msgid "Ignore world errors" @@ -2060,7 +2071,7 @@ msgstr "Ignorer les erreurs du monde" #: src/settings_translation_file.cpp msgid "In-Game" -msgstr "En jeu" +msgstr "Dans le jeu" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -2094,7 +2105,7 @@ msgstr "Inverser les mouvements verticaux de la souris." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "Durée d'apparition des items jetés" +msgstr "Durée de vie des items abandonnés" #: src/settings_translation_file.cpp msgid "Jump key" @@ -2376,7 +2387,7 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche pour afficher/enlever la brume.\n" +"Touche pour afficher/cacher la brume.\n" "Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" "5e3da1b0edf72eb3" @@ -2421,7 +2432,7 @@ msgid "" "- Opaque: disable transparency" msgstr "" "Apparence des feuilles d'arbres :\n" -"- Détaillée : tous les faces sont visibles\n" +"- Détaillée : toutes les faces sont visibles\n" "- Simple : seulement les faces externes sont visibles\n" "- Opaque : désactive la transparence entre les feuilles" @@ -2457,11 +2468,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "Limite de files émergentes sur le disque" +msgstr "Limite des files émergentes sur le disque" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "Limite de files émergentes à générer" +msgstr "Limite des files émergentes à générer" #: src/settings_translation_file.cpp msgid "" @@ -2487,11 +2498,11 @@ msgstr "Régularité de la fluidité des liquides" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "Itérations maximum sur la transformation des liquides" +msgstr "Itérations maximum pendant la transformation des liquides" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" -msgstr "Délais de nettoyage d'une file" +msgstr "Délais de nettoyage d'une file de liquide" #: src/settings_translation_file.cpp msgid "Liquid sink" @@ -2499,11 +2510,11 @@ msgstr "Facteur d'écoulement des liquides" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "Intervalle entre mise-à-jour des liquides en secondes." +msgstr "Intervalle de mise-à-jour des liquides en secondes." #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "Intervalle entre mise-à-jour des liquides" +msgstr "Intervalle de mise-à-jour des liquides" #: src/settings_translation_file.cpp msgid "Main menu game manager" @@ -2543,6 +2554,12 @@ msgid "" "default.\n" "Flags starting with " msgstr "" +"Attributs spécifiques à Mapgen V6.\n" +"Quand les terrains neigeux sont activés, les jungles sont activés et les " +"drapeaux jungle est ignoré.\n" +"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " +"défaut.\n" +"Les drapeaux commençant par \"non\" sont désactivés. " #: src/settings_translation_file.cpp msgid "" @@ -2552,10 +2569,15 @@ msgid "" "default.\n" "Flags starting with " msgstr "" +"Attributs de terrain spécifiques à Mapgen V7.\n" +"'ridges' sont les rivières.\n" +"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " +"défaut.\n" +"Les drapeaux commençant par \"non\" sont désactivés. " #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "Limites de la génération de terrain" +msgstr "Limites de génération du terrain" #: src/settings_translation_file.cpp msgid "Map save interval" @@ -2563,7 +2585,7 @@ msgstr "Intervalle de sauvegarde de la carte" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "Limite de mapblocks" +msgstr "Limite des mapblocks" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" @@ -2611,7 +2633,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "" +msgstr "Mapgen V5 : paramètres de facteur de dispersion" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" @@ -2619,7 +2641,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "" +msgstr "Mapgen V5 : paramètres de dispersion de hauteur" #: src/settings_translation_file.cpp msgid "Mapgen v6" @@ -2627,7 +2649,7 @@ msgstr "Mapgen V6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion des arbres à pommes" +msgstr "Mapgen V6 : paramètres de dispersion des pommiers" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" @@ -2671,7 +2693,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion de l'altitude du terrain" +msgstr "Mapgen V6 : paramètres de dispersion de l'altitude" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" @@ -2715,15 +2737,15 @@ msgstr "Mapgen V7 : paramètres de dispersion des montagnes" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion des crêtes" +msgstr "Mapgen V7 : paramètres de dispersion des rivières" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion des crêtes de rivières" +msgstr "Mapgen V7 : paramètres de dispersion de l'eau des rivières" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion de l'altitude de terrain" +msgstr "Mapgen V7 : paramètres de dispersion de l'altitude" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" @@ -2751,7 +2773,7 @@ msgstr "Maximum d'extra-mapblocks par clearobjects" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" -msgstr "Nombre maximum de paquets par itération" +msgstr "Paquets maximum par itération" #: src/settings_translation_file.cpp msgid "Maximum FPS" @@ -2763,7 +2785,7 @@ msgstr "FPS maximum quand le jeu est en pause." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "Maximum de mapblocks chargés de force" +msgstr "Mapblocks maximum chargés de force" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" @@ -2820,7 +2842,7 @@ msgstr "Nombre maximum de joueurs qui peuvent être connectés en même temps." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "Nombre maximum d'objets sauvegardés dans un mapblock (= 16^3 blocs)." +msgstr "Nombre maximum d'objets sauvegardés dans un mapblock (16^3 blocs)." #: src/settings_translation_file.cpp msgid "" @@ -2832,17 +2854,17 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "Nombre maximum de mapblocks simultanés envoyé par client" +msgstr "Nombre maximum de mapblocks simultanés envoyés par client" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "Nombre maximum total de mapblocks simultanés envoyé" +msgstr "Nombre maximum total de mapblocks simultanés envoyés" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" -"Délais maximal de temps de téléchargement d'un fichier (ex.: un mod), établi " -"en millisecondes." +"Délais maximum de téléchargement d'un fichier (ex.: un mod), établi en " +"millisecondes." #: src/settings_translation_file.cpp msgid "Maximum users" @@ -3111,6 +3133,8 @@ msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the " msgstr "" +"Le joueur est capable de voler sans être affecté par la gravité.\n" +"Nécessite le privilège \"fly\" sur un serveur. " #: src/settings_translation_file.cpp msgid "Player name" From d7d280b407ce1b7d07a77f65de37b0ff6695029a Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 27 Oct 2015 20:56:50 +0100 Subject: [PATCH 033/531] Translated using Weblate (German) Currently translated at 98.8% (744 of 753 strings) --- po/de/minetest.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index be260d6d..4065440b 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-27 00:27+0200\n" -"Last-Translator: Jan Zabel \n" +"PO-Revision-Date: 2015-10-27 20:56+0200\n" +"Last-Translator: Wuzzy \n" "Language-Team: German " "\n" "Language: de\n" @@ -903,9 +903,8 @@ msgid "Convert" msgstr "Convert" #: src/keycode.cpp -#, fuzzy msgid "CrSel" -msgstr "Cursorauswahl" +msgstr "CrSel" #: src/keycode.cpp msgid "Down" From 2797c6c4507c62d8b05f193e42bcd0f9022d9f23 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:45:42 +0100 Subject: [PATCH 034/531] Translated using Weblate (Indonesian) Currently translated at 40.2% (303 of 753 strings) --- po/id/minetest.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/id/minetest.po b/po/id/minetest.po index 37d56fdf..97be3dd7 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -8,9 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-25 10:46+0200\n" -"Last-Translator: Muhammad Rifqi Priyo Susanto " -"\n" +"PO-Revision-Date: 2015-10-27 16:45+0200\n" +"Last-Translator: PilzAdam \n" "Language-Team: Indonesian " "\n" "Language: id\n" @@ -604,7 +603,7 @@ msgstr "Jalur dunia yang diberikan tidak ada: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "no" #: src/game.cpp msgid "" From a7874a283c93d920983e68eef56ae0a0593647cf Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:45:33 +0100 Subject: [PATCH 035/531] Translated using Weblate (Italian) Currently translated at 28.2% (213 of 753 strings) --- po/it/minetest.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index e8d80539..fcba0b6c 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-08-24 20:44+0200\n" -"Last-Translator: betacentury \n" -"Language-Team: Italian \n" +"PO-Revision-Date: 2015-10-27 16:45+0200\n" +"Last-Translator: PilzAdam \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -617,7 +617,7 @@ msgstr "Il percorso del mondo fornito non esiste: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "no" #: src/game.cpp msgid "" From 78bf13663fb492780a57fc43eb3612aaef896de0 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:46:51 +0100 Subject: [PATCH 036/531] Translated using Weblate (Portuguese (Brazil)) Currently translated at 26.4% (199 of 753 strings) --- po/pt_BR/minetest.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index b5e5f822..aebaee97 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-15 04:11+0200\n" -"Last-Translator: Leonardo \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2015-10-27 16:46+0200\n" +"Last-Translator: PilzAdam \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -614,7 +614,7 @@ msgstr "" #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "no" #: src/game.cpp msgid "" From 44ee97a1bbd436804ef8bfafb8f492f9d8cefef1 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:46:32 +0100 Subject: [PATCH 037/531] Translated using Weblate (Romanian) Currently translated at 25.8% (195 of 753 strings) --- po/ro/minetest.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/ro/minetest.po b/po/ro/minetest.po index 66dc1885..1075e556 100644 --- a/po/ro/minetest.po +++ b/po/ro/minetest.po @@ -8,16 +8,17 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2013-12-18 21:44+0200\n" -"Last-Translator: King Artur \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2015-10-27 16:46+0200\n" +"Last-Translator: PilzAdam \n" +"Language-Team: Romanian " +"\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -610,7 +611,7 @@ msgstr "" #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "lipsă_tip_font" +msgstr "no" #: src/game.cpp msgid "" From cf9351e07d5fe6e11b7f821b4507994d7de51b82 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 27 Oct 2015 19:39:27 +0100 Subject: [PATCH 038/531] Translated using Weblate (Spanish) Currently translated at 32.9% (248 of 753 strings) --- po/es/minetest.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index e9a547d7..489a30eb 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-27 16:46+0200\n" -"Last-Translator: PilzAdam \n" +"PO-Revision-Date: 2015-10-27 19:39+0200\n" +"Last-Translator: ShadowNinja \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -433,7 +433,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Navegar" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -446,7 +446,7 @@ msgstr "Desactivar paquete" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Editar" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -460,9 +460,8 @@ msgid "" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" -msgstr "Juego" +msgstr "Juegos" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." From f1d19e7358b033e313ed056a3ff84d8763433cb4 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 27 Oct 2015 16:46:20 +0100 Subject: [PATCH 039/531] Translated using Weblate (Turkish) Currently translated at 33.0% (249 of 753 strings) --- po/tr/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr/minetest.po b/po/tr/minetest.po index b1055dc2..6f4a237b 100644 --- a/po/tr/minetest.po +++ b/po/tr/minetest.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 0.1.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 21:06+0200\n" -"Last-Translator: Mahmut Elmas \n" +"PO-Revision-Date: 2015-10-27 16:46+0200\n" +"Last-Translator: PilzAdam \n" "Language-Team: Turkish " "\n" "Language: tr\n" @@ -597,7 +597,7 @@ msgstr "Belirtilen dünya konumu yok:" #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "no" #: src/game.cpp msgid "" From d6a91b51729d2ee8b4bc112c17aa4072b50dc6f7 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Wed, 28 Oct 2015 00:08:37 +0100 Subject: [PATCH 040/531] Translated using Weblate (French) Currently translated at 98.2% (740 of 753 strings) --- po/fr/minetest.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index d4e98878..179e785f 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-27 21:53+0200\n" +"PO-Revision-Date: 2015-10-28 00:08+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -599,7 +599,7 @@ msgstr "Le chemin du monde spécifié n'existe pas : " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "yes" #: src/game.cpp msgid "" From 23321beb454dfc86a6632428006edc7a66af1ee7 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Wed, 28 Oct 2015 12:51:26 +0100 Subject: [PATCH 041/531] Translated using Weblate (French) Currently translated at 100.0% (753 of 753 strings) --- po/fr/minetest.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 179e785f..9339dc38 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-28 00:08+0200\n" +"PO-Revision-Date: 2015-10-28 12:51+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -37,11 +37,11 @@ msgstr "OK" #: builtin/fstk/ui.lua msgid "Reconnect" -msgstr "Rejoindre" +msgstr "Se reconnecter" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "Le serveur a demandé une re-connexion :" +msgstr "Le serveur souhaite rétablir une connexion :" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -101,7 +101,7 @@ msgid "" msgstr "" "Échec du chargement du mod \"$1\" car il contient des caractères non-" "autorisés.\n" -"Seulement les caractères [a-z0-9_] sont autorisés." +"Seulement les caractères alphanumériques [a-z0-9_] sont autorisés." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -1157,8 +1157,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" -"0 = occlusion parallaxe (plus rapide, mais moins détaillé).\n" -"1 = relief mapping (plus lent, mais plus détaillé)." +"0 = occlusion parallaxe avec des informations de pente (plus rapide).\n" +"1 = cartographie en relief (plus lent, plus précis)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1981,8 +1981,8 @@ msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" -"Délais maximum jusqu'où le serveur va attendre avant de décharger les " -"mapblocks inactifs.\n" +"Délais maximum jusqu'où le serveur va attendre avant de purger les mapblocks " +"inactifs.\n" "Une valeur plus grande est plus confortable, mais utilise davantage de " "mémoire." @@ -2605,7 +2605,7 @@ msgstr "Mapgen : paramètres de dispersion de l'humidité" #: src/settings_translation_file.cpp msgid "Mapgen debug" -msgstr "Débogage de génération de terrain" +msgstr "Débogage de la génération du terrain" #: src/settings_translation_file.cpp msgid "Mapgen flags" @@ -2625,11 +2625,11 @@ msgstr "Mapgen V5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "" +msgstr "Mapgen V5 : paramètres de dispersion cave1" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "" +msgstr "Mapgen V5 : paramètre de dispersion cave2" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" @@ -2637,7 +2637,7 @@ msgstr "Mapgen V5 : paramètres de facteur de dispersion" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "" +msgstr "Mapgen V5 : paramètres de bruit sur la profondeur" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" @@ -2677,7 +2677,7 @@ msgstr "Mapgen V6 : drapeaux" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de sélection de la hauteur de dispersion" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" @@ -2689,7 +2689,7 @@ msgstr "Mapgen V6 : paramètres de dispersion de la vase" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion des pentes" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" @@ -2697,7 +2697,7 @@ msgstr "Mapgen V6 : paramètres de dispersion de l'altitude" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "" +msgstr "Mapgen V6 : paramètres de dispersion du terrain de base" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" @@ -2709,15 +2709,15 @@ msgstr "Mapgen V7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de dispersion cave1" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de dispersion cave2" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de bruit sur la profondeur" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" @@ -2725,11 +2725,11 @@ msgstr "Mapgen V7 : drapeaux" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de sélection de la hauteur du bruit" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres de hauteur du bruit des montagnes" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" @@ -2749,11 +2749,11 @@ msgstr "Mapgen V7 : paramètres de dispersion de l'altitude" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres du bruit du terrain de base" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "" +msgstr "Mapgen V7 : paramètres du bruit de la persistance du terrain" #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -3597,7 +3597,7 @@ msgstr "Distance de transfert du joueur illimitée" #: src/settings_translation_file.cpp msgid "Unload unused server data" -msgstr "Décharger les données de serveur inutiles" +msgstr "Purger les données de serveur inutiles" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." From 1b0883c754a371774e4ee9e8a0bef7265336cefc Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Wed, 28 Oct 2015 12:55:41 +0100 Subject: [PATCH 042/531] Translated using Weblate (French) Currently translated at 100.0% (753 of 753 strings) --- po/fr/minetest.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 9339dc38..1420ec84 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-28 12:51+0200\n" +"PO-Revision-Date: 2015-10-28 12:55+0200\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -2593,7 +2593,7 @@ msgstr "Délais d'interruption du déchargement des mapblocks" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "Mapgen : paramètres de dispersion de la température" +msgstr "Mapgen : paramètres de bruit de la température" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" @@ -2601,7 +2601,7 @@ msgstr "Mapgen : paramètres de mélange de l'humidité" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "Mapgen : paramètres de dispersion de l'humidité" +msgstr "Mapgen : paramètres de bruit de l'humidité" #: src/settings_translation_file.cpp msgid "Mapgen debug" @@ -2625,11 +2625,11 @@ msgstr "Mapgen V5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "Mapgen V5 : paramètres de dispersion cave1" +msgstr "Mapgen V5 : paramètres de bruit cave1" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "Mapgen V5 : paramètre de dispersion cave2" +msgstr "Mapgen V5 : paramètre de bruit cave2" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" @@ -2641,7 +2641,7 @@ msgstr "Mapgen V5 : paramètres de bruit sur la profondeur" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "Mapgen V5 : paramètres de dispersion de hauteur" +msgstr "Mapgen V5 : paramètres de bruit de la hauteur" #: src/settings_translation_file.cpp msgid "Mapgen v6" @@ -2649,7 +2649,7 @@ msgstr "Mapgen V6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion des pommiers" +msgstr "Mapgen V6 : paramètres de bruit des pommiers" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" @@ -2657,15 +2657,15 @@ msgstr "Mapgen V6 : fréquence des plages" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion des plages" +msgstr "Mapgen V6 : paramètres de bruit des plages" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion des biomes" +msgstr "Mapgen V6 : paramètres de bruit des biomes" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion des caves" +msgstr "Mapgen V6 : paramètres de bruit des caves" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" @@ -2677,31 +2677,31 @@ msgstr "Mapgen V6 : drapeaux" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "Mapgen V6 : paramètres de sélection de la hauteur de dispersion" +msgstr "Mapgen V6 : paramètres de sélection de la hauteur de bruit" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion de l'humidité" +msgstr "Mapgen V6 : paramètres de bruit de l'humidité" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion de la vase" +msgstr "Mapgen V6 : paramètres de bruit de la vase" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion des pentes" +msgstr "Mapgen V6 : paramètres de bruit des pentes" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion de l'altitude" +msgstr "Mapgen V6 : paramètres de bruit de l'altitude du terrain" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion du terrain de base" +msgstr "Mapgen V6 : paramètres de bruit du terrain de base" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "Mapgen V6 : paramètres de dispersion des arbres" +msgstr "Mapgen V6 : paramètres de bruit des arbres" #: src/settings_translation_file.cpp msgid "Mapgen v7" @@ -2709,11 +2709,11 @@ msgstr "Mapgen V7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion cave1" +msgstr "Mapgen V7 : paramètres de bruit cave1" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion cave2" +msgstr "Mapgen V7 : paramètres de bruit cave2" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" @@ -2733,19 +2733,19 @@ msgstr "Mapgen V7 : paramètres de hauteur du bruit des montagnes" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion des montagnes" +msgstr "Mapgen V7 : paramètres de bruit des montagnes" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion des rivières" +msgstr "Mapgen V7 : paramètres de bruit des rivières" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion de l'eau des rivières" +msgstr "Mapgen V7 : paramètres de bruit de l'eau des rivières" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "Mapgen V7 : paramètres de dispersion de l'altitude" +msgstr "Mapgen V7 : paramètres de bruit de l'altitude du terrain" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" From 80dd4086ee39656498ef72cfff52255c022e8bfb Mon Sep 17 00:00:00 2001 From: "Maksim D. Gamarnik" Date: Fri, 30 Oct 2015 21:51:46 +0100 Subject: [PATCH 043/531] Translated using Weblate (Russian) Currently translated at 32.2% (243 of 753 strings) --- po/ru/minetest.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 822b9ec7..c477db2e 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-26 13:24+0200\n" -"Last-Translator: Pavel Sokolov \n" +"PO-Revision-Date: 2015-10-30 21:51+0200\n" +"Last-Translator: Maksim D. Gamarnik \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -37,9 +37,8 @@ msgid "Ok" msgstr "OK" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Подключиться" +msgstr "Переподключиться" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" From d89aa09b7094d22bd48436a68ac30283a4087601 Mon Sep 17 00:00:00 2001 From: Pavel Sokolov Date: Fri, 30 Oct 2015 21:53:53 +0100 Subject: [PATCH 044/531] Translated using Weblate (Russian) Currently translated at 32.6% (246 of 753 strings) --- po/ru/minetest.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index c477db2e..a891fce5 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-30 21:51+0200\n" -"Last-Translator: Maksim D. Gamarnik \n" +"PO-Revision-Date: 2015-10-30 21:53+0200\n" +"Last-Translator: Pavel Sokolov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -42,7 +42,7 @@ msgstr "Переподключиться" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Сервер запросил повторное соединение:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -50,7 +50,7 @@ msgstr "Загрузка..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Несоответствие версии протокола." #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " @@ -58,7 +58,7 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Сервер поддерживает версии протокола между $1 и $2." #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." From 94da70a544fafa6445ee0a7492cd04f4c7b4b795 Mon Sep 17 00:00:00 2001 From: hybriddog Date: Fri, 30 Oct 2015 19:48:30 +0100 Subject: [PATCH 045/531] Translated using Weblate (German) Currently translated at 99.3% (748 of 753 strings) --- po/de/minetest.po | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 4065440b..6521ea20 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-27 20:56+0200\n" -"Last-Translator: Wuzzy \n" +"PO-Revision-Date: 2015-10-30 19:48+0200\n" +"Last-Translator: hybriddog \n" "Language-Team: German " "\n" "Language: de\n" @@ -420,8 +420,9 @@ msgid "Start Game" msgstr "Spiel starten" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "\"" -msgstr "" +msgstr "”" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -1609,7 +1610,7 @@ msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben." #: src/settings_translation_file.cpp msgid "Enable a bit lower water surface, so it doesn't " -msgstr "" +msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht " #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1769,6 +1770,8 @@ msgid "" "Fast movement (via use key).\n" "This requires the " msgstr "" +"Schnelles Laufen (aux1 Taste).\n" +"Das benötigt das " #: src/settings_translation_file.cpp msgid "Field of view" @@ -2020,11 +2023,15 @@ msgid "If disabled " msgstr "Wenn deaktiviert " #: src/settings_translation_file.cpp +#, fuzzy msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" "This requires the " msgstr "" +"Falls es aktiviert ist, kann der Spieler im Flugmodus durch solide Blöcke " +"fliegen.\n" +"Es benötigt den " #: src/settings_translation_file.cpp msgid "If enabled, " @@ -2571,6 +2578,7 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen V7.\n" "'ridges' are the rivers.\n" @@ -2578,6 +2586,11 @@ msgid "" "default.\n" "Flags starting with " msgstr "" +"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" +"'ridges' sind die Flüsse.\n" +"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " +"zugewiesen.\n" +"Flags, die mit starten " #: src/settings_translation_file.cpp msgid "Map generation limit" @@ -2844,9 +2857,8 @@ msgstr "" "anstreben." #: src/settings_translation_file.cpp -#, fuzzy msgid "Maximum number of players that can connect simultaneously." -msgstr "Anzahl der Spieler, die sich gleichzeitig verbinden können." +msgstr "Maximale Anzahl der Spieler, die sich simultan verbinden können." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." @@ -3151,6 +3163,8 @@ msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the " msgstr "" +"Der Spieler kann unabhängig von der Schwerkraft fliegen.\n" +"Das benötigt die " #: src/settings_translation_file.cpp msgid "Player name" From 2240b1d8b8c75ad0585b332f38396718635ee28c Mon Sep 17 00:00:00 2001 From: "Maksim D. Gamarnik" Date: Fri, 30 Oct 2015 22:12:03 +0100 Subject: [PATCH 046/531] Translated using Weblate (Russian) Currently translated at 39.7% (299 of 753 strings) --- po/ru/minetest.po | 126 ++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 72 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index a891fce5..ac5eabb4 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-30 21:53+0200\n" -"Last-Translator: Pavel Sokolov \n" +"PO-Revision-Date: 2015-10-30 22:12+0200\n" +"Last-Translator: Maksim D. Gamarnik \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -67,7 +67,7 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Поддерживается только протокол версии $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." @@ -416,7 +416,7 @@ msgstr "Начать игру" #: builtin/mainmenu/tab_settings.lua msgid "\"" -msgstr "" +msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -431,18 +431,16 @@ msgid "Change keys" msgstr "Смена управления" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Отключить мультиплеер" +msgstr "Отключить" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Редактировать" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "включено" +msgstr "Включено" #: builtin/mainmenu/tab_settings.lua msgid "" @@ -468,7 +466,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Пожалуйста, введите корректное число." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " @@ -476,7 +474,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Восстановить по-умолчанию" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -489,7 +487,7 @@ msgstr "Настройки" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Отобразить технические названия" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." @@ -525,7 +523,7 @@ msgstr "Описание отсутствует" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Ничего" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -536,9 +534,8 @@ msgid "Texturepacks" msgstr "Пакеты текстур" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Ошибка соединения (таймаут?)" +msgstr "Тайм-аут соединения." #: src/client.cpp msgid "Done!" @@ -1160,13 +1157,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "3D облака" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "3D режим" #: src/settings_translation_file.cpp msgid "" @@ -1187,11 +1183,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "Сообщение, которое будет отображаться для всех при падении сервера." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" +msgstr "Сообщение, которое будет показано всем при отключении сервера." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1234,7 +1230,7 @@ msgstr "Дополнительно" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Всегда включен полёт и ускорение" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" @@ -1247,7 +1243,7 @@ msgstr "Анизотропная фильтрация" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "О сервере" #: src/settings_translation_file.cpp msgid "" @@ -1262,7 +1258,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Автоматически добавлять в список серверов." #: src/settings_translation_file.cpp #, fuzzy @@ -1309,9 +1305,8 @@ msgid "Camera update toggle key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Смена управления" +msgstr "Кнопка чата" #: src/settings_translation_file.cpp #, fuzzy @@ -1320,7 +1315,7 @@ msgstr "Смена управления" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Размер чанка" #: src/settings_translation_file.cpp #, fuzzy @@ -1338,7 +1333,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Клиент и Сервер" #: src/settings_translation_file.cpp msgid "Climbing speed" @@ -1346,29 +1341,27 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Высота облаков" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Радиус облаков" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D облака" +msgstr "Облака" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Главное меню" +msgstr "Облака в меню" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Цветной туман" #: src/settings_translation_file.cpp msgid "" @@ -1419,9 +1412,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Ctrl" +msgstr "Управление" #: src/settings_translation_file.cpp msgid "" @@ -1438,7 +1430,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Сообщение при падении" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1462,12 +1454,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Разрешить увечья" +msgstr "Увечья" #: src/settings_translation_file.cpp msgid "Debug info toggle key" @@ -1475,7 +1466,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Отладочный уровень" #: src/settings_translation_file.cpp msgid "Dedicated server step" @@ -1486,9 +1477,8 @@ msgid "Default acceleration" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "Редактировать" +msgstr "Стандартная игра" #: src/settings_translation_file.cpp msgid "" @@ -1497,13 +1487,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Новый пароль" +msgstr "Стандартный пароль" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Стандартные права" #: src/settings_translation_file.cpp msgid "" @@ -1552,31 +1541,28 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Включить частицы" +msgstr "Отключить анти-чит" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Запретить пустой пароль" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "Двойной прыжок = летать" +msgstr "Полет по двойному прыжку" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Двойной прыжок = летать" +msgstr "Двойное нажатие на прыжок включает режим полёта." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Кнопка выброса блока" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." @@ -1587,9 +1573,8 @@ msgid "Enable a bit lower water surface, so it doesn't " msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Онлайн-хранилище модов" +msgstr "Включить защиту модов" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." @@ -1646,9 +1631,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Разрешить увечья" +msgstr "Включить мини-карту." #: src/settings_translation_file.cpp msgid "" @@ -1670,7 +1654,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS во время паузы" #: src/settings_translation_file.cpp msgid "FSAA" @@ -1681,9 +1665,8 @@ msgid "Fall bobbing" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "no" +msgstr "Fallback шрифт" #: src/settings_translation_file.cpp msgid "Fallback font shadow" @@ -1695,11 +1678,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Fallback размер шрифта" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Клавиша ускорения" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" @@ -1721,11 +1704,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Поле зрения" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Поле зрения в градусах." #: src/settings_translation_file.cpp msgid "" @@ -1742,25 +1725,24 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Без фильтраций" +msgstr "Фильтрация" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Конкретное семя мира" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "" +msgstr "Кнопка полёта" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Полёт" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Туман" #: src/settings_translation_file.cpp msgid "Fog toggle key" @@ -1772,7 +1754,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Тень шрифта" #: src/settings_translation_file.cpp msgid "Font shadow alpha" @@ -3525,7 +3507,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "cURL тайм-аут" #~ msgid "Rendering:" #~ msgstr "Рендеринг:" From d048636576a61a3d06cbdf6b54c0fef9f59e4548 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Sat, 31 Oct 2015 14:59:14 +0100 Subject: [PATCH 047/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 46.7% (352 of 753 strings) --- po/zh_TW/minetest.po | 53 ++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index d4047d46..0b3717cb 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-27 16:45+0200\n" -"Last-Translator: PilzAdam \n" +"PO-Revision-Date: 2015-10-31 14:59+0200\n" +"Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) " "\n" "Language: zh_TW\n" @@ -53,11 +53,11 @@ msgstr "協定版本不符合。 " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "伺服器強制協定版本 $1。 " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "伺服器支援協定版本 $1 到 $2 " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -65,11 +65,11 @@ msgstr "嘗試重新啟用公共伺服器清單並檢查您的網際網路連線 #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "我們只支援協定版本 $1。" #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "我們支援協定版本 $1 到 $2。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -415,15 +415,15 @@ msgstr "開始遊戲" #: builtin/mainmenu/tab_settings.lua msgid "\"" -msgstr "" +msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "（這個設定沒有描述可用）" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "瀏覽" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -435,7 +435,7 @@ msgstr "已停用" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "編輯" #: builtin/mainmenu/tab_settings.lua msgid "Enabled" @@ -445,7 +445,7 @@ msgstr "已啟用" msgid "" "Format: , , (, , ), , " ", " -msgstr "" +msgstr "格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續性>" #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -453,27 +453,27 @@ msgstr "遊戲" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "選擇性的空隙度可以以一個逗號開頭附加。" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "請輸入逗號以分離各項旗標。" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "請輸入有效的整數。" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "請輸入有效的數字。" #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "可能的值為： " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "恢復預設值" #: builtin/mainmenu/tab_settings.lua msgid "Select path" @@ -485,15 +485,15 @@ msgstr "設定" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "顯示技術名稱" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "值必須大於 $1。" #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "值必須低於 $1。" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -1150,6 +1150,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = 包含斜率資訊的視差遮蔽（較快）。\n" +"1 = 替換貼圖（較慢，較準確）。" #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1157,7 +1159,7 @@ msgstr "3D 雲朵" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "3D 模式" #: src/settings_translation_file.cpp msgid "" @@ -1169,12 +1171,21 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"3D 支援。\n" +"目前已支援：\n" +"- 無：無 3D 輸出。\n" +"- 浮雕：青色／品紅色彩色 3D。\n" +"- 交錯的：基於偏振螢幕的奇／偶行支援。\n" +"- 頂底：將螢幕分離為頂部／底部。\n" +"- 一邊一個：將螢幕分離為一邊一個。" #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"新地圖的已選取種子，留空則為隨機。\n" +"當在主選單中建立新世界的時候將會被覆寫。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." From dbb46f4da44cb8d287b157abc309e14e9b08d451 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Mon, 2 Nov 2015 13:23:10 +0100 Subject: [PATCH 048/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 48.0% (362 of 753 strings) --- po/zh_TW/minetest.po | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 0b3717cb..2679a9d9 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-31 14:59+0200\n" +"PO-Revision-Date: 2015-11-02 13:23+0200\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) " "\n" @@ -1189,27 +1189,27 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "當伺服器當機時要顯示在所有客戶端上的訊息。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" +msgstr "當伺服器關機時要顯示在所有客戶端上的訊息。" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "發生佇列的絕對限制" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "在空氣中的加速" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "活動區塊範圍" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "活動目標發送範圍" #: src/settings_translation_file.cpp msgid "" @@ -1217,22 +1217,27 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"要連線到的地址。\n" +"把這個留空以啟動本機伺服器。\n" +"注意在主選單中的地址欄會覆寫這個設定。" #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "" +msgstr "調整您螢幕的 DPI 設定（並不只有 X11/Android）例如 4K 螢幕。" #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"調整亮度表的伽瑪編碼。較低的數值會較亮。\n" +"這個設定是給客戶端使用的，會被伺服器忽略。" #: src/settings_translation_file.cpp msgid "Advanced" -msgstr "" +msgstr "進階" #: src/settings_translation_file.cpp msgid "Always fly and fast" From 2203e2889dc1c20ff63c3822fe51f4f823843cf1 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Mon, 2 Nov 2015 15:04:08 +0100 Subject: [PATCH 049/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 56.3% (424 of 753 strings) --- po/zh_TW/minetest.po | 129 +++++++++++++++++++++++++------------------ 1 file changed, 74 insertions(+), 55 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 2679a9d9..105211d5 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-11-02 13:23+0200\n" -"Last-Translator: Jeff Huang \n" +"PO-Revision-Date: 2015-11-02 15:04+0200\n" +"Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) " "\n" "Language: zh_TW\n" @@ -1241,19 +1241,19 @@ msgstr "進階" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "總是啟用飛行與快速" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "環境遮蔽光" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" -msgstr "" +msgstr "各向異性過濾" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "公佈伺服器" #: src/settings_translation_file.cpp msgid "" @@ -1261,14 +1261,16 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"公佈到這個伺服器列表。\n" +"若您想要公佈您的 IPv6 地址，使用 serverlist_url = v6.servers.minetest.net。" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "詢問是否在當機後重新連線" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "自動回報到伺服器列表。" #: src/settings_translation_file.cpp msgid "Backward key" @@ -1276,7 +1278,7 @@ msgstr "後退鍵" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "基礎" #: src/settings_translation_file.cpp msgid "Bilinear filtering" @@ -1288,11 +1290,11 @@ msgstr "綁定地址" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "全螢幕模式中的位元／像素（又稱色彩深度）。" #: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "" +msgstr "在玩家內構建" #: src/settings_translation_file.cpp msgid "Bumpmapping" @@ -1300,15 +1302,15 @@ msgstr "映射貼圖" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "攝影機平滑" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "在電影模式中攝影機平滑" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "攝影機切換更新按鍵" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1320,7 +1322,7 @@ msgstr "聊天切換按鍵" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "方塊大小" #: src/settings_translation_file.cpp msgid "Cinematic mode" @@ -1332,23 +1334,23 @@ msgstr "電影模式按鍵" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "清除透明材質" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "客戶端與伺服器" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "攀爬速度" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "雲朵高度" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "雲朵範圍" #: src/settings_translation_file.cpp msgid "Clouds" @@ -1356,7 +1358,7 @@ msgstr "雲朵" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "雲朵是客戶端的特效。" #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1364,13 +1366,15 @@ msgstr "選單中的雲朵" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "彩色迷霧" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"受信任的 Mod 列表，以逗號分隔，其可存取不安全的\n" +"功能，即便 mod 安全性是（經由 request_insecure_environment()）。" #: src/settings_translation_file.cpp msgid "Command key" @@ -1386,7 +1390,7 @@ msgstr "連線至外部媒體伺服器" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "若節點支援則連接玻璃。" #: src/settings_translation_file.cpp msgid "Console alpha" @@ -1402,11 +1406,11 @@ msgstr "終端機按鍵" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "連續前進" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "連續前進移動（僅供測試使用）。" #: src/settings_translation_file.cpp msgid "Controls" @@ -1418,40 +1422,44 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"控制日／夜循環的長度。\n" +"範例：72 = 20分鐘，360 = 4分鐘，1 = 24小時，0 = 日／夜／一切保持不變。" #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen V6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"控制在 Mapgen V6 中的沙漠與沙灘大小。\n" +"當 snowbiomes 啟用時「mgv6_freq_desert」會被忽略。" #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "當機訊息" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "十字 alpha 值" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "十字 alpha 值（不透明，0 至 255間）。" #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "十字色彩" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "十字色彩 (R,G,B)。" #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "蹲伏速度" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp msgid "Damage" @@ -1459,29 +1467,31 @@ msgstr "傷害" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "除錯資訊切換按鍵" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "除錯記錄等級" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "專用伺服器步驟" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "預設加速" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "" +msgstr "預設遊戲" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"當建立新世界時的預設遊戲。\n" +"當從主選單建立世界時將會被覆寫。" #: src/settings_translation_file.cpp msgid "Default password" @@ -1489,53 +1499,57 @@ msgstr "預設密碼" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "預設特權" #: src/settings_translation_file.cpp msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"cURL 的預設逾時，以毫秒計算。\n" +"只會在與 cURL 一同編譯的情況下才會有影響。" #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"定義材質的採樣步驟。\n" +"較高的值會有較平滑的一般地圖。" #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." -msgstr "" +msgstr "定義玩家最大可傳送的距離，以方塊計（0 = 不限制）。" #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "顯示工具提示前的延遲，以毫秒計算。" #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "不推薦使用 Lua API 處理" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "遞減速度" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." -msgstr "" +msgstr "伺服器的描述，會在玩家加入時顯示，也會顯示在伺服器列表上。" #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "異步化方塊動畫" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" +msgstr "詳細的 mod 檔案資料。對 mod 開發者很有用。" #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "詳細的 mod 檔案" #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1543,11 +1557,11 @@ msgstr "停用反作弊" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "不允許空密碼" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "伺服器的域名，將會在伺服器列表中顯示。" #: src/settings_translation_file.cpp msgid "Double tap jump for fly" @@ -1559,37 +1573,39 @@ msgstr "輕擊兩次跳躍鍵以切換成飛行模式。" #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "丟棄物品鍵" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "轉儲 mapgen 的除錯資訊。" #: src/settings_translation_file.cpp msgid "Enable a bit lower water surface, so it doesn't " -msgstr "" +msgstr "啟用較低的水面，所以它不會 " #: src/settings_translation_file.cpp msgid "Enable mod security" -msgstr "" +msgstr "啟用 mod 安全性" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "啟用玩家傷害及瀕死。" #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "啟用隨機使用者輸入（僅供測試使用）。" #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" +msgstr "啟用節點選擇突顯（停用選取框）。" #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"啟用包含簡易環境光遮蔽的平滑光。\n" +"停用以取得速度或不同的外觀。" #: src/settings_translation_file.cpp msgid "" @@ -1599,6 +1615,9 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"啟用以讓舊的客戶端無法連線。\n" +"較舊的客戶端在這個意義上相容，它們不會在連線至\n" +"新伺服器時當掉，但它們可能會不支援一些您預期會有的新功能。" #: src/settings_translation_file.cpp msgid "" From 7a019c28b0091e734308abff8ddc605af1265a33 Mon Sep 17 00:00:00 2001 From: Onee Chan Date: Thu, 5 Nov 2015 04:46:35 +0100 Subject: [PATCH 050/531] Translated using Weblate (Japanese) Currently translated at 40.6% (306 of 753 strings) --- po/ja/minetest.po | 175 +++++++++++++++------------------------------- 1 file changed, 58 insertions(+), 117 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 2e1024d5..95597ea3 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,10 +3,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-05 08:20+0200\n" -"Last-Translator: Rui \n" -"Language-Team: Japanese \n" +"PO-Revision-Date: 2015-11-05 04:46+0000\n" +"Last-Translator: Onee Chan \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -477,9 +477,8 @@ msgid "Restore Default" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "選択キー" +msgstr "ファイルパスを選択" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -1156,14 +1155,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" -msgstr "3Dの雲" +msgstr "立体雲" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D mode" -msgstr "飛行モード" +msgstr "3Dモード" #: src/settings_translation_file.cpp msgid "" @@ -1261,18 +1258,16 @@ msgid "Automaticaly report to the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "後退" +msgstr "後キー" #: src/settings_translation_file.cpp msgid "Basic" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" -msgstr "バイリニアフィルタ" +msgstr "バイリニアフィルタリング" #: src/settings_translation_file.cpp #, fuzzy @@ -1304,14 +1299,12 @@ msgid "Camera update toggle key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "操作変更" +msgstr "チャットキー" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "操作変更" +msgstr "チャットトグルキー" #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1348,18 +1341,16 @@ msgid "Cloud radius" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3Dの雲" +msgstr "雲" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "メインメニュー" +msgstr "メニューに雲" #: src/settings_translation_file.cpp msgid "Colored fog" @@ -1372,9 +1363,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "コマンド" +msgstr "コマンドキー" #: src/settings_translation_file.cpp #, fuzzy @@ -1391,19 +1381,16 @@ msgid "Connects glass if supported by node." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "コンソール" +msgstr "コンソールアルファ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "コンソール" +msgstr "コンソール色" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "コンソール" +msgstr "コンソールキー" #: src/settings_translation_file.cpp msgid "Continuous forward" @@ -1414,9 +1401,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "コントロール" +msgstr "操作法" #: src/settings_translation_file.cpp msgid "" @@ -1460,9 +1446,8 @@ msgid "DPI" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "ダメージ有効" +msgstr "ダメージ" #: src/settings_translation_file.cpp msgid "Debug info toggle key" @@ -1491,9 +1476,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "新しいパスワード" +msgstr "既定パスワード" #: src/settings_translation_file.cpp msgid "Default privileges" @@ -1546,9 +1530,8 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "パーティクル有効化" +msgstr "対チート機関無効化" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" @@ -1559,7 +1542,6 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" msgstr "「ジャンプ」キー二回押しで飛行モード" @@ -1640,9 +1622,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "ダメージ有効" +msgstr "ミニマップを有効にする。" #: src/settings_translation_file.cpp msgid "" @@ -1675,9 +1656,8 @@ msgid "Fall bobbing" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "yes" +msgstr "フォールバックフォント" #: src/settings_translation_file.cpp msgid "Fallback font shadow" @@ -1736,18 +1716,16 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "フィルタ無し" +msgstr "フィルタリング" #: src/settings_translation_file.cpp msgid "Fixed map seed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fly key" -msgstr "飛行モード" +msgstr "飛行キー" #: src/settings_translation_file.cpp msgid "Flying" @@ -1786,9 +1764,8 @@ msgid "Font size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "前進" +msgstr "前キー" #: src/settings_translation_file.cpp msgid "Freetype fonts" @@ -1840,7 +1817,6 @@ msgid "Gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "ノーマルマップの生成" @@ -1893,7 +1869,7 @@ msgid "" "How large area of blocks are subject to the active block stuff, stated in " "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." -msgstr "" +msgstr "Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。" #: src/settings_translation_file.cpp msgid "" @@ -1929,9 +1905,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If disabled " -msgstr "無効化" +msgstr "無効化の場合 " #: src/settings_translation_file.cpp msgid "" @@ -1941,9 +1916,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If enabled, " -msgstr "有効化" +msgstr "有効化の場合 " #: src/settings_translation_file.cpp msgid "" @@ -2002,9 +1976,8 @@ msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "インベントリ" +msgstr "インベントリキー" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -2019,9 +1992,8 @@ msgid "Item entity TTL" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "ジャンプ" +msgstr "ジャンプキー" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2253,9 +2225,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "左メニュー" +msgstr "左キー" #: src/settings_translation_file.cpp msgid "" @@ -2327,12 +2298,11 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "Main menu mod manager" -msgstr "メインメニュー" +msgstr "メインメニューMod管理" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "メインメニュー" +msgstr "メインメニュースクリプト" #: src/settings_translation_file.cpp msgid "" @@ -2395,23 +2365,20 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "ワールドタイプ" +msgstr "マップ生成のデバグ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "ワールドタイプ" +msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "ワールドタイプ" +msgstr "マップ生成名" #: src/settings_translation_file.cpp #, fuzzy @@ -2645,7 +2612,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." -msgstr "" +msgstr "ファイルダウンロード (例: Modのダウンロード)の最大経過時間。" #: src/settings_translation_file.cpp msgid "Maximum users" @@ -2656,7 +2623,6 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" msgstr "メニュー" @@ -2696,9 +2662,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" -msgstr "バンプマッピング" +msgstr "ミップマッピング" #: src/settings_translation_file.cpp msgid "Mod profiling" @@ -2789,7 +2754,6 @@ msgid "Noclip key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" msgstr "ノードをハイライト" @@ -2842,7 +2806,6 @@ msgid "Parallax Occlusion" msgstr "視差遮蔽マッピング" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" msgstr "視差遮蔽マッピング" @@ -2862,9 +2825,8 @@ msgid "Parallax occlusion iterations" msgstr "視差遮蔽マッピング" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "視差遮蔽マッピング" +msgstr "視差遮蔽マッピングモード" #: src/settings_translation_file.cpp #, fuzzy @@ -2894,9 +2856,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "名前が長過ぎます。" +msgstr "プレイヤ名" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -2970,9 +2931,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "右メニュー" +msgstr "右キー" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3012,9 +2972,8 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Snapshot" +msgstr "スクリーンショット" #: src/settings_translation_file.cpp msgid "Screenshot folder" @@ -3046,39 +3005,32 @@ msgid "Server / Singleplayer" msgstr "シングルプレイ開始" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "サーバー" +msgstr "サーバーURL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "サーバーのポート" +msgstr "サーバーアドレス" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "サーバーのポート" +msgstr "サーバーポート" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "サーバー" +msgstr "サーバー名" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" -msgstr "サーバーのポート" +msgstr "サーバーポート" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "公開サーバーリスト" +msgstr "サーバーリストURL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "公開サーバーリスト" +msgstr "サーバーリストファイル" #: src/settings_translation_file.cpp msgid "" @@ -3134,9 +3086,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "滑らかな光" +msgstr "滑らかな照明" #: src/settings_translation_file.cpp msgid "" @@ -3153,9 +3104,8 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "スニーク" +msgstr "スニークキー" #: src/settings_translation_file.cpp msgid "Sound" @@ -3191,9 +3141,8 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "テクスチャ" +msgstr "テクスチャパス" #: src/settings_translation_file.cpp msgid "" @@ -3276,9 +3225,8 @@ msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" -msgstr "トリリニアフィルタ" +msgstr "トリリニアフィルタリング" #: src/settings_translation_file.cpp msgid "" @@ -3320,9 +3268,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "キー入力待ち" +msgstr "使用キー" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -3333,9 +3280,8 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "以前の開発者" +msgstr "Mod開発に便利。" #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3374,14 +3320,12 @@ msgid "Viewing range minimum" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "音量" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "揺れる葉" +msgstr "歩き速度" #: src/settings_translation_file.cpp msgid "Wanted FPS" @@ -3396,12 +3340,10 @@ msgid "Water surface level of the world." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "揺れる葉" +msgstr "揺れるノード" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" msgstr "揺れる葉" @@ -3411,7 +3353,6 @@ msgid "Waving plants" msgstr "揺れる草花" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "揺れる水" From a93b79d9bb629ff1af6ca8bdd01ebd393f888de9 Mon Sep 17 00:00:00 2001 From: Elia Argentieri Date: Fri, 6 Nov 2015 16:37:27 +0100 Subject: [PATCH 051/531] Translated using Weblate (Italian) Currently translated at 35.1% (265 of 753 strings) --- po/it/minetest.po | 137 ++++++++++++++++++++++++++++++---------------- 1 file changed, 90 insertions(+), 47 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index fcba0b6c..96881b25 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-27 16:45+0200\n" -"Last-Translator: PilzAdam \n" +"PO-Revision-Date: 2015-11-06 16:37+0000\n" +"Last-Translator: Elia Argentieri \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -29,7 +29,6 @@ msgid "An error occured:" msgstr "Si è verificato un errore:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Menù principale" @@ -38,13 +37,12 @@ msgid "Ok" msgstr "Ok" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Connettere" +msgstr "Riconnettiti" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Il server ha richiesto una riconnessione:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -52,27 +50,29 @@ msgstr "Caricamento..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "La versione dei protocolli non coincide. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Il server richiede la versione $1 del protocollo. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Il server supporta versioni del protocollo comprese fra $1 e $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Prova a riabilitare la lista dei server pubblici e controlla la tua " +"connessione ad Internet." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Supportiamo soltanto la versione $1 del protocollo." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Supportiamo soltanto versioni del protocollo comprese tra $1 e $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -101,6 +101,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Impossibile abilitare il modulo \"$1\" perché contiene caratteri non " +"permessi. Soltanto i caratteri [a-z0-9_] sono permessi." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -137,7 +139,7 @@ msgstr "Creare" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "Scarica un sottogioco, come minetest_game, da minetest.net" +msgstr "Scaricare un sottogioco, ad esempio minetest_game, da minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -164,6 +166,7 @@ msgstr "Seme casuale" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." msgstr "" +"Attenzione: il test di sviluppo minimale è pensato per gli sviluppatori." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -3247,10 +3250,12 @@ msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" +"Il tempo in secondi che intercorre tra pressioni ripetute del tasto destro " +"quando viene trattenuto il pulsante destro del mouse." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "" +msgstr "Questo font verrà utilizzato per alcune lingue." #: src/settings_translation_file.cpp msgid "" @@ -3264,11 +3269,13 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Time speed" -msgstr "" +msgstr "Velocità del tempo" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." msgstr "" +"Tempo impiegato dai client per rimuovere dati della mappa non utilizzati " +"dalla memoria." #: src/settings_translation_file.cpp msgid "" @@ -3277,19 +3284,22 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" +"Per ridurre il ritardo, i trasferimenti dei blocchi vengono rallentati " +"quando un giocatore sta costruendo qualcosa.\n" +"Questo determina per quanto vengono rallentati dopo aver posizionato o " +"rimosso un nodo." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "Tasto per variare la visuale" #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" -msgstr "Filtro Tri-Lineare" +msgstr "Filtro trilineare" #: src/settings_translation_file.cpp msgid "" @@ -3300,15 +3310,17 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "" +msgstr "Moduli fidati" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." msgstr "" +"URL che punta alla lista di server mostrata nella scheda Multigiocatore." #: src/settings_translation_file.cpp +#, fuzzy msgid "Unlimited player transfer distance" -msgstr "" +msgstr "Distanza illimitata di visualizzazione dei giocatori" #: src/settings_translation_file.cpp msgid "Unload unused server data" @@ -3316,32 +3328,34 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "Dai alle nuvole un aspetto 3D invece che piatto." #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." -msgstr "" +msgstr "Usa un'animazione di nuvole come sfondo del menù principale." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." msgstr "" +"Usa un filtro anisotropico per migliorare le texture viste da un angolo." #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." -msgstr "" +msgstr "Usa un filtro bilineare quando si scalano le texture." #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "premere il tasto" +msgstr "Tasto Usa" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." msgstr "" +"Usa il mip mapping per ridurre le texture. Potrebbe decrementare leggermente " +"le prestazioni." #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." -msgstr "" +msgstr "Usa un filtro trilineare quando si scalano le texture." #: src/settings_translation_file.cpp #, fuzzy @@ -3350,19 +3364,19 @@ msgstr "Sviluppatori principali" #: src/settings_translation_file.cpp msgid "V-Sync" -msgstr "" +msgstr "Sincronia verticale" #: src/settings_translation_file.cpp msgid "Vertical initial window size." -msgstr "" +msgstr "Dimensione iniziale verticale della finestra." #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "" +msgstr "Dimensione iniziale orizzontale della finestra." #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "Driver del video" #: src/settings_translation_file.cpp msgid "View bobbing" @@ -3370,19 +3384,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "" +msgstr "Tasto per decrementare la visibilità" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "" +msgstr "Tasto per incrementare la visibilità" #: src/settings_translation_file.cpp msgid "Viewing range maximum" -msgstr "" +msgstr "Distanza massima di visibilità" #: src/settings_translation_file.cpp msgid "Viewing range minimum" -msgstr "" +msgstr "Distanza minima di visibilità" #: src/settings_translation_file.cpp #, fuzzy @@ -3391,19 +3405,19 @@ msgstr "Volume del suono" #: src/settings_translation_file.cpp msgid "Walking speed" -msgstr "" +msgstr "Velocità di movimento" #: src/settings_translation_file.cpp msgid "Wanted FPS" -msgstr "" +msgstr "FPS desiderati" #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "Livello dell'acqua" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "Livello della superficie dell'acqua del mondo." #: src/settings_translation_file.cpp #, fuzzy @@ -3411,29 +3425,28 @@ msgid "Waving Nodes" msgstr "Inizializzazione nodi" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" -msgstr "Alberi migliori" +msgstr "Foglie ondeggianti" #: src/settings_translation_file.cpp msgid "Waving plants" -msgstr "" +msgstr "Piante ondeggianti" #: src/settings_translation_file.cpp msgid "Waving water" -msgstr "" +msgstr "Acqua ondeggiante" #: src/settings_translation_file.cpp msgid "Waving water height" -msgstr "" +msgstr "Altezza delle onde dell'acqua" #: src/settings_translation_file.cpp msgid "Waving water length" -msgstr "" +msgstr "Lunghezza delle onde dell'acqua" #: src/settings_translation_file.cpp msgid "Waving water speed" -msgstr "" +msgstr "Velocità dell'ondeggiamento dell'acqua" #: src/settings_translation_file.cpp msgid "" @@ -3451,6 +3464,7 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" "can be blurred, so automatically upscale them with nearest-neighbor\n" @@ -3460,6 +3474,17 @@ msgid "" "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" "enabled." msgstr "" +"Quando si usano filtri bilineari/trilineari/anisotropici, le superfici a " +"bassa\n" +"risoluzione possono apparire sfocate, quindi ingrandiscile automaticamente\n" +"con l'interpolazione nearest-neighbor per preservare pixel nitidi. Questo\n" +"imposta la minima dimensione delle texture per le texture ingrandite; " +"valori\n" +"più elevati appaiono più nitidi, ma richiedono più memoria. Sono\n" +"raccomandate potenze di 2. Impostare questo più alto di 1 potrebbe non\n" +"avere un effetto visibile a meno che un filtro bilineari/trilineari/" +"anisotropici\n" +"sia abilitato." #: src/settings_translation_file.cpp msgid "" @@ -3470,6 +3495,14 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"Dove fermare il generatore di mappe.\n" +"Nota bene:\n" +"- limitato a 31000 (valori più alti non hanno effetto).\n" +"- il generatore di mappe funziona con gruppi di nodi da 80x80x80 (5x5x5 " +"MapBlocks).\n" +"- questi gruppi hanno uno scostamento di -32, -32 nodi dall'origine.\n" +"- solo i gruppi che si trovano all'interno di map_generation_limit " +"vengono generati" #: src/settings_translation_file.cpp msgid "" @@ -3485,35 +3518,45 @@ msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" +"Se i giocatori vengono mostrati ai client senza alcun limite di distanza.\n" +"Deprecato, usare l'impostazione player_transfer_distance invece." #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "" +msgstr "Permettere ai giocatori di danneggiarsi e uccidersi a vicenda." #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"Se chiedere ai client di ricollegarsi dopo un crash (Lua).\n" +"Imposta questo su true se il tuo server è impostato per riavviarsi " +"automaticamente." #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "Se annebbiare la fine dell'area visibile." #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +"Se mostrare al client le informazioni di debug (ha lo stesso effetto di " +"premere F5)." #: src/settings_translation_file.cpp +#, fuzzy msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "Larghezza dei riquadri attorno ai nodi." #: src/settings_translation_file.cpp msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" +"Cartella del mondo (tutto il mondo si trova qui).\n" +"Non è necessario se si inizia dal menù principale." #: src/settings_translation_file.cpp msgid "cURL file download timeout" From 6f468a0baf09752d42f255a801182b2c633ca72d Mon Sep 17 00:00:00 2001 From: betacentury Date: Fri, 6 Nov 2015 16:40:04 +0100 Subject: [PATCH 052/531] Translated using Weblate (Italian) Currently translated at 35.1% (265 of 753 strings) --- po/it/minetest.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 96881b25..373776d4 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-11-06 16:37+0000\n" -"Last-Translator: Elia Argentieri \n" +"PO-Revision-Date: 2015-11-06 16:40+0000\n" +"Last-Translator: betacentury \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -231,12 +231,12 @@ msgstr "Installazione modulo: file: \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" msgstr "" -"Installare un modulo: impossibile trovare il vero nome del modulo per: $1" +"Installazione modulo: impossibile trovare il vero nome del modulo per: $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" -"Installare un modulo: impossibile trovare un nome di cartella appropriato " +"Installazione modulo: impossibile trovare un nome di cartella appropriato " "per il pacchetto moduli $1" #: builtin/mainmenu/store.lua From 5d8e24d7be0403c078ddc71411f1d65d0be8a8f7 Mon Sep 17 00:00:00 2001 From: Elia Argentieri Date: Fri, 6 Nov 2015 17:28:34 +0100 Subject: [PATCH 053/531] Translated using Weblate (Italian) Currently translated at 43.0% (324 of 753 strings) --- po/it/minetest.po | 187 ++++++++++++++++++++++++---------------------- 1 file changed, 98 insertions(+), 89 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 373776d4..b6ba7ea4 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-11-06 16:40+0000\n" -"Last-Translator: betacentury \n" +"PO-Revision-Date: 2015-11-06 17:28+0000\n" +"Last-Translator: Elia Argentieri \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -42,7 +42,7 @@ msgstr "Riconnettiti" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "Il server ha richiesto una riconnessione:" +msgstr "Il server ha richiesto una riconnessione" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -240,12 +240,13 @@ msgstr "" "per il pacchetto moduli $1" #: builtin/mainmenu/store.lua +#, fuzzy msgid "Close store" -msgstr "" +msgstr "Chiudi deposito" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "" +msgstr "Scaricamento di $1, attendere prego..." #: builtin/mainmenu/store.lua msgid "Install" @@ -299,7 +300,7 @@ msgstr "Contributori precedenti" #: builtin/mainmenu/tab_credits.lua #, fuzzy msgid "Previous Core Developers" -msgstr "Sviluppatori principali" +msgstr "Sviluppatori del motore precedenti" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -334,9 +335,8 @@ msgid "Uninstall selected modpack" msgstr "Disinstallare il pacchetto moduli selezionato" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "Indirizzo/Porta" +msgstr "Indirizzo / Porta:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -347,7 +347,6 @@ msgid "Connect" msgstr "Connettere" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" msgstr "Modalità creativa" @@ -361,18 +360,16 @@ msgid "Delete" msgstr "Cancellare" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "Nome/Password" +msgstr "Nome / Password:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" msgstr "Elenco dei server pubblici" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "PvP enabled" -msgstr "attivata" +msgstr "attiva PvP" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" @@ -401,11 +398,8 @@ msgid "New" msgstr "Nuovo" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -#, fuzzy msgid "No world created or selected!" -msgstr "" -"Non è stato fornito nessun nome del mondo oppure non è stato selezionato " -"nessun gioco" +msgstr "Nessun mondo creato o selezionato!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -437,11 +431,11 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Non è disponibile nessuna descrizione dell'impostazione)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Naviga" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -454,7 +448,7 @@ msgstr "Disatt. pacch." #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Modifica" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -477,23 +471,23 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Inserire una lista di impostazioni separate da virgola." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Inserire un intero valido." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Inserire un numero valido." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "I valori possibili sono: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Ripristina predefiniti" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -506,15 +500,15 @@ msgstr "Impostazioni" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Mostra nomi tecnici" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Il valore deve essere maggiore di $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Il valore deve essere minore di $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -526,9 +520,8 @@ msgid "Main" msgstr "Menù principale" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Start Singleplayer" -msgstr "Giocatore singolo" +msgstr "Avvia giocatore singolo" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -553,24 +546,21 @@ msgstr "Selezionare un pacchetto di immagini:" #: builtin/mainmenu/tab_texturepacks.lua #, fuzzy msgid "Texturepacks" -msgstr "Pacch. immagini" +msgstr "Pacch. Texture" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Errore di connessione (scaduta?)" +msgstr "Connessione scaduta." #: src/client.cpp msgid "Done!" msgstr "Fatto!" #: src/client.cpp -#, fuzzy msgid "Initializing nodes" msgstr "Inizializzazione nodi" #: src/client.cpp -#, fuzzy msgid "Initializing nodes..." msgstr "Inizializzazione nodi..." @@ -579,14 +569,12 @@ msgid "Item textures..." msgstr "Immagini degli oggetti..." #: src/client.cpp -#, fuzzy msgid "Loading textures..." -msgstr "Caricamento..." +msgstr "Caricamento delle texture..." #: src/client.cpp -#, fuzzy msgid "Rebuilding shaders..." -msgstr "Risoluzione dell'indirizzo..." +msgstr "Ricompilazione degli shader..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -683,6 +671,7 @@ msgstr "" "- T: chat\n" #: src/game.cpp +#, fuzzy msgid "" "Default Controls:\n" "No menu visible:\n" @@ -697,6 +686,19 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Comandi predefiniti:\n" +"Nessun menù visibile:\n" +"- tocco singolo: attiva pulsante\n" +"- doppio tocco: posiziona/usa\n" +"- scorri le dita: guardati intorno\n" +"Menu/Inventario visibile:\n" +"- doppio tocco(fuori):\n" +"--> chiudi\n" +"- tocca una pila poi uno slot:\n" +"--> sposta la pila\n" +"- tocca e trascina, tocca col\n" +"secondo dito: --> posiziona\n" +"un solo oggetto sullo slot\n" #: src/game.cpp msgid "Exit to Menu" @@ -739,9 +741,8 @@ msgid "Respawn" msgstr "Riapparire" #: src/game.cpp -#, fuzzy msgid "Shutting down..." -msgstr "Spegnimento della roba..." +msgstr "Arresto..." #: src/game.cpp msgid "Sound Volume" @@ -831,9 +832,8 @@ msgid "Sneak" msgstr "Strisciare" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Correre On/Off" +msgstr "Cinematico On/Off" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1178,15 +1178,15 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "Nuvole 3D" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "Modalità 3D" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1196,36 +1196,50 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"Supporto 3D.\n" +"Supportati attualmente:\n" +"- none: nessuna uscita 3d.\n" +"- anaglyph: 3d anaglifico ciano/magenta.\n" +"- interlaced: interlacciato linee pari/dispari basato sul supporto di " +"polarizzazione dello schermo.\n" +"- topbottom: dividi lo schermo sopra e sotto.\n" +"- sidebyside: dividi lo schermo a destra e sinistra." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Un seme scelto per la generazione di una nuova mappa, lascialo vuoto per uno " +"casuale.\n" +"Verrà sovrascritto quando verrà creata un nuovo mondo nel menù principale." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Un messaggio da mostrare a tutti i giocatori quando il server va in errore." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Un messaggio da mostrare a tutti i giocatori quando il server si spegne." #: src/settings_translation_file.cpp +#, fuzzy msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Limite assoluto delle code di \"emersione\"" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Accelerazione in aria" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Distanza di attivazione blocchi" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Distanza di invio oggetti ativi" #: src/settings_translation_file.cpp msgid "" @@ -1233,12 +1247,17 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Indirizzo a cui connettersi.\n" +"Lascialo bianco per avviare un server locale.\n" +"Nota che l'indirizzo impostato nel menù principale sovrascrive questa " +"impostazione." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "" +msgstr "dpi del tuo schermo (no X11/solo Android) per esempio schermi 4K." #: src/settings_translation_file.cpp msgid "" @@ -1247,8 +1266,9 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Advanced" -msgstr "" +msgstr "Avanzato" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1259,7 +1279,6 @@ msgid "Ambient occlusion gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" msgstr "Filtro anisotropico" @@ -1276,25 +1295,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Chiedi se riconnettersi dopo un errore" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Rapporto automatico alla lista di server." #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "Indietro" +msgstr "Tasto Indietro" #: src/settings_translation_file.cpp msgid "Basic" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" -msgstr "Filtro Bi-Lineare" +msgstr "Filtro bilineare" #: src/settings_translation_file.cpp #, fuzzy @@ -1310,45 +1327,41 @@ msgid "Build inside player" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bumpmapping" -msgstr "Mip-Mapping" +msgstr "" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Ammorbidisci la visuale" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Ammorbidisci la visuale in modalità cinematica" #: src/settings_translation_file.cpp msgid "Camera update toggle key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Cambiare i tasti" +msgstr "Tasto Chat" #: src/settings_translation_file.cpp #, fuzzy msgid "Chat toggle key" -msgstr "Cambiare i tasti" +msgstr "Tasto mostra/nascondi chat" #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Modalità creativa" +msgstr "Modalità cinematica" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Modalità creativa" +msgstr "Tasto modalità cinematica" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1360,33 +1373,31 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Velocità di arrampicata" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Altezza delle nuvole" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Raggio delle nuvole" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "Nuvole 3D" +msgstr "Nuvole" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Le nuvole sono un effetto lato client." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Menù principale" +msgstr "Nuvole nel menù" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Nebbia colorata" #: src/settings_translation_file.cpp msgid "" @@ -1402,16 +1413,16 @@ msgstr "Comando" #: src/settings_translation_file.cpp #, fuzzy msgid "Connect glass" -msgstr "Connettere" +msgstr "Vetro connesso" #: src/settings_translation_file.cpp #, fuzzy msgid "Connect to external media server" -msgstr "Connessione al server..." +msgstr "Connettiti al server dati esterno" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Collega il vetro se supportato dal nodo." #: src/settings_translation_file.cpp #, fuzzy @@ -1437,9 +1448,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Control" +msgstr "Controlli" #: src/settings_translation_file.cpp msgid "" @@ -1456,23 +1466,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Messaggio di errore" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Alfa del mirino" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Alfa del mirino (opacità, tra 0 e 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Colore del mirino" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Colore del mirino (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" @@ -1483,7 +1493,6 @@ msgid "DPI" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" msgstr "Abilitare il danno" From 0dd4da19edebf6b5848e1abd33badcf82e0afb28 Mon Sep 17 00:00:00 2001 From: Jun Zhang Date: Sat, 7 Nov 2015 08:04:52 +0100 Subject: [PATCH 054/531] Translated using Weblate (Chinese (China)) Currently translated at 30.0% (226 of 753 strings) --- po/zh_CN/minetest.po | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index dadf8cef..e625f392 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-04-19 02:00+0800\n" -"Last-Translator: Ang Weijie \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2015-11-07 08:04+0000\n" +"Last-Translator: Jun Zhang \n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -24,7 +25,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "错误:" #: builtin/fstk/ui.lua #, fuzzy @@ -36,13 +37,12 @@ msgid "Ok" msgstr "确定" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "连接" +msgstr "重新连接" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "服务器请求重新连接:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -50,27 +50,27 @@ msgstr "载入中..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "协议版本不匹配. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "服务器要求协议版本为 $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "服务器支持的协议版本为 $1 至 $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." -msgstr "" +msgstr "请尝试重新启用公共服务器列表并检查您的网络连接." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "我们只支持协议版本 $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "我们支持的协议版本为 $1 至 $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -98,7 +98,7 @@ msgstr "全部启用" msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." -msgstr "" +msgstr "无法启用 MOD \"$1\": 含有不支持的字符. 允许的字符为 [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -206,13 +206,12 @@ msgid "Rename Modpack:" msgstr "重命名MOD包：" #: builtin/mainmenu/modmgr.lua -#, fuzzy msgid "" "\n" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"安装MOD：不支持的文件类型“$1“" +"安装MOD：不支持的文件类型“$1“或文件损坏" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" @@ -235,9 +234,8 @@ msgid "Close store" msgstr "关闭商店" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Downloading $1, please wait..." -msgstr "请稍候..." +msgstr "正在下载 $1, 请稍候..." #: builtin/mainmenu/store.lua msgid "Install" @@ -428,11 +426,11 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(没有关于此设置的信息)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "浏览" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -445,7 +443,7 @@ msgstr "禁用MOD包" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "设置" #: builtin/mainmenu/tab_settings.lua #, fuzzy From 7f3e4a4bf633f2ffc55503a6622d2c16f159841b Mon Sep 17 00:00:00 2001 From: Vasily Pavlov Date: Sun, 8 Nov 2015 09:55:15 +0100 Subject: [PATCH 055/531] Translated using Weblate (Russian) Currently translated at 47.0% (354 of 753 strings) --- po/ru/minetest.po | 143 ++++++++++++++++------------------------------ 1 file changed, 49 insertions(+), 94 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index ac5eabb4..1a6a0aff 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-10-30 22:12+0200\n" -"Last-Translator: Maksim D. Gamarnik \n" +"PO-Revision-Date: 2015-11-08 09:55+0000\n" +"Last-Translator: Vasily Pavlov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -54,7 +54,7 @@ msgstr "Несоответствие версии протокола." #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Сервер обеспечивает соблюдение версии протокола $ 1." #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " @@ -71,7 +71,7 @@ msgstr "Поддерживается только протокол версии #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Мы поддерживаем версии протоколов между $1 и $2" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -100,6 +100,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Ошибка при попытке включения мода \"$1\" поскольку он содержит недопустимые " +"символы. Допускается использование символов от Aa-Zz и от 0-9." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -420,7 +422,7 @@ msgstr "\"" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Отсутствует описание настройки)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" @@ -447,6 +449,8 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Формат: <Смещение>,<Масштаб>, (<По оси X>,<По оси Y>,<По оси Z>), <Зерно>, " +"<Октавы>,<Постоянство>" #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -454,7 +458,7 @@ msgstr "Игры" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "Опционально лакунарностью могут быть добавлены с ведущей запятой." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." @@ -1275,18 +1279,16 @@ msgid "Bilinear filtering" msgstr "Билинейная фильтрация" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "Адрес" +msgstr "Адрес бинда" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "Сетевая игра" +msgstr "Возможность строить внутри модели игрока." #: src/settings_translation_file.cpp msgid "Bumpmapping" @@ -1309,23 +1311,20 @@ msgid "Chat key" msgstr "Кнопка чата" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Смена управления" +msgstr "Кнопка переключения чата" #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Размер чанка" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Режим творчества" +msgstr "Кинематографический режим" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Режим творчества" +msgstr "Кнопка переключения в кинематографический режим" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1370,38 +1369,32 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" msgstr "Команда" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" msgstr "Стёкла без швов" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Подключение к серверу..." +msgstr "Подключение к внешнему серверу..." #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" msgstr "Консоль" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Консоль" +msgstr "Цвет в консоли" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Консоль" +msgstr "Кнопка вызова консоли" #: src/settings_translation_file.cpp msgid "Continuous forward" @@ -1773,7 +1766,6 @@ msgid "Font size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" msgstr "Вперед" @@ -1814,9 +1806,8 @@ msgid "GUI scaling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "Масштаб интерфейса" +msgstr "Фильтр масштабирования интерфейса" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" @@ -1827,7 +1818,6 @@ msgid "Gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "Генерировать карты нормалей" @@ -1916,9 +1906,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If disabled " -msgstr "Отключить мультиплеер" +msgstr "Если выключено_" #: src/settings_translation_file.cpp msgid "" @@ -1928,9 +1917,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "If enabled, " -msgstr "включено" +msgstr "Если включено_" #: src/settings_translation_file.cpp msgid "" @@ -1968,9 +1956,8 @@ msgid "Ignore world errors" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Игра" +msgstr "В игре" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -1989,9 +1976,8 @@ msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Инвентарь" +msgstr "Кнопка открытия инвентаря" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -2006,9 +1992,8 @@ msgid "Item entity TTL" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Прыжок" +msgstr "Кнопка, отвечающая за прыжок" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2240,9 +2225,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Левая клавиша меню" +msgstr "Кнопка выхода" #: src/settings_translation_file.cpp msgid "" @@ -2312,14 +2296,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Главное меню" +msgstr "Мод менеджер главного меню" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Главное меню" +msgstr "Скрипт главного меню" #: src/settings_translation_file.cpp msgid "" @@ -2382,28 +2364,24 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Генератор карты" +msgstr "Дебаггинг генератора карты" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Генератор карты" +msgstr "Флаги генератора карты" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Генератор карты" +msgstr "Название генератора карты" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Генератор карты" +msgstr "Генератор карты версии 5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2426,9 +2404,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Генератор карты" +msgstr "Генератор карты версии 6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2487,9 +2464,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Генератор карты" +msgstr "Генератор карты версии 7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2643,7 +2619,6 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" msgstr "Меню" @@ -2683,9 +2658,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" -msgstr "Mip-текстурирование" +msgstr "Mip-текстурирование (Мип-маппинг)" #: src/settings_translation_file.cpp msgid "Mod profiling" @@ -2776,7 +2750,6 @@ msgid "Noclip key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" msgstr "Подсветка нод" @@ -2829,34 +2802,28 @@ msgid "Parallax Occlusion" msgstr "Parallax Occlusion" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" -msgstr "Parallax Occlusion" +msgstr "Включить параллакс" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" -msgstr "Parallax Occlusion" +msgstr "Масштаб параллакса" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "Parallax Occlusion" +msgstr "Смещение параллакса" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "Parallax Occlusion" +msgstr "Повторение параллакса" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "Parallax Occlusion" +msgstr "Режим параллакса" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" -msgstr "Parallax Occlusion" +msgstr "Сила параллакса" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." @@ -2881,9 +2848,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Имя игрока слишком длинное." +msgstr "Имя игрока" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -2908,9 +2874,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Загрузка текстур..." +msgstr "Предзагрузка текстур..." #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." @@ -2940,9 +2905,8 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Зона видимости" +msgstr "Кнопка настройки дальности видимости" #: src/settings_translation_file.cpp msgid "Remote media" @@ -2957,7 +2921,6 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" msgstr "Правая клавиша меню" @@ -2999,9 +2962,8 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Cнимок" +msgstr "Cкриншот" #: src/settings_translation_file.cpp msgid "Screenshot folder" @@ -3028,37 +2990,30 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Начать одиночную игру" +msgstr "Сервер / одиночная игра" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Сервер" +msgstr "URL сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Порт сервера" +msgstr "Адрес сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Порт сервера" +msgstr "Описание сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Сервер" +msgstr "Имя сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Порт сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" msgstr "Список публичных серверов" From bfb30362a2fcfffd6c4dd1f8d2658c46baa93537 Mon Sep 17 00:00:00 2001 From: Pavel Sokolov Date: Sun, 8 Nov 2015 09:56:42 +0100 Subject: [PATCH 056/531] Translated using Weblate (Russian) Currently translated at 47.2% (356 of 753 strings) --- po/ru/minetest.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 1a6a0aff..27d09c0d 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-11-08 09:55+0000\n" -"Last-Translator: Vasily Pavlov \n" +"PO-Revision-Date: 2015-11-08 09:56+0000\n" +"Last-Translator: Pavel Sokolov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -466,7 +466,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Введите допустимое целое число." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." @@ -474,7 +474,7 @@ msgstr "Пожалуйста, введите корректное число." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Возможные значения:" #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" From 87769c7747ad00b428ad46338060cc716093855f Mon Sep 17 00:00:00 2001 From: Vasily Pavlov Date: Sun, 8 Nov 2015 09:56:51 +0100 Subject: [PATCH 057/531] Translated using Weblate (Russian) Currently translated at 47.4% (357 of 753 strings) --- po/ru/minetest.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 27d09c0d..3acbbafa 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" "PO-Revision-Date: 2015-11-08 09:56+0000\n" -"Last-Translator: Pavel Sokolov \n" +"Last-Translator: Vasily Pavlov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -481,9 +481,8 @@ msgid "Restore Default" msgstr "Восстановить по-умолчанию" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Выбор" +msgstr "Выбрать путь" #: builtin/mainmenu/tab_settings.lua msgid "Settings" From 2d493a215d1e829cbf01f0ccffd6f8ccbba47e6d Mon Sep 17 00:00:00 2001 From: Pavel Sokolov Date: Sun, 8 Nov 2015 09:57:08 +0100 Subject: [PATCH 058/531] Translated using Weblate (Russian) Currently translated at 47.6% (359 of 753 strings) --- po/ru/minetest.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 3acbbafa..a392a82e 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-11-08 09:56+0000\n" -"Last-Translator: Vasily Pavlov \n" +"PO-Revision-Date: 2015-11-08 09:57+0000\n" +"Last-Translator: Pavel Sokolov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -494,11 +494,11 @@ msgstr "Отобразить технические названия" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Значение должно быть больше, чем $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Значение должно быть меньше, чем $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" From aee0afa7977d32b1fb3db8bce077ad3d0690f3c5 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Sun, 8 Nov 2015 10:49:26 +0100 Subject: [PATCH 059/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 58.0% (437 of 753 strings) --- po/zh_TW/minetest.po | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 105211d5..b8ca9733 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-11-02 15:04+0200\n" +"PO-Revision-Date: 2015-11-08 10:49+0000\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) " "\n" @@ -1626,6 +1626,9 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"啟用遠端媒體伺服器的使用（若由伺服器提供的話）。\n" +"當連線到伺服器時，遠端伺服器提供了一個\n" +"顯著較快的下載媒體（如材質）的方式。" #: src/settings_translation_file.cpp msgid "" @@ -1633,6 +1636,9 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"啟用／停用執行 IPv6 伺服器。IPv6 伺服器可能會限制只有\n" +"IPv6 客戶端才能連線，取決於系統設定。\n" +"當 bind_address 被設定時將會被忽略。" #: src/settings_translation_file.cpp msgid "" @@ -1641,10 +1647,13 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"為材質啟用貼圖轉儲。普通地圖需要材質包的支援\n" +"或是自動生成。\n" +"必須啟用著色器。" #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." -msgstr "" +msgstr "啟用面旋轉方向的網格快取。" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -1655,30 +1664,36 @@ msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" +"啟用忙碌的一般地圖生成（浮雕效果）。\n" +"必須啟用貼圖轉儲。" #: src/settings_translation_file.cpp msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"啟用視差遮蔽貼圖。\n" +"必須啟用著色器。" #: src/settings_translation_file.cpp msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"實驗性選項，當設定到大於零的值時\n" +"也許會造成在方塊間有視覺空隙。" #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "在暫停選單中的 FPS" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "墜落上下移動" #: src/settings_translation_file.cpp msgid "Fallback font" @@ -1686,15 +1701,15 @@ msgstr "備用字型" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "後備字型陰影" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "後備字型陰影 alpha 值" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "後備字型大小" #: src/settings_translation_file.cpp msgid "Fast key" From cefa5b3710d2b6e485d3fc1e63d0a22a2b631767 Mon Sep 17 00:00:00 2001 From: Vasily Pavlov Date: Sun, 8 Nov 2015 10:10:12 +0100 Subject: [PATCH 060/531] Translated using Weblate (Russian) Currently translated at 49.5% (373 of 753 strings) --- po/ru/minetest.po | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index a392a82e..4759121f 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-24 20:28+0200\n" -"PO-Revision-Date: 2015-11-08 09:57+0000\n" -"Last-Translator: Pavel Sokolov \n" +"PO-Revision-Date: 2015-11-08 10:10+0000\n" +"Last-Translator: Vasily Pavlov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -426,7 +426,7 @@ msgstr "(Отсутствует описание настройки)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Выбрать..." #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -462,7 +462,7 @@ msgstr "Опционально лакунарностью могут быть д #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Пожалуйста, вводите запятые для разделения списка флагов." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." @@ -1158,6 +1158,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = Параллакс с информацией о наклоне (Быстрее)\n" +"1 = Рельефный маппинг (Медленнее, качественнее)" #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1177,12 +1179,21 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"Поддержка 3D\n" +"Нет: нет выходного сигнала.\n" +"Анаглиф: голубой\\пурпурный цвет в 3D\n" +"Чересстрочно: четное / нечетное линия поддержки процесса поляризации экрана\n" +"Верх\\низ: Разделение экрана низ/верх\n" +"Двестороны: Разделение экрана пополам (право/лево)" #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Выбранный сид для новой карты, оставьте значение пустым для случайной " +"генерации.\n" +"Будет отменено при создании нового мира, в главном меню." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." @@ -1194,19 +1205,19 @@ msgstr "Сообщение, которое будет показано всем #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Абсолютный лимит появляющихся запросов." #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Ускорение в воздухе" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Дальность взаимодействия с блоками" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Дальность отправляемого активного объекта" #: src/settings_translation_file.cpp msgid "" @@ -1214,18 +1225,26 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Адрес, к которому присоединиться.\n" +"Оставьте это поле, чтобы запустить локальный сервер.\n" +"ПРИМЕЧАНИЕ: это поле адреса перезапишет эту настройку в главном меню." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Настройте конфигурацию точек на дюйм для вашего экрана (Не 11/Только для " +"Android) Напр. для мониторов с разрешением в 4k" #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Отрегулируйте гамма кодировку для таблиц освещения. Более низкие значения " +"ярче.\n" +"Этот параметр предназначен только для клиента и игнорируется сервером." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1237,12 +1256,11 @@ msgstr "Всегда включен полёт и ускорение" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Гамма Ambient occlusion" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" -msgstr "Анизотропная фильтрация" +msgstr "Анизантропная фильтрация" #: src/settings_translation_file.cpp msgid "Announce server" From aabdf80d1b6e7e48520deede3c0289dee4c58ee7 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 8 Nov 2015 20:41:57 +0100 Subject: [PATCH 061/531] Russian translation: remove weird char Whatever that char is, it isn't a space. --- po/ru/minetest.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 4759121f..627b295b 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -1924,7 +1924,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If disabled " -msgstr "Если выключено_" +msgstr "Если выключено " #: src/settings_translation_file.cpp msgid "" @@ -1935,7 +1935,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, " -msgstr "Если включено_" +msgstr "Если включено " #: src/settings_translation_file.cpp msgid "" From d657dce61b7526a097d97885b7bba9be849e302e Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 8 Nov 2015 20:42:38 +0100 Subject: [PATCH 062/531] Some german translation improvements --- po/de/minetest.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 6521ea20..90df7f78 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -1531,7 +1531,7 @@ msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" -"Standard-Timeout für cURL, in Millisekunden angegeben.\n" +"Standardzeitlimit für cURL, in Millisekunden.\n" "Hat nur eine Wirkung, wenn mit cURL kompiliert wurde." #: src/settings_translation_file.cpp @@ -1880,7 +1880,7 @@ msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" "Von wie weit weg Klienten über Objekte bescheid wissen,\n" -"in Kartenblöcken (16 Blöcke) angegeben." +"in Kartenblöcken (16 Blöcke)." #: src/settings_translation_file.cpp msgid "Full screen" @@ -2105,7 +2105,7 @@ msgstr "Hintergrundfarbe (R,G,B) der Chat-Konsole im Spiel." msgid "Interval of saving important changes in the world, stated in seconds." msgstr "" "Zeitintervall des Abspeicherns wichtiger Änderungen in der Welt,\n" -"in Sekunden angegeben." +"in Sekunden." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." @@ -3230,8 +3230,8 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" -"Radius des Wolkenbereichs; angegeben in Einheiten von 64 Blöcken.\n" -"Werter größer als 26 werden scharfe Schnittkanten an den Ecken des Wolken-\n" +"Radius des Wolkenbereichs; In Einheiten von 64 Blöcken.\n" +"Werte größer als 26 werden scharfe Schnittkanten an den Ecken des Wolken-\n" "bereichs erzeugen." #: src/settings_translation_file.cpp @@ -3426,7 +3426,7 @@ msgid "" "nodes)." msgstr "" "Größe der Stücke, die gleichzeitig vom Kartengenerator erzeugt werden,\n" -"in Kartenblöcken (16×16×16 Blöcke) angegeben." +"in Kartenblöcken (16×16×16 Blöcke)." #: src/settings_translation_file.cpp msgid "Smooth lighting" From 9a91f58e66e84bfba13c967753d537996e4c5d6d Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 8 Nov 2015 21:07:41 +0100 Subject: [PATCH 063/531] Settings tab: add v3f type Add the v3f type, currently is just a nice placeholder for string. Currently undocumented, on wish of @PilzAdam, to support future changes. --- builtin/mainmenu/tab_settings.lua | 7 +++++-- builtin/settingtypes.txt | 16 ++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 6d71904c..db8d08d5 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -112,7 +112,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se end if setting_type == "string" or setting_type == "noise_params" - or setting_type == "key" then + or setting_type == "key" or setting_type == "v3f" then local default = remaining_line:match("^(.*)$") if not default then @@ -381,6 +381,9 @@ local function create_change_setting_formspec(dialogdata) formspec = formspec .. ",," .. "," .. fgettext("Format: , , (, , ), , , ") .. "," .. "," .. fgettext("Optionally the lacunarity can be appended with a leading comma.") .. "," + elseif setting.type == "v3f" then + formspec = formspec .. ",," + .. "," .. fgettext_ne("Format is 3 numbers separated by commas and inside brackets.") .. "," end formspec = formspec:sub(1, -2) -- remove trailing comma @@ -424,7 +427,7 @@ local function create_change_setting_formspec(dialogdata) .. "button[8,3.75;2,1;btn_browser_path;" .. fgettext("Browse") .. "]" else - -- TODO: fancy input for float, int, flags, noise_params + -- TODO: fancy input for float, int, flags, noise_params, v3f local width = 10 local text = get_current_value(setting) if dialogdata.error_message then diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 607fbe60..3c44ea66 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -941,15 +941,11 @@ mgfractal_spflags (Mapgen fractal flags) flags nojulia julia,nojulia mgfractal_m_iterations (Mapgen fractal mandelbrot iterations) int 9 # Mandelbrot set: Approximate (X,Y,Z) scales in nodes. -# Format is 3 numbers separated by commas and inside brackets. -mgfractal_m_scale (Mapgen fractal mandelbrot scale) string (1024.0, 256.0, 1024.0) -# Type 'string' is currently used for a v3f. +mgfractal_m_scale (Mapgen fractal mandelbrot scale) v3f (1024.0, 256.0, 1024.0) # Mandelbrot set: (X,Y,Z) offsets from world centre. -# Format is 3 numbers separated by commas and inside brackets. # Range roughly -2 to 2, multiply by m_scale for offsets in nodes. -mgfractal_m_offset (Mapgen fractal mandelbrot offset) string (1.75, 0.0, 0.0) -# Type 'string' is currently used for a v3f. +mgfractal_m_offset (Mapgen fractal mandelbrot offset) v3f (1.75, 0.0, 0.0) # Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape. # Range roughly -2 to 2. @@ -960,15 +956,11 @@ mgfractal_m_slice_w (Mapgen fractal mandelbrot slice w) float 0.0 mgfractal_j_iterations (Mapgen fractal julia iterations) int 9 # Julia set: Approximate (X,Y,Z) scales in nodes. -# Format is 3 numbers separated by commas and inside brackets. -mgfractal_j_scale (Mapgen fractal julia scale) string (2048.0, 512.0, 2048.0) -# Type 'string' is currently used for a v3f. +mgfractal_j_scale (Mapgen fractal julia scale) v3f (2048.0, 512.0, 2048.0) # Julia set: (X,Y,Z) offsets from world centre. -# Format is 3 numbers separated by commas and inside brackets. # Range roughly -2 to 2, multiply by j_scale for offsets in nodes. -mgfractal_j_offset (Mapgen fractal julia offset) string (0.0, 1.0, 0.0) -# Type 'string' is currently used for a v3f. +mgfractal_j_offset (Mapgen fractal julia offset) v3f (0.0, 1.0, 0.0) # Julia set: W co-ordinate of the generated 3D slice of the 4D shape. # Range roughly -2 to 2. From 78caafbd43a27aad4d94fe5d02e79ea1d32c696f Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 8 Nov 2015 21:23:09 +0100 Subject: [PATCH 064/531] Update minetest.conf.example and src/settings_translation_file.cpp --- minetest.conf.example | 16 +++++++++++-- src/settings_translation_file.cpp | 39 ++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/minetest.conf.example b/minetest.conf.example index 99ac2425..f590aefa 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1096,7 +1096,7 @@ # type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, nojungles, nobiomeblend, nomudflow, nosnowbiomes # mgv6_spflags = jungles,biomeblend,mudflow,snowbiomes -# Controls size of deserts and beaches in Mapgen V6. +# Controls size of deserts and beaches in Mapgen v6. # When snowbiomes are enabled 'mgv6_freq_desert' is ignored. # type: float # mgv6_freq_desert = 0.45 @@ -1226,12 +1226,24 @@ # type: float # mgfractal_j_slice_w = 0.0 -# Julia set: The following 4 values determine the 4D shape. +# Julia set: X value determining the 4D shape. # Range roughly -2 to 2. # type: float # mgfractal_julia_x = 0.33 + +# Julia set: Y value determining the 4D shape. +# Range roughly -2 to 2. +# type: float # mgfractal_julia_y = 0.33 + +# Julia set: Z value determining the 4D shape. +# Range roughly -2 to 2. +# type: float # mgfractal_julia_z = 0.33 + +# Julia set: W value determining the 4D shape. +# Range roughly -2 to 2. +# type: float # mgfractal_julia_w = 0.33 # type: noise_params diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index bdeb1b82..89bd192e 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -345,6 +345,8 @@ fake_function() { gettext("Whether to allow players to damage and kill each other."); gettext("Static spawnpoint"); gettext("If this is set, players will always (re)spawn at the given position."); + gettext("Vertical spawn range"); + gettext("Maximum distance above water level for player spawn.\nLarger values result in spawn points closer to (x = 0, z = 0).\nSmaller values may result in a suitable spawn point not being found,\nresulting in a spawn at (0, 0, 0) possibly buried underground."); gettext("Disallow empty passwords"); gettext("If enabled, new players cannot join with an empty password."); gettext("Disable anticheat"); @@ -449,9 +451,9 @@ fake_function() { gettext("Mapgen v5 cave2 noise parameters"); gettext("Mapgen v6"); gettext("Mapgen v6 flags"); - gettext("Map generation attributes specific to Mapgen V6.\nWhen snowbiomes are enabled jungles are enabled and the jungles flag is ignored.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Map generation attributes specific to Mapgen v6.\nWhen snowbiomes are enabled jungles are enabled and the jungles flag is ignored.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); gettext("Mapgen v6 desert frequency"); - gettext("Controls size of deserts and beaches in Mapgen V6.\nWhen snowbiomes are enabled 'mgv6_freq_desert' is ignored."); + gettext("Controls size of deserts and beaches in Mapgen v6.\nWhen snowbiomes are enabled 'mgv6_freq_desert' is ignored."); gettext("Mapgen v6 beach frequency"); gettext("Mapgen v6 terrain base noise parameters"); gettext("Mapgen v6 terrain altitude noise parameters"); @@ -466,7 +468,7 @@ fake_function() { gettext("Mapgen v6 apple trees noise parameters"); gettext("Mapgen v7"); gettext("Mapgen v7 flags"); - gettext("Map generation attributes specific to Mapgen V7.\n'ridges' are the rivers.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Map generation attributes specific to Mapgen v7.\n'ridges' are the rivers.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); gettext("Mapgen v7 terrain base noise parameters"); gettext("Mapgen v7 terrain altitude noise parameters"); gettext("Mapgen v7 terrain persistation noise parameters"); @@ -478,6 +480,37 @@ fake_function() { gettext("Mapgen v7 ridge noise parameters"); gettext("Mapgen v7 cave1 noise parameters"); gettext("Mapgen v7 cave2 noise parameters"); + gettext("Mapgen fractal"); + gettext("Mapgen fractal flags"); + gettext("Map generation attributes specific to Mapgen fractal.\n'julia' selects a julia set to be generated instead of a mandelbrot set.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Mapgen fractal mandelbrot iterations"); + gettext("Mandelbrot set: Iterations of the recursive function.\nControls scale of finest detail."); + gettext("Mapgen fractal mandelbrot scale"); + gettext("Mandelbrot set: Approximate (X,Y,Z) scales in nodes."); + gettext("Mapgen fractal mandelbrot offset"); + gettext("Mandelbrot set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by m_scale for offsets in nodes."); + gettext("Mapgen fractal mandelbrot slice w"); + gettext("Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2."); + gettext("Mapgen fractal julia iterations"); + gettext("Julia set: Iterations of the recursive function.\nControls scale of finest detail."); + gettext("Mapgen fractal julia scale"); + gettext("Julia set: Approximate (X,Y,Z) scales in nodes."); + gettext("Mapgen fractal julia offset"); + gettext("Julia set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by j_scale for offsets in nodes."); + gettext("Mapgen fractal julia slice w"); + gettext("Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2."); + gettext("Mapgen fractal julia x"); + gettext("Julia set: X value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Mapgen fractal julia y"); + gettext("Julia set: Y value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Mapgen fractal julia z"); + gettext("Julia set: Z value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Mapgen fractal julia w"); + gettext("Julia set: W value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Mapgen fractal seabed noise parameters"); + gettext("Mapgen fractal filler depth noise parameters"); + gettext("Mapgen fractal cave1 noise parameters"); + gettext("Mapgen fractal cave2 noise parameters"); gettext("Security"); gettext("Enable mod security"); gettext("Prevent mods from doing insecure things like running shell commands."); From d506d567075914b138ca869981f2e45ce503ee5d Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 8 Nov 2015 21:26:42 +0100 Subject: [PATCH 065/531] Run util/updatepo.sh --- po/be/minetest.po | 208 +- po/cs/minetest.po | 463 ++-- po/da/minetest.po | 364 +++- po/de/minetest.po | 725 +++--- po/eo/minetest.po | 341 ++- po/es/minetest.po | 335 ++- po/et/minetest.po | 418 +++- po/fr/minetest.po | 684 ++++-- po/he/minetest.po | 4960 ++++++++++++++++++++++-------------------- po/hu/minetest.po | 463 ++-- po/id/minetest.po | 348 ++- po/it/minetest.po | 380 +++- po/ja/minetest.po | 356 ++- po/jbo/minetest.po | 247 ++- po/ko/minetest.po | 208 +- po/ky/minetest.po | 338 ++- po/lt/minetest.po | 328 ++- po/minetest.pot | 204 +- po/nb/minetest.po | 248 ++- po/nl/minetest.po | 531 +++-- po/pl/minetest.po | 470 ++-- po/pt/minetest.po | 468 ++-- po/pt_BR/minetest.po | 430 ++-- po/ro/minetest.po | 384 +++- po/ru/minetest.po | 484 +++-- po/tr/minetest.po | 370 +++- po/uk/minetest.po | 385 +++- po/zh_CN/minetest.po | 483 ++-- po/zh_TW/minetest.po | 344 ++- 29 files changed, 10648 insertions(+), 5319 deletions(-) diff --git a/po/be/minetest.po b/po/be/minetest.po index ac84c027..65942421 100644 --- a/po/be/minetest.po +++ b/po/be/minetest.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2013-11-23 17:37+0100\n" "Last-Translator: Selat \n" "Language-Team: Belarusian\n" @@ -406,7 +406,7 @@ msgid "Start Game" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -433,6 +433,10 @@ msgstr "" msgid "Enabled" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1372,7 +1376,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1517,7 +1521,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1647,7 +1655,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1781,7 +1789,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1861,18 +1870,22 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." msgstr "" #: src/settings_translation_file.cpp @@ -1946,6 +1959,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "" @@ -2267,27 +2326,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2326,6 +2416,78 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2498,6 +2660,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2799,7 +2969,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3035,7 +3205,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3238,6 +3408,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" diff --git a/po/cs/minetest.po b/po/cs/minetest.po index 00983622..78f21b70 100644 --- a/po/cs/minetest.po +++ b/po/cs/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-26 16:53+0200\n" "Last-Translator: Honza Borovička \n" -"Language-Team: Czech " -"\n" +"Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,6 @@ msgid "Protocol version mismatch. " msgstr "Neshoda verze protokolu. " #: builtin/mainmenu/common.lua -#, fuzzy msgid "Server enforces protocol version $1. " msgstr "" @@ -418,8 +417,8 @@ msgid "Start Game" msgstr "Spustit hru" #: builtin/mainmenu/tab_settings.lua -msgid "\"" -msgstr "\"" +msgid "\"$1\" is not a valid flag." +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -445,6 +444,10 @@ msgstr "Upravit" msgid "Enabled" msgstr "Povolený" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1421,7 +1424,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1566,7 +1569,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1696,7 +1703,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1830,7 +1837,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1910,19 +1918,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " -msgstr "Je-li zakázáno " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, " -msgstr "Je-li povoleno, " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1995,6 +2007,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "Skok" @@ -2317,27 +2375,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2378,6 +2467,81 @@ msgstr "Generátor mapy" msgid "Mapgen flags" msgstr "Generátor mapy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Generátor mapy" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Generátor mapy" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Parallax Occlusion" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2554,6 +2718,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2864,7 +3036,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3114,7 +3286,7 @@ msgstr "Plynulé osvětlení" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3323,6 +3495,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3496,129 +3672,138 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "Renderování:" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Jste si jisti, že chcete resetovat místní svět?" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest" +#~ msgid "Fancy Leaves" +#~ msgstr "Vícevrstevné listí" + +#~ msgid "Mipmap" +#~ msgstr "Mipmapa" + +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mipmapa + Anizo. filtr" + +#~ msgid "No Mipmap" +#~ msgstr "Žádné Mipmapy" + +#~ msgid "No!!!" +#~ msgstr "Ne!!!" + +#~ msgid "Opaque Leaves" +#~ msgstr "Neprůhledné listí" + +#~ msgid "Opaque Water" +#~ msgstr "Neprůhledná voda" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Reset místního světa" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Měřítko aplikované na prvky menu: " + +#~ msgid "Simple Leaves" +#~ msgstr "Jednoduché listí" + +#~ msgid "Texturing:" +#~ msgstr "Texturování:" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Pro povolení shaderů musíte používat OpenGL ovladač." + +#~ msgid "Touch free target" +#~ msgstr "Středový kurzor" + +#~ msgid "Touchthreshold (px)" +#~ msgstr "Dosah dotyku (px)" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid "Downloading" +#~ msgstr "Stahuji" + +#~ msgid "Game Name" +#~ msgstr "Název hry" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\"" + +#~ msgid "GAMES" +#~ msgstr "HRY" + +#~ msgid "Mods:" +#~ msgstr "Mody:" + +#~ msgid "new game" +#~ msgstr "nová hra" + +#~ msgid "EDIT GAME" +#~ msgstr "UPRAVIT HRU" + +#~ msgid "Remove selected mod" +#~ msgstr "Odstranit vybraný mod" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Přidat mod" + +#~ msgid "CLIENT" +#~ msgstr "KLIENT" + +#~ msgid "Favorites:" +#~ msgstr "Oblíbené:" + +#~ msgid "START SERVER" +#~ msgstr "MÍSTNÍ SERVER" + +#~ msgid "Name" +#~ msgstr "Jméno" + +#~ msgid "Password" +#~ msgstr "Heslo" + +#~ msgid "SETTINGS" +#~ msgstr "NASTAVENÍ" + +#~ msgid "Preload item visuals" +#~ msgstr "Přednačíst textury předmětů" + +#~ msgid "Finite Liquid" +#~ msgstr "Konečná voda" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "HRA JEDNOHO HRÁČE" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "BALÍČKY TEXTUR" + +#~ msgid "MODS" +#~ msgstr "MODY" + +#~ msgid "Add mod:" +#~ msgstr "Přidat mod:" + +#~ msgid "Local install" +#~ msgstr "Místní instalace" #~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" #~ "Levý klik: Přesunout všechny předměty, Pravý klik: Přesunout jeden předmět" -#~ msgid "Local install" -#~ msgstr "Místní instalace" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest" -#~ msgid "Add mod:" -#~ msgstr "Přidat mod:" +#~ msgid "Rendering:" +#~ msgstr "Renderování:" -#~ msgid "MODS" -#~ msgstr "MODY" +#~ msgid "If enabled, " +#~ msgstr "Je-li povoleno, " -#~ msgid "TEXTURE PACKS" -#~ msgstr "BALÍČKY TEXTUR" +#~ msgid "If disabled " +#~ msgstr "Je-li zakázáno " -#~ msgid "SINGLE PLAYER" -#~ msgstr "HRA JEDNOHO HRÁČE" - -#~ msgid "Finite Liquid" -#~ msgstr "Konečná voda" - -#~ msgid "Preload item visuals" -#~ msgstr "Přednačíst textury předmětů" - -#~ msgid "SETTINGS" -#~ msgstr "NASTAVENÍ" - -#~ msgid "Password" -#~ msgstr "Heslo" - -#~ msgid "Name" -#~ msgstr "Jméno" - -#~ msgid "START SERVER" -#~ msgstr "MÍSTNÍ SERVER" - -#~ msgid "Favorites:" -#~ msgstr "Oblíbené:" - -#~ msgid "CLIENT" -#~ msgstr "KLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Přidat mod" - -#~ msgid "Remove selected mod" -#~ msgstr "Odstranit vybraný mod" - -#~ msgid "EDIT GAME" -#~ msgstr "UPRAVIT HRU" - -#~ msgid "new game" -#~ msgstr "nová hra" - -#~ msgid "Mods:" -#~ msgstr "Mody:" - -#~ msgid "GAMES" -#~ msgstr "HRY" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Název hry" - -#~ msgid "Downloading" -#~ msgstr "Stahuji" - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Dosah dotyku (px)" - -#~ msgid "Touch free target" -#~ msgstr "Středový kurzor" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Pro povolení shaderů musíte používat OpenGL ovladač." - -#~ msgid "Texturing:" -#~ msgstr "Texturování:" - -#~ msgid "Simple Leaves" -#~ msgstr "Jednoduché listí" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Měřítko aplikované na prvky menu: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Reset místního světa" - -#~ msgid "Opaque Water" -#~ msgstr "Neprůhledná voda" - -#~ msgid "Opaque Leaves" -#~ msgstr "Neprůhledné listí" - -#~ msgid "No!!!" -#~ msgstr "Ne!!!" - -#~ msgid "No Mipmap" -#~ msgstr "Žádné Mipmapy" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmapa + Anizo. filtr" - -#~ msgid "Mipmap" -#~ msgstr "Mipmapa" - -#~ msgid "Fancy Leaves" -#~ msgstr "Vícevrstevné listí" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Jste si jisti, že chcete resetovat místní svět?" +#~ msgid "\"" +#~ msgstr "\"" diff --git a/po/da/minetest.po b/po/da/minetest.po index 52d2349f..5065541c 100644 --- a/po/da/minetest.po +++ b/po/da/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2013-02-17 00:41+0200\n" "Last-Translator: Rune Biskopstö Christensen \n" "Language-Team: \n" @@ -429,7 +429,7 @@ msgid "Start Game" msgstr "Start spil / Forbind" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -458,6 +458,10 @@ msgstr "" msgid "Enabled" msgstr "aktiveret" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1432,7 +1436,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1586,7 +1590,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1717,7 +1725,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1853,7 +1861,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1933,21 +1942,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Deaktivér alle" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "aktiveret" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2022,6 +2033,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2347,27 +2404,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2406,6 +2494,78 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2578,6 +2738,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2881,7 +3049,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3122,7 +3290,7 @@ msgstr "Glat belysning" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3328,6 +3496,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3494,36 +3666,65 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Game Name" -#~ msgstr "Spil" +#~ msgid "Opaque Leaves" +#~ msgstr "Opakt (uigennemsigtigt) vand" #, fuzzy -#~ msgid "Favorites:" +#~ msgid "Opaque Water" +#~ msgstr "Opakt (uigennemsigtigt) vand" + +#, fuzzy +#~ msgid "Reset singleplayer world" +#~ msgstr "Enligspiller" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Ned" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed" + +#~ msgid "is required by:" +#~ msgstr "er påkrævet af:" + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguration gemt. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver" + +#~ msgid "Show Public" +#~ msgstr "Vis offentlig" + +#~ msgid "Show Favorites" #~ msgstr "Vis favoritter" -#, fuzzy -#~ msgid "Password" -#~ msgstr "Gammelt kodeord" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server." -#~ msgid "Preload item visuals" -#~ msgstr "For-indlæs elementernes grafik" +#~ msgid "Create world" +#~ msgstr "Skab verden" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n" -#~ "De vil blive aktiveret som standard når du gemmer konfigurationen. " +#~ msgid "Address required." +#~ msgstr "Adresse påkrævet." -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n" -#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen. " +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kan ikke slette verden: ingenting valgt" -#~ msgid "Delete map" -#~ msgstr "Slet mappen" +#~ msgid "Files to be deleted" +#~ msgstr "Filer som slettes" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kan ikke skabe verden: ingen spil fundet" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kan ikke konfigurere verden: ingenting valgt" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Mislykkedes i at slette alle verdenens filer" #~ msgid "" #~ "Default Controls:\n" @@ -3550,63 +3751,42 @@ msgstr "" #~ "- ESC: denne menu\n" #~ "- T: snak\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Mislykkedes i at slette alle verdenens filer" +#~ msgid "Delete map" +#~ msgstr "Slet mappen" -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kan ikke konfigurere verden: ingenting valgt" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n" +#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen. " -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kan ikke skabe verden: ingen spil fundet" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n" +#~ "De vil blive aktiveret som standard når du gemmer konfigurationen. " -#~ msgid "Files to be deleted" -#~ msgstr "Filer som slettes" +#~ msgid "Preload item visuals" +#~ msgstr "For-indlæs elementernes grafik" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kan ikke slette verden: ingenting valgt" +#, fuzzy +#~ msgid "Password" +#~ msgstr "Gammelt kodeord" -#~ msgid "Address required." -#~ msgstr "Adresse påkrævet." - -#~ msgid "Create world" -#~ msgstr "Skab verden" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server." - -#~ msgid "Show Favorites" +#, fuzzy +#~ msgid "Favorites:" #~ msgstr "Vis favoritter" -#~ msgid "Show Public" -#~ msgstr "Vis offentlig" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende. " - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguration gemt. " - -#~ msgid "is required by:" -#~ msgstr "er påkrævet af:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed" +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Spil" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ned" +#~ msgid "If enabled, " +#~ msgstr "aktiveret" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Enligspiller" - -#, fuzzy -#~ msgid "Opaque Water" -#~ msgstr "Opakt (uigennemsigtigt) vand" - -#, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Opakt (uigennemsigtigt) vand" +#~ msgid "If disabled " +#~ msgstr "Deaktivér alle" diff --git a/po/de/minetest.po b/po/de/minetest.po index 90df7f78..f038f6ca 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-30 19:48+0200\n" "Last-Translator: hybriddog \n" -"Language-Team: German " -"\n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -420,9 +420,8 @@ msgid "Start Game" msgstr "Spiel starten" #: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "\"" -msgstr "”" +msgid "\"$1\" is not a valid flag." +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -448,6 +447,10 @@ msgstr "Ändern" msgid "Enabled" msgstr "Aktiviert" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1450,8 +1453,9 @@ msgstr "" "Veränderung." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" "Verändert die Größe der Wüsten und Strände in Kartengenerator V6.\n" @@ -1609,8 +1613,12 @@ msgid "Dump the mapgen debug infos." msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben." #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " -msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." +msgstr "" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1766,9 +1774,10 @@ msgid "Fast movement" msgstr "Schnell bewegen" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" "Schnelles Laufen (aux1 Taste).\n" "Das benötigt das " @@ -1840,7 +1849,8 @@ msgstr "Schriftschatten-Undurchsichtigkeit" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "Undurchsichtigkeit des Schattens der Schrift (Wert zwischen 0 und 255)." +msgstr "" +"Undurchsichtigkeit des Schattens der Schrift (Wert zwischen 0 und 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." @@ -1915,12 +1925,19 @@ msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" +"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" +"'ridges' sind die Flüsse.\n" +"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " +"zugewiesen.\n" +"Flags, die mit starten " #: src/settings_translation_file.cpp msgid "Graphics" @@ -1942,12 +1959,12 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" "Handhabung für veraltete Lua-API-Aufrufe:\n" -"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release)." -"\n" +"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für " +"Release).\n" "- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs " "protokollieren (Standard für Debug).\n" -"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen (" -"empfohlen für Mod-Entwickler)." +"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen " +"(empfohlen für Mod-Entwickler)." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -2019,23 +2036,27 @@ msgstr "" "unnötig zu belasten." #: src/settings_translation_file.cpp -msgid "If disabled " -msgstr "Wenn deaktiviert " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" "Falls es aktiviert ist, kann der Spieler im Flugmodus durch solide Blöcke " "fliegen.\n" "Es benötigt den " #: src/settings_translation_file.cpp -msgid "If enabled, " -msgstr "Wenn aktiviert, " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2127,6 +2148,52 @@ msgstr "Kehrt die vertikale Mausbewegung um." msgid "Item entity TTL" msgstr "Item-Entity-TTL" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "Sprungtaste" @@ -2142,8 +2209,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2152,8 +2219,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Fallenlassen des ausgewählten Gegenstandes.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2162,8 +2229,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2172,8 +2239,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Springen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2182,8 +2249,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um sich schnell im Schnellmodus zu bewegen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2192,8 +2259,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um den Spieler rückwärts zu bewegen.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2202,8 +2269,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um den Spieler vorwärts zu bewegen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2212,8 +2279,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um den Spieler nach links zu bewegen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2222,8 +2289,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um den Spieler nach rechts zu bewegen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2232,8 +2299,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um die Chat-Konsole im Spiel zu öffnen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2242,8 +2309,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um das Chat-Fenster zu öffnen, um Kommandos einzugeben.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2252,8 +2319,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Öffnen des Chat-Fensters.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2262,8 +2329,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Öffnen des Inventars.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2272,8 +2339,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um die Debug-Stacks auszugeben. Für die Entwicklung benutzt.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2284,8 +2351,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Schleichen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2294,8 +2361,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Wechseln der Kamera (Ego- oder Dritte-Person-Perspektive).\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2304,8 +2371,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zur Erzeugung von Bildschirmfotos.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2314,8 +2381,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Filmmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2324,8 +2391,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Wechseln der Anzeige der Übersichtskarte.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2334,8 +2401,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Schnellmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2344,8 +2411,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Flugmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2354,8 +2421,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Geistmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2365,8 +2432,8 @@ msgid "" msgstr "" "Taste zum Umschalten der Kameraaktualisierung. Nur für die Entwicklung " "benutzt.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2375,8 +2442,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten der Anzeige der Debug-Informationen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2385,8 +2452,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um das HUD zu verbergen oder wieder anzuzeigen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2395,8 +2462,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um das Chatprotokoll zu verbergen oder wieder anzuzeigen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2405,8 +2472,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Nebels.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2415,8 +2482,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten der Profiler-Anzeige. Für die Entwicklung benutzt.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2425,8 +2492,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2504,8 +2571,8 @@ msgid "" "Only has an effect if compiled with cURL." msgstr "" "Begrenzt die Anzahl der parallelen HTTP-Anfragen. Betrifft:\n" -"- Medienabholung, falls der Server die remote_media-Einstellung verwendet." -"\n" +"- Medienabholung, falls der Server die remote_media-Einstellung " +"verwendet.\n" "- Herunterladen der Serverliste und Server-Ankündigungsdaten.\n" "- Downloads, die vom Hauptmenü aus getätigt werden (z.B. Mod-Manager).\n" "Hat nur eine Wirkung, wenn mit cURL-Unterstützung kompiliert wurde." @@ -2563,28 +2630,71 @@ msgstr "" "DirectX mit LuaJIT zusammenarbeiten lassen. Deaktivieren Sie dies,\n" "falls es Probleme verursacht." +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Weltordner" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" +"'ridges' sind die Flüsse.\n" +"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " +"zugewiesen.\n" +"Flags, die mit starten " #: src/settings_translation_file.cpp #, fuzzy msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" +"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" +"'ridges' sind die Flüsse.\n" +"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " +"zugewiesen.\n" +"Flags, die mit starten " + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" "Kartengenerierungsattribute speziell für Kartengenerator V7.\n" "'ridges' sind die Flüsse.\n" @@ -2628,6 +2738,86 @@ msgstr "Kartengenerator-Debugging" msgid "Mapgen flags" msgstr "Kartengenerator-Flags" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Kartengenerator-Flags" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave1 noise parameters" +msgstr "Höhlen-Rauschparameter 1" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave2 noise parameters" +msgstr "Höhlen-Rauschparameter 2" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal filler depth noise parameters" +msgstr "Fülltiefen-Rauschparameter" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Kartengenerator-Flags" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Parallax-Occlusion-Iterationen" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal mandelbrot iterations" +msgstr "Max. Pakete pro Iteration" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal seabed noise parameters" +msgstr "Hitzenübergangs-Rauschparameter" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "Hitzenübergangs-Rauschparameter" @@ -2800,6 +2990,14 @@ msgstr "Maximale Bildwiederholrate" msgid "Maximum FPS when game is paused." msgstr "Maximale Bildwiederholrate, wenn das Spiel pausiert ist." +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "Maximal zwangsgeladene Kartenblöcke" @@ -2839,8 +3037,8 @@ msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" -"Maximale Anzahl der Kartenblöcke, die der Klient im Speicher vorhalten soll." -"\n" +"Maximale Anzahl der Kartenblöcke, die der Klient im Speicher vorhalten " +"soll.\n" "Auf -1 setzen, um keine Obergrenze zu verwenden." #: src/settings_translation_file.cpp @@ -2911,8 +3109,8 @@ msgstr "Meldung des Tages (message of the day)" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." msgstr "" -"Die Meldung des Tages, die frisch verbundenen Spielern angezeigt werden soll." -"\n" +"Die Meldung des Tages, die frisch verbundenen Spielern angezeigt werden " +"soll.\n" "Auf Englisch bekannt als „message of the day“ oder „MOTD“." #: src/settings_translation_file.cpp @@ -3159,9 +3357,10 @@ msgid "Physics" msgstr "Physik" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" "Der Spieler kann unabhängig von der Schwerkraft fliegen.\n" "Das benötigt die " @@ -3433,8 +3632,9 @@ msgid "Smooth lighting" msgstr "Geglättetes Licht" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" "Glättet Kamerabewegungen beim Umsehen.\n" @@ -3687,6 +3887,10 @@ msgstr "Anfängliche Fensterhöhe." msgid "Vertical screen synchronization." msgstr "Vertikale Bildschirmsynchronisation." +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Grafiktreiber" @@ -3891,59 +4095,152 @@ msgstr "cURL-Parallel-Begrenzung" msgid "cURL timeout" msgstr "cURL-Zeitüberschreitung" -#~ msgid "Rendering:" -#~ msgstr "Rendering:" +#~ msgid "2x" +#~ msgstr "2x" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Neustart nach Ändern des Treibers erforderlich" +#~ msgid "4x" +#~ msgstr "4x" -#~ msgid "Downloading" -#~ msgstr "Lade herunter" +#~ msgid "8x" +#~ msgstr "8x" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen" +#~ msgid "Antialiasing:" +#~ msgstr "Kantenglättung:" -#~ msgid "is required by:" -#~ msgstr "wird benötigt von:" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguration gespeichert. " +#~ msgid "Fancy Leaves" +#~ msgstr "Schöne Blätter" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Warnung: Konfiguration nicht konsistent. " +#~ msgid "Mipmap" +#~ msgstr "Mipmap" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen" +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mipmap u. Aniso. Filter" -#~ msgid "Show Public" -#~ msgstr "Zeige öffentliche" +#~ msgid "No Mipmap" +#~ msgstr "Keine Mipmap" -#~ msgid "Show Favorites" -#~ msgstr "Zeige Favoriten" +#~ msgid "No!!!" +#~ msgstr "Nein!!!" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten." +#~ msgid "Opaque Leaves" +#~ msgstr "Undurchs. Blätter" -#~ msgid "Create world" -#~ msgstr "Welt erstellen" +#~ msgid "Opaque Water" +#~ msgstr "Undurchs. Wasser" -#~ msgid "Address required." -#~ msgstr "Adresse benötigt." +#~ msgid "Reset singleplayer world" +#~ msgstr "Einzelspielerwelt zurücksetzen" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: " -#~ msgid "Files to be deleted" -#~ msgstr "Zu löschende Dateien" +#~ msgid "Simple Leaves" +#~ msgstr "Einfache Blätter" -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden" +#~ msgid "Texturing:" +#~ msgstr "Texturierung:" -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Um Shader zu benutzen, muss der OpenGL-Treiber benutzt werden." -#~ msgid "Failed to delete all world files" -#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden" +#~ msgid "Touch free target" +#~ msgstr "Berührungsfreies Ziel" + +#~ msgid "Touchthreshold (px)" +#~ msgstr "Berührungsempfindlichkeit (px)" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid "Game Name" +#~ msgstr "Spielname" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren" + +#~ msgid "GAMES" +#~ msgstr "SPIELE" + +#~ msgid "Mods:" +#~ msgstr "Mods:" + +#~ msgid "new game" +#~ msgstr "neues Spiel" + +#~ msgid "EDIT GAME" +#~ msgstr "SPIEL ÄNDERN" + +#~ msgid "Remove selected mod" +#~ msgstr "Ausgewählte Mod löschen" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Mod hinzufügen" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "Favorites:" +#~ msgstr "Favoriten:" + +#~ msgid "START SERVER" +#~ msgstr "SERVER STARTEN" + +#~ msgid "Name" +#~ msgstr "Name" + +#~ msgid "Password" +#~ msgstr "Passwort" + +#~ msgid "SETTINGS" +#~ msgstr "EINSTELLUNGEN" + +#~ msgid "Preload item visuals" +#~ msgstr "Lade Inventarbilder vor" + +#~ msgid "Finite Liquid" +#~ msgstr "Endliches Wasser" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "EINZELSPIELER" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTUREN PAKETE" + +#~ msgid "MODS" +#~ msgstr "MODS" + +#~ msgid "Add mod:" +#~ msgstr "Modifikation hinzufügen:" + +#~ msgid "Local install" +#~ msgstr "Lokale Install." + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n" +#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird. " + +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Warnung: Einige konfigurierte Mods fehlen.\n" +#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert " +#~ "wird. " + +#~ msgid "KEYBINDINGS" +#~ msgstr "TASTEN EINST." + +#~ msgid "Delete map" +#~ msgstr "Karte löschen" #~ msgid "" #~ "Default Controls:\n" @@ -3969,149 +4266,69 @@ msgstr "cURL-Zeitüberschreitung" #~ "- I: Inventar\n" #~ "- T: Chat\n" -#~ msgid "Delete map" -#~ msgstr "Karte löschen" +#~ msgid "Failed to delete all world files" +#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden" -#~ msgid "KEYBINDINGS" -#~ msgstr "TASTEN EINST." +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Warnung: Einige konfigurierte Mods fehlen.\n" -#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert " -#~ "wird. " +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n" -#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird. " +#~ msgid "Files to be deleted" +#~ msgstr "Zu löschende Dateien" -#~ msgid "Local install" -#~ msgstr "Lokale Install." +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt" -#~ msgid "Add mod:" -#~ msgstr "Modifikation hinzufügen:" +#~ msgid "Address required." +#~ msgstr "Adresse benötigt." -#~ msgid "MODS" -#~ msgstr "MODS" +#~ msgid "Create world" +#~ msgstr "Welt erstellen" -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTUREN PAKETE" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten." -#~ msgid "SINGLE PLAYER" -#~ msgstr "EINZELSPIELER" +#~ msgid "Show Favorites" +#~ msgstr "Zeige Favoriten" -#~ msgid "Finite Liquid" -#~ msgstr "Endliches Wasser" +#~ msgid "Show Public" +#~ msgstr "Zeige öffentliche" -#~ msgid "Preload item visuals" -#~ msgstr "Lade Inventarbilder vor" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen" -#~ msgid "SETTINGS" -#~ msgstr "EINSTELLUNGEN" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Warnung: Konfiguration nicht konsistent. " -#~ msgid "Password" -#~ msgstr "Passwort" +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguration gespeichert. " -#~ msgid "Name" -#~ msgstr "Name" +#~ msgid "is required by:" +#~ msgstr "wird benötigt von:" -#~ msgid "START SERVER" -#~ msgstr "SERVER STARTEN" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen" -#~ msgid "Favorites:" -#~ msgstr "Favoriten:" +#~ msgid "Downloading" +#~ msgstr "Lade herunter" -#~ msgid "CLIENT" -#~ msgstr "CLIENT" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Neustart nach Ändern des Treibers erforderlich" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Mod hinzufügen" +#~ msgid "Rendering:" +#~ msgstr "Rendering:" -#~ msgid "Remove selected mod" -#~ msgstr "Ausgewählte Mod löschen" +#~ msgid "If enabled, " +#~ msgstr "Wenn aktiviert, " -#~ msgid "EDIT GAME" -#~ msgstr "SPIEL ÄNDERN" +#~ msgid "If disabled " +#~ msgstr "Wenn deaktiviert " -#~ msgid "new game" -#~ msgstr "neues Spiel" +#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht " -#~ msgid "Mods:" -#~ msgstr "Mods:" - -#~ msgid "GAMES" -#~ msgstr "SPIELE" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren" - -#~ msgid "Game Name" -#~ msgstr "Spielname" - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Berührungsempfindlichkeit (px)" - -#~ msgid "Touch free target" -#~ msgstr "Berührungsfreies Ziel" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Um Shader zu benutzen, muss der OpenGL-Treiber benutzt werden." - -#~ msgid "Texturing:" -#~ msgstr "Texturierung:" - -#~ msgid "Simple Leaves" -#~ msgstr "Einfache Blätter" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Einzelspielerwelt zurücksetzen" - -#~ msgid "Opaque Water" -#~ msgstr "Undurchs. Wasser" - -#~ msgid "Opaque Leaves" -#~ msgstr "Undurchs. Blätter" - -#~ msgid "No!!!" -#~ msgstr "Nein!!!" - -#~ msgid "No Mipmap" -#~ msgstr "Keine Mipmap" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap u. Aniso. Filter" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#~ msgid "Fancy Leaves" -#~ msgstr "Schöne Blätter" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" - -#~ msgid "Antialiasing:" -#~ msgstr "Kantenglättung:" - -#~ msgid "8x" -#~ msgstr "8x" - -#~ msgid "4x" -#~ msgstr "4x" - -#~ msgid "2x" -#~ msgstr "2x" +#, fuzzy +#~ msgid "\"" +#~ msgstr "”" diff --git a/po/eo/minetest.po b/po/eo/minetest.po index d0ca66e5..bcbbea98 100644 --- a/po/eo/minetest.po +++ b/po/eo/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-09-13 12:36+0200\n" "Last-Translator: Tim \n" "Language-Team: Esperanto , , (, , ), , " @@ -1429,7 +1433,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1579,7 +1583,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1712,7 +1720,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1850,7 +1858,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1930,21 +1939,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Malŝaltu modifaron" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "ŝaltita" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2019,6 +2030,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2344,27 +2401,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2405,6 +2493,81 @@ msgstr "Mondogenerilo" msgid "Mapgen flags" msgstr "Mondogenerilo" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Mondogenerilo" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Mondogenerilo" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Paralaksa Okludo" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2581,6 +2744,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2891,7 +3062,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3141,7 +3312,7 @@ msgstr "Glatiga lumo" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3350,6 +3521,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3523,65 +3698,73 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "Bildigo:" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Tuŝa sojlo (px)" - -#~ msgid "Touch free target" -#~ msgstr "Sentuŝa celo" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Por uzi ombrigilojn, OpenGL-a pelilo estas necesa." - -#~ msgid "Texturing:" -#~ msgstr "Teksturado:" - -#~ msgid "Simple Leaves" -#~ msgstr "Simplaj foliaĵoj" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Skala faktoro por menuoj " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Nuligi solludantan mondon" - -#~ msgid "Opaque Water" -#~ msgstr "Opaka akvo" - -#~ msgid "Opaque Leaves" -#~ msgstr "Opakaj foliaĵoj" - -#~ msgid "No!!!" -#~ msgstr "Ne!!!" - -#~ msgid "No Mipmap" -#~ msgstr "Neniu Mipmapo" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmapo + Malizotropa filtrilo" - -#~ msgid "Mipmap" -#~ msgstr "Mipmapo" - -#~ msgid "Fancy Leaves" -#~ msgstr "Ŝikaj foliaĵoj" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Ĉu vi certas, ke vi volas nuligi vian solludantan mondon?" - -#~ msgid "Antialiasing:" -#~ msgstr "Glatigo:" - -#~ msgid "8x" -#~ msgstr "8x" +#~ msgid "2x" +#~ msgstr "2x" #~ msgid "4x" #~ msgstr "4x" -#~ msgid "2x" -#~ msgstr "2x" +#~ msgid "8x" +#~ msgstr "8x" + +#~ msgid "Antialiasing:" +#~ msgstr "Glatigo:" + +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Ĉu vi certas, ke vi volas nuligi vian solludantan mondon?" + +#~ msgid "Fancy Leaves" +#~ msgstr "Ŝikaj foliaĵoj" + +#~ msgid "Mipmap" +#~ msgstr "Mipmapo" + +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mipmapo + Malizotropa filtrilo" + +#~ msgid "No Mipmap" +#~ msgstr "Neniu Mipmapo" + +#~ msgid "No!!!" +#~ msgstr "Ne!!!" + +#~ msgid "Opaque Leaves" +#~ msgstr "Opakaj foliaĵoj" + +#~ msgid "Opaque Water" +#~ msgstr "Opaka akvo" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Nuligi solludantan mondon" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Skala faktoro por menuoj " + +#~ msgid "Simple Leaves" +#~ msgstr "Simplaj foliaĵoj" + +#~ msgid "Texturing:" +#~ msgstr "Teksturado:" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Por uzi ombrigilojn, OpenGL-a pelilo estas necesa." + +#~ msgid "Touch free target" +#~ msgstr "Sentuŝa celo" + +#~ msgid "Touchthreshold (px)" +#~ msgstr "Tuŝa sojlo (px)" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon" + +#~ msgid "Rendering:" +#~ msgstr "Bildigo:" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "ŝaltita" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Malŝaltu modifaron" diff --git a/po/es/minetest.po b/po/es/minetest.po index 489a30eb..3c74911a 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-27 19:39+0200\n" "Last-Translator: ShadowNinja \n" -"Language-Team: Spanish " -"\n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -424,7 +424,7 @@ msgid "Start Game" msgstr "Iniciar juego" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -453,6 +453,10 @@ msgstr "Editar" msgid "Enabled" msgstr "Activado" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1443,7 +1447,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1593,7 +1597,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1726,7 +1734,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1865,7 +1873,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1945,21 +1954,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Desactivar paquete" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "Activado" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2034,6 +2045,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2359,27 +2416,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2420,6 +2508,81 @@ msgstr "Generador de mapas" msgid "Mapgen flags" msgstr "Generador de mapas" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Generador de mapas" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Generador de mapas" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Oclusión de paralaje" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2596,6 +2759,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2906,7 +3077,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3156,7 +3327,7 @@ msgstr "Iluminación suave" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3366,6 +3537,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3539,73 +3714,81 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "Renderizado:" +#~ msgid "2x" +#~ msgstr "2x" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "" -#~ "Reinicia minetest para que los cambios en el controlador tengan efecto" +#~ msgid "4x" +#~ msgstr "4x" -#~ msgid " MB/s" -#~ msgstr " MB/s" +#~ msgid "8x" +#~ msgstr "8x" -#~ msgid " KB/s" -#~ msgstr " KB/s" +#~ msgid "Antialiasing:" +#~ msgstr "Suavizado:" -#~ msgid "Touchthreshold (px)" -#~ msgstr "Umbral táctil (px)" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?" -#~ msgid "Touch free target" -#~ msgstr "Tocar para interactuar" +#~ msgid "Fancy Leaves" +#~ msgstr "Hojas elegantes" + +#~ msgid "Mipmap" +#~ msgstr "Mipmap" + +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mipmap + Filtro aniso." + +#~ msgid "No Mipmap" +#~ msgstr "Sin Mipmap" + +#~ msgid "No!!!" +#~ msgstr "¡¡¡No!!!" + +#~ msgid "Opaque Leaves" +#~ msgstr "Hojas opacas" + +#~ msgid "Opaque Water" +#~ msgstr "Agua opaca" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Reiniciar mundo de un jugador" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Factor de escala aplicado a los elementos del menú: " + +#~ msgid "Simple Leaves" +#~ msgstr "Hojas simples" + +#~ msgid "Texturing:" +#~ msgstr "Texturizado:" #~ msgid "To enable shaders the OpenGL driver needs to be used." #~ msgstr "" #~ "Para habilitar los sombreadores debe utilizar el controlador OpenGL." -#~ msgid "Texturing:" -#~ msgstr "Texturizado:" +#~ msgid "Touch free target" +#~ msgstr "Tocar para interactuar" -#~ msgid "Simple Leaves" -#~ msgstr "Hojas simples" +#~ msgid "Touchthreshold (px)" +#~ msgstr "Umbral táctil (px)" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Factor de escala aplicado a los elementos del menú: " +#~ msgid " KB/s" +#~ msgstr " KB/s" -#~ msgid "Reset singleplayer world" -#~ msgstr "Reiniciar mundo de un jugador" +#~ msgid " MB/s" +#~ msgstr " MB/s" -#~ msgid "Opaque Water" -#~ msgstr "Agua opaca" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "" +#~ "Reinicia minetest para que los cambios en el controlador tengan efecto" -#~ msgid "Opaque Leaves" -#~ msgstr "Hojas opacas" +#~ msgid "Rendering:" +#~ msgstr "Renderizado:" -#~ msgid "No!!!" -#~ msgstr "¡¡¡No!!!" +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Activado" -#~ msgid "No Mipmap" -#~ msgstr "Sin Mipmap" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap + Filtro aniso." - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#~ msgid "Fancy Leaves" -#~ msgstr "Hojas elegantes" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?" - -#~ msgid "Antialiasing:" -#~ msgstr "Suavizado:" - -#~ msgid "8x" -#~ msgstr "8x" - -#~ msgid "4x" -#~ msgstr "4x" - -#~ msgid "2x" -#~ msgstr "2x" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Desactivar paquete" diff --git a/po/et/minetest.po b/po/et/minetest.po index c4883888..1bf9e2a9 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2013-12-18 21:28+0200\n" "Last-Translator: Jabo Babo \n" "Language-Team: LANGUAGE \n" @@ -431,7 +431,7 @@ msgid "Start Game" msgstr "Alusta mängu" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -460,6 +460,10 @@ msgstr "" msgid "Enabled" msgstr "Sisse lülitatud" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1429,7 +1433,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1580,7 +1584,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1711,7 +1719,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1847,7 +1855,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1927,21 +1936,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Lülita kõik välja" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "Sisse lülitatud" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2016,6 +2027,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2341,27 +2398,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2402,6 +2490,80 @@ msgstr "Põlvkonna kaardid" msgid "Mapgen flags" msgstr "Põlvkonna kaardid" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Põlvkonna kaardid" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Põlvkonna kaardid" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2578,6 +2740,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2881,7 +3051,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3124,7 +3294,7 @@ msgstr "Ilus valgustus" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3332,6 +3502,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3499,58 +3673,70 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Game Name" -#~ msgstr "Mäng" - -#~ msgid "GAMES" -#~ msgstr "MÄNGUD" - -#~ msgid "new game" -#~ msgstr "uus mängu" - -#~ msgid "EDIT GAME" -#~ msgstr "MUUDA MÄNGU" +#~ msgid "Opaque Leaves" +#~ msgstr "Läbipaistmatu vesi" #, fuzzy -#~ msgid "Remove selected mod" -#~ msgstr "Eemalda valitud muutus" +#~ msgid "Opaque Water" +#~ msgstr "Läbipaistmatu vesi" #, fuzzy -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Lisama muutus" +#~ msgid "Reset singleplayer world" +#~ msgstr "Üksikmäng" -#~ msgid "Favorites:" -#~ msgstr "Lemmikud:" - -#~ msgid "Name" -#~ msgstr "Nimi" - -#~ msgid "Password" -#~ msgstr "Parool" - -#~ msgid "SETTINGS" -#~ msgstr "Seaded" - -#~ msgid "Preload item visuals" -#~ msgstr "Lae asjade visuaale" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Aktiveerimiseks varjud, nad vajavad OpenGL draiver." #, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Löppev vedelik" +#~ msgid "Downloading" +#~ msgstr "Alla" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n" -#~ "Need lülitatakse sisse kohe pärast sätete salvestamist." +#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut " +#~ "asja" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n" -#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon." +#~ msgid "is required by:" +#~ msgstr "Seda vajavad:" + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguratsioon salvestatud. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Hoiatus: Konfiguratsioon pole kindel." + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" + +#~ msgid "Show Public" +#~ msgstr "Näita avalikke" + +#~ msgid "Show Favorites" +#~ msgstr "Näita lemmikuid" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." + +#~ msgid "Create world" +#~ msgstr "Loo maailm" + +#~ msgid "Address required." +#~ msgstr "IP on vajalkik." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" + +#~ msgid "Files to be deleted" +#~ msgstr "Failid mida kustutada" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus" #~ msgid "" #~ "Default Controls:\n" @@ -3577,68 +3763,64 @@ msgstr "" #~ "- ESC: Menüü\n" #~ "- T: Jututupa\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" - -#~ msgid "Files to be deleted" -#~ msgstr "Failid mida kustutada" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" - -#~ msgid "Address required." -#~ msgstr "IP on vajalkik." - -#~ msgid "Create world" -#~ msgstr "Loo maailm" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." - -#~ msgid "Show Favorites" -#~ msgstr "Näita lemmikuid" - -#~ msgid "Show Public" -#~ msgstr "Näita avalikke" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Hoiatus: Konfiguratsioon pole kindel." - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguratsioon salvestatud. " - -#~ msgid "is required by:" -#~ msgstr "Seda vajavad:" - -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " #~ msgstr "" -#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut " -#~ "asja" +#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n" +#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon." + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n" +#~ "Need lülitatakse sisse kohe pärast sätete salvestamist." #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Alla" +#~ msgid "Finite Liquid" +#~ msgstr "Löppev vedelik" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Aktiveerimiseks varjud, nad vajavad OpenGL draiver." +#~ msgid "Preload item visuals" +#~ msgstr "Lae asjade visuaale" + +#~ msgid "SETTINGS" +#~ msgstr "Seaded" + +#~ msgid "Password" +#~ msgstr "Parool" + +#~ msgid "Name" +#~ msgstr "Nimi" + +#~ msgid "Favorites:" +#~ msgstr "Lemmikud:" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Üksikmäng" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Lisama muutus" #, fuzzy -#~ msgid "Opaque Water" -#~ msgstr "Läbipaistmatu vesi" +#~ msgid "Remove selected mod" +#~ msgstr "Eemalda valitud muutus" + +#~ msgid "EDIT GAME" +#~ msgstr "MUUDA MÄNGU" + +#~ msgid "new game" +#~ msgstr "uus mängu" + +#~ msgid "GAMES" +#~ msgstr "MÄNGUD" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Läbipaistmatu vesi" +#~ msgid "Game Name" +#~ msgstr "Mäng" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Sisse lülitatud" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Lülita kõik välja" diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 1420ec84..1581d11e 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-28 12:55+0200\n" "Last-Translator: Jean-Patrick G. \n" -"Language-Team: French " -"\n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -420,8 +420,8 @@ msgid "Start Game" msgstr "Démarrer" #: builtin/mainmenu/tab_settings.lua -msgid "\"" -msgstr "\"" +msgid "\"$1\" is not a valid flag." +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -447,6 +447,10 @@ msgstr "Modifier" msgid "Enabled" msgstr "Activé" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -462,8 +466,8 @@ msgstr "Jeux" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" -"Éventuellement, l'option \"lacunarity\" peut être jointe par une virgule d" -"'en-tête." +"Éventuellement, l'option \"lacunarity\" peut être jointe par une virgule " +"d'en-tête." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." @@ -1272,8 +1276,8 @@ msgid "" "minetest.net." msgstr "" "Annoncer à la liste des serveurs publics.\n" -"Si vous voulez annoncer votre adresse IPv6, utilisez serverlist_url = " -"v6.servers.minetest.net." +"Si vous voulez annoncer votre adresse IPv6, utilisez serverlist_url = v6." +"servers.minetest.net." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1281,7 +1285,8 @@ msgstr "Demander de se reconnecter après une coupure de connexion" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "Déclarer automatiquement votre serveur à la liste des serveurs publics." +msgstr "" +"Déclarer automatiquement votre serveur à la liste des serveurs publics." #: src/settings_translation_file.cpp msgid "Backward key" @@ -1439,8 +1444,9 @@ msgstr "" "reste figé(e)." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" "Taille des déserts et plages dans Mapgen V6.\n" @@ -1597,12 +1603,12 @@ msgid "Dump the mapgen debug infos." msgstr "Afficher les infos de débogage de la génération de terrain." #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" -"Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas le " -"bloc complètement.\n" -"Note : cette fonctionnalité est assez expérimentale et l'éclairage doux ne " -"fonctionne pas dessus. " #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1614,7 +1620,8 @@ msgstr "Active les dégâts et la mort des joueurs." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "Active l'entrée aléatoire du joueur (seulement utilisé pour des tests)." +msgstr "" +"Active l'entrée aléatoire du joueur (seulement utilisé pour des tests)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." @@ -1757,9 +1764,10 @@ msgid "Fast movement" msgstr "Mouvement rapide" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" "Mouvement rapide (via la touche utiliser).\n" "Nécessite le privilège \"fast\" sur un serveur. " @@ -1906,11 +1914,13 @@ msgid "Generate normalmaps" msgstr "Normal mapping" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" "Attributs généraux de la génération de terrain.\n" "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent leurs " @@ -2008,21 +2018,26 @@ msgstr "" "pour ne pas gaspiller inutilement les ressources du processeur." #: src/settings_translation_file.cpp -msgid "If disabled " -msgstr "Si désactivé " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" "Si activé avec le mode vol, le joueur sera capable de traverser les blocs " "solides. " #: src/settings_translation_file.cpp -msgid "If enabled, " -msgstr "Si activé, " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2107,6 +2122,52 @@ msgstr "Inverser les mouvements verticaux de la souris." msgid "Item entity TTL" msgstr "Durée de vie des items abandonnés" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "Sauter" @@ -2121,10 +2182,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche pour réduire la distance de vue. Modifie la distance de vue minimale." -"\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Touche pour réduire la distance de vue. Modifie la distance de vue " +"minimale.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2133,8 +2194,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour jeter l'objet sélectionné.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2144,8 +2205,8 @@ msgid "" msgstr "" "Touche pour augmenter la distance de vue. Modifie la distance de vue " "minimale.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2154,8 +2215,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour sauter.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2164,8 +2225,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour se déplacer rapidement en mode rapide.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2174,8 +2235,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour reculer.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2184,8 +2245,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour avancer.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2194,8 +2255,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour se déplacer à gauche.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2204,8 +2265,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour se déplacer à droite.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2214,8 +2275,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour ouvrir la console de jeu.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2224,8 +2285,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour ouvrir la fenêtre de chat pour entrer des commandes.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2234,8 +2295,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour ouvrir la fenêtre de chat.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2244,8 +2305,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour ouvrir l'inventaire.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2254,8 +2315,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour afficher les infos de débogage. Utilisé pour le développement.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2267,8 +2328,8 @@ msgid "" msgstr "" "Touche pour se déplacer lentement.\n" "Utilisé pour descendre si aux1_descends est désactivé.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2277,8 +2338,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour changer de vue entre la 1ère et 3ème personne.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2287,8 +2348,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour prendre des captures d'écran.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2297,8 +2358,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour passer en mode cinématique.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2307,8 +2368,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour afficher/cacher la mini-carte.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2317,8 +2378,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour passer en mode rapide.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2327,8 +2388,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour voler.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2337,8 +2398,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour passer en mode \"sans-collision\".\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2346,10 +2407,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche de mise à jour de la caméra. Seulement utilisé pour le développement." -"\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Touche de mise à jour de la caméra. Seulement utilisé pour le " +"développement.\n" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2358,8 +2419,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour afficher/cacher les infos de débogage.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2368,8 +2429,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour afficher/cacher le HUD.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2378,8 +2439,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour afficher/cacher la zone de chat.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2388,8 +2449,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour afficher/cacher la brume.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2399,8 +2460,8 @@ msgid "" msgstr "" "Touche pour afficher/cacher la zone de profilage. Utilisé pour le " "développement.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2409,8 +2470,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Touche pour activer/désactiver la distance de vue illimitée.\n" -"Voir http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190173" -"5e3da1b0edf72eb3" +"Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2541,18 +2602,56 @@ msgstr "" "Rendre DirectX compatible avec LuaJIT. Désactiver si cela cause des " "problèmes." +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Chemin du monde" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen V6.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" +"Attributs de terrain spécifiques à Mapgen V7.\n" +"'ridges' sont les rivières.\n" +"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " +"défaut.\n" +"Les drapeaux commençant par \"non\" sont désactivés. " + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v6.\n" "When snowbiomes are enabled jungles are enabled and the jungles flag is " "ignored.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" "Attributs spécifiques à Mapgen V6.\n" "Quand les terrains neigeux sont activés, les jungles sont activés et les " @@ -2562,12 +2661,13 @@ msgstr "" "Les drapeaux commençant par \"non\" sont désactivés. " #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" "Attributs de terrain spécifiques à Mapgen V7.\n" "'ridges' sont les rivières.\n" @@ -2611,6 +2711,86 @@ msgstr "Débogage de la génération du terrain" msgid "Mapgen flags" msgstr "Drapeaux de génération de terrain" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Drapeaux de génération de terrain" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave1 noise parameters" +msgstr "Mapgen V5 : paramètres de bruit cave1" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave2 noise parameters" +msgstr "Mapgen V5 : paramètre de bruit cave2" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal filler depth noise parameters" +msgstr "Mapgen V5 : paramètres de bruit sur la profondeur" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Drapeaux de génération de terrain" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Nombre d'itérations sur l'occlusion parallaxe" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal mandelbrot iterations" +msgstr "Paquets maximum par itération" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal seabed noise parameters" +msgstr "Mapgen : paramètres de mélange de la température" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "Mapgen : paramètres de mélange de la température" @@ -2783,6 +2963,14 @@ msgstr "FPS maximum" msgid "Maximum FPS when game is paused." msgstr "FPS maximum quand le jeu est en pause." +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "Mapblocks maximum chargés de force" @@ -3129,9 +3317,10 @@ msgid "Physics" msgstr "Physique" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" "Le joueur est capable de voler sans être affecté par la gravité.\n" "Nécessite le privilège \"fly\" sur un serveur. " @@ -3164,8 +3353,8 @@ msgid "" "inventory." msgstr "" "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n" -"Cela augmente le temps de démarrage, mais rend les inventaires plus fluides." -"\n" +"Cela augmente le temps de démarrage, mais rend les inventaires plus " +"fluides.\n" "Les textures générées peuvent facilement déborder votre VRAM, causant des " "bugs dans votre inventaire." @@ -3182,8 +3371,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" -"Délais d’intervalle d'affichage du profilage des données. 0 = désactivation." -"\n" +"Délais d’intervalle d'affichage du profilage des données. 0 = " +"désactivation.\n" "Utile pour les développeurs." #: src/settings_translation_file.cpp @@ -3400,8 +3589,9 @@ msgid "Smooth lighting" msgstr "Lumière douce" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" "Lisse les mouvement de la caméra en se déplaçant et en regardant autour.\n" @@ -3432,8 +3622,8 @@ msgid "" msgstr "" "Spécifie l'URL à laquelle les clients obtiennent les fichiers média au lieu " "d'utiliser le port UDP.\n" -"$filename doit être accessible depuis $remote_media$filename via cURL (" -"évidemment, remote_media devrait\n" +"$filename doit être accessible depuis $remote_media$filename via cURL " +"(évidemment, remote_media devrait\n" "se terminer avec un slash).\n" "Les fichiers qui ne sont pas présents seront obtenus avec le moyen usuel." @@ -3643,6 +3833,10 @@ msgstr "Largeur initiale de la fenêtre de jeu." msgid "Vertical screen synchronization." msgstr "Synchronisation verticale de la fenêtre de jeu." +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Pilote vidéo" @@ -3847,91 +4041,100 @@ msgstr "Limite parallèle de cURL" msgid "cURL timeout" msgstr "Délais d'interruption de cURL" -#~ msgid "Rendering:" -#~ msgstr "Affichage :" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet" +#~ msgid "Fancy Leaves" +#~ msgstr "Arbres détaillés" -#~ msgid "Game Name" -#~ msgstr "Nom du jeu" +#~ msgid "Mipmap" +#~ msgstr "MIP mapping" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\"" +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "MIP map + anisotropie" -#~ msgid "GAMES" -#~ msgstr "JEUX" +#~ msgid "No Mipmap" +#~ msgstr "Sans MIP map" -#~ msgid "Mods:" -#~ msgstr "Mods :" +#~ msgid "No!!!" +#~ msgstr "Non !" -#~ msgid "new game" -#~ msgstr "nouveau jeu" +#~ msgid "Opaque Leaves" +#~ msgstr "Arbres minimaux" -#~ msgid "EDIT GAME" -#~ msgstr "MODIFIER LE JEU" +#~ msgid "Opaque Water" +#~ msgstr "Eau opaque" -#~ msgid "Remove selected mod" -#~ msgstr "Supprimer le mod sélectionné" +#~ msgid "Reset singleplayer world" +#~ msgstr "Réinitialiser le monde" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Ajouter un mod" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Taille appliquée aux menus : " -#~ msgid "CLIENT" -#~ msgstr "CLIENT" +#~ msgid "Simple Leaves" +#~ msgstr "Arbres simples" -#~ msgid "Favorites:" -#~ msgstr "Favoris :" +#~ msgid "Texturing:" +#~ msgstr "Textures :" -#~ msgid "START SERVER" -#~ msgstr "DÉMARRER LE SERVEUR" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé." -#~ msgid "Name" -#~ msgstr "Nom" +#~ msgid "Downloading" +#~ msgstr "Téléchargement" -#~ msgid "Password" -#~ msgstr "Mot de passe" +#~ msgid " KB/s" +#~ msgstr " Ko/s" -#~ msgid "SETTINGS" -#~ msgstr "PARAMÈTRES" +#~ msgid " MB/s" +#~ msgstr " Mo/s" -#~ msgid "Preload item visuals" -#~ msgstr "Précharger les objets" - -#~ msgid "Finite Liquid" -#~ msgstr "Liquides limités" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "PARTIE SOLO" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACKS DE TEXTURES" - -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "Add mod:" -#~ msgstr "Ajouter un mod :" - -#~ msgid "Local install" -#~ msgstr "Installation locale" - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Attention : certains mods ne sont pas encore configurés.\n" -#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. " +#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ msgid "is required by:" +#~ msgstr "est requis par :" + +#~ msgid "Configuration saved. " +#~ msgstr "Configuration enregistrée. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Attention : configuration incorrecte. " + +#~ msgid "Cannot create world: Name contains invalid characters" #~ msgstr "" -#~ "Attention : certains mods configurés sont introuvables.\n" -#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. " +#~ "Impossible de créer le monde : le nom contient des caractères invalides" -#~ msgid "Delete map" -#~ msgstr "Supprimer la carte" +#~ msgid "Show Public" +#~ msgstr "Voir les serveurs publics" + +#~ msgid "Show Favorites" +#~ msgstr "Voir les serveurs favoris" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Laisser l'adresse vide pour lancer un serveur local." + +#~ msgid "Create world" +#~ msgstr "Créer un monde" + +#~ msgid "Address required." +#~ msgstr "Adresse requise." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné" + +#~ msgid "Files to be deleted" +#~ msgstr "Fichiers à supprimer" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Impossible de configurer ce monde : aucune sélection active" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés" #~ msgid "" #~ "Default Controls:\n" @@ -3958,97 +4161,104 @@ msgstr "Délais d'interruption de cURL" #~ "- Échap : ce menu\n" #~ "- T : discuter\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés" +#~ msgid "Delete map" +#~ msgstr "Supprimer la carte" -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Impossible de configurer ce monde : aucune sélection active" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent" - -#~ msgid "Files to be deleted" -#~ msgstr "Fichiers à supprimer" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné" - -#~ msgid "Address required." -#~ msgstr "Adresse requise." - -#~ msgid "Create world" -#~ msgstr "Créer un monde" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Laisser l'adresse vide pour lancer un serveur local." - -#~ msgid "Show Favorites" -#~ msgstr "Voir les serveurs favoris" - -#~ msgid "Show Public" -#~ msgstr "Voir les serveurs publics" - -#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " #~ msgstr "" -#~ "Impossible de créer le monde : le nom contient des caractères invalides" +#~ "Attention : certains mods configurés sont introuvables.\n" +#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. " -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Attention : configuration incorrecte. " - -#~ msgid "Configuration saved. " -#~ msgstr "Configuration enregistrée. " - -#~ msgid "is required by:" -#~ msgstr "est requis par :" - -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " #~ msgstr "" -#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet" +#~ "Attention : certains mods ne sont pas encore configurés.\n" +#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. " -#~ msgid " MB/s" -#~ msgstr " Mo/s" +#~ msgid "Local install" +#~ msgstr "Installation locale" -#~ msgid " KB/s" -#~ msgstr " Ko/s" +#~ msgid "Add mod:" +#~ msgstr "Ajouter un mod :" -#~ msgid "Downloading" -#~ msgstr "Téléchargement" +#~ msgid "MODS" +#~ msgstr "MODS" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé." +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACKS DE TEXTURES" -#~ msgid "Texturing:" -#~ msgstr "Textures :" +#~ msgid "SINGLE PLAYER" +#~ msgstr "PARTIE SOLO" -#~ msgid "Simple Leaves" -#~ msgstr "Arbres simples" +#~ msgid "Finite Liquid" +#~ msgstr "Liquides limités" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Taille appliquée aux menus : " +#~ msgid "Preload item visuals" +#~ msgstr "Précharger les objets" -#~ msgid "Reset singleplayer world" -#~ msgstr "Réinitialiser le monde" +#~ msgid "SETTINGS" +#~ msgstr "PARAMÈTRES" -#~ msgid "Opaque Water" -#~ msgstr "Eau opaque" +#~ msgid "Password" +#~ msgstr "Mot de passe" -#~ msgid "Opaque Leaves" -#~ msgstr "Arbres minimaux" +#~ msgid "Name" +#~ msgstr "Nom" -#~ msgid "No!!!" -#~ msgstr "Non !" +#~ msgid "START SERVER" +#~ msgstr "DÉMARRER LE SERVEUR" -#~ msgid "No Mipmap" -#~ msgstr "Sans MIP map" +#~ msgid "Favorites:" +#~ msgstr "Favoris :" -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "MIP map + anisotropie" +#~ msgid "CLIENT" +#~ msgstr "CLIENT" -#~ msgid "Mipmap" -#~ msgstr "MIP mapping" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Ajouter un mod" -#~ msgid "Fancy Leaves" -#~ msgstr "Arbres détaillés" +#~ msgid "Remove selected mod" +#~ msgstr "Supprimer le mod sélectionné" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?" +#~ msgid "EDIT GAME" +#~ msgstr "MODIFIER LE JEU" + +#~ msgid "new game" +#~ msgstr "nouveau jeu" + +#~ msgid "Mods:" +#~ msgstr "Mods :" + +#~ msgid "GAMES" +#~ msgstr "JEUX" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nom du jeu" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet" + +#~ msgid "Rendering:" +#~ msgstr "Affichage :" + +#~ msgid "If enabled, " +#~ msgstr "Si activé, " + +#~ msgid "If disabled " +#~ msgstr "Si désactivé " + +#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgstr "" +#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas " +#~ "le bloc complètement.\n" +#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux " +#~ "ne fonctionne pas dessus. " + +#~ msgid "\"" +#~ msgstr "\"" diff --git a/po/he/minetest.po b/po/he/minetest.po index 12e0cc72..7c9e8e95 100644 --- a/po/he/minetest.po +++ b/po/he/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-26 16:22+0200\n" "Last-Translator: ChaosWormz \n" -"Language-Team: Hebrew " -"\n" +"Language-Team: Hebrew \n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,18 +19,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.5-dev\n" -#: builtin/fstk/ui.lua -msgid "The server has requested a reconnect:" -msgstr "" - -#: builtin/fstk/ui.lua -msgid "Main menu" -msgstr "תפריט ראשי" - -#: builtin/fstk/ui.lua -msgid "Reconnect" -msgstr "התחבר מחדש" - #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" msgstr "" @@ -39,20 +27,28 @@ msgstr "" msgid "An error occured:" msgstr "התרחשה שגיאה:" +#: builtin/fstk/ui.lua +msgid "Main menu" +msgstr "תפריט ראשי" + #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" msgstr "אישור" +#: builtin/fstk/ui.lua +msgid "Reconnect" +msgstr "התחבר מחדש" + +#: builtin/fstk/ui.lua +msgid "The server has requested a reconnect:" +msgstr "" + #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." msgstr "טוען..." #: builtin/mainmenu/common.lua -msgid "Try reenabling public serverlist and check your internet connection." -msgstr "" - -#: builtin/mainmenu/common.lua -msgid "Server supports protocol versions between $1 and $2. " +msgid "Protocol version mismatch. " msgstr "" #: builtin/mainmenu/common.lua @@ -60,7 +56,11 @@ msgid "Server enforces protocol version $1. " msgstr "" #: builtin/mainmenu/common.lua -msgid "We support protocol versions between version $1 and $2." +msgid "Server supports protocol versions between $1 and $2. " +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Try reenabling public serverlist and check your internet connection." msgstr "" #: builtin/mainmenu/common.lua @@ -68,12 +68,38 @@ msgid "We only support protocol version $1." msgstr "" #: builtin/mainmenu/common.lua -msgid "Protocol version mismatch. " +msgid "We support protocol versions between version $1 and $2." +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Cancel" +msgstr "ביטול" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua +#, fuzzy +msgid "Depends:" +msgstr "תלוי ב:" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Disable MP" msgstr "" #: builtin/mainmenu/dlg_config_world.lua -msgid "World:" -msgstr "עולם:" +msgid "Enable MP" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +#, fuzzy +msgid "Enable all" +msgstr "אפשר בכל" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "" +"Failed to enable mod \"$1\" as it contains disallowed characters. Only " +"chararacters [a-z0-9_] are allowed." +msgstr "" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -88,102 +114,68 @@ msgstr "" msgid "Mod:" msgstr "מוד:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua -#, fuzzy -msgid "Depends:" -msgstr "תלוי ב:" - #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp msgid "Save" msgstr "שמור" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp -msgid "Cancel" -msgstr "ביטול" - #: builtin/mainmenu/dlg_config_world.lua -msgid "Enable MP" -msgstr "" - -#: builtin/mainmenu/dlg_config_world.lua -msgid "Disable MP" -msgstr "" +msgid "World:" +msgstr "עולם:" #: builtin/mainmenu/dlg_config_world.lua #, fuzzy msgid "enabled" msgstr "מופעל" -#: builtin/mainmenu/dlg_config_world.lua -#, fuzzy -msgid "Enable all" -msgstr "אפשר בכל" - -#: builtin/mainmenu/dlg_config_world.lua -msgid "" -"Failed to enable mod \"$1\" as it contains disallowed characters. Only " -"chararacters [a-z0-9_] are allowed." -msgstr "" - #: builtin/mainmenu/dlg_create_world.lua -msgid "World name" -msgstr "שם העולם" - -#: builtin/mainmenu/dlg_create_world.lua -msgid "Seed" +msgid "A world named \"$1\" already exists" msgstr "" -#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp -msgid "Mapgen" -msgstr "" - -#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp -msgid "Game" -msgstr "משחק" - #: builtin/mainmenu/dlg_create_world.lua msgid "Create" msgstr "ליצור" #: builtin/mainmenu/dlg_create_world.lua -msgid "You have no subgames installed." +msgid "Download a subgame, such as minetest_game, from minetest.net" msgstr "" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" msgstr "" +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Game" +msgstr "משחק" + +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Mapgen" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "No worldname given or no game selected" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Seed" +msgstr "" + #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." msgstr "" #: builtin/mainmenu/dlg_create_world.lua -msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" +msgid "World name" +msgstr "שם העולם" #: builtin/mainmenu/dlg_create_world.lua -msgid "A world named \"$1\" already exists" -msgstr "" - -#: builtin/mainmenu/dlg_create_world.lua -msgid "No worldname given or no game selected" +msgid "You have no subgames installed." msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" msgstr "האם ברצונך למחוק את \"$1\"?" -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -msgid "Yes" -msgstr "כן" - -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "לא ברור שלא!" - #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "" @@ -192,6 +184,14 @@ msgstr "" msgid "Modmgr: invalid modpath \"$1\"" msgstr "" +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "No of course not!" +msgstr "לא ברור שלא!" + +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +msgid "Yes" +msgstr "כן" + #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "למחוק עולם \"$1\"?" @@ -200,17 +200,13 @@ msgstr "למחוק עולם \"$1\"?" msgid "No" msgstr "לא" -#: builtin/mainmenu/dlg_rename_modpack.lua -msgid "Rename Modpack:" -msgstr "" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp #, fuzzy msgid "Accept" msgstr "קבל" -#: builtin/mainmenu/modmgr.lua -msgid "Install Mod: file: \"$1\"" +#: builtin/mainmenu/dlg_rename_modpack.lua +msgid "Rename Modpack:" msgstr "" #: builtin/mainmenu/modmgr.lua @@ -224,55 +220,59 @@ msgid "Failed to install $1 to $2" msgstr "" #: builtin/mainmenu/modmgr.lua -msgid "Install Mod: unable to find suitable foldername for modpack $1" +msgid "Install Mod: file: \"$1\"" msgstr "" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" msgstr "" -#: builtin/mainmenu/store.lua -msgid "Unsorted" +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" -#: builtin/mainmenu/store.lua -msgid "Search" -msgstr "חפש" - -#: builtin/mainmenu/store.lua -msgid "Downloading $1, please wait..." -msgstr "" - -#: builtin/mainmenu/store.lua -msgid "Successfully installed:" -msgstr "הותקן בהצלחה:" - -#: builtin/mainmenu/store.lua -msgid "Shortname:" -msgstr "שם קצר:" - -#: builtin/mainmenu/store.lua -msgid "Rating" -msgstr "דירוג" - -#: builtin/mainmenu/store.lua -msgid "re-Install" -msgstr "התקן מחדש" - -#: builtin/mainmenu/store.lua -msgid "Install" -msgstr "החקן" - #: builtin/mainmenu/store.lua msgid "Close store" msgstr "" +#: builtin/mainmenu/store.lua +msgid "Downloading $1, please wait..." +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Install" +msgstr "החקן" + #: builtin/mainmenu/store.lua msgid "Page $1 of $2" msgstr "" +#: builtin/mainmenu/store.lua +msgid "Rating" +msgstr "דירוג" + +#: builtin/mainmenu/store.lua +msgid "Search" +msgstr "חפש" + +#: builtin/mainmenu/store.lua +msgid "Shortname:" +msgstr "שם קצר:" + +#: builtin/mainmenu/store.lua +msgid "Successfully installed:" +msgstr "הותקן בהצלחה:" + +#: builtin/mainmenu/store.lua +msgid "Unsorted" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "re-Install" +msgstr "התקן מחדש" + #: builtin/mainmenu/tab_credits.lua -msgid "Credits" +msgid "Active Contributors" msgstr "" #: builtin/mainmenu/tab_credits.lua @@ -280,27 +280,31 @@ msgid "Core Developers" msgstr "" #: builtin/mainmenu/tab_credits.lua -msgid "Active Contributors" -msgstr "" - -#: builtin/mainmenu/tab_credits.lua -msgid "Previous Core Developers" +msgid "Credits" msgstr "" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" msgstr "" +#: builtin/mainmenu/tab_credits.lua +msgid "Previous Core Developers" +msgstr "" + #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" msgstr "" #: builtin/mainmenu/tab_mods.lua -msgid "No mod description available" +msgid "Mod information:" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua +msgid "Mods" msgstr "" #: builtin/mainmenu/tab_mods.lua -msgid "Mod information:" +msgid "No mod description available" msgstr "" #: builtin/mainmenu/tab_mods.lua @@ -308,7 +312,7 @@ msgid "Rename" msgstr "" #: builtin/mainmenu/tab_mods.lua -msgid "Uninstall selected modpack" +msgid "Select Mod File:" msgstr "" #: builtin/mainmenu/tab_mods.lua @@ -316,29 +320,17 @@ msgid "Uninstall selected mod" msgstr "" #: builtin/mainmenu/tab_mods.lua -msgid "Select Mod File:" -msgstr "" - -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" +msgid "Uninstall selected modpack" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" msgstr "" -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "" - -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "" - -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "" +#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Client" +msgstr "קלינט" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" @@ -352,31 +344,31 @@ msgstr "" msgid "Damage enabled" msgstr "" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua +#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp +msgid "Delete" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua +msgid "Name / Password :" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Public Serverlist" +msgstr "" + #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" msgstr "" -#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp -#, fuzzy -msgid "Client" -msgstr "קלינט" - -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -msgid "New" +#: builtin/mainmenu/tab_server.lua +msgid "Bind Address" msgstr "" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" msgstr "" -#: builtin/mainmenu/tab_server.lua -msgid "Start Game" -msgstr "" - -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -msgid "Select World:" -msgstr "" - #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Creative Mode" @@ -387,36 +379,44 @@ msgstr "" msgid "Enable Damage" msgstr "" -#: builtin/mainmenu/tab_server.lua -msgid "Public" -msgstr "" - #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua msgid "Name/Password" msgstr "" -#: builtin/mainmenu/tab_server.lua -msgid "Bind Address" -msgstr "" - -#: builtin/mainmenu/tab_server.lua -msgid "Port" -msgstr "" - -#: builtin/mainmenu/tab_server.lua -msgid "Server Port" +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "New" msgstr "" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" msgstr "" +#: builtin/mainmenu/tab_server.lua +msgid "Port" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Public" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "Select World:" +msgstr "" + #: builtin/mainmenu/tab_server.lua msgid "Server" msgstr "" +#: builtin/mainmenu/tab_server.lua +msgid "Server Port" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Start Game" +msgstr "" + #: builtin/mainmenu/tab_settings.lua -msgid "Games" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -424,11 +424,27 @@ msgid "(No description of setting given)" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." +msgid "Browse" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " +msgid "Change keys" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Disabled" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Enabled" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -437,26 +453,46 @@ msgid "" ", " msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Games" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "Please enter a comma seperated list of flags." msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Settings" +msgstr "הגדרות" + +#: builtin/mainmenu/tab_settings.lua +msgid "Show technical names" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." msgstr "" @@ -465,42 +501,6 @@ msgstr "" msgid "The value must be lower than $1." msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "\"" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Change keys" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Settings" -msgstr "הגדרות" - -#: builtin/mainmenu/tab_simple_main.lua -msgid "Start Singleplayer" -msgstr "" - #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "" @@ -509,6 +509,10 @@ msgstr "" msgid "Main" msgstr "" +#: builtin/mainmenu/tab_simple_main.lua +msgid "Start Singleplayer" +msgstr "" + #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" msgstr "" @@ -517,6 +521,10 @@ msgstr "" msgid "Singleplayer" msgstr "שחקן יחיד" +#: builtin/mainmenu/tab_texturepacks.lua +msgid "No information available" +msgstr "" + #: builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "" @@ -525,10 +533,6 @@ msgstr "" msgid "Select texture pack:" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "No information available" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" msgstr "" @@ -538,49 +542,33 @@ msgid "Connection timed out." msgstr "" #: src/client.cpp -msgid "Loading textures..." -msgstr "" - -#: src/client.cpp -msgid "Rebuilding shaders..." -msgstr "" - -#: src/client.cpp -msgid "Initializing nodes..." +msgid "Done!" msgstr "" #: src/client.cpp msgid "Initializing nodes" msgstr "" +#: src/client.cpp +msgid "Initializing nodes..." +msgstr "" + #: src/client.cpp msgid "Item textures..." msgstr "" #: src/client.cpp -msgid "Done!" +msgid "Loading textures..." msgstr "" -#: src/client/clientlauncher.cpp -msgid "Main Menu" -msgstr "" - -#: src/client/clientlauncher.cpp -msgid "Player name too long." +#: src/client.cpp +msgid "Rebuilding shaders..." msgstr "" #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" msgstr "" -#: src/client/clientlauncher.cpp -msgid "No world selected and no address provided. Nothing to do." -msgstr "" - -#: src/client/clientlauncher.cpp -msgid "Provided world path doesn't exist: " -msgstr "" - #: src/client/clientlauncher.cpp msgid "Could not find or load game \"" msgstr "" @@ -589,20 +577,69 @@ msgstr "" msgid "Invalid gamespec." msgstr "" +#: src/client/clientlauncher.cpp +msgid "Main Menu" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "No world selected and no address provided. Nothing to do." +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Player name too long." +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Provided world path doesn't exist: " +msgstr "" + #: src/fontengine.cpp msgid "needs_fallback_font" msgstr "" -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" +#: src/game.cpp +msgid "" +"\n" +"Check debug.txt for details." msgstr "" #: src/game.cpp -msgid "You died." +msgid "Change Keys" msgstr "" #: src/game.cpp -msgid "Respawn" +msgid "Change Password" +msgstr "" + +#: src/game.cpp +msgid "Connecting to server..." +msgstr "" + +#: src/game.cpp +msgid "Continue" +msgstr "" + +#: src/game.cpp +msgid "Creating client..." +msgstr "" + +#: src/game.cpp +msgid "Creating server..." +msgstr "" + +#: src/game.cpp +msgid "" +"Default Controls:\n" +"- WASD: move\n" +"- Space: jump/climb\n" +"- Shift: sneak/go down\n" +"- Q: drop item\n" +"- I: inventory\n" +"- Mouse: turn/look\n" +"- Mouse left: dig/punch\n" +"- Mouse right: place/use\n" +"- Mouse wheel: select item\n" +"- T: chat\n" msgstr "" #: src/game.cpp @@ -621,37 +658,6 @@ msgid "" " --> place single item to slot\n" msgstr "" -#: src/game.cpp -msgid "" -"Default Controls:\n" -"- WASD: move\n" -"- Space: jump/climb\n" -"- Shift: sneak/go down\n" -"- Q: drop item\n" -"- I: inventory\n" -"- Mouse: turn/look\n" -"- Mouse left: dig/punch\n" -"- Mouse right: place/use\n" -"- Mouse wheel: select item\n" -"- T: chat\n" -msgstr "" - -#: src/game.cpp -msgid "Continue" -msgstr "" - -#: src/game.cpp -msgid "Change Password" -msgstr "" - -#: src/game.cpp -msgid "Sound Volume" -msgstr "" - -#: src/game.cpp -msgid "Change Keys" -msgstr "" - #: src/game.cpp msgid "Exit to Menu" msgstr "" @@ -660,50 +666,48 @@ msgstr "" msgid "Exit to OS" msgstr "" -#: src/game.cpp -msgid "Shutting down..." -msgstr "" - -#: src/game.cpp -msgid "Creating server..." -msgstr "" - -#: src/game.cpp -msgid "Creating client..." -msgstr "" - -#: src/game.cpp -msgid "Resolving address..." -msgstr "" - -#: src/game.cpp -msgid "Connecting to server..." -msgstr "" - #: src/game.cpp msgid "Item definitions..." msgstr "" -#: src/game.cpp -msgid "Node definitions..." -msgstr "" - -#: src/game.cpp -msgid "Media..." -msgstr "" - #: src/game.cpp msgid "KiB/s" msgstr "" +#: src/game.cpp +msgid "Media..." +msgstr "" + #: src/game.cpp msgid "MiB/s" msgstr "" #: src/game.cpp -msgid "" -"\n" -"Check debug.txt for details." +msgid "Node definitions..." +msgstr "" + +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "Proceed" +msgstr "" + +#: src/game.cpp +msgid "Resolving address..." +msgstr "" + +#: src/game.cpp +msgid "Respawn" +msgstr "" + +#: src/game.cpp +msgid "Shutting down..." +msgstr "" + +#: src/game.cpp +msgid "Sound Volume" +msgstr "" + +#: src/game.cpp +msgid "You died." msgstr "" #: src/guiFormSpecMenu.cpp @@ -714,62 +718,14 @@ msgstr "" msgid "ok" msgstr "" -#: src/guiKeyChangeMenu.cpp -msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "" - #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" msgstr "" -#: src/guiKeyChangeMenu.cpp -msgid "Double tap \"jump\" to toggle fly" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "Key already in use" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "press key" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "Forward" -msgstr "" - #: src/guiKeyChangeMenu.cpp msgid "Backward" msgstr "" -#: src/guiKeyChangeMenu.cpp src/keycode.cpp -msgid "Left" -msgstr "" - -#: src/guiKeyChangeMenu.cpp src/keycode.cpp -msgid "Right" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "Use" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "Jump" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "Sneak" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "Drop" -msgstr "" - -#: src/guiKeyChangeMenu.cpp -msgid "Inventory" -msgstr "" - #: src/guiKeyChangeMenu.cpp msgid "Chat" msgstr "" @@ -783,39 +739,75 @@ msgid "Console" msgstr "" #: src/guiKeyChangeMenu.cpp -msgid "Toggle fly" +msgid "Double tap \"jump\" to toggle fly" msgstr "" #: src/guiKeyChangeMenu.cpp -msgid "Toggle fast" +msgid "Drop" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Forward" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Inventory" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Jump" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Key already in use" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Left" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp +msgid "Print stacks" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Range select" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Right" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Sneak" msgstr "" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" msgstr "" +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fast" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fly" +msgstr "" + #: src/guiKeyChangeMenu.cpp msgid "Toggle noclip" msgstr "" #: src/guiKeyChangeMenu.cpp -msgid "Range select" +msgid "Use" msgstr "" -#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp -msgid "Print stacks" -msgstr "" - -#: src/guiPasswordChange.cpp -msgid "Old Password" -msgstr "" - -#: src/guiPasswordChange.cpp -msgid "New Password" -msgstr "" - -#: src/guiPasswordChange.cpp -msgid "Confirm Password" +#: src/guiKeyChangeMenu.cpp +msgid "press key" msgstr "" #: src/guiPasswordChange.cpp @@ -823,109 +815,149 @@ msgid "Change" msgstr "" #: src/guiPasswordChange.cpp -msgid "Passwords do not match!" +msgid "Confirm Password" msgstr "" -#: src/guiVolumeChange.cpp -msgid "Sound Volume: " +#: src/guiPasswordChange.cpp +msgid "New Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Old Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Passwords do not match!" msgstr "" #: src/guiVolumeChange.cpp msgid "Exit" msgstr "" -#: src/keycode.cpp -msgid "Left Button" +#: src/guiVolumeChange.cpp +msgid "Sound Volume: " msgstr "" #: src/keycode.cpp -msgid "Middle Button" +msgid "Apps" msgstr "" #: src/keycode.cpp -msgid "Right Button" -msgstr "" - -#: src/keycode.cpp -msgid "X Button 1" +msgid "Attn" msgstr "" #: src/keycode.cpp msgid "Back" msgstr "" +#: src/keycode.cpp +msgid "Capital" +msgstr "" + #: src/keycode.cpp msgid "Clear" msgstr "" #: src/keycode.cpp -msgid "Return" -msgstr "" - -#: src/keycode.cpp -msgid "Tab" -msgstr "" - -#: src/keycode.cpp -msgid "X Button 2" -msgstr "" - -#: src/keycode.cpp -msgid "Capital" +msgid "Comma" msgstr "" #: src/keycode.cpp msgid "Control" msgstr "" -#: src/keycode.cpp -msgid "Kana" -msgstr "" - -#: src/keycode.cpp -msgid "Menu" -msgstr "" - -#: src/keycode.cpp -msgid "Pause" -msgstr "" - -#: src/keycode.cpp -msgid "Shift" -msgstr "" - #: src/keycode.cpp msgid "Convert" msgstr "" #: src/keycode.cpp -msgid "Escape" +msgid "CrSel" msgstr "" #: src/keycode.cpp -msgid "Final" -msgstr "" - -#: src/keycode.cpp -msgid "Junja" -msgstr "" - -#: src/keycode.cpp -msgid "Kanji" -msgstr "" - -#: src/keycode.cpp -msgid "Nonconvert" +msgid "Down" msgstr "" #: src/keycode.cpp msgid "End" msgstr "" +#: src/keycode.cpp +msgid "Erase OEF" +msgstr "" + +#: src/keycode.cpp +msgid "Escape" +msgstr "" + +#: src/keycode.cpp +msgid "ExSel" +msgstr "" + +#: src/keycode.cpp +msgid "Execute" +msgstr "" + +#: src/keycode.cpp +msgid "Final" +msgstr "" + +#: src/keycode.cpp +msgid "Help" +msgstr "" + #: src/keycode.cpp msgid "Home" msgstr "" +#: src/keycode.cpp +msgid "Insert" +msgstr "" + +#: src/keycode.cpp +msgid "Junja" +msgstr "" + +#: src/keycode.cpp +msgid "Kana" +msgstr "" + +#: src/keycode.cpp +msgid "Kanji" +msgstr "" + +#: src/keycode.cpp +msgid "Left Button" +msgstr "" + +#: src/keycode.cpp +msgid "Left Control" +msgstr "" + +#: src/keycode.cpp +msgid "Left Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Left Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Left Windows" +msgstr "" + +#: src/keycode.cpp +msgid "Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Middle Button" +msgstr "" + +#: src/keycode.cpp +msgid "Minus" +msgstr "" + #: src/keycode.cpp msgid "Mode Change" msgstr "" @@ -935,51 +967,27 @@ msgid "Next" msgstr "" #: src/keycode.cpp -msgid "Prior" +msgid "Nonconvert" msgstr "" #: src/keycode.cpp -msgid "Space" +msgid "Num Lock" msgstr "" #: src/keycode.cpp -msgid "Down" +msgid "Numpad *" msgstr "" #: src/keycode.cpp -msgid "Execute" +msgid "Numpad +" msgstr "" #: src/keycode.cpp -msgid "Print" +msgid "Numpad -" msgstr "" #: src/keycode.cpp -msgid "Select" -msgstr "" - -#: src/keycode.cpp -msgid "Up" -msgstr "" - -#: src/keycode.cpp -msgid "Help" -msgstr "" - -#: src/keycode.cpp -msgid "Insert" -msgstr "" - -#: src/keycode.cpp -msgid "Snapshot" -msgstr "" - -#: src/keycode.cpp -msgid "Left Windows" -msgstr "" - -#: src/keycode.cpp -msgid "Apps" +msgid "Numpad /" msgstr "" #: src/keycode.cpp @@ -990,14 +998,6 @@ msgstr "" msgid "Numpad 1" msgstr "" -#: src/keycode.cpp -msgid "Right Windows" -msgstr "" - -#: src/keycode.cpp -msgid "Sleep" -msgstr "" - #: src/keycode.cpp msgid "Numpad 2" msgstr "" @@ -1022,22 +1022,6 @@ msgstr "" msgid "Numpad 7" msgstr "" -#: src/keycode.cpp -msgid "Numpad *" -msgstr "" - -#: src/keycode.cpp -msgid "Numpad +" -msgstr "" - -#: src/keycode.cpp -msgid "Numpad -" -msgstr "" - -#: src/keycode.cpp -msgid "Numpad /" -msgstr "" - #: src/keycode.cpp msgid "Numpad 8" msgstr "" @@ -1046,70 +1030,6 @@ msgstr "" msgid "Numpad 9" msgstr "" -#: src/keycode.cpp -msgid "Num Lock" -msgstr "" - -#: src/keycode.cpp -msgid "Scroll Lock" -msgstr "" - -#: src/keycode.cpp -msgid "Left Shift" -msgstr "" - -#: src/keycode.cpp -msgid "Right Shift" -msgstr "" - -#: src/keycode.cpp -msgid "Left Control" -msgstr "" - -#: src/keycode.cpp -msgid "Left Menu" -msgstr "" - -#: src/keycode.cpp -msgid "Right Control" -msgstr "" - -#: src/keycode.cpp -msgid "Right Menu" -msgstr "" - -#: src/keycode.cpp -msgid "Comma" -msgstr "" - -#: src/keycode.cpp -msgid "Minus" -msgstr "" - -#: src/keycode.cpp -msgid "Period" -msgstr "" - -#: src/keycode.cpp -msgid "Plus" -msgstr "" - -#: src/keycode.cpp -msgid "Attn" -msgstr "" - -#: src/keycode.cpp -msgid "CrSel" -msgstr "" - -#: src/keycode.cpp -msgid "Erase OEF" -msgstr "" - -#: src/keycode.cpp -msgid "ExSel" -msgstr "" - #: src/keycode.cpp msgid "OEM Clear" msgstr "" @@ -1118,756 +1038,94 @@ msgstr "" msgid "PA1" msgstr "" +#: src/keycode.cpp +msgid "Pause" +msgstr "" + +#: src/keycode.cpp +msgid "Period" +msgstr "" + +#: src/keycode.cpp +msgid "Plus" +msgstr "" + +#: src/keycode.cpp +msgid "Print" +msgstr "" + +#: src/keycode.cpp +msgid "Prior" +msgstr "" + +#: src/keycode.cpp +msgid "Return" +msgstr "" + +#: src/keycode.cpp +msgid "Right Button" +msgstr "" + +#: src/keycode.cpp +msgid "Right Control" +msgstr "" + +#: src/keycode.cpp +msgid "Right Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Right Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Right Windows" +msgstr "" + +#: src/keycode.cpp +msgid "Scroll Lock" +msgstr "" + +#: src/keycode.cpp +msgid "Select" +msgstr "" + +#: src/keycode.cpp +msgid "Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Sleep" +msgstr "" + +#: src/keycode.cpp +msgid "Snapshot" +msgstr "" + +#: src/keycode.cpp +msgid "Space" +msgstr "" + +#: src/keycode.cpp +msgid "Tab" +msgstr "" + +#: src/keycode.cpp +msgid "Up" +msgstr "" + +#: src/keycode.cpp +msgid "X Button 1" +msgstr "" + +#: src/keycode.cpp +msgid "X Button 2" +msgstr "" + #: src/keycode.cpp msgid "Zoom" msgstr "" -#: src/settings_translation_file.cpp -msgid "Controls" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Build inside player" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"If enabled, you can place blocks at the position (feet + eye level) where " -"you stand.\n" -"This is helpful when working with nodeboxes in small areas." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Flying" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Player is able to fly without being affected by gravity.\n" -"This requires the " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fast movement" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Fast movement (via use key).\n" -"This requires the " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Noclip" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"If enabled together with fly mode, player is able to fly through solid " -"nodes.\n" -"This requires the " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Cinematic mode" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Smooths camera when moving and looking arround.\n" -"Useful for recording videos." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Camera smoothing" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Smooths rotation of camera. 0 to disable." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Camera smoothing in cinematic mode" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Invert mouse" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Invert vertical mouse movement." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mouse sensitivity" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mouse sensitivity multiplier." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Key use for climbing/descending" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "If enabled, " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Double tap jump for fly" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Double-tapping the jump key toggles fly mode." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Always fly and fast" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "If disabled " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Rightclick repetition interval" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"The time in seconds it takes between repeated right clicks when holding the " -"right mouse button." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Random input" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable random user input (only used for testing)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Continuous forward" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Continuous forward movement (only used for testing)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Forward key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving the player forward.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Backward key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving the player backward.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Left key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving the player left.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Right key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving the player right.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Jump key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for jumping.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Sneak key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for sneaking.\n" -"Also used for climbing down and descending in water if aux1_descends is " -"disabled.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Inventory key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for opening the inventory.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving fast in fast mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Chat key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for opening the chat window.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Command key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for opening the chat window to type commands.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Console key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for opening the chat console.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Range select key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling unlimited view range.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fly key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling flying.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fast key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling fast mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Noclip key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling noclip mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Cinematic mode key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling cinematic mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimap key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling display of minimap.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screenshot" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for taking screenshots.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Drop item key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for dropping the currently selected item.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "HUD toggle key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling the display of the HUD.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Chat toggle key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling the display of the chat.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fog toggle key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling the display of the fog.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Camera update toggle key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling the camrea update. Only used for development\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Debug info toggle key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling the display of debug info.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Profiler toggle key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling the display of the profiler. Used for development.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Toggle camera mode key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for switching between first- and third-person camera.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "View range increase key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "View range decrease key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for printing debug stacks. Used for development.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Network" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server address" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Address to connect to.\n" -"Leave this blank to start a local server.\n" -"Note that the address field in the main menu overrides this setting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Remote port" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Port to connect to (UDP).\n" -"Note that the port field in the main menu overrides this setting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Saving map received from server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Save the map received by the client on disk." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Connect to external media server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable usage of remote media server (if provided by server).\n" -"Remote servers offer a significantly faster way to download media (e.g. " -"textures)\n" -"when connecting to the server." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Serverlist URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Serverlist file" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"File in client/serverlist/ that contains your favorite servers displayed in " -"the Multiplayer Tab." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Graphics" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "In-Game" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Basic" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fog" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Whether to fog out the end of the visible area." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Leaves style" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Leaves style:\n" -"- Fancy: all faces visible\n" -"- Simple: only outer faces, if defined special_tiles are used\n" -"- Opaque: disable transparency" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Connect glass" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Connects glass if supported by node." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Smooth lighting" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable smooth lighting with simple ambient occlusion.\n" -"Disable for speed or for different looks." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Clouds" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Clouds are a client side effect." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "3D clouds" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use 3D cloud look instead of flat." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mipmapping" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use mip mapping to scale textures. May slightly increase performance." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Anisotropic filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bilinear filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use bilinear filtering when scaling textures." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Trilinear filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use trilinear filtering when scaling textures." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Clean transparent textures" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Filtered textures can blend RGB values with fully-transparent neighbors,\n" -"which PNG optimizers usually discard, sometimes resulting in a dark or\n" -"light edge to transparent textures. Apply this filter to clean that up\n" -"at texture load time." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimum texture size for filters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" -"can be blurred, so automatically upscale them with nearest-neighbor\n" -"interpolation to preserve crisp pixels. This sets the minimum texture size\n" -"for the upscaled textures; higher values look sharper, but require more\n" -"memory. Powers of 2 are recommended. Setting this higher than 1 may not\n" -"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" -"enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "FSAA" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Experimental option, might cause visible spaces between blocks\n" -"when set to higher number than 0." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Shaders allow advanced visul effects and may increase performance on some " -"video cards.\n" -"Thy only work with the OpenGL video backend." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enables bumpmapping for textures. Normalmaps need to be supplied by the " -"texture pack\n" -"or need to be auto-generated.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Generate normalmaps" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enables on the fly normalmap generation (Emboss effect).\n" -"Requires bumpmapping to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Normalmaps strength" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Strength of generated normalmaps." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Normalmaps sampling" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Defines sampling step of texture.\n" -"A higher value results in smoother normal maps." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enables parallax occlusion mapping.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion mode" -msgstr "" - #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1875,242 +1133,7 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Parallax occlusion strength" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Strength of parallax." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Number of parallax occlusion iterations." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion Scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Overall scale of parallax occlusion effect." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion bias" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Overall bias of parallax occlusion effect, usually scale/2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving Nodes" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Set to true enables waving water.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water length" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving leaves" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Set to true enables waving leaves.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving plants" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Set to true enables waving plants.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Advanced" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum FPS" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"If FPS would go higher than this, limit it by sleeping\n" -"to not waste CPU power for no benefit." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "FPS in pause menu" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum FPS when game is paused." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screen width" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Vertical initial window size." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screen height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Horizontal initial window size." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Full screen" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fullscreen mode." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Full screen BPP" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "V-Sync" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Vertical screen synchronization." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Field of view" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Field of view in degrees." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Gamma" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" -"This setting is for the client only and is ignored by the server." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Texture path" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Path to texture directory. All textures are first searched from here." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Video driver" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "The rendering back-end for Irrlicht." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Cloud height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Height on which clouds are appearing." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Cloud radius" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Radius of cloud area stated in number of 64 node cloud squares.\n" -"Values larger than 26 will start to produce sharp cutoffs at cloud area " -"corners." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "View bobbing" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Multiplier for view bobbing.\n" -"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fall bobbing" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Multiplier for fall bobbing.\n" -"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgid "3D clouds" msgstr "" #: src/settings_translation_file.cpp @@ -2129,11 +1152,205 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Console color" +msgid "" +"A chosen map seed for a new map, leave empty for random.\n" +"Will be overridden when creating a new world in the main menu." msgstr "" #: src/settings_translation_file.cpp -msgid "In-game chat console background color (R,G,B)." +msgid "A message to be displayed to all clients when the server crashes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "A message to be displayed to all clients when the server shuts down." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Absolute limit of emerge queues" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Acceleration in air" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active block range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active object send range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Address to connect to.\n" +"Leave this blank to start a local server.\n" +"Note that the address field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " +"screens." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" +"This setting is for the client only and is ignored by the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Advanced" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Always fly and fast" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ambient occlusion gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Anisotropic filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Announce server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Announce to this serverlist.\n" +"If you want to announce your ipv6 address, use serverlist_url = v6.servers." +"minetest.net." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ask to reconnect after crash" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Automaticaly report to the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Backward key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Basic" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bind address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bits per pixel (aka color depth) in fullscreen mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Build inside player" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera smoothing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera smoothing in cinematic mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera update toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chunk size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clean transparent textures" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Client and Server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Climbing speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud radius" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds are a client side effect." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds in menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Colored fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Comma-separated list of trusted mods that are allowed to access insecure\n" +"functions even when mod security is on (via request_insecure_environment())." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Command key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect glass" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect to external media server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connects glass if supported by node." msgstr "" #: src/settings_translation_file.cpp @@ -2141,31 +1358,40 @@ msgid "Console alpha" msgstr "" #: src/settings_translation_file.cpp -msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." +msgid "Console color" msgstr "" #: src/settings_translation_file.cpp -msgid "Selection box color" +msgid "Console key" msgstr "" #: src/settings_translation_file.cpp -msgid "Selection box border color (R,G,B)." +msgid "Continuous forward" msgstr "" #: src/settings_translation_file.cpp -msgid "Selection box width" +msgid "Continuous forward movement (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -msgid "Width of the selectionbox's lines around nodes." +msgid "Controls" msgstr "" #: src/settings_translation_file.cpp -msgid "Crosshair color" +msgid "" +"Controls length of day/night cycle.\n" +"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " +"unchanged." msgstr "" #: src/settings_translation_file.cpp -msgid "Crosshair color (R,G,B)." +msgid "" +"Controls size of deserts and beaches in Mapgen v6.\n" +"When snowbiomes are enabled 'mgv6_freq_desert' is ignored." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crash message" msgstr "" #: src/settings_translation_file.cpp @@ -2177,214 +1403,15 @@ msgid "Crosshair alpha (opaqueness, between 0 and 255)." msgstr "" #: src/settings_translation_file.cpp -msgid "Desynchronize block animation" +msgid "Crosshair color" msgstr "" #: src/settings_translation_file.cpp -msgid "Whether node texture animations should be desynchronized per mapblock." +msgid "Crosshair color (R,G,B)." msgstr "" #: src/settings_translation_file.cpp -msgid "Maximum hotbar width" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum proportion of current window to be used for hotbar.\n" -"Useful if there's something to be displayed right or left of hotbar." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Node highlighting" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mesh cache" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enables caching of facedir rotated meshes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimap" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enables minimap." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Round minimap" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimap scan height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"True = 256\n" -"False = 128\n" -"Useable to make minimap smoother on slower machines." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Colored fog" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Make fog and sky colors depend on daytime (dawn/sunset) and view direction." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Ambient occlusion gamma" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"The strength (darkness) of node ambient-occlusion shading.\n" -"Lower is darker, Higher is lighter. The valid range of values for this\n" -"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" -"set to the nearest valid value." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Menus" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Clouds in menu" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use a cloud animation for the main menu background." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "GUI scaling" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Scale gui by a user specified value.\n" -"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" -"This will smooth over some of the rough edges, and blend\n" -"pixels when scaling down, at the cost of blurring some\n" -"edge pixels when images are scaled by non-integer sizes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "GUI scaling filter" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"When gui_scaling_filter is true, all GUI images need to be\n" -"filtered in software, but some images are generated directly\n" -"to hardware (e.g. render-to-texture for nodes in inventory)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "GUI scaling filter txr2img" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"When gui_scaling_filter_txr2img is true, copy those images\n" -"from hardware to software for scaling. When false, fall back\n" -"to the old scaling method, for video drivers that don't\n" -"propery support downloading textures back from hardware." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Tooltip delay" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Freetype fonts" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font path" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Path to TrueTypeFont or bitmap." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font size" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow alpha" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Monospace font path" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Monospace font size" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "This font will be used for certain languages." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font size" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font shadow" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font shadow alpha" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screenshot folder" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Path to save screenshots at." +msgid "Crouch speed" msgstr "" #: src/settings_translation_file.cpp @@ -2392,184 +1419,23 @@ msgid "DPI" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " -"screens." +msgid "Damage" msgstr "" #: src/settings_translation_file.cpp -msgid "Sound" +msgid "Debug info toggle key" msgstr "" #: src/settings_translation_file.cpp -msgid "Volume" +msgid "Debug log level" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapblock unload timeout" +msgid "Dedicated server step" msgstr "" #: src/settings_translation_file.cpp -msgid "Timeout for client to remove unused map data from memory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapblock limit" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum number of mapblocks for client to be kept in memory.\n" -"Set to -1 for unlimited amount." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Show debug info" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server / Singleplayer" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server name" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Name of the server, to be displayed when players join and in the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server description" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Description of server, to be displayed when players join and in the " -"serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Announce server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Automaticaly report to the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Announce to this serverlist.\n" -"If you want to announce your ipv6 address, use serverlist_url = v6.servers." -"minetest.net." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server port" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Network port to listen (UDP).\n" -"This value will be overridden when starting from the main menu." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bind address" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "The network interface that the server listens on." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Strict protocol checking" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable to disallow old clients from connecting.\n" -"Older clients are compatible in the sense that they will not crash when " -"connecting\n" -"to new servers, but they may not support all new features that you are " -"expecting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Remote media" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Specifies URL from which client fetches media instead of using UDP.\n" -"$filename should be accessible from $remote_media$filename via cURL\n" -"(obviously, remote_media should end with a slash).\n" -"Files that are not present will be fetched the usual way." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "IPv6 server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable/disable running an IPv6 server. An IPv6 server may be restricted\n" -"to IPv6 clients, depending on system configuration.\n" -"Ignored if bind_address is set." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum simultaneously blocks send per client" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "How many blocks are flying in the wire simultaneously per client." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum simultaneously bocks send total" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"How many blocks are flying in the wire simultaneously for the whole server." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"To reduce lag, block transfers are slowed down when a player is building " -"something.\n" -"This determines how long they are slowed down after placing or removing a " -"node." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Max. packets per iteration" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum number of packets sent per send step, if you have a slow connection\n" -"try reducing it, but don't reduce it to a number below double of targeted\n" -"client number." +msgid "Default acceleration" msgstr "" #: src/settings_translation_file.cpp @@ -2582,90 +1448,24 @@ msgid "" "This will be overridden when creating a world from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "Message of the day" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Message of the day displayed to players connecting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum users" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum number of players that can connect simultaneously." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Map directory" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"World directory (everything in the world is stored here).\n" -"Not needed if starting from the main menu." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Item entity TTL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Time in seconds for item entity (dropped items) to live.\n" -"Setting it to -1 disables the feature." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Damage" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable players getting damage and dying." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fixed map seed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"A chosen map seed for a new map, leave empty for random.\n" -"Will be overridden when creating a new world in the main menu." -msgstr "" - #: src/settings_translation_file.cpp msgid "Default password" msgstr "" -#: src/settings_translation_file.cpp -msgid "New users need to input this password." -msgstr "" - #: src/settings_translation_file.cpp msgid "Default privileges" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The privileges that new users automatically get.\n" -"See /privs in game for a full list on your server and mod configuration." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Unlimited player transfer distance" +"Default timeout for cURL, stated in milliseconds.\n" +"Only has an effect if compiled with cURL." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Whether players are shown to clients without any range limit.\n" -"Deprecated, use the setting player_transfer_distance instead." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Player transfer distance" +"Defines sampling step of texture.\n" +"A higher value results in smoother normal maps." msgstr "" #: src/settings_translation_file.cpp @@ -2673,27 +1473,33 @@ msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" #: src/settings_translation_file.cpp -msgid "Player versus Player" +msgid "Delay showing tooltips, stated in milliseconds." msgstr "" #: src/settings_translation_file.cpp -msgid "Whether to allow players to damage and kill each other." +msgid "Deprecated Lua API handling" msgstr "" #: src/settings_translation_file.cpp -msgid "Static spawnpoint" +msgid "Descending speed" msgstr "" #: src/settings_translation_file.cpp -msgid "If this is set, players will always (re)spawn at the given position." +msgid "" +"Description of server, to be displayed when players join and in the " +"serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Disallow empty passwords" +msgid "Desynchronize block animation" msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, new players cannot join with an empty password." +msgid "Detailed mod profile data. Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp @@ -2701,67 +1507,249 @@ msgid "Disable anticheat" msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, disable cheat prevention in multiplayer." +msgid "Disallow empty passwords" msgstr "" #: src/settings_translation_file.cpp -msgid "Rollback recording" +msgid "Domain name of server, to be displayed in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Double tap jump for fly" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Double-tapping the jump key toggles fly mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Drop item key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp msgid "" -"If enabled, actions are recorded for rollback.\n" -"This option is only read when server starts." +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp -msgid "Shutdown message" +msgid "Enable mod security" msgstr "" #: src/settings_translation_file.cpp -msgid "A message to be displayed to all clients when the server shuts down." +msgid "Enable players getting damage and dying." msgstr "" #: src/settings_translation_file.cpp -msgid "Crash message" +msgid "Enable random user input (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -msgid "A message to be displayed to all clients when the server crashes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Ask to reconnect after crash" +msgid "Enable selection highlighting for nodes (disables selectionbox)." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Whether to ask clients to reconnect after a (Lua) crash.\n" -"Set this to true if your server is set up to restart automatically." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Active object send range" +"Enable smooth lighting with simple ambient occlusion.\n" +"Disable for speed or for different looks." msgstr "" #: src/settings_translation_file.cpp msgid "" -"From how far clients know about objects, stated in mapblocks (16 nodes)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Active block range" +"Enable to disallow old clients from connecting.\n" +"Older clients are compatible in the sense that they will not crash when " +"connecting\n" +"to new servers, but they may not support all new features that you are " +"expecting." msgstr "" #: src/settings_translation_file.cpp msgid "" -"How large area of blocks are subject to the active block stuff, stated in " -"mapblocks (16 nodes).\n" -"In active blocks objects are loaded and ABMs run." +"Enable usage of remote media server (if provided by server).\n" +"Remote servers offer a significantly faster way to download media (e.g. " +"textures)\n" +"when connecting to the server." msgstr "" #: src/settings_translation_file.cpp -msgid "Max block send distance" +msgid "" +"Enable/disable running an IPv6 server. An IPv6 server may be restricted\n" +"to IPv6 clients, depending on system configuration.\n" +"Ignored if bind_address is set." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables bumpmapping for textures. Normalmaps need to be supplied by the " +"texture pack\n" +"or need to be auto-generated.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables caching of facedir rotated meshes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables minimap." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables on the fly normalmap generation (Emboss effect).\n" +"Requires bumpmapping to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables parallax occlusion mapping.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Experimental option, might cause visible spaces between blocks\n" +"when set to higher number than 0." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FPS in pause menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FSAA" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fall bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode acceleration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast movement" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Fast movement (via use key).\n" +"This requires the \"fast\" privilege on the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Field of view" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Field of view in degrees." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"File in client/serverlist/ that contains your favorite servers displayed in " +"the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Filtered textures can blend RGB values with fully-transparent neighbors,\n" +"which PNG optimizers usually discard, sometimes resulting in a dark or\n" +"light edge to transparent textures. Apply this filter to clean that up\n" +"at texture load time." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fixed map seed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fly key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Flying" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow offset, if 0 then shadow will not be drawn." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Forward key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Freetype fonts" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far blocks are generated for clients, stated in mapblocks (16 " +"nodes)." msgstr "" #: src/settings_translation_file.cpp @@ -2770,90 +1758,53 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Maximum forceloaded blocks" +msgid "" +"From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" #: src/settings_translation_file.cpp -msgid "Maximum number of forceloaded mapblocks." +msgid "Full screen" msgstr "" #: src/settings_translation_file.cpp -msgid "Time send interval" +msgid "Full screen BPP" msgstr "" #: src/settings_translation_file.cpp -msgid "Interval of sending time of day to clients." +msgid "Fullscreen mode." msgstr "" #: src/settings_translation_file.cpp -msgid "Time speed" +msgid "GUI scaling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter txr2img" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Generate normalmaps" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls length of day/night cycle.\n" -"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " -"unchanged." +"Global map generation attributes.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp -msgid "Map save interval" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Interval of saving important changes in the world, stated in seconds." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Physics" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Default acceleration" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Acceleration in air" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fast mode acceleration" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Walking speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Crouch speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fast mode speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Climbing speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Jumping speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Descending speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Liquid fluidity" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Liquid fluidity smoothing" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Liquid sink" +msgid "Graphics" msgstr "" #: src/settings_translation_file.cpp @@ -2861,7 +1812,7 @@ msgid "Gravity" msgstr "" #: src/settings_translation_file.cpp -msgid "Deprecated Lua API handling" +msgid "HUD toggle key" msgstr "" #: src/settings_translation_file.cpp @@ -2873,42 +1824,35 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Mod profiling" +msgid "Height on which clouds are appearing." msgstr "" #: src/settings_translation_file.cpp -msgid "Useful for mod developers." +msgid "High-precision FPU" msgstr "" #: src/settings_translation_file.cpp -msgid "Detailed mod profiling" +msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Profiling print interval" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Profiler data print interval. 0 = disable. Useful for developers." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Max. clearobjects extra blocks" +msgid "Horizontal initial window size." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Number of extra blocks that can be loaded by /clearobjects at once.\n" -"This is a trade-off between sqlite transaction overhead and\n" -"memory consumption (4096=100MB, as a rule of thumb)." +"How large area of blocks are subject to the active block stuff, stated in " +"mapblocks (16 nodes).\n" +"In active blocks objects are loaded and ABMs run." msgstr "" #: src/settings_translation_file.cpp -msgid "Unload unused server data" +msgid "" +"How many blocks are flying in the wire simultaneously for the whole server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How many blocks are flying in the wire simultaneously per client." msgstr "" #: src/settings_translation_file.cpp @@ -2918,33 +1862,50 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Maxmimum objects per block" +msgid "IPv6" msgstr "" #: src/settings_translation_file.cpp -msgid "Maximum number of statically stored objects in a block." +msgid "IPv6 server" msgstr "" #: src/settings_translation_file.cpp -msgid "Synchronous SQLite" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Dedicated server step" +msgid "IPv6 support." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Length of a server tick and the interval at which objects are generally " -"updated over network." +"If FPS would go higher than this, limit it by sleeping\n" +"to not waste CPU power for no benefit." msgstr "" #: src/settings_translation_file.cpp -msgid "Ignore world errors" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled together with fly mode, player is able to fly through solid " +"nodes.\n" +"This requires the \"noclip\" privilege on the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, actions are recorded for rollback.\n" +"This option is only read when server starts." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If enabled, disable cheat prevention in multiplayer." msgstr "" #: src/settings_translation_file.cpp @@ -2954,11 +1915,388 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Liquid loop max" +msgid "If enabled, new players cannot join with an empty password." msgstr "" #: src/settings_translation_file.cpp -msgid "Max liquids processed per step." +msgid "" +"If enabled, you can place blocks at the position (feet + eye level) where " +"you stand.\n" +"This is helpful when working with nodeboxes in small areas." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If this is set, players will always (re)spawn at the given position." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ignore world errors" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-Game" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of saving important changes in the world, stated in seconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of sending time of day to clients." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Inventory key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Invert mouse" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Invert vertical mouse movement." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Item entity TTL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Jump key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Jumping speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for dropping the currently selected item.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for jumping.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving fast in fast mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player backward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player forward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player left.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player right.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat console.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window to type commands.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the inventory.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for printing debug stacks. Used for development.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for sneaking.\n" +"Also used for climbing down and descending in water if aux1_descends is " +"disabled.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for switching between first- and third-person camera.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for taking screenshots.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling cinematic mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling display of minimap.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling fast mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling flying.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling noclip mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the camrea update. Only used for development\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of debug info.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the HUD.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the chat.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the fog.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the profiler. Used for development.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling unlimited view range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Key use for climbing/descending" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Language" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Leaves style" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Leaves style:\n" +"- Fancy: all faces visible\n" +"- Simple: only outer faces, if defined special_tiles are used\n" +"- Opaque: disable transparency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Left key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Length of a server tick and the interval at which objects are generally " +"updated over network." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Level of logging to be written to debug.txt:\n" +"- (no logging)\n" +"- none (messages with no level)\n" +"- error\n" +"- warning\n" +"- action\n" +"- info\n" +"- verbose" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Limit of emerge queues on disk" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Limit of emerge queues to generate" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Limits number of parallel HTTP requests. Affects:\n" +"- Media fetch if server uses remote_media setting.\n" +"- Serverlist download and server announcement.\n" +"- Downloads performed by main menu (e.g. mod manager).\n" +"Only has an effect if compiled with cURL." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid fluidity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid fluidity smoothing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid loop max" msgstr "" #: src/settings_translation_file.cpp @@ -2966,14 +2304,7 @@ msgid "Liquid queue purge time" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"The time (in seconds) that the liquids queue may grow beyond processing\n" -"capacity until an attempt is made to decrease its size by dumping old queue\n" -"items. A value of 0 disables the functionality." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Liquid update tick" +msgid "Liquid sink" msgstr "" #: src/settings_translation_file.cpp @@ -2981,31 +2312,82 @@ msgid "Liquid update interval in seconds." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen name" +msgid "Liquid update tick" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu game manager" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu mod manager" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu script" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Name of map generator to be used when creating a new world.\n" -"Creating a world in the main menu will override this." +"Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" #: src/settings_translation_file.cpp -msgid "Water level" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Water surface level of the world." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Max block generate distance" +msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" #: src/settings_translation_file.cpp msgid "" -"From how far blocks are generated for clients, stated in mapblocks (16 " -"nodes)." +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Map directory" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" +"'ridges' are the rivers.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3013,35 +2395,27 @@ msgid "Map generation limit" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Where the map generator stops.\n" -"Please note:\n" -"- Limited to 31000 (setting above has no effect)\n" -"- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n" -"- Those groups have an offset of -32, -32 nodes from the origin.\n" -"- Only groups which are within the map_generation_limit are generated" +msgid "Map save interval" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen flags" +msgid "Mapblock limit" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Global map generation attributes.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with " +msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -msgid "Chunk size" +msgid "Mapgen biome heat noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " -"nodes)." +msgid "Mapgen biome humidity blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp @@ -3049,11 +2423,267 @@ msgid "Mapgen debug" msgstr "" #: src/settings_translation_file.cpp -msgid "Dump the mapgen debug infos." +msgid "Mapgen flags" msgstr "" #: src/settings_translation_file.cpp -msgid "Absolute limit of emerge queues" +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen heat blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 factor noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 apple trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 biome noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 cave noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 desert frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 humidity noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 mud noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 steepness noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mount height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mountain noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge water noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain persistation noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block generate distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block send distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max liquids processed per step." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. clearobjects extra blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. packets per iteration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS when game is paused." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum forceloaded blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum hotbar width" msgstr "" #: src/settings_translation_file.cpp @@ -3061,7 +2691,9 @@ msgid "Maximum number of blocks that can be queued for loading." msgstr "" #: src/settings_translation_file.cpp -msgid "Limit of emerge queues on disk" +msgid "" +"Maximum number of blocks to be queued that are to be generated.\n" +"Set to blank for an appropriate amount to be chosen automatically." msgstr "" #: src/settings_translation_file.cpp @@ -3071,13 +2703,201 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Limit of emerge queues to generate" +msgid "Maximum number of forceloaded mapblocks." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Maximum number of blocks to be queued that are to be generated.\n" -"Set to blank for an appropriate amount to be chosen automatically." +"Maximum number of mapblocks for client to be kept in memory.\n" +"Set to -1 for unlimited amount." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of packets sent per send step, if you have a slow connection\n" +"try reducing it, but don't reduce it to a number below double of targeted\n" +"client number." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of players that can connect simultaneously." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of statically stored objects in a block." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum proportion of current window to be used for hotbar.\n" +"Useful if there's something to be displayed right or left of hotbar." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously blocks send per client" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously bocks send total" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum time in ms a file download (e.g. a mod download) may take." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum users" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maxmimum objects per block" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Menus" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mesh cache" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day displayed to players connecting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap scan height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimum texture size for filters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Minimum wanted FPS.\n" +"The amount of rendered stuff is dynamically set according to this. and " +"viewing range min and max." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mipmapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mod profiling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore details URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore download URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore mods list URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity multiplier." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for fall bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for view bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of map generator to be used when creating a new world.\n" +"Creating a world in the main menu will override this." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the player.\n" +"When running a server, clients connecting with this name are admins.\n" +"When starting from the main menu, this is overridden." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the server, to be displayed when players join and in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Network" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Network port to listen (UDP).\n" +"This value will be overridden when starting from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "New style water" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "New users need to input this password." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Node highlighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noise parameters for biome API temperature, humidity and biome blend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps sampling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps strength" msgstr "" #: src/settings_translation_file.cpp @@ -3094,210 +2914,72 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen biome heat noise parameters" +msgid "" +"Number of extra blocks that can be loaded by /clearobjects at once.\n" +"This is a trade-off between sqlite transaction overhead and\n" +"memory consumption (4096=100MB, as a rule of thumb)." msgstr "" #: src/settings_translation_file.cpp -msgid "Noise parameters for biome API temperature, humidity and biome blend." +msgid "Number of parallax occlusion iterations." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen heat blend noise parameters" +msgid "Overall bias of parallax occlusion effect, usually scale/2." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen biome humidity noise parameters" +msgid "Overall scale of parallax occlusion effect." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen biome humidity blend noise parameters" +msgid "Parallax Occlusion" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5" +msgid "Parallax occlusion" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 filler depth noise parameters" +msgid "Parallax occlusion Scale" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 factor noise parameters" +msgid "Parallax occlusion bias" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 height noise parameters" +msgid "Parallax occlusion iterations" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 cave1 noise parameters" +msgid "Parallax occlusion mode" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 cave2 noise parameters" +msgid "Parallax occlusion strength" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v6" +msgid "Path to TrueTypeFont or bitmap." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v6 flags" +msgid "Path to save screenshots at." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Path to texture directory. All textures are first searched from here." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Physics" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 desert frequency" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" -"When snowbiomes are enabled 'mgv6_freq_desert' is ignored." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 beach frequency" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 terrain base noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 steepness noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 height select noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 mud noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 beach noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 biome noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 cave noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 humidity noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 trees noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 apple trees noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 flags" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen V7.\n" -"'ridges' are the rivers.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with " -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 terrain base noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 height select noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 filler depth noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 mount height noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 ridge water noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 mountain noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 ridge noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 cave1 noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 cave2 noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Security" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable mod security" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Prevent mods from doing insecure things like running shell commands." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Trusted mods" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Comma-separated list of trusted mods that are allowed to access insecure\n" -"functions even when mod security is on (via request_insecure_environment())." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Client and Server" +"Player is able to fly without being affected by gravity.\n" +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3305,14 +2987,173 @@ msgid "Player name" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Name of the player.\n" -"When running a server, clients connecting with this name are admins.\n" -"When starting from the main menu, this is overridden." +msgid "Player transfer distance" msgstr "" #: src/settings_translation_file.cpp -msgid "Language" +msgid "Player versus Player" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Port to connect to (UDP).\n" +"Note that the port field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Pre-generate all item visuals used in the inventory.\n" +"This increases startup time, but runs smoother in-game.\n" +"The generated textures can easily exceed your VRAM, causing artifacts in the " +"inventory." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Preload inventory textures" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Prevent mods from doing insecure things like running shell commands." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler data print interval. 0 = disable. Useful for developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiling print interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Radius of cloud area stated in number of 64 node cloud squares.\n" +"Values larger than 26 will start to produce sharp cutoffs at cloud area " +"corners." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Random input" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Range select key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote media" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Replaces the default main menu with a custom one." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Right key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Rightclick repetition interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Rollback recording" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Round minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Save the map received by the client on disk." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Saving map received from server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Scale gui by a user specified value.\n" +"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" +"This will smooth over some of the rough edges, and blend\n" +"pixels when scaling down, at the cost of blurring some\n" +"edge pixels when images are scaled by non-integer sizes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot folder" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Security" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box border color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server / Singleplayer" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server description" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist file" msgstr "" #: src/settings_translation_file.cpp @@ -3322,50 +3163,415 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Debug log level" +msgid "" +"Set to true enables waving leaves.\n" +"Requires shaders to be enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Level of logging to be written to debug.txt:\n" -"- (no logging)\n" -"- none (messages with no level)\n" -"- error\n" -"- warning\n" -"- action\n" -"- info\n" -"- verbose" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "IPv6" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "IPv6 support." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "cURL timeout" +"Set to true enables waving plants.\n" +"Requires shaders to be enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Default timeout for cURL, stated in milliseconds.\n" -"Only has an effect if compiled with cURL." +"Set to true enables waving water.\n" +"Requires shaders to be enabled." msgstr "" #: src/settings_translation_file.cpp -msgid "cURL parallel limit" +msgid "Shaders" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Limits number of parallel HTTP requests. Affects:\n" -"- Media fetch if server uses remote_media setting.\n" -"- Serverlist download and server announcement.\n" -"- Downloads performed by main menu (e.g. mod manager).\n" -"Only has an effect if compiled with cURL." +"Shaders allow advanced visul effects and may increase performance on some " +"video cards.\n" +"Thy only work with the OpenGL video backend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shape of the minimap. Enabled = round, disabled = square." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Show debug info" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shutdown message" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " +"nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooth lighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Smooths camera when moving and looking around.\n" +"Useful for recording videos." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera in cinematic mode. 0 to disable." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera. 0 to disable." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Sneak key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Sound" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Specifies URL from which client fetches media instead of using UDP.\n" +"$filename should be accessible from $remote_media$filename via cURL\n" +"(obviously, remote_media should end with a slash).\n" +"Files that are not present will be fetched the usual way." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Static spawnpoint" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of generated normalmaps." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of parallax." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strict protocol checking" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Synchronous SQLite" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The allowed adjustment range for the automatic rendering range adjustment.\n" +"Set this to be equal to viewing range minimum to disable the auto-adjustment " +"algorithm." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The network interface that the server listens on." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The privileges that new users automatically get.\n" +"See /privs in game for a full list on your server and mod configuration." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The rendering back-end for Irrlicht." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The strength (darkness) of node ambient-occlusion shading.\n" +"Lower is darker, Higher is lighter. The valid range of values for this\n" +"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" +"set to the nearest valid value." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time (in seconds) that the liquids queue may grow beyond processing\n" +"capacity until an attempt is made to decrease its size by dumping old queue\n" +"items. A value of 0 disables the functionality." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time in seconds it takes between repeated right clicks when holding the " +"right mouse button." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "This font will be used for certain languages." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Time in seconds for item entity (dropped items) to live.\n" +"Setting it to -1 disables the feature." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time send interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Timeout for client to remove unused map data from memory." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"To reduce lag, block transfers are slowed down when a player is building " +"something.\n" +"This determines how long they are slowed down after placing or removing a " +"node." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Toggle camera mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Tooltip delay" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"True = 256\n" +"False = 128\n" +"Useable to make minimap smoother on slower machines." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trusted mods" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "URL to the server list displayed in the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unlimited player transfer distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unload unused server data" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use 3D cloud look instead of flat." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use a cloud animation for the main menu background." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use anisotropic filtering when viewing at textures from an angle." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use bilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use mip mapping to scale textures. May slightly increase performance." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use trilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "V-Sync" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical initial window size." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical screen synchronization." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Video driver" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range decrease key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range increase key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Viewing range maximum" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Viewing range minimum" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Volume" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Walking speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Wanted FPS" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water surface level of the world." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving Nodes" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving leaves" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving plants" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water length" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter is true, all GUI images need to be\n" +"filtered in software, but some images are generated directly\n" +"to hardware (e.g. render-to-texture for nodes in inventory)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter_txr2img is true, copy those images\n" +"from hardware to software for scaling. When false, fall back\n" +"to the old scaling method, for video drivers that don't\n" +"propery support downloading textures back from hardware." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" +"can be blurred, so automatically upscale them with nearest-neighbor\n" +"interpolation to preserve crisp pixels. This sets the minimum texture size\n" +"for the upscaled textures; higher values look sharper, but require more\n" +"memory. Powers of 2 are recommended. Setting this higher than 1 may not\n" +"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" +"enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Where the map generator stops.\n" +"Please note:\n" +"- Limited to 31000 (setting above has no effect)\n" +"- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n" +"- Those groups have an offset of -32, -32 nodes from the origin.\n" +"- Only groups which are within the map_generation_limit are generated" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether freetype fonts are used, requires freetype support to be compiled in." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether node texture animations should be desynchronized per mapblock." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether players are shown to clients without any range limit.\n" +"Deprecated, use the setting player_transfer_distance instead." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to allow players to damage and kill each other." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to ask clients to reconnect after a (Lua) crash.\n" +"Set this to true if your server is set up to restart automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to fog out the end of the visible area." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to show the client debug info (has the same effect as hitting F5)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Width of the selectionbox's lines around nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"World directory (everything in the world is stored here).\n" +"Not needed if starting from the main menu." msgstr "" #: src/settings_translation_file.cpp @@ -3373,41 +3579,9 @@ msgid "cURL file download timeout" msgstr "" #: src/settings_translation_file.cpp -msgid "Maximum time in ms a file download (e.g. a mod download) may take." +msgid "cURL parallel limit" msgstr "" #: src/settings_translation_file.cpp -msgid "High-precision FPU" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Main menu script" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Replaces the default main menu with a custom one." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Main menu game manager" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Main menu mod manager" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Modstore download URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Modstore mods list URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Modstore details URL" +msgid "cURL timeout" msgstr "" diff --git a/po/hu/minetest.po b/po/hu/minetest.po index faccede7..38468e17 100644 --- a/po/hu/minetest.po +++ b/po/hu/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-09-21 14:55+0200\n" "Last-Translator: way-hu \n" "Language-Team: Hungarian , , (, , ), , " @@ -1449,7 +1453,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1599,7 +1603,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1732,7 +1740,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1870,7 +1878,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1950,21 +1959,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Csomag letiltás" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "Engedélyez" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2039,6 +2050,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2364,27 +2421,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2425,6 +2513,81 @@ msgstr "Térkép generátor" msgid "Mapgen flags" msgstr "Térkép generátor" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Térkép generátor" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Térkép generátor" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Parallax Occlusion" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2601,6 +2764,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2912,7 +3083,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3162,7 +3333,7 @@ msgstr "Simított megvilágítás" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3371,6 +3542,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3544,137 +3719,145 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "Renderelés:" +#~ msgid "2x" +#~ msgstr "2x" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet" +#~ msgid "4x" +#~ msgstr "4x" + +#~ msgid "8x" +#~ msgstr "8x" + +#~ msgid "Antialiasing:" +#~ msgstr "Élsimítás:" + +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Biztosan visszaállítod az egyjátékos világod?" + +#~ msgid "Fancy Leaves" +#~ msgstr "Szép levelek" #, fuzzy -#~ msgid "Game Name" -#~ msgstr "Játék" - -#~ msgid "Favorites:" -#~ msgstr "Kedvencek:" - -#, fuzzy -#~ msgid "Password" -#~ msgstr "Régi jelszó" - -#~ msgid "Preload item visuals" -#~ msgstr "Előretöltött tárgy láthatóság" - -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Végtelen folyadék" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Hiba az összes világ törlése közben" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék" - -#~ msgid "Files to be deleted" -#~ msgstr "A fájl törölve lett" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Nem törölhető a világ: Nincs kiválasztva" - -#~ msgid "Address required." -#~ msgstr "Cím szükséges." - -#~ msgid "Create world" -#~ msgstr "Világ létrehozása" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts." - -#~ msgid "Show Favorites" -#~ msgstr "Kedvencek mutatása" - -#~ msgid "Show Public" -#~ msgstr "Publikus mutatása" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Figyelem: A beállítások nem egyformák. " - -#~ msgid "Configuration saved. " -#~ msgstr "Beállítások mentve. " - -#~ msgid "is required by:" -#~ msgstr "kell neki:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat" - -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Le" - -#, fuzzy -#~ msgid "Touchthreshold (px)" -#~ msgstr "Touchthreshold (px)" - -#, fuzzy -#~ msgid "Touch free target" -#~ msgstr "Touch free target" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "A shaderek engedélyezéséhez OpenGL driver használata szükséges." - -#~ msgid "Texturing:" -#~ msgstr "Textúrázás:" - -#~ msgid "Simple Leaves" -#~ msgstr "Egyszerű levelek" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "A méretarány alkalmazva a menü elemekre: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Egyjátékos világ visszaállítása" - -#~ msgid "Opaque Water" -#~ msgstr "Áttetsző víz" - -#~ msgid "Opaque Leaves" -#~ msgstr "Áttetsző levelek" - -#~ msgid "No!!!" -#~ msgstr "Nem!!!" - -#, fuzzy -#~ msgid "No Mipmap" -#~ msgstr "No Mipmap" +#~ msgid "Mipmap" +#~ msgstr "Mipmap" #, fuzzy #~ msgid "Mipmap + Aniso. Filter" #~ msgstr "Mipmap + Aniso. Filter" #, fuzzy -#~ msgid "Mipmap" -#~ msgstr "Mipmap" +#~ msgid "No Mipmap" +#~ msgstr "No Mipmap" -#~ msgid "Fancy Leaves" -#~ msgstr "Szép levelek" +#~ msgid "No!!!" +#~ msgstr "Nem!!!" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Biztosan visszaállítod az egyjátékos világod?" +#~ msgid "Opaque Leaves" +#~ msgstr "Áttetsző levelek" -#~ msgid "Antialiasing:" -#~ msgstr "Élsimítás:" +#~ msgid "Opaque Water" +#~ msgstr "Áttetsző víz" -#~ msgid "8x" -#~ msgstr "8x" +#~ msgid "Reset singleplayer world" +#~ msgstr "Egyjátékos világ visszaállítása" -#~ msgid "4x" -#~ msgstr "4x" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "A méretarány alkalmazva a menü elemekre: " -#~ msgid "2x" -#~ msgstr "2x" +#~ msgid "Simple Leaves" +#~ msgstr "Egyszerű levelek" + +#~ msgid "Texturing:" +#~ msgstr "Textúrázás:" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "A shaderek engedélyezéséhez OpenGL driver használata szükséges." + +#, fuzzy +#~ msgid "Touch free target" +#~ msgstr "Touch free target" + +#, fuzzy +#~ msgid "Touchthreshold (px)" +#~ msgstr "Touchthreshold (px)" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Le" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat" + +#~ msgid "is required by:" +#~ msgstr "kell neki:" + +#~ msgid "Configuration saved. " +#~ msgstr "Beállítások mentve. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Figyelem: A beállítások nem egyformák. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak" + +#~ msgid "Show Public" +#~ msgstr "Publikus mutatása" + +#~ msgid "Show Favorites" +#~ msgstr "Kedvencek mutatása" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts." + +#~ msgid "Create world" +#~ msgstr "Világ létrehozása" + +#~ msgid "Address required." +#~ msgstr "Cím szükséges." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Nem törölhető a világ: Nincs kiválasztva" + +#~ msgid "Files to be deleted" +#~ msgstr "A fájl törölve lett" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Hiba az összes világ törlése közben" + +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Végtelen folyadék" + +#~ msgid "Preload item visuals" +#~ msgstr "Előretöltött tárgy láthatóság" + +#, fuzzy +#~ msgid "Password" +#~ msgstr "Régi jelszó" + +#~ msgid "Favorites:" +#~ msgstr "Kedvencek:" + +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Játék" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet" + +#~ msgid "Rendering:" +#~ msgstr "Renderelés:" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Engedélyez" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Csomag letiltás" diff --git a/po/id/minetest.po b/po/id/minetest.po index 97be3dd7..c54d377a 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-27 16:45+0200\n" "Last-Translator: PilzAdam \n" -"Language-Team: Indonesian " -"\n" +"Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -422,8 +422,8 @@ msgid "Start Game" msgstr "Mulai Permainan" #: builtin/mainmenu/tab_settings.lua -msgid "\"" -msgstr "\"" +msgid "\"$1\" is not a valid flag." +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -450,6 +450,10 @@ msgstr "Sunting" msgid "Enabled" msgstr "Diaktifkan" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "" @@ -1285,8 +1289,8 @@ msgid "" "minetest.net." msgstr "" "Mengumumkan kepada daftar server ini.\n" -"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = " -"v6.servers.minetest.net." +"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6." +"servers.minetest.net." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1454,7 +1458,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1608,7 +1612,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1741,7 +1749,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1880,7 +1888,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1960,21 +1969,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Nonaktifkan PM" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "diaktifkan" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2049,6 +2060,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2374,27 +2431,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2435,6 +2523,81 @@ msgstr "Generator peta" msgid "Mapgen flags" msgstr "Generator peta" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Generator peta" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Generator peta" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Parallax Occlusion" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2611,6 +2774,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2920,7 +3091,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3170,7 +3341,7 @@ msgstr "Pencahayaan Halus" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3379,6 +3550,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3552,62 +3727,73 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "Rendering:" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih" - -#~ msgid " MB/s" -#~ msgstr " MB/detik" - -#~ msgid " KB/s" -#~ msgstr " KB/detik" - -#~ msgid "Downloading" -#~ msgstr "Mengunduh" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Batas sentuhan (px)" - -#~ msgid "Touch free target" -#~ msgstr "Bebas sentuhan" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Untuk mengaktifkan shaders OpenGL driver harus digunakan." - -#~ msgid "Texturing:" -#~ msgstr "Penteksturan:" - -#~ msgid "Simple Leaves" -#~ msgstr "Daun Sederhana" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Faktor skala yang diatur untuk elemen menu: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Atur ulang dunia pemain tunggal" - -#~ msgid "Opaque Water" -#~ msgstr "Air Buram" - -#~ msgid "Opaque Leaves" -#~ msgstr "Daun Opak" - -#~ msgid "No!!!" -#~ msgstr "Tidak!!!" - -#~ msgid "No Mipmap" -#~ msgstr "Tanpa Mipmap" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap + Aniso. Filter" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Yakin ingin mengaturulang dunia anda?" #~ msgid "Fancy Leaves" #~ msgstr "Daun Megah" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Yakin ingin mengaturulang dunia anda?" +#~ msgid "Mipmap" +#~ msgstr "Mipmap" + +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mipmap + Aniso. Filter" + +#~ msgid "No Mipmap" +#~ msgstr "Tanpa Mipmap" + +#~ msgid "No!!!" +#~ msgstr "Tidak!!!" + +#~ msgid "Opaque Leaves" +#~ msgstr "Daun Opak" + +#~ msgid "Opaque Water" +#~ msgstr "Air Buram" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Atur ulang dunia pemain tunggal" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Faktor skala yang diatur untuk elemen menu: " + +#~ msgid "Simple Leaves" +#~ msgstr "Daun Sederhana" + +#~ msgid "Texturing:" +#~ msgstr "Penteksturan:" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Untuk mengaktifkan shaders OpenGL driver harus digunakan." + +#~ msgid "Touch free target" +#~ msgstr "Bebas sentuhan" + +#~ msgid "Touchthreshold (px)" +#~ msgstr "Batas sentuhan (px)" + +#~ msgid "Downloading" +#~ msgstr "Mengunduh" + +#~ msgid " KB/s" +#~ msgstr " KB/detik" + +#~ msgid " MB/s" +#~ msgstr " MB/detik" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih" + +#~ msgid "Rendering:" +#~ msgstr "Rendering:" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "diaktifkan" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Nonaktifkan PM" + +#~ msgid "\"" +#~ msgstr "\"" diff --git a/po/it/minetest.po b/po/it/minetest.po index b6ba7ea4..f3ea35bd 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-11-06 17:28+0000\n" "Last-Translator: Elia Argentieri \n" -"Language-Team: Italian " -"\n" +"Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -426,7 +426,7 @@ msgid "Start Game" msgstr "Avviare il gioco" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -455,6 +455,10 @@ msgstr "Modifica" msgid "Enabled" msgstr "attivata" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1460,7 +1464,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1610,7 +1614,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1743,7 +1751,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1879,7 +1887,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1959,21 +1968,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Disatt. pacch." +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "attivata" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2048,6 +2059,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2373,27 +2430,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2434,6 +2522,80 @@ msgstr "Generat. mappe" msgid "Mapgen flags" msgstr "Generat. mappe" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Generat. mappe" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Generat. mappe" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2610,6 +2772,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2914,7 +3084,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3164,7 +3334,7 @@ msgstr "Illuminazione armoniosa" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3383,6 +3553,10 @@ msgstr "Dimensione iniziale verticale della finestra." msgid "Vertical screen synchronization." msgstr "Dimensione iniziale orizzontale della finestra." +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Driver del video" @@ -3579,88 +3753,96 @@ msgstr "" msgid "cURL timeout" msgstr "" -#, fuzzy -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Riavviare minetest per rendere effettive le modifiche" +#~ msgid "No!!!" +#~ msgstr "No!!!" -#~ msgid "Game Name" -#~ msgstr "Nome del gioco" +#~ msgid "Opaque Leaves" +#~ msgstr "Foglie opache" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "GIOCHI" - -#~ msgid "Mods:" -#~ msgstr "Moduli:" - -#~ msgid "new game" -#~ msgstr "nuovo gioco" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFICARE IL GIOCO" - -#~ msgid "Remove selected mod" -#~ msgstr "Rimuovere il modulo selezionato" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Aggiungere il modulo" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Preferiti:" - -#~ msgid "START SERVER" -#~ msgstr "AVVIO SERVER" - -#~ msgid "Name" -#~ msgstr "Nome" - -#~ msgid "Password" -#~ msgstr "Password" - -#~ msgid "SETTINGS" -#~ msgstr "IMPOSTAZIONI" - -#~ msgid "Preload item visuals" -#~ msgstr "Precaricare le immagini" - -#~ msgid "Finite Liquid" -#~ msgstr "Liquido limitato" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "GIOC. SING." - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACCH. DI IMM." - -#~ msgid "MODS" -#~ msgstr "MODULI" - -#~ msgid "Add mod:" -#~ msgstr "Aggiungere un modulo:" - -#~ msgid "Local install" -#~ msgstr "Installazione locale" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "E' necessario usare i driver OpenGL per abilitare gli shader." - -#~ msgid "Simple Leaves" -#~ msgstr "Foglie semplici" +#~ msgid "Opaque Water" +#~ msgstr "Acqua opaca" #, fuzzy #~ msgid "Reset singleplayer world" #~ msgstr "Giocatore singolo" -#~ msgid "Opaque Water" -#~ msgstr "Acqua opaca" +#~ msgid "Simple Leaves" +#~ msgstr "Foglie semplici" -#~ msgid "Opaque Leaves" -#~ msgstr "Foglie opache" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "E' necessario usare i driver OpenGL per abilitare gli shader." -#~ msgid "No!!!" -#~ msgstr "No!!!" +#~ msgid "Local install" +#~ msgstr "Installazione locale" + +#~ msgid "Add mod:" +#~ msgstr "Aggiungere un modulo:" + +#~ msgid "MODS" +#~ msgstr "MODULI" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACCH. DI IMM." + +#~ msgid "SINGLE PLAYER" +#~ msgstr "GIOC. SING." + +#~ msgid "Finite Liquid" +#~ msgstr "Liquido limitato" + +#~ msgid "Preload item visuals" +#~ msgstr "Precaricare le immagini" + +#~ msgid "SETTINGS" +#~ msgstr "IMPOSTAZIONI" + +#~ msgid "Password" +#~ msgstr "Password" + +#~ msgid "Name" +#~ msgstr "Nome" + +#~ msgid "START SERVER" +#~ msgstr "AVVIO SERVER" + +#~ msgid "Favorites:" +#~ msgstr "Preferiti:" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Aggiungere il modulo" + +#~ msgid "Remove selected mod" +#~ msgstr "Rimuovere il modulo selezionato" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFICARE IL GIOCO" + +#~ msgid "new game" +#~ msgstr "nuovo gioco" + +#~ msgid "Mods:" +#~ msgstr "Moduli:" + +#~ msgid "GAMES" +#~ msgstr "GIOCHI" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nome del gioco" + +#, fuzzy +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Riavviare minetest per rendere effettive le modifiche" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "attivata" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Disatt. pacch." diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 95597ea3..812e9928 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -2,11 +2,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-11-05 04:46+0000\n" "Last-Translator: Onee Chan \n" -"Language-Team: Japanese " -"\n" +"Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -412,7 +412,7 @@ msgid "Start Game" msgstr "ゲームスタート" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -441,6 +441,10 @@ msgstr "" msgid "Enabled" msgstr "有効化" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1413,7 +1417,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1559,7 +1563,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1690,7 +1698,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1825,7 +1833,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1869,7 +1878,8 @@ msgid "" "How large area of blocks are subject to the active block stuff, stated in " "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." -msgstr "Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。" +msgstr "" +"Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。" #: src/settings_translation_file.cpp msgid "" @@ -1905,19 +1915,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " -msgstr "無効化の場合 " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, " -msgstr "有効化の場合 " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1991,6 +2005,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "ジャンプキー" @@ -2313,27 +2373,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2372,6 +2463,81 @@ msgstr "マップ生成のデバグ" msgid "Mapgen flags" msgstr "マップ生成フラグ" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "マップ生成フラグ" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "マップ生成フラグ" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "視差遮蔽マッピング" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2547,6 +2713,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2852,7 +3026,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3091,7 +3265,7 @@ msgstr "滑らかな照明" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3295,6 +3469,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3463,71 +3641,77 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "レンダリング:" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "ドライバーを変更するためMinetestを再起動します" - -#~ msgid " MB/s" -#~ msgstr " MB/秒" - -#~ msgid " KB/s" -#~ msgstr " KB/秒" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "タッチのしきい値（ピクセル）" - -#~ msgid "Touch free target" -#~ msgstr "タッチ位置を自由にする" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "シェーダーを有効にするにはOpenGLを使用する必要があります。" - -#~ msgid "Texturing:" -#~ msgstr "テクスチャリング:" - -#~ msgid "Simple Leaves" -#~ msgstr "シンプルな葉" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "メニューの大きさとして設定されている数値: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "シングルプレイヤーのワールドをリセット" - -#~ msgid "Opaque Water" -#~ msgstr "不透明な水" - -#~ msgid "Opaque Leaves" -#~ msgstr "不透明な葉" - -#~ msgid "No!!!" -#~ msgstr "いいえ！！！" - -#~ msgid "No Mipmap" -#~ msgstr "ミップマップ無し" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "異方性フィルタ" - -#~ msgid "Mipmap" -#~ msgstr "ミップマップ" - -#~ msgid "Fancy Leaves" -#~ msgstr "綺麗な葉" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "シングルプレイヤーのワールドをリセットしてよろしいですか？" - -#~ msgid "Antialiasing:" -#~ msgstr "アンチエイリアス:" - -#~ msgid "8x" -#~ msgstr "8倍" +#~ msgid "2x" +#~ msgstr "2倍" #~ msgid "4x" #~ msgstr "4倍" -#~ msgid "2x" -#~ msgstr "2倍" +#~ msgid "8x" +#~ msgstr "8倍" + +#~ msgid "Antialiasing:" +#~ msgstr "アンチエイリアス:" + +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "シングルプレイヤーのワールドをリセットしてよろしいですか？" + +#~ msgid "Fancy Leaves" +#~ msgstr "綺麗な葉" + +#~ msgid "Mipmap" +#~ msgstr "ミップマップ" + +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "異方性フィルタ" + +#~ msgid "No Mipmap" +#~ msgstr "ミップマップ無し" + +#~ msgid "No!!!" +#~ msgstr "いいえ！！！" + +#~ msgid "Opaque Leaves" +#~ msgstr "不透明な葉" + +#~ msgid "Opaque Water" +#~ msgstr "不透明な水" + +#~ msgid "Reset singleplayer world" +#~ msgstr "シングルプレイヤーのワールドをリセット" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "メニューの大きさとして設定されている数値: " + +#~ msgid "Simple Leaves" +#~ msgstr "シンプルな葉" + +#~ msgid "Texturing:" +#~ msgstr "テクスチャリング:" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "シェーダーを有効にするにはOpenGLを使用する必要があります。" + +#~ msgid "Touch free target" +#~ msgstr "タッチ位置を自由にする" + +#~ msgid "Touchthreshold (px)" +#~ msgstr "タッチのしきい値（ピクセル）" + +#~ msgid " KB/s" +#~ msgstr " KB/秒" + +#~ msgid " MB/s" +#~ msgstr " MB/秒" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "ドライバーを変更するためMinetestを再起動します" + +#~ msgid "Rendering:" +#~ msgstr "レンダリング:" + +#~ msgid "If enabled, " +#~ msgstr "有効化の場合 " + +#~ msgid "If disabled " +#~ msgstr "無効化の場合 " diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po index 9a7ffaa5..e42b19dd 100644 --- a/po/jbo/minetest.po +++ b/po/jbo/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-08-15 16:30+0200\n" "Last-Translator: Wuzzy \n" "Language-Team: Lojban , , (, , ), , " @@ -1398,7 +1402,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1545,7 +1549,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1676,7 +1684,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1811,7 +1819,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1891,20 +1900,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "selpli" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1978,6 +1990,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2303,27 +2361,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2362,6 +2451,78 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2534,6 +2695,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2836,7 +3005,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3083,7 +3252,7 @@ msgstr "lo xutla se gusni" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3289,6 +3458,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3456,23 +3629,27 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Simple Leaves" -#~ msgstr "lo sampu pezli" - -#~ msgid "Reset singleplayer world" -#~ msgstr "kraga'igau le za'e pavykelci munje" - -#~ msgid "Opaque Water" -#~ msgstr "lo tolkli djacu" - -#~ msgid "Opaque Leaves" -#~ msgstr "lo tolkli pezli" - -#~ msgid "No!!!" -#~ msgstr "nasai go'i" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr ".i xu do je'u djica lo nu kraga'igau le do za'e pavykelci munje" #~ msgid "Mipmap + Aniso. Filter" #~ msgstr "lo puvrmipmepi .e lo puvytolmanfyju'e" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr ".i xu do je'u djica lo nu kraga'igau le do za'e pavykelci munje" +#~ msgid "No!!!" +#~ msgstr "nasai go'i" + +#~ msgid "Opaque Leaves" +#~ msgstr "lo tolkli pezli" + +#~ msgid "Opaque Water" +#~ msgstr "lo tolkli djacu" + +#~ msgid "Reset singleplayer world" +#~ msgstr "kraga'igau le za'e pavykelci munje" + +#~ msgid "Simple Leaves" +#~ msgstr "lo sampu pezli" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "selpli" diff --git a/po/ko/minetest.po b/po/ko/minetest.po index 007141a8..37a606cc 100644 --- a/po/ko/minetest.po +++ b/po/ko/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-07-08 23:30+0200\n" "Last-Translator: Tae Lim Kook \n" "Language-Team: Korean , , (, , ), , " @@ -1376,7 +1380,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1521,7 +1525,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1652,7 +1660,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1786,7 +1794,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1866,18 +1875,22 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." msgstr "" #: src/settings_translation_file.cpp @@ -1951,6 +1964,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "" @@ -2272,27 +2331,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2331,6 +2421,78 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2503,6 +2665,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2804,7 +2974,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3040,7 +3210,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3243,6 +3413,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" diff --git a/po/ky/minetest.po b/po/ky/minetest.po index 09d16a43..a3a198c7 100644 --- a/po/ky/minetest.po +++ b/po/ky/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2013-06-01 18:09+0200\n" "Last-Translator: Chynggyz Jumaliev \n" "Language-Team: LANGUAGE \n" @@ -428,7 +428,7 @@ msgid "Start Game" msgstr "Оюнду баштоо/туташуу" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -457,6 +457,10 @@ msgstr "" msgid "Enabled" msgstr "күйгүзүлгөн" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1442,7 +1446,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1590,7 +1594,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1721,7 +1729,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1857,7 +1865,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1937,21 +1946,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Баарын өчүрүү" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "күйгүзүлгөн" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2026,6 +2037,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2351,27 +2408,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2410,6 +2498,78 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2582,6 +2742,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2885,7 +3053,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3128,7 +3296,7 @@ msgstr "Тегиз жарык" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3334,6 +3502,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3501,19 +3673,62 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Game Name" -#~ msgstr "Оюн" - -#~ msgid "Favorites:" -#~ msgstr "Тандалмалар:" +#~ msgid "Opaque Leaves" +#~ msgstr "Күңүрт суу" #, fuzzy -#~ msgid "Password" -#~ msgstr "Эски сырсөз" +#~ msgid "Opaque Water" +#~ msgstr "Күңүрт суу" #, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Чектүү суюктук" +#~ msgid "Reset singleplayer world" +#~ msgstr "Бир кишилик" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Ылдый" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу" + +#~ msgid "is required by:" +#~ msgstr "талап кылынганы:" + +#~ msgid "Configuration saved. " +#~ msgstr "Конфигурация сакталды. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Эскертүү: Туура эмес конфигурация. " + +#~ msgid "Show Public" +#~ msgstr "Жалпылыкты көрсөтүү" + +#~ msgid "Show Favorites" +#~ msgstr "Тандалмаларды көрсөтүү" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз." + +#~ msgid "Create world" +#~ msgstr "Дүйнөнү жаратуу" + +#~ msgid "Address required." +#~ msgstr "Дареги талап кылынат." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок" + +#~ msgid "Files to be deleted" +#~ msgstr "Өчүрүлө турган файлдар" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок" #~ msgid "" #~ "Default Controls:\n" @@ -3540,60 +3755,25 @@ msgstr "" #~ "- ESC: бул меню\n" #~ "- T: маек\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок" - -#~ msgid "Files to be deleted" -#~ msgstr "Өчүрүлө турган файлдар" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок" - -#~ msgid "Address required." -#~ msgstr "Дареги талап кылынат." - -#~ msgid "Create world" -#~ msgstr "Дүйнөнү жаратуу" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз." - -#~ msgid "Show Favorites" -#~ msgstr "Тандалмаларды көрсөтүү" - -#~ msgid "Show Public" -#~ msgstr "Жалпылыкты көрсөтүү" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Эскертүү: Туура эмес конфигурация. " - -#~ msgid "Configuration saved. " -#~ msgstr "Конфигурация сакталды. " - -#~ msgid "is required by:" -#~ msgstr "талап кылынганы:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу" +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Чектүү суюктук" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ылдый" +#~ msgid "Password" +#~ msgstr "Эски сырсөз" + +#~ msgid "Favorites:" +#~ msgstr "Тандалмалар:" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Бир кишилик" +#~ msgid "Game Name" +#~ msgstr "Оюн" #, fuzzy -#~ msgid "Opaque Water" -#~ msgstr "Күңүрт суу" +#~ msgid "If enabled, " +#~ msgstr "күйгүзүлгөн" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Күңүрт суу" +#~ msgid "If disabled " +#~ msgstr "Баарын өчүрүү" diff --git a/po/lt/minetest.po b/po/lt/minetest.po index 6e424815..362eaf5b 100644 --- a/po/lt/minetest.po +++ b/po/lt/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2013-12-11 19:23+0200\n" "Last-Translator: Jonas Kriaučiūnas \n" "Language-Team: LANGUAGE \n" @@ -422,7 +422,7 @@ msgid "Start Game" msgstr "Pradėti žaidimą" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -451,6 +451,10 @@ msgstr "" msgid "Enabled" msgstr "įjungtas" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1414,7 +1418,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1562,7 +1566,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1694,7 +1702,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1829,7 +1837,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1909,21 +1918,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Išjungti papildinį" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "įjungtas" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1998,6 +2009,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2323,27 +2380,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2382,6 +2470,78 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2554,6 +2714,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2856,7 +3024,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3104,7 +3272,7 @@ msgstr "Apšvietimo efektai" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3310,6 +3478,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3474,62 +3646,70 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Game Name" -#~ msgstr "Žaidimo pavadinimas" - -#~ msgid "GAMES" -#~ msgstr "ŽAIDIMAI" - -#~ msgid "Mods:" -#~ msgstr "Papildiniai:" - -#~ msgid "new game" -#~ msgstr "naujas žaidimas" - #, fuzzy -#~ msgid "EDIT GAME" -#~ msgstr "KEISTI ŽAIDIMĄ" - -#~ msgid "Remove selected mod" -#~ msgstr "Pašalinti pasirinktą papildinį" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Pridėti papildinį" - -#~ msgid "CLIENT" -#~ msgstr "ŽAISTI TINKLE" - -#~ msgid "Favorites:" -#~ msgstr "Mėgiami:" - -#~ msgid "START SERVER" -#~ msgstr "PALEISTI SERVERĮ" - -#~ msgid "Name" -#~ msgstr "Vardas" - -#~ msgid "Password" -#~ msgstr "Slaptažodis" - -#~ msgid "SETTINGS" -#~ msgstr "NUSTATYMAI" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "VIENAS ŽAIDĖJAS" - -#~ msgid "MODS" -#~ msgstr "PAPILDINIAI" - -#~ msgid "Add mod:" -#~ msgstr "Pridėti papildinį:" - -#, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Žaisti vienam" +#~ msgid "Opaque Leaves" +#~ msgstr "Nepermatomas vanduo" #~ msgid "Opaque Water" #~ msgstr "Nepermatomas vanduo" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Nepermatomas vanduo" +#~ msgid "Reset singleplayer world" +#~ msgstr "Žaisti vienam" + +#~ msgid "Add mod:" +#~ msgstr "Pridėti papildinį:" + +#~ msgid "MODS" +#~ msgstr "PAPILDINIAI" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "VIENAS ŽAIDĖJAS" + +#~ msgid "SETTINGS" +#~ msgstr "NUSTATYMAI" + +#~ msgid "Password" +#~ msgstr "Slaptažodis" + +#~ msgid "Name" +#~ msgstr "Vardas" + +#~ msgid "START SERVER" +#~ msgstr "PALEISTI SERVERĮ" + +#~ msgid "Favorites:" +#~ msgstr "Mėgiami:" + +#~ msgid "CLIENT" +#~ msgstr "ŽAISTI TINKLE" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Pridėti papildinį" + +#~ msgid "Remove selected mod" +#~ msgstr "Pašalinti pasirinktą papildinį" + +#, fuzzy +#~ msgid "EDIT GAME" +#~ msgstr "KEISTI ŽAIDIMĄ" + +#~ msgid "new game" +#~ msgstr "naujas žaidimas" + +#~ msgid "Mods:" +#~ msgstr "Papildiniai:" + +#~ msgid "GAMES" +#~ msgstr "ŽAIDIMAI" + +#~ msgid "Game Name" +#~ msgstr "Žaidimo pavadinimas" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "įjungtas" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Išjungti papildinį" diff --git a/po/minetest.pot b/po/minetest.pot index f48e7679..4e04d6c0 100644 --- a/po/minetest.pot +++ b/po/minetest.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -433,6 +433,10 @@ msgstr "" msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Disabled" msgstr "" @@ -462,7 +466,7 @@ msgid "Please enter a valid number." msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -1136,7 +1140,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1146,7 +1150,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1157,7 +1161,7 @@ msgstr "" msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1166,7 +1170,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -1207,7 +1211,9 @@ msgid "Key use for climbing/descending" msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." msgstr "" #: src/settings_translation_file.cpp @@ -1223,7 +1229,9 @@ msgid "Always fly and fast" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." msgstr "" #: src/settings_translation_file.cpp @@ -1657,7 +1665,11 @@ msgid "New style water" msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -2680,6 +2692,18 @@ msgstr "" msgid "If this is set, players will always (re)spawn at the given position." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disallow empty passwords" msgstr "" @@ -3023,7 +3047,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -3139,12 +3164,12 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" +"Map generation attributes specific to Mapgen v6.\n" "When snowbiomes are enabled jungles are enabled and the jungles flag is " "ignored.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3153,7 +3178,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -3215,11 +3240,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3266,6 +3291,155 @@ msgstr "" msgid "Mapgen v7 cave2 noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" diff --git a/po/nb/minetest.po b/po/nb/minetest.po index 89a1c2da..5309d1d3 100644 --- a/po/nb/minetest.po +++ b/po/nb/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-09-20 17:15+0200\n" "Last-Translator: Christian Haug \n" "Language-Team: Norwegian Bokmål , , (, , ), , " @@ -1391,7 +1395,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1537,7 +1541,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1668,7 +1676,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1802,7 +1810,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1882,21 +1891,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Deaktiver Alle" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "aktivert" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1970,6 +1981,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "" @@ -2291,27 +2348,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2350,6 +2438,78 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2522,6 +2682,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2823,7 +2991,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3059,7 +3227,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3262,6 +3430,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3426,16 +3598,11 @@ msgstr "" msgid "cURL timeout" msgstr "" -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Spill" +#~ msgid "is required by:" +#~ msgstr "trengs av:" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: Noen modifikasjoner er ikke konfigurert enda. \n" -#~ "De vil bli aktivert som standard når du lagrer konfigurasjonen." +#~ msgid "Configuration saved. " +#~ msgstr "Konfigurasjon lagret. " #~ msgid "" #~ "Warning: Some configured mods are missing.\n" @@ -3444,8 +3611,21 @@ msgstr "" #~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n" #~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen." -#~ msgid "Configuration saved. " -#~ msgstr "Konfigurasjon lagret. " +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: Noen modifikasjoner er ikke konfigurert enda. \n" +#~ "De vil bli aktivert som standard når du lagrer konfigurasjonen." -#~ msgid "is required by:" -#~ msgstr "trengs av:" +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Spill" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "aktivert" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Deaktiver Alle" diff --git a/po/nl/minetest.po b/po/nl/minetest.po index fcc22bb6..380fe73c 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-27 16:44+0200\n" "Last-Translator: PilzAdam \n" -"Language-Team: Dutch " -"\n" +"Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -417,7 +417,7 @@ msgid "Start Game" msgstr "Start Server" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -446,6 +446,10 @@ msgstr "" msgid "Enabled" msgstr "ingeschakeld" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1424,7 +1428,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1575,7 +1579,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1708,7 +1716,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1845,7 +1853,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1925,21 +1934,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "MP uitschakelen" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "ingeschakeld" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2014,6 +2025,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2339,27 +2396,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2400,6 +2488,81 @@ msgstr "Kaartgenerator" msgid "Mapgen flags" msgstr "Kaartgenerator" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Kaartgenerator" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Kaartgenerator" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Parallax occlusie" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2576,6 +2739,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2886,7 +3057,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3136,7 +3307,7 @@ msgstr "Mooie verlichting" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3344,6 +3515,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3517,89 +3692,94 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "Rendering:" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Weet je zeker dat je je wereld wilt resetten?" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Herstart minetest om de driver te activeren" +#~ msgid "Fancy Leaves" +#~ msgstr "Mooie bladeren" -#~ msgid "Game Name" -#~ msgstr "Spel" +#~ msgid "Mipmap" +#~ msgstr "Mipmap" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren" +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mipmap + Anisotropisch filteren" -#~ msgid "GAMES" -#~ msgstr "SPELLEN" +#~ msgid "No Mipmap" +#~ msgstr "Geen Mipmap" -#~ msgid "Mods:" -#~ msgstr "Mods:" +#~ msgid "No!!!" +#~ msgstr "Nee!!!" -#~ msgid "new game" -#~ msgstr "nieuw spel" +#~ msgid "Opaque Leaves" +#~ msgstr "Ondoorzichtige bladeren" -#~ msgid "EDIT GAME" -#~ msgstr "SPEL AANPASSEN" +#~ msgid "Opaque Water" +#~ msgstr "Ondoorzichtig water" -#~ msgid "Remove selected mod" -#~ msgstr "Geselecteerde mod verwijderen" +#~ msgid "Reset singleplayer world" +#~ msgstr "Reset Singleplayer wereld" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Mod toevoegen" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Schaal-factor toegepast op menu elementen: " -#~ msgid "CLIENT" -#~ msgstr "CLIENT" +#~ msgid "Simple Leaves" +#~ msgstr "Eenvoudige bladeren" -#~ msgid "Favorites:" -#~ msgstr "Favorieten:" +#~ msgid "Texturing:" +#~ msgstr "Textuur:" -#~ msgid "START SERVER" -#~ msgstr "START SERVER" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Om schaduwen mogelijk te maken moet OpenGL worden gebruikt." -#~ msgid "Name" -#~ msgstr "Naam" +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Downloaden" -#~ msgid "Password" -#~ msgstr "Wachtwoord" - -#~ msgid "SETTINGS" -#~ msgstr "INSTELLINGEN" - -#~ msgid "Preload item visuals" -#~ msgstr "Voorwerpen vooraf laden" - -#~ msgid "Finite Liquid" -#~ msgstr "Eindige vloeistoffen" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "SINGLEPLAYER" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTUREN" - -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "Add mod:" -#~ msgstr "Mod toevoegen:" - -#~ msgid "Local install" -#~ msgstr "Plaatselijk installeren" - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n" -#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie " -#~ "bewaard. " +#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "LEt op: Sommige ingestelde mods zijn vermist.\n" -#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. " +#~ msgid "is required by:" +#~ msgstr "is benodigd voor:" + +#~ msgid "Configuration saved. " +#~ msgstr "Instellingen bewaard. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Waarschuwing: Instellingen niet consistent. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens" + +#~ msgid "Show Public" +#~ msgstr "Publieke server" + +#~ msgid "Show Favorites" +#~ msgstr "Favourieten" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Laat het adres leeg om een lokale server te starten." + +#~ msgid "Create world" +#~ msgstr "Maak wereld aan" + +#~ msgid "Address required." +#~ msgstr "IP-adres nodig." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd" + +#~ msgid "Files to be deleted" +#~ msgstr "Deze bestanden worden verwijderd" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Niet alle bestanden zijn verwijderd" #~ msgid "" #~ "Default Controls:\n" @@ -3626,91 +3806,94 @@ msgstr "" #~ "- ESC: Menu\n" #~ "- T: Chat\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Niet alle bestanden zijn verwijderd" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden" - -#~ msgid "Files to be deleted" -#~ msgstr "Deze bestanden worden verwijderd" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd" - -#~ msgid "Address required." -#~ msgstr "IP-adres nodig." - -#~ msgid "Create world" -#~ msgstr "Maak wereld aan" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Laat het adres leeg om een lokale server te starten." - -#~ msgid "Show Favorites" -#~ msgstr "Favourieten" - -#~ msgid "Show Public" -#~ msgstr "Publieke server" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Waarschuwing: Instellingen niet consistent. " - -#~ msgid "Configuration saved. " -#~ msgstr "Instellingen bewaard. " - -#~ msgid "is required by:" -#~ msgstr "is benodigd voor:" - -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " #~ msgstr "" -#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item" +#~ "LEt op: Sommige ingestelde mods zijn vermist.\n" +#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. " + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n" +#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie " +#~ "bewaard. " + +#~ msgid "Local install" +#~ msgstr "Plaatselijk installeren" + +#~ msgid "Add mod:" +#~ msgstr "Mod toevoegen:" + +#~ msgid "MODS" +#~ msgstr "MODS" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTUREN" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "SINGLEPLAYER" + +#~ msgid "Finite Liquid" +#~ msgstr "Eindige vloeistoffen" + +#~ msgid "Preload item visuals" +#~ msgstr "Voorwerpen vooraf laden" + +#~ msgid "SETTINGS" +#~ msgstr "INSTELLINGEN" + +#~ msgid "Password" +#~ msgstr "Wachtwoord" + +#~ msgid "Name" +#~ msgstr "Naam" + +#~ msgid "START SERVER" +#~ msgstr "START SERVER" + +#~ msgid "Favorites:" +#~ msgstr "Favorieten:" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Mod toevoegen" + +#~ msgid "Remove selected mod" +#~ msgstr "Geselecteerde mod verwijderen" + +#~ msgid "EDIT GAME" +#~ msgstr "SPEL AANPASSEN" + +#~ msgid "new game" +#~ msgstr "nieuw spel" + +#~ msgid "Mods:" +#~ msgstr "Mods:" + +#~ msgid "GAMES" +#~ msgstr "SPELLEN" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren" + +#~ msgid "Game Name" +#~ msgstr "Spel" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Herstart minetest om de driver te activeren" + +#~ msgid "Rendering:" +#~ msgstr "Rendering:" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Downloaden" +#~ msgid "If enabled, " +#~ msgstr "ingeschakeld" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Om schaduwen mogelijk te maken moet OpenGL worden gebruikt." - -#~ msgid "Texturing:" -#~ msgstr "Textuur:" - -#~ msgid "Simple Leaves" -#~ msgstr "Eenvoudige bladeren" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Schaal-factor toegepast op menu elementen: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Reset Singleplayer wereld" - -#~ msgid "Opaque Water" -#~ msgstr "Ondoorzichtig water" - -#~ msgid "Opaque Leaves" -#~ msgstr "Ondoorzichtige bladeren" - -#~ msgid "No!!!" -#~ msgstr "Nee!!!" - -#~ msgid "No Mipmap" -#~ msgstr "Geen Mipmap" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap + Anisotropisch filteren" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#~ msgid "Fancy Leaves" -#~ msgstr "Mooie bladeren" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Weet je zeker dat je je wereld wilt resetten?" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "MP uitschakelen" diff --git a/po/pl/minetest.po b/po/pl/minetest.po index 672f9a21..4d06c753 100644 --- a/po/pl/minetest.po +++ b/po/pl/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2013-10-08 21:22+0200\n" "Last-Translator: Maciej Kasatkin \n" "Language-Team: Polish <>\n" @@ -429,7 +429,7 @@ msgid "Start Game" msgstr "Rozpocznij grę/Połącz" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -458,6 +458,10 @@ msgstr "" msgid "Enabled" msgstr "włączone" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1444,7 +1448,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1595,7 +1599,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1726,7 +1734,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1862,7 +1870,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1942,21 +1951,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Wyłącz wszystkie" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "włączone" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2031,6 +2042,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2356,27 +2413,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2417,6 +2505,80 @@ msgstr "Generator mapy" msgid "Mapgen flags" msgstr "Generator mapy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Generator mapy" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Generator mapy" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2593,6 +2755,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2896,7 +3066,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3145,7 +3315,7 @@ msgstr "Płynne oświetlenie" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3353,6 +3523,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3519,84 +3693,67 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Game Name" -#~ msgstr "Nazwa Gry" +#, fuzzy +#~ msgid "Opaque Leaves" +#~ msgstr "Nieprzeźroczysta woda" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się" - -#~ msgid "GAMES" -#~ msgstr "GRY" - -#~ msgid "Mods:" -#~ msgstr "Mody:" - -#~ msgid "new game" -#~ msgstr "nowa gra" - -#~ msgid "EDIT GAME" -#~ msgstr "EDYTUJ GRĘ" - -#~ msgid "Remove selected mod" -#~ msgstr "Usuń zaznaczony mod" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<--Dodaj mod" - -#~ msgid "CLIENT" -#~ msgstr "KLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Ulubione:" - -#~ msgid "START SERVER" -#~ msgstr "URUCHOM SERWER" - -#~ msgid "Name" -#~ msgstr "Nazwa" - -#~ msgid "Password" -#~ msgstr "Hasło" - -#~ msgid "SETTINGS" -#~ msgstr "USTAWIENIA" - -#~ msgid "Preload item visuals" -#~ msgstr "Ładuj obrazy przedmiotów" - -#~ msgid "Finite Liquid" -#~ msgstr "Realistyczne ciecze" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "TRYB JEDNOOSOBOWY" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACZKI TEKSTUR" - -#~ msgid "MODS" -#~ msgstr "MODY" +#~ msgid "Opaque Water" +#~ msgstr "Nieprzeźroczysta woda" #, fuzzy -#~ msgid "Add mod:" -#~ msgstr "<<--Dodaj mod" +#~ msgid "Reset singleplayer world" +#~ msgstr "Pojedynczy gracz" #, fuzzy -#~ msgid "Local install" -#~ msgstr "Instaluj" +#~ msgid "Downloading" +#~ msgstr "Ściągnij" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n" -#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację. " +#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: " +#~ "przenieś pojedynczy przedmiot" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n" -#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację. " +#~ msgid "is required by:" +#~ msgstr "wymagane przez:" + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguracja zapisana. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki" + +#~ msgid "Show Public" +#~ msgstr "Pokaż publiczne" + +#~ msgid "Show Favorites" +#~ msgstr "Pokaż ulubione" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny." + +#~ msgid "Create world" +#~ msgstr "Stwórz świat" + +#~ msgid "Address required." +#~ msgstr "Wymagany adres." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Nie można skasować świata: nic nie zaznaczono" + +#~ msgid "Files to be deleted" +#~ msgstr "Pliki do skasowania" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Nie udało się skasować wszystkich plików świata" #~ msgid "" #~ "Default Controls:\n" @@ -3623,64 +3780,89 @@ msgstr "" #~ "- ESC: to menu\n" #~ "- T: czat\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Nie udało się skasować wszystkich plików świata" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry" - -#~ msgid "Files to be deleted" -#~ msgstr "Pliki do skasowania" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Nie można skasować świata: nic nie zaznaczono" - -#~ msgid "Address required." -#~ msgstr "Wymagany adres." - -#~ msgid "Create world" -#~ msgstr "Stwórz świat" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny." - -#~ msgid "Show Favorites" -#~ msgstr "Pokaż ulubione" - -#~ msgid "Show Public" -#~ msgstr "Pokaż publiczne" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny. " - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguracja zapisana. " - -#~ msgid "is required by:" -#~ msgstr "wymagane przez:" - -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " #~ msgstr "" -#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: " -#~ "przenieś pojedynczy przedmiot" +#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n" +#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację. " + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n" +#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację. " #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ściągnij" +#~ msgid "Local install" +#~ msgstr "Instaluj" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Pojedynczy gracz" +#~ msgid "Add mod:" +#~ msgstr "<<--Dodaj mod" -#~ msgid "Opaque Water" -#~ msgstr "Nieprzeźroczysta woda" +#~ msgid "MODS" +#~ msgstr "MODY" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACZKI TEKSTUR" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "TRYB JEDNOOSOBOWY" + +#~ msgid "Finite Liquid" +#~ msgstr "Realistyczne ciecze" + +#~ msgid "Preload item visuals" +#~ msgstr "Ładuj obrazy przedmiotów" + +#~ msgid "SETTINGS" +#~ msgstr "USTAWIENIA" + +#~ msgid "Password" +#~ msgstr "Hasło" + +#~ msgid "Name" +#~ msgstr "Nazwa" + +#~ msgid "START SERVER" +#~ msgstr "URUCHOM SERWER" + +#~ msgid "Favorites:" +#~ msgstr "Ulubione:" + +#~ msgid "CLIENT" +#~ msgstr "KLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<--Dodaj mod" + +#~ msgid "Remove selected mod" +#~ msgstr "Usuń zaznaczony mod" + +#~ msgid "EDIT GAME" +#~ msgstr "EDYTUJ GRĘ" + +#~ msgid "new game" +#~ msgstr "nowa gra" + +#~ msgid "Mods:" +#~ msgstr "Mody:" + +#~ msgid "GAMES" +#~ msgstr "GRY" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się" + +#~ msgid "Game Name" +#~ msgstr "Nazwa Gry" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Nieprzeźroczysta woda" +#~ msgid "If enabled, " +#~ msgstr "włączone" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Wyłącz wszystkie" diff --git a/po/pt/minetest.po b/po/pt/minetest.po index 037aa80f..da85b92d 100644 --- a/po/pt/minetest.po +++ b/po/pt/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2014-01-06 01:45+0200\n" "Last-Translator: João Farias \n" "Language-Team: LANGUAGE \n" @@ -428,7 +428,7 @@ msgid "Start Game" msgstr "Jogar" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -457,6 +457,10 @@ msgstr "" msgid "Enabled" msgstr "ativo" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1442,7 +1446,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1593,7 +1597,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1725,7 +1733,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1861,7 +1869,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1941,21 +1950,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Desativar Tudo" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "ativo" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2030,6 +2041,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2355,27 +2412,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2416,6 +2504,80 @@ msgstr "Geração de Mapa" msgid "Mapgen flags" msgstr "Geração de Mapa" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Geração de Mapa" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Geração de Mapa" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2592,6 +2754,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2895,7 +3065,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3144,7 +3314,7 @@ msgstr "Iluminação Suave" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3352,6 +3522,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3518,86 +3692,65 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Game Name" -#~ msgstr "Nome do Jogo" +#, fuzzy +#~ msgid "Opaque Leaves" +#~ msgstr "Água Opaca" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "" -#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo " -#~ "\"$2\"" +#~ msgid "Opaque Water" +#~ msgstr "Água Opaca" -#~ msgid "GAMES" -#~ msgstr "JOGOS" - -#~ msgid "Mods:" -#~ msgstr "Extras:" - -#~ msgid "new game" -#~ msgstr "novo jogo" - -#~ msgid "EDIT GAME" -#~ msgstr "EDITAR JOGO" - -#~ msgid "Remove selected mod" -#~ msgstr "Remover extra selecionado" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adicionar extra" - -#~ msgid "CLIENT" -#~ msgstr "CLIENTE" - -#~ msgid "Favorites:" -#~ msgstr "Favoritos:" - -#~ msgid "START SERVER" -#~ msgstr "INICIAR SERVIDOR" - -#~ msgid "Name" -#~ msgstr "Nome" - -#~ msgid "Password" -#~ msgstr "Senha" - -#~ msgid "SETTINGS" -#~ msgstr "DEFINIÇÕES" - -#~ msgid "Preload item visuals" -#~ msgstr "Pré-carregamento dos itens" - -#~ msgid "Finite Liquid" -#~ msgstr "Líquido Finito" - -#~ msgid "SINGLE PLAYER" +#, fuzzy +#~ msgid "Reset singleplayer world" #~ msgstr "Um Jogador" -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACOTES DE TEXTURAS" - -#~ msgid "MODS" -#~ msgstr "EXTRAS" - #, fuzzy -#~ msgid "Add mod:" -#~ msgstr "<<-- Adicionar extra" +#~ msgid "Downloading" +#~ msgstr "Descarregar" -#, fuzzy -#~ msgid "Local install" -#~ msgstr "Instalar" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Botão esq: Mover todos os itens Botão dir: Mover um item" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods ainda não estão configurados.\n" -#~ "Eles vão ser ativados por predefinição quando guardar a configuração. " +#~ msgid "is required by:" +#~ msgstr "é necessário pelo:" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods configurados estão em falta.\n" -#~ "As suas definições vão ser removidas quando gravar a configuração. " +#~ msgid "Configuration saved. " +#~ msgstr "Configuração gravada. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Atenção: Configuração não compatível. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos" + +#~ msgid "Show Public" +#~ msgstr "Mostrar Públicos" + +#~ msgid "Show Favorites" +#~ msgstr "Mostrar Favoritos" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Deixe endereço em branco para iniciar servidor local." + +#~ msgid "Create world" +#~ msgstr "Criar mundo" + +#~ msgid "Address required." +#~ msgstr "Endereço necessário." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado" + +#~ msgid "Files to be deleted" +#~ msgstr "Ficheiros para eliminar" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Não foi possível configurar mundo: Nada seleccionado" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos" #~ msgid "" #~ "Default Controls:\n" @@ -3624,62 +3777,91 @@ msgstr "" #~ "- ESC: Este menu\n" #~ "- T: Chat\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods configurados estão em falta.\n" +#~ "As suas definições vão ser removidas quando gravar a configuração. " -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Não foi possível configurar mundo: Nada seleccionado" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos" - -#~ msgid "Files to be deleted" -#~ msgstr "Ficheiros para eliminar" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado" - -#~ msgid "Address required." -#~ msgstr "Endereço necessário." - -#~ msgid "Create world" -#~ msgstr "Criar mundo" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Deixe endereço em branco para iniciar servidor local." - -#~ msgid "Show Favorites" -#~ msgstr "Mostrar Favoritos" - -#~ msgid "Show Public" -#~ msgstr "Mostrar Públicos" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Atenção: Configuração não compatível. " - -#~ msgid "Configuration saved. " -#~ msgstr "Configuração gravada. " - -#~ msgid "is required by:" -#~ msgstr "é necessário pelo:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Botão esq: Mover todos os itens Botão dir: Mover um item" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods ainda não estão configurados.\n" +#~ "Eles vão ser ativados por predefinição quando guardar a configuração. " #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Descarregar" +#~ msgid "Local install" +#~ msgstr "Instalar" #, fuzzy -#~ msgid "Reset singleplayer world" +#~ msgid "Add mod:" +#~ msgstr "<<-- Adicionar extra" + +#~ msgid "MODS" +#~ msgstr "EXTRAS" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACOTES DE TEXTURAS" + +#~ msgid "SINGLE PLAYER" #~ msgstr "Um Jogador" -#~ msgid "Opaque Water" -#~ msgstr "Água Opaca" +#~ msgid "Finite Liquid" +#~ msgstr "Líquido Finito" + +#~ msgid "Preload item visuals" +#~ msgstr "Pré-carregamento dos itens" + +#~ msgid "SETTINGS" +#~ msgstr "DEFINIÇÕES" + +#~ msgid "Password" +#~ msgstr "Senha" + +#~ msgid "Name" +#~ msgstr "Nome" + +#~ msgid "START SERVER" +#~ msgstr "INICIAR SERVIDOR" + +#~ msgid "Favorites:" +#~ msgstr "Favoritos:" + +#~ msgid "CLIENT" +#~ msgstr "CLIENTE" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adicionar extra" + +#~ msgid "Remove selected mod" +#~ msgstr "Remover extra selecionado" + +#~ msgid "EDIT GAME" +#~ msgstr "EDITAR JOGO" + +#~ msgid "new game" +#~ msgstr "novo jogo" + +#~ msgid "Mods:" +#~ msgstr "Extras:" + +#~ msgid "GAMES" +#~ msgstr "JOGOS" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "" +#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo " +#~ "\"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nome do Jogo" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Água Opaca" +#~ msgid "If enabled, " +#~ msgstr "ativo" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Desativar Tudo" diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index aebaee97..7b2029c0 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-27 16:46+0200\n" "Last-Translator: PilzAdam \n" -"Language-Team: Portuguese (Brazil) " -"\n" +"Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -427,7 +427,7 @@ msgid "Start Game" msgstr "Iniciar o jogo" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -456,6 +456,10 @@ msgstr "" msgid "Enabled" msgstr "habilitado" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1444,7 +1448,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1595,7 +1599,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1728,7 +1736,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1864,7 +1872,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1944,21 +1953,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Desabilitar PMs" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "habilitado" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2033,6 +2044,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2358,27 +2415,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2419,6 +2507,80 @@ msgstr "Mapgen" msgid "Mapgen flags" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2595,6 +2757,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2898,7 +3068,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3147,7 +3317,7 @@ msgstr "Iluminação suave" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3355,6 +3525,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3521,82 +3695,68 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Game Name" -#~ msgstr "Nome do jogo" +#, fuzzy +#~ msgid "Opaque Leaves" +#~ msgstr "Água opaca" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\"" +#~ msgid "Opaque Water" +#~ msgstr "Água opaca" -#~ msgid "GAMES" -#~ msgstr "JOGOS" +#, fuzzy +#~ msgid "Reset singleplayer world" +#~ msgstr "Um jogador" -#~ msgid "Mods:" -#~ msgstr "Módulos:" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Para habilitar os sombreadores é necessário usar o driver OpenGL." -#~ msgid "new game" -#~ msgstr "novo jogo" +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Baixar" -#~ msgid "EDIT GAME" -#~ msgstr "EDITAR JOGO" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item" -#~ msgid "Remove selected mod" -#~ msgstr "Remover o módulo selecionado" +#~ msgid "is required by:" +#~ msgstr "é necessário para:" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adicionar módulo" +#~ msgid "Configuration saved. " +#~ msgstr "A configuração foi salva. " -#~ msgid "CLIENT" -#~ msgstr "CLIENTE" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Atenção: A configuração não está consistente." -#~ msgid "Favorites:" -#~ msgstr "Favoritos:" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos" -#~ msgid "START SERVER" -#~ msgstr "SERVIDOR" +#~ msgid "Show Public" +#~ msgstr "Exibir públicos" -#~ msgid "Name" -#~ msgstr "Nome" +#~ msgid "Show Favorites" +#~ msgstr "Exibir favoritos" -#~ msgid "Password" -#~ msgstr "Senha" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Deixe o endereço em branco para iniciar um servidor local." -#~ msgid "SETTINGS" -#~ msgstr "CONFIGURAÇÕES" +#~ msgid "Create world" +#~ msgstr "Criar o mundo" -#~ msgid "Preload item visuals" -#~ msgstr "Precarga de elementos visuais" +#~ msgid "Address required." +#~ msgstr "É necessário um endereço." -#~ msgid "Finite Liquid" -#~ msgstr "Líquido finito" +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado" -#~ msgid "SINGLE PLAYER" -#~ msgstr "UM JOGADOR" +#~ msgid "Files to be deleted" +#~ msgstr "Arquivos a serem excluídos" -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTURAS" +#~ msgid "Cannot create world: No games found" +#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo" -#~ msgid "MODS" -#~ msgstr "MÓDULOS" +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado" -#~ msgid "Add mod:" -#~ msgstr "Adicionar módulo:" - -#~ msgid "Local install" -#~ msgstr "Instalação local" - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods ainda não foram configurados.\n" -#~ "E eles serão ativados por padrão, quando você salvar a configuração." - -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods configurados não foram encontrados.\n" -#~ "Suas definições serão removidas quando você salvar a configuração." +#~ msgid "Failed to delete all world files" +#~ msgstr "Não foi possível excluir todos os arquivos do mundo" #~ msgid "" #~ "Default Controls:\n" @@ -3623,65 +3783,87 @@ msgstr "" #~ "- ESC: este menu\n" #~ "- T: bate-papo\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Não foi possível excluir todos os arquivos do mundo" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods configurados não foram encontrados.\n" +#~ "Suas definições serão removidas quando você salvar a configuração." -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods ainda não foram configurados.\n" +#~ "E eles serão ativados por padrão, quando você salvar a configuração." -#~ msgid "Cannot create world: No games found" -#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo" +#~ msgid "Local install" +#~ msgstr "Instalação local" -#~ msgid "Files to be deleted" -#~ msgstr "Arquivos a serem excluídos" +#~ msgid "Add mod:" +#~ msgstr "Adicionar módulo:" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado" +#~ msgid "MODS" +#~ msgstr "MÓDULOS" -#~ msgid "Address required." -#~ msgstr "É necessário um endereço." +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTURAS" -#~ msgid "Create world" -#~ msgstr "Criar o mundo" +#~ msgid "SINGLE PLAYER" +#~ msgstr "UM JOGADOR" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Deixe o endereço em branco para iniciar um servidor local." +#~ msgid "Finite Liquid" +#~ msgstr "Líquido finito" -#~ msgid "Show Favorites" -#~ msgstr "Exibir favoritos" +#~ msgid "Preload item visuals" +#~ msgstr "Precarga de elementos visuais" -#~ msgid "Show Public" -#~ msgstr "Exibir públicos" +#~ msgid "SETTINGS" +#~ msgstr "CONFIGURAÇÕES" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos" +#~ msgid "Password" +#~ msgstr "Senha" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Atenção: A configuração não está consistente." +#~ msgid "Name" +#~ msgstr "Nome" -#~ msgid "Configuration saved. " -#~ msgstr "A configuração foi salva. " +#~ msgid "START SERVER" +#~ msgstr "SERVIDOR" -#~ msgid "is required by:" -#~ msgstr "é necessário para:" +#~ msgid "Favorites:" +#~ msgstr "Favoritos:" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item" +#~ msgid "CLIENT" +#~ msgstr "CLIENTE" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adicionar módulo" + +#~ msgid "Remove selected mod" +#~ msgstr "Remover o módulo selecionado" + +#~ msgid "EDIT GAME" +#~ msgstr "EDITAR JOGO" + +#~ msgid "new game" +#~ msgstr "novo jogo" + +#~ msgid "Mods:" +#~ msgstr "Módulos:" + +#~ msgid "GAMES" +#~ msgstr "JOGOS" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nome do jogo" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Baixar" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Para habilitar os sombreadores é necessário usar o driver OpenGL." +#~ msgid "If enabled, " +#~ msgstr "habilitado" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Um jogador" - -#~ msgid "Opaque Water" -#~ msgstr "Água opaca" - -#, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Água opaca" +#~ msgid "If disabled " +#~ msgstr "Desabilitar PMs" diff --git a/po/ro/minetest.po b/po/ro/minetest.po index 1075e556..97b60a40 100644 --- a/po/ro/minetest.po +++ b/po/ro/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-27 16:46+0200\n" "Last-Translator: PilzAdam \n" -"Language-Team: Romanian " -"\n" +"Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -426,7 +426,7 @@ msgid "Start Game" msgstr "Începe jocul" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -455,6 +455,10 @@ msgstr "" msgid "Enabled" msgstr "activat" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1439,7 +1443,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1590,7 +1594,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1723,7 +1731,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1859,7 +1867,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1939,21 +1948,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Dezactivează MP" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "activat" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2028,6 +2039,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2353,27 +2410,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2414,6 +2502,80 @@ msgstr "Mapgen" msgid "Mapgen flags" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2590,6 +2752,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2893,7 +3063,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3142,7 +3312,7 @@ msgstr "Lumină mai bună" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3350,6 +3520,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3516,87 +3690,95 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Game Name" -#~ msgstr "Numele jocului" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "JOCURI" - -#~ msgid "Mods:" -#~ msgstr "Moduri:" - -#~ msgid "new game" -#~ msgstr "joc nou" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFICĂ JOCUL" - -#~ msgid "Remove selected mod" -#~ msgstr "Șterge modul selectat" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adaugă modul" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Preferate:" - -#~ msgid "START SERVER" -#~ msgstr "DESCHIDE SERVERUL" - -#~ msgid "Name" -#~ msgstr "Nume" - -#~ msgid "Password" -#~ msgstr "Parolă" - -#~ msgid "SETTINGS" -#~ msgstr "SETĂRI" - -#~ msgid "Preload item visuals" -#~ msgstr "Pre-încarcă imaginile obiectelor" - -#~ msgid "Finite Liquid" -#~ msgstr "Lichid finit" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "SINGLE PLAYER" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACHETE DE TEXTURĂ" - -#~ msgid "MODS" -#~ msgstr "MODURI" - -#~ msgid "Add mod:" -#~ msgstr "Adăugaţi mod:" - -#~ msgid "Local install" -#~ msgstr "Instalare locală" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "" -#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect" - #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Descarcă" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Pentru a permite shadere OpenGL trebuie să fie folosite." - -#, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Singleplayer" +#~ msgid "Opaque Leaves" +#~ msgstr "Apă opacă" #~ msgid "Opaque Water" #~ msgstr "Apă opacă" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Apă opacă" +#~ msgid "Reset singleplayer world" +#~ msgstr "Singleplayer" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Pentru a permite shadere OpenGL trebuie să fie folosite." + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Descarcă" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "" +#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect" + +#~ msgid "Local install" +#~ msgstr "Instalare locală" + +#~ msgid "Add mod:" +#~ msgstr "Adăugaţi mod:" + +#~ msgid "MODS" +#~ msgstr "MODURI" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACHETE DE TEXTURĂ" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "SINGLE PLAYER" + +#~ msgid "Finite Liquid" +#~ msgstr "Lichid finit" + +#~ msgid "Preload item visuals" +#~ msgstr "Pre-încarcă imaginile obiectelor" + +#~ msgid "SETTINGS" +#~ msgstr "SETĂRI" + +#~ msgid "Password" +#~ msgstr "Parolă" + +#~ msgid "Name" +#~ msgstr "Nume" + +#~ msgid "START SERVER" +#~ msgstr "DESCHIDE SERVERUL" + +#~ msgid "Favorites:" +#~ msgstr "Preferate:" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adaugă modul" + +#~ msgid "Remove selected mod" +#~ msgstr "Șterge modul selectat" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFICĂ JOCUL" + +#~ msgid "new game" +#~ msgstr "joc nou" + +#~ msgid "Mods:" +#~ msgstr "Moduri:" + +#~ msgid "GAMES" +#~ msgstr "JOCURI" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Numele jocului" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "activat" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Dezactivează MP" diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 627b295b..363e0030 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -7,17 +7,17 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-11-08 10:10+0000\n" "Last-Translator: Vasily Pavlov \n" -"Language-Team: Russian " -"\n" +"Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua @@ -417,8 +417,8 @@ msgid "Start Game" msgstr "Начать игру" #: builtin/mainmenu/tab_settings.lua -msgid "\"" -msgstr "\"" +msgid "\"$1\" is not a valid flag." +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -444,6 +444,10 @@ msgstr "Редактировать" msgid "Enabled" msgstr "Включено" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1434,7 +1438,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1579,7 +1583,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1709,7 +1717,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1843,7 +1851,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1923,19 +1932,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " -msgstr "Если выключено " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, " -msgstr "Если включено " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2008,6 +2021,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "Кнопка, отвечающая за прыжок" @@ -2329,27 +2388,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2388,6 +2478,81 @@ msgstr "Дебаггинг генератора карты" msgid "Mapgen flags" msgstr "Флаги генератора карты" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Флаги генератора карты" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Флаги генератора карты" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Повторение параллакса" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2560,6 +2725,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2861,7 +3034,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3099,7 +3272,7 @@ msgstr "Мягкое освещение" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3308,6 +3481,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3481,89 +3658,99 @@ msgstr "" msgid "cURL timeout" msgstr "cURL тайм-аут" -#~ msgid "Rendering:" -#~ msgstr "Рендеринг:" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Уверены, что хотите сбросить мир одиночной игры?" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Перезапустите Minetest для принятия изменений" +#~ msgid "Fancy Leaves" +#~ msgstr "Красивая листва" -#~ msgid "Game Name" -#~ msgstr "Название" +#~ msgid "Mipmap" +#~ msgstr "Мипмаппинг" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\"" +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Мипмаппинг с анизотр. фильтром" -#~ msgid "GAMES" -#~ msgstr "ИГРЫ" +#~ msgid "No Mipmap" +#~ msgstr "Без Мипмаппинга" -#~ msgid "Mods:" -#~ msgstr "Моды:" +#~ msgid "No!!!" +#~ msgstr "Нет!" -#~ msgid "new game" -#~ msgstr "Создать игру" +#~ msgid "Opaque Leaves" +#~ msgstr "Непрозрачная листва" -#~ msgid "EDIT GAME" -#~ msgstr "РЕДАКТИРОВАНИЕ" +#~ msgid "Opaque Water" +#~ msgstr "Непрозрачная вода" -#~ msgid "Remove selected mod" -#~ msgstr "Удалить мод" +#~ msgid "Reset singleplayer world" +#~ msgstr "Сброс одиночной игры" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Добавить мод" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Коэффициент масштаба интерфейса: " -#~ msgid "CLIENT" -#~ msgstr "КЛИЕНТ" +#~ msgid "Simple Leaves" +#~ msgstr "Упрощённая листва" -#~ msgid "Favorites:" -#~ msgstr "Избранное:" +#~ msgid "Texturing:" +#~ msgstr "Текстурирование:" -#~ msgid "START SERVER" -#~ msgstr "СЕРВЕР" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "Для включения шейдеров необходим драйвер OpenGL." -#~ msgid "Name" -#~ msgstr "Имя" +#~ msgid "Touch free target" +#~ msgstr "Свободный выбор цели" -#~ msgid "Password" -#~ msgstr "Пароль" +#~ msgid "Touchthreshold (px)" +#~ msgstr "Чувствительность (пк)" -#~ msgid "SETTINGS" -#~ msgstr "НАСТРОЙКИ" +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Загрузить" -#~ msgid "Preload item visuals" -#~ msgstr "Предзагрузка изображений" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет" -#~ msgid "Finite Liquid" -#~ msgstr "Конечные жидкости" +#~ msgid "is required by:" +#~ msgstr "требуется для:" -#~ msgid "SINGLE PLAYER" -#~ msgstr "ОДИНОЧНАЯ ИГРА" +#~ msgid "Configuration saved. " +#~ msgstr "Настройки сохранены. " -#~ msgid "TEXTURE PACKS" -#~ msgstr "ПАКЕТЫ ТЕКСТУР" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Предупреждение: Неверная конфигурация. " -#~ msgid "MODS" -#~ msgstr "МОДЫ" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы" -#~ msgid "Add mod:" -#~ msgstr "Добавить мод:" +#~ msgid "Show Public" +#~ msgstr "Публичные" -#~ msgid "Local install" -#~ msgstr "Локальная установка" +#~ msgid "Show Favorites" +#~ msgstr "Избранные" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Предупреждение: Некоторые моды еще не настроены.\n" -#~ "Их стандартные настройки будут установлены, когда вы сохраните " -#~ "конфигурацию. " +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Оставьте адрес пустым для запуска локального сервера." -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Предупреждение: Некоторые моды не найдены.\n" -#~ "Их настройки будут удалены, когда вы сохраните конфигурацию. " +#~ msgid "Create world" +#~ msgstr "Создать мир" + +#~ msgid "Address required." +#~ msgstr "Нужно ввести адрес." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Невозможно удалить мир: Ничего не выбрано" + +#~ msgid "Files to be deleted" +#~ msgstr "Следующие файлы будут удалены" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Невозможно создать мир: Ни одной игры не найдено" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Невозможно настроить мир: ничего не выбрано" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Ошибка при удалении файлов мира" #~ msgid "" #~ "Default Controls:\n" @@ -3590,96 +3777,95 @@ msgstr "cURL тайм-аут" #~ "- ESC: это меню\n" #~ "- T: чат\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Ошибка при удалении файлов мира" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Предупреждение: Некоторые моды не найдены.\n" +#~ "Их настройки будут удалены, когда вы сохраните конфигурацию. " -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Невозможно настроить мир: ничего не выбрано" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Предупреждение: Некоторые моды еще не настроены.\n" +#~ "Их стандартные настройки будут установлены, когда вы сохраните " +#~ "конфигурацию. " -#~ msgid "Cannot create world: No games found" -#~ msgstr "Невозможно создать мир: Ни одной игры не найдено" +#~ msgid "Local install" +#~ msgstr "Локальная установка" -#~ msgid "Files to be deleted" -#~ msgstr "Следующие файлы будут удалены" +#~ msgid "Add mod:" +#~ msgstr "Добавить мод:" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Невозможно удалить мир: Ничего не выбрано" +#~ msgid "MODS" +#~ msgstr "МОДЫ" -#~ msgid "Address required." -#~ msgstr "Нужно ввести адрес." +#~ msgid "TEXTURE PACKS" +#~ msgstr "ПАКЕТЫ ТЕКСТУР" -#~ msgid "Create world" -#~ msgstr "Создать мир" +#~ msgid "SINGLE PLAYER" +#~ msgstr "ОДИНОЧНАЯ ИГРА" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Оставьте адрес пустым для запуска локального сервера." +#~ msgid "Finite Liquid" +#~ msgstr "Конечные жидкости" -#~ msgid "Show Favorites" -#~ msgstr "Избранные" +#~ msgid "Preload item visuals" +#~ msgstr "Предзагрузка изображений" -#~ msgid "Show Public" -#~ msgstr "Публичные" +#~ msgid "SETTINGS" +#~ msgstr "НАСТРОЙКИ" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы" +#~ msgid "Password" +#~ msgstr "Пароль" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Предупреждение: Неверная конфигурация. " +#~ msgid "Name" +#~ msgstr "Имя" -#~ msgid "Configuration saved. " -#~ msgstr "Настройки сохранены. " +#~ msgid "START SERVER" +#~ msgstr "СЕРВЕР" -#~ msgid "is required by:" -#~ msgstr "требуется для:" +#~ msgid "Favorites:" +#~ msgstr "Избранное:" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет" +#~ msgid "CLIENT" +#~ msgstr "КЛИЕНТ" -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Загрузить" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Добавить мод" -#~ msgid "Touchthreshold (px)" -#~ msgstr "Чувствительность (пк)" +#~ msgid "Remove selected mod" +#~ msgstr "Удалить мод" -#~ msgid "Touch free target" -#~ msgstr "Свободный выбор цели" +#~ msgid "EDIT GAME" +#~ msgstr "РЕДАКТИРОВАНИЕ" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Для включения шейдеров необходим драйвер OpenGL." +#~ msgid "new game" +#~ msgstr "Создать игру" -#~ msgid "Texturing:" -#~ msgstr "Текстурирование:" +#~ msgid "Mods:" +#~ msgstr "Моды:" -#~ msgid "Simple Leaves" -#~ msgstr "Упрощённая листва" +#~ msgid "GAMES" +#~ msgstr "ИГРЫ" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Коэффициент масштаба интерфейса: " +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\"" -#~ msgid "Reset singleplayer world" -#~ msgstr "Сброс одиночной игры" +#~ msgid "Game Name" +#~ msgstr "Название" -#~ msgid "Opaque Water" -#~ msgstr "Непрозрачная вода" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Перезапустите Minetest для принятия изменений" -#~ msgid "Opaque Leaves" -#~ msgstr "Непрозрачная листва" +#~ msgid "Rendering:" +#~ msgstr "Рендеринг:" -#~ msgid "No!!!" -#~ msgstr "Нет!" +#~ msgid "If enabled, " +#~ msgstr "Если включено " -#~ msgid "No Mipmap" -#~ msgstr "Без Мипмаппинга" +#~ msgid "If disabled " +#~ msgstr "Если выключено " -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Мипмаппинг с анизотр. фильтром" - -#~ msgid "Mipmap" -#~ msgstr "Мипмаппинг" - -#~ msgid "Fancy Leaves" -#~ msgstr "Красивая листва" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Уверены, что хотите сбросить мир одиночной игры?" +#~ msgid "\"" +#~ msgstr "\"" diff --git a/po/tr/minetest.po b/po/tr/minetest.po index 6f4a237b..50289276 100644 --- a/po/tr/minetest.po +++ b/po/tr/minetest.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-27 16:46+0200\n" "Last-Translator: PilzAdam \n" -"Language-Team: Turkish " -"\n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -419,8 +419,8 @@ msgid "Start Game" msgstr "Oyunu Başlat" #: builtin/mainmenu/tab_settings.lua -msgid "\"" -msgstr "\"" +msgid "\"$1\" is not a valid flag." +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -446,6 +446,10 @@ msgstr "Düzenle" msgid "Enabled" msgstr "Etkinleştirildi" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1433,7 +1437,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1583,7 +1587,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1716,7 +1724,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1855,7 +1863,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1935,21 +1944,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Paketi Kapat" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "Etkinleştirildi" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2024,6 +2035,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2349,27 +2406,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2410,6 +2498,81 @@ msgstr "Mapgen" msgid "Mapgen flags" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Parallax Occlusion" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2586,6 +2749,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2896,7 +3067,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3146,7 +3317,7 @@ msgstr "Pürüzsüz ışıklandırma" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3355,6 +3526,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3528,78 +3703,89 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Rendering:" -#~ msgstr "Kaplama:" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Tek kişilik dünyayı sıfırlamak istediğinizden emin misiniz ?" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın" - -#~ msgid "Numpad " -#~ msgstr "Numpad " - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid "please wait..." -#~ msgstr "lütfen bekleyin..." - -#~ msgid "Downloading" -#~ msgstr "İndiriliyor" - -#~ msgid "Trilinear Filter" -#~ msgstr "Üç yönlü süzme" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Touchthreshold (px)" - -#~ msgid "Touch free target" -#~ msgstr "Touch free target" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "OpenGL sürücüleri seçilmeden Shader etkinleştirilemez." - -#~ msgid "Texturing:" -#~ msgstr "Doku:" - -#, fuzzy -#~ msgid "Simple Leaves" -#~ msgstr "Dalgalanan Yapraklar" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Ölçeklendirme menülere işlendi:" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Tek kişilik oyunu sıfırlayın" - -#~ msgid "Opaque Water" -#~ msgstr "Şeffaf su" - -#, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Şeffaf su" - -#~ msgid "No!!!" -#~ msgstr "Hayır!!!" - -#~ msgid "No Mipmap" -#~ msgstr "Mipmap kapalı" - -#, fuzzy -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap Aniso. Süzgeci" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" +#~ msgid "Bilinear Filter" +#~ msgstr "İki yönlü süzme" #, fuzzy #~ msgid "Fancy Leaves" #~ msgstr "Şık ağaçlar" -#~ msgid "Bilinear Filter" -#~ msgstr "İki yönlü süzme" +#~ msgid "Mipmap" +#~ msgstr "Mipmap" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Tek kişilik dünyayı sıfırlamak istediğinizden emin misiniz ?" +#, fuzzy +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mipmap Aniso. Süzgeci" + +#~ msgid "No Mipmap" +#~ msgstr "Mipmap kapalı" + +#~ msgid "No!!!" +#~ msgstr "Hayır!!!" + +#, fuzzy +#~ msgid "Opaque Leaves" +#~ msgstr "Şeffaf su" + +#~ msgid "Opaque Water" +#~ msgstr "Şeffaf su" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Tek kişilik oyunu sıfırlayın" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Ölçeklendirme menülere işlendi:" + +#, fuzzy +#~ msgid "Simple Leaves" +#~ msgstr "Dalgalanan Yapraklar" + +#~ msgid "Texturing:" +#~ msgstr "Doku:" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "OpenGL sürücüleri seçilmeden Shader etkinleştirilemez." + +#~ msgid "Touch free target" +#~ msgstr "Touch free target" + +#~ msgid "Touchthreshold (px)" +#~ msgstr "Touchthreshold (px)" + +#~ msgid "Trilinear Filter" +#~ msgstr "Üç yönlü süzme" + +#~ msgid "Downloading" +#~ msgstr "İndiriliyor" + +#~ msgid "please wait..." +#~ msgstr "lütfen bekleyin..." + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid "Numpad " +#~ msgstr "Numpad " + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın" + +#~ msgid "Rendering:" +#~ msgstr "Kaplama:" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Etkinleştirildi" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Paketi Kapat" + +#~ msgid "\"" +#~ msgstr "\"" diff --git a/po/uk/minetest.po b/po/uk/minetest.po index 773df14a..e6f13fae 100644 --- a/po/uk/minetest.po +++ b/po/uk/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-09-21 23:18+0200\n" "Last-Translator: Olexandr \n" "Language-Team: Ukrainian , , (, , ), , " @@ -1450,7 +1454,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1600,7 +1604,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1731,7 +1739,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1869,7 +1877,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1949,21 +1958,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "Вимкнути багатокористувацьку гру" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "Увімкнено" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2038,6 +2049,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2363,27 +2420,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2424,6 +2512,81 @@ msgstr "Генератор карти" msgid "Mapgen flags" msgstr "Генератор карти" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "Генератор карти" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "Генератор карти" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "Оклюзія паралакса" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2600,6 +2763,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2909,7 +3080,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3158,7 +3329,7 @@ msgstr "Рівне освітлення" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3366,6 +3537,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3533,99 +3708,107 @@ msgstr "" msgid "cURL timeout" msgstr "" -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Гра" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "Ви впевнені, що бажаєте скинути свій світ однокористувацької гри?" -#~ msgid "Favorites:" -#~ msgstr "Улюблені:" +#~ msgid "No!!!" +#~ msgstr "Ні!!!" + +#~ msgid "Opaque Leaves" +#~ msgstr "Непрозоре листя" + +#~ msgid "Opaque Water" +#~ msgstr "Непрозора вода" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Скинути світ однокористувацької гри" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Масштабування елементів меню: " + +#~ msgid "Simple Leaves" +#~ msgstr "Просте листя" + +#~ msgid "Texturing:" +#~ msgstr "Текстурування:" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "" +#~ "Для того, щоб увімкнути шейдери, потрібно використовувати двайвер OpenGL." #, fuzzy -#~ msgid "Password" -#~ msgstr "Старий Пароль" - -#~ msgid "Preload item visuals" -#~ msgstr "Попереднє завантаження зображень" - -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Кінцеві рідини" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Помилка при видаленні файлів світу" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Неможливо створити світ: Не знайдено жодної гри" - -#~ msgid "Files to be deleted" -#~ msgstr "Файлів, що підлягають видаленню" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Неможливо видалити світ: Нічого не вибрано" - -#~ msgid "Address required." -#~ msgstr "Адреса необхідна." - -#~ msgid "Create world" -#~ msgstr "Створити світ" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Залишіть адресу незаповненою для створення локального серверу." - -#~ msgid "Show Favorites" -#~ msgstr "Показати Улюблені" - -#~ msgid "Show Public" -#~ msgstr "Показати Публічні" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Попередження: Помилкова конфігурація. " - -#~ msgid "Configuration saved. " -#~ msgstr "Налаштування Збережено. " - -#~ msgid "is required by:" -#~ msgstr "необхідний для:" +#~ msgid "Downloading" +#~ msgstr "Вниз" #~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" #~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: " #~ "Перемістити один предмет" +#~ msgid "is required by:" +#~ msgstr "необхідний для:" + +#~ msgid "Configuration saved. " +#~ msgstr "Налаштування Збережено. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Попередження: Помилкова конфігурація. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи" + +#~ msgid "Show Public" +#~ msgstr "Показати Публічні" + +#~ msgid "Show Favorites" +#~ msgstr "Показати Улюблені" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Залишіть адресу незаповненою для створення локального серверу." + +#~ msgid "Create world" +#~ msgstr "Створити світ" + +#~ msgid "Address required." +#~ msgstr "Адреса необхідна." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Неможливо видалити світ: Нічого не вибрано" + +#~ msgid "Files to be deleted" +#~ msgstr "Файлів, що підлягають видаленню" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Неможливо створити світ: Не знайдено жодної гри" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Помилка при видаленні файлів світу" + #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Вниз" +#~ msgid "Finite Liquid" +#~ msgstr "Кінцеві рідини" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "" -#~ "Для того, щоб увімкнути шейдери, потрібно використовувати двайвер OpenGL." +#~ msgid "Preload item visuals" +#~ msgstr "Попереднє завантаження зображень" -#~ msgid "Texturing:" -#~ msgstr "Текстурування:" +#, fuzzy +#~ msgid "Password" +#~ msgstr "Старий Пароль" -#~ msgid "Simple Leaves" -#~ msgstr "Просте листя" +#~ msgid "Favorites:" +#~ msgstr "Улюблені:" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Масштабування елементів меню: " +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Гра" -#~ msgid "Reset singleplayer world" -#~ msgstr "Скинути світ однокористувацької гри" +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Увімкнено" -#~ msgid "Opaque Water" -#~ msgstr "Непрозора вода" - -#~ msgid "Opaque Leaves" -#~ msgstr "Непрозоре листя" - -#~ msgid "No!!!" -#~ msgstr "Ні!!!" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Ви впевнені, що бажаєте скинути свій світ однокористувацької гри?" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Вимкнути багатокористувацьку гру" diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index e625f392..c13b3304 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-11-07 08:04+0000\n" "Last-Translator: Jun Zhang \n" -"Language-Team: Chinese (China) " -"\n" +"Language-Team: Chinese (China) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -421,7 +421,7 @@ msgid "Start Game" msgstr "启动游戏" #: builtin/mainmenu/tab_settings.lua -msgid "\"" +msgid "\"$1\" is not a valid flag." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -450,6 +450,10 @@ msgstr "设置" msgid "Enabled" msgstr "启用" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " @@ -1435,7 +1439,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" @@ -1586,7 +1590,11 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." msgstr "" #: src/settings_translation_file.cpp @@ -1719,7 +1727,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1858,7 +1866,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1938,21 +1947,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If disabled " -msgstr "禁用MOD包" +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy -msgid "If enabled, " -msgstr "启用" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2027,6 +2038,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Jump key" @@ -2352,27 +2409,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2413,6 +2501,81 @@ msgstr "地图生成器" msgid "Mapgen flags" msgstr "地图生成器" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "地图生成器" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "地图生成器" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "视差贴图" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2589,6 +2752,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2898,7 +3069,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3148,7 +3319,7 @@ msgstr "平滑光照" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3357,6 +3528,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3530,85 +3705,97 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "重启minetest让驱动变化生效" +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "你确定要重置您的单人世界吗？" -#~ msgid "Game Name" -#~ msgstr "游戏名" +#, fuzzy +#~ msgid "Fancy Leaves" +#~ msgstr "花式树" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”" +#~ msgid "No!!!" +#~ msgstr "不!!!" -#~ msgid "GAMES" -#~ msgstr "游戏" +#, fuzzy +#~ msgid "Opaque Leaves" +#~ msgstr "不透明的水" -#~ msgid "Mods:" -#~ msgstr "MODS：" +#~ msgid "Opaque Water" +#~ msgstr "不透明的水" -#~ msgid "new game" -#~ msgstr "新建游戏" +#, fuzzy +#~ msgid "Reset singleplayer world" +#~ msgstr "重置单人游戏" -#~ msgid "EDIT GAME" -#~ msgstr "编辑游戏" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "菜单元素应用缩放因子" -#~ msgid "Remove selected mod" -#~ msgstr "删除选中MOD" +#, fuzzy +#~ msgid "Simple Leaves" +#~ msgstr "摇动的叶子" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- 添加MOD" +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "启用着色器需要使用OpenGL驱动。" -#~ msgid "CLIENT" -#~ msgstr "客户端" +#~ msgid "Touch free target" +#~ msgstr "自由触摸目标" -#~ msgid "Favorites:" -#~ msgstr "最爱的服务器：" +#~ msgid "Touchthreshold (px)" +#~ msgstr "触控阈值（像素）" -#~ msgid "START SERVER" -#~ msgstr "启动服务器" +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "下载中" -#~ msgid "Name" -#~ msgstr "名字" +#~ msgid " KB/s" +#~ msgstr "千字节/秒" -#~ msgid "Password" -#~ msgstr "密码" +#~ msgid " MB/s" +#~ msgstr "兆字节/秒" -#~ msgid "SETTINGS" -#~ msgstr "设置" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "左键：移动所有物品，右键：移动单个物品" -#~ msgid "Preload item visuals" -#~ msgstr "预先加载物品图像" +#~ msgid "is required by:" +#~ msgstr "被需要：" -#~ msgid "Finite Liquid" -#~ msgstr "液体有限延伸" +#~ msgid "Configuration saved. " +#~ msgstr "配置已保存。 " -#~ msgid "SINGLE PLAYER" -#~ msgstr "单人游戏" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "警告：配置不一致。 " -#~ msgid "TEXTURE PACKS" -#~ msgstr "材质包" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "无法创建世界：名字包含非法字符" -#~ msgid "MODS" -#~ msgstr "MODS" +#~ msgid "Show Public" +#~ msgstr "显示公共" -#~ msgid "Add mod:" -#~ msgstr "添加MOD：" +#~ msgid "Show Favorites" +#~ msgstr "显示最爱" -#~ msgid "Local install" -#~ msgstr "本地安装" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "地址栏留空可启动本地服务器。" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "警告：一些MOD仍未设定。\n" -#~ "它们会在你保存配置的时候自动启用。 " +#~ msgid "Create world" +#~ msgstr "创造世界" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "警告：缺少一些设定了的MOD。\n" -#~ "它们的设置会在你保存配置的时候被移除。 " +#~ msgid "Address required." +#~ msgstr "需要地址。" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "无法删除世界：没有选择世界" + +#~ msgid "Files to be deleted" +#~ msgstr "将被删除的文件" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "无法创造世界：未找到游戏模式" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "无法配置世界：没有选择世界" + +#~ msgid "Failed to delete all world files" +#~ msgstr "无法删除所有该世界的文件" #~ msgid "" #~ "Default Controls:\n" @@ -3636,94 +3823,90 @@ msgstr "" #~ "ESC：菜单\n" #~ "T：聊天\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "无法删除所有该世界的文件" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "警告：缺少一些设定了的MOD。\n" +#~ "它们的设置会在你保存配置的时候被移除。 " -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "无法配置世界：没有选择世界" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "警告：一些MOD仍未设定。\n" +#~ "它们会在你保存配置的时候自动启用。 " -#~ msgid "Cannot create world: No games found" -#~ msgstr "无法创造世界：未找到游戏模式" +#~ msgid "Local install" +#~ msgstr "本地安装" -#~ msgid "Files to be deleted" -#~ msgstr "将被删除的文件" +#~ msgid "Add mod:" +#~ msgstr "添加MOD：" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "无法删除世界：没有选择世界" +#~ msgid "MODS" +#~ msgstr "MODS" -#~ msgid "Address required." -#~ msgstr "需要地址。" +#~ msgid "TEXTURE PACKS" +#~ msgstr "材质包" -#~ msgid "Create world" -#~ msgstr "创造世界" +#~ msgid "SINGLE PLAYER" +#~ msgstr "单人游戏" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "地址栏留空可启动本地服务器。" +#~ msgid "Finite Liquid" +#~ msgstr "液体有限延伸" -#~ msgid "Show Favorites" -#~ msgstr "显示最爱" +#~ msgid "Preload item visuals" +#~ msgstr "预先加载物品图像" -#~ msgid "Show Public" -#~ msgstr "显示公共" +#~ msgid "SETTINGS" +#~ msgstr "设置" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "无法创建世界：名字包含非法字符" +#~ msgid "Password" +#~ msgstr "密码" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "警告：配置不一致。 " +#~ msgid "Name" +#~ msgstr "名字" -#~ msgid "Configuration saved. " -#~ msgstr "配置已保存。 " +#~ msgid "START SERVER" +#~ msgstr "启动服务器" -#~ msgid "is required by:" -#~ msgstr "被需要：" +#~ msgid "Favorites:" +#~ msgstr "最爱的服务器：" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "左键：移动所有物品，右键：移动单个物品" +#~ msgid "CLIENT" +#~ msgstr "客户端" -#~ msgid " MB/s" -#~ msgstr "兆字节/秒" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- 添加MOD" -#~ msgid " KB/s" -#~ msgstr "千字节/秒" +#~ msgid "Remove selected mod" +#~ msgstr "删除选中MOD" + +#~ msgid "EDIT GAME" +#~ msgstr "编辑游戏" + +#~ msgid "new game" +#~ msgstr "新建游戏" + +#~ msgid "Mods:" +#~ msgstr "MODS：" + +#~ msgid "GAMES" +#~ msgstr "游戏" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”" + +#~ msgid "Game Name" +#~ msgstr "游戏名" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "重启minetest让驱动变化生效" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "下载中" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "触控阈值（像素）" - -#~ msgid "Touch free target" -#~ msgstr "自由触摸目标" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "启用着色器需要使用OpenGL驱动。" +#~ msgid "If enabled, " +#~ msgstr "启用" #, fuzzy -#~ msgid "Simple Leaves" -#~ msgstr "摇动的叶子" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "菜单元素应用缩放因子" - -#, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "重置单人游戏" - -#~ msgid "Opaque Water" -#~ msgstr "不透明的水" - -#, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "不透明的水" - -#~ msgid "No!!!" -#~ msgstr "不!!!" - -#, fuzzy -#~ msgid "Fancy Leaves" -#~ msgstr "花式树" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "你确定要重置您的单人世界吗？" +#~ msgid "If disabled " +#~ msgstr "禁用MOD包" diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index b8ca9733..43ac23f1 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 20:28+0200\n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-11-08 10:49+0000\n" "Last-Translator: Jeff Huang \n" -"Language-Team: Chinese (Taiwan) " -"\n" +"Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -414,8 +414,8 @@ msgid "Start Game" msgstr "開始遊戲" #: builtin/mainmenu/tab_settings.lua -msgid "\"" -msgstr "\"" +msgid "\"$1\" is not a valid flag." +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -441,11 +441,17 @@ msgstr "編輯" msgid "Enabled" msgstr "已啟用" +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " -msgstr "格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續性>" +msgstr "" +"格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續" +"性>" #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -1426,8 +1432,9 @@ msgstr "" "範例：72 = 20分鐘，360 = 4分鐘，1 = 24小時，0 = 日／夜／一切保持不變。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Controls size of deserts and beaches in Mapgen V6.\n" +"Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" "控制在 Mapgen V6 中的沙漠與沙灘大小。\n" @@ -1580,8 +1587,12 @@ msgid "Dump the mapgen debug infos." msgstr "轉儲 mapgen 的除錯資訊。" #: src/settings_translation_file.cpp -msgid "Enable a bit lower water surface, so it doesn't " -msgstr "啟用較低的水面，所以它不會 " +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." +msgstr "" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1730,7 +1741,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" -"This requires the " +"This requires the \"fast\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -1864,7 +1875,8 @@ msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." msgstr "" #: src/settings_translation_file.cpp @@ -1944,19 +1956,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "If disabled " -msgstr "若停用 " +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" #: src/settings_translation_file.cpp msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" -"This requires the " +"This requires the \"noclip\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp -msgid "If enabled, " -msgstr "若啟用， " +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2029,6 +2045,52 @@ msgstr "" msgid "Item entity TTL" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Jump key" msgstr "跳躍鍵" @@ -2350,27 +2412,58 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen V7.\n" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with " +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2409,6 +2502,81 @@ msgstr "地圖產生器除錯" msgid "Mapgen flags" msgstr "地圖產生器旗標" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal" +msgstr "地圖產生器旗標" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal flags" +msgstr "地圖產生器旗標" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal julia iterations" +msgstr "視差遮蔽迭代" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2581,6 +2749,14 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2882,7 +3058,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" -"This requires the " +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3118,7 +3294,7 @@ msgstr "平滑光" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking arround.\n" +"Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" @@ -3321,6 +3497,10 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "" +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3485,59 +3665,71 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "要啟用著色器，必須使用 OpenGL 驅動程式。" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "碰觸限值（像素）" - -#~ msgid "Touch free target" -#~ msgstr "碰觸自由目標" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "套用在選單元素的縮放係數： " - -#~ msgid "Reset singleplayer world" -#~ msgstr "重置單人遊戲世界" - -#~ msgid "Antialiasing:" -#~ msgstr "反鋸齒：" - -#~ msgid "Texturing:" -#~ msgstr "紋理：" - -#~ msgid "Opaque Water" -#~ msgstr "不透明水" - -#~ msgid "No!!!" -#~ msgstr "否！！！" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "您確定要要重置您的單人遊戲世界嗎？" - -#~ msgid "8x" -#~ msgstr "8x" - -#~ msgid "4x" -#~ msgstr "4x" - -#~ msgid "2x" -#~ msgstr "2x" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mip 貼圖 + Aniso. 過濾器" - -#~ msgid "Mipmap" -#~ msgstr "Mip 貼圖" - -#~ msgid "No Mipmap" -#~ msgstr "無 Mip 貼圖" - -#~ msgid "Fancy Leaves" -#~ msgstr "華麗葉子" +#~ msgid "Opaque Leaves" +#~ msgstr "不透明葉子" #~ msgid "Simple Leaves" #~ msgstr "簡易葉子" -#~ msgid "Opaque Leaves" -#~ msgstr "不透明葉子" +#~ msgid "Fancy Leaves" +#~ msgstr "華麗葉子" + +#~ msgid "No Mipmap" +#~ msgstr "無 Mip 貼圖" + +#~ msgid "Mipmap" +#~ msgstr "Mip 貼圖" + +#~ msgid "Mipmap + Aniso. Filter" +#~ msgstr "Mip 貼圖 + Aniso. 過濾器" + +#~ msgid "2x" +#~ msgstr "2x" + +#~ msgid "4x" +#~ msgstr "4x" + +#~ msgid "8x" +#~ msgstr "8x" + +#~ msgid "Are you sure to reset your singleplayer world?" +#~ msgstr "您確定要要重置您的單人遊戲世界嗎？" + +#~ msgid "No!!!" +#~ msgstr "否！！！" + +#~ msgid "Opaque Water" +#~ msgstr "不透明水" + +#~ msgid "Texturing:" +#~ msgstr "紋理：" + +#~ msgid "Antialiasing:" +#~ msgstr "反鋸齒：" + +#~ msgid "Reset singleplayer world" +#~ msgstr "重置單人遊戲世界" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "套用在選單元素的縮放係數： " + +#~ msgid "Touch free target" +#~ msgstr "碰觸自由目標" + +#~ msgid "Touchthreshold (px)" +#~ msgstr "碰觸限值（像素）" + +#~ msgid "To enable shaders the OpenGL driver needs to be used." +#~ msgstr "要啟用著色器，必須使用 OpenGL 驅動程式。" + +#~ msgid "If enabled, " +#~ msgstr "若啟用， " + +#~ msgid "If disabled " +#~ msgstr "若停用 " + +#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgstr "啟用較低的水面，所以它不會 " + +#~ msgid "\"" +#~ msgstr "\"" From ad5ac39d8d1a8b8f6f0fe077e20bac914ddc624b Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 6 Aug 2015 08:57:13 +0200 Subject: [PATCH 066/531] Add LuaSecureRandom --- doc/lua_api.txt | 9 +++ src/porting.cpp | 43 +++++++++++- src/porting.h | 1 + src/script/lua_api/l_noise.cpp | 115 +++++++++++++++++++++++++++++++++ src/script/lua_api/l_noise.h | 33 ++++++++++ src/script/scripting_game.cpp | 1 + 6 files changed, 201 insertions(+), 1 deletion(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 63e4971e..f82c3c2a 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2765,6 +2765,15 @@ It can be created via `PcgRandom(seed)` or `PcgRandom(seed, sequence)`. * This is only a rough approximation of a normal distribution with mean=(max-min)/2 and variance=1 * Increasing num_trials improves accuracy of the approximation +### `SecureRandom` +Interface for the operating system's crypto-secure PRNG. + +It can be created via `SecureRandom()`. The constructor returns nil if a secure random device cannot be +be found on the system. + +#### Methods +* `next_bytes([count])`: return next `count` (default 1, capped at 2048) many random bytes, as a string. + ### `PerlinNoise` A perlin noise generator. It can be created via `PerlinNoise(seed, octaves, persistence, scale)` diff --git a/src/porting.cpp b/src/porting.cpp index ced41d4f..3e39fc81 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -29,6 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #elif defined(_WIN32) + #include + #include #include #endif #if !defined(_WIN32) @@ -701,5 +703,44 @@ v2u32 getDisplaySize() # endif // __ANDROID__ #endif // SERVER -} //namespace porting +//// +//// OS-specific Secure Random +//// + +#ifdef WIN32 + +bool secure_rand_fill_buf(void *buf, size_t len) +{ + HCRYPTPROV wctx; + + if (!CryptAcquireContext(&wctx, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + return false; + + CryptGenRandom(wctx, len, (BYTE *)buf); + CryptReleaseContext(wctx, 0); + return true; +} + +#else + +bool secure_rand_fill_buf(void *buf, size_t len) +{ + // N.B. This function checks *only* for /dev/urandom, because on most + // common OSes it is non-blocking, whereas /dev/random is blocking, and it + // is exceptionally uncommon for there to be a situation where /dev/random + // exists but /dev/urandom does not. This guesswork is necessary since + // random devices are not covered by any POSIX standard... + FILE *fp = fopen("/dev/urandom", "rb"); + if (!fp) + return false; + + bool success = fread(buf, len, 1, fp) == 1; + + fclose(fp); + return success; +} + +#endif + +} //namespace porting diff --git a/src/porting.h b/src/porting.h index a86d37fb..1e89cd04 100644 --- a/src/porting.h +++ b/src/porting.h @@ -343,6 +343,7 @@ void setXorgClassHint(const video::SExposedVideoData &video_data, // threads in the process inherit this exception handler void setWin32ExceptionHandler(); +bool secure_rand_fill_buf(void *buf, size_t len); } // namespace porting #ifdef __ANDROID__ diff --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp index 6dcffa31..04dc6048 100644 --- a/src/script/lua_api/l_noise.cpp +++ b/src/script/lua_api/l_noise.cpp @@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common/c_converter.h" #include "common/c_content.h" #include "log.h" +#include "porting.h" +#include "util/numeric.h" /////////////////////////////////////// /* @@ -600,3 +602,116 @@ const luaL_reg LuaPcgRandom::methods[] = { luamethod(LuaPcgRandom, rand_normal_dist), {0,0} }; + +/////////////////////////////////////// +/* + LuaSecureRandom +*/ + +bool LuaSecureRandom::fillRandBuf() +{ + return porting::secure_rand_fill_buf(m_rand_buf, RAND_BUF_SIZE); +} + +int LuaSecureRandom::l_next_bytes(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + + LuaSecureRandom *o = checkobject(L, 1); + u32 count = lua_isnumber(L, 2) ? lua_tointeger(L, 2) : 1; + + // Limit count + count = MYMIN(RAND_BUF_SIZE, count); + + // Find out whether we can pass directly from our array, or have to do some gluing + size_t count_remaining = RAND_BUF_SIZE - o->m_rand_idx; + if (count_remaining >= count) { + lua_pushlstring(L, o->m_rand_buf + o->m_rand_idx, count); + o->m_rand_idx += count; + } else { + char output_buf[RAND_BUF_SIZE]; + + // Copy over with what we have left from our current buffer + memcpy(output_buf, o->m_rand_buf + o->m_rand_idx, count_remaining); + + // Refill buffer and copy over the remainder of what was requested + o->fillRandBuf(); + memcpy(output_buf + count_remaining, o->m_rand_buf, count - count_remaining); + + // Update index + o->m_rand_idx = count - count_remaining; + + lua_pushlstring(L, output_buf, count); + } + + return 1; +} + + +int LuaSecureRandom::create_object(lua_State *L) +{ + LuaSecureRandom *o = new LuaSecureRandom(); + + // Fail and return nil if we can't securely fill the buffer + if (!o->fillRandBuf()) { + delete o; + return 0; + } + + *(void **)(lua_newuserdata(L, sizeof(void *))) = o; + luaL_getmetatable(L, className); + lua_setmetatable(L, -2); + return 1; +} + + +int LuaSecureRandom::gc_object(lua_State *L) +{ + LuaSecureRandom *o = *(LuaSecureRandom **)(lua_touserdata(L, 1)); + delete o; + return 0; +} + + +LuaSecureRandom *LuaSecureRandom::checkobject(lua_State *L, int narg) +{ + luaL_checktype(L, narg, LUA_TUSERDATA); + void *ud = luaL_checkudata(L, narg, className); + if (!ud) + luaL_typerror(L, narg, className); + return *(LuaSecureRandom **)ud; +} + + +void LuaSecureRandom::Register(lua_State *L) +{ + lua_newtable(L); + int methodtable = lua_gettop(L); + luaL_newmetatable(L, className); + int metatable = lua_gettop(L); + + lua_pushliteral(L, "__metatable"); + lua_pushvalue(L, methodtable); + lua_settable(L, metatable); + + lua_pushliteral(L, "__index"); + lua_pushvalue(L, methodtable); + lua_settable(L, metatable); + + lua_pushliteral(L, "__gc"); + lua_pushcfunction(L, gc_object); + lua_settable(L, metatable); + + lua_pop(L, 1); + + luaL_openlib(L, 0, methods, 0); + lua_pop(L, 1); + + lua_register(L, className, create_object); +} + +const char LuaSecureRandom::className[] = "SecureRandom"; +const luaL_reg LuaSecureRandom::methods[] = { + luamethod(LuaSecureRandom, next_bytes), + {0,0} +}; diff --git a/src/script/lua_api/l_noise.h b/src/script/lua_api/l_noise.h index e958c5a2..492eb755 100644 --- a/src/script/lua_api/l_noise.h +++ b/src/script/lua_api/l_noise.h @@ -160,4 +160,37 @@ public: static void Register(lua_State *L); }; + +/* + LuaSecureRandom +*/ +class LuaSecureRandom : public ModApiBase { +private: + static const size_t RAND_BUF_SIZE = 2048; + static const char className[]; + static const luaL_reg methods[]; + + u32 m_rand_idx; + char m_rand_buf[RAND_BUF_SIZE]; + + // Exported functions + + // garbage collector + static int gc_object(lua_State *L); + + // next_bytes(self, count) -> get count many bytes + static int l_next_bytes(lua_State *L); + +public: + bool fillRandBuf(); + + // LuaSecureRandom() + // Creates an LuaSecureRandom and leaves it on top of stack + static int create_object(lua_State *L); + + static LuaSecureRandom *checkobject(lua_State *L, int narg); + + static void Register(lua_State *L); +}; + #endif /* L_NOISE_H_ */ diff --git a/src/script/scripting_game.cpp b/src/script/scripting_game.cpp index 4f0350d4..33bc5c2a 100644 --- a/src/script/scripting_game.cpp +++ b/src/script/scripting_game.cpp @@ -98,6 +98,7 @@ void GameScripting::InitializeModApi(lua_State *L, int top) LuaPerlinNoiseMap::Register(L); LuaPseudoRandom::Register(L); LuaPcgRandom::Register(L); + LuaSecureRandom::Register(L); LuaVoxelManip::Register(L); NodeMetaRef::Register(L); NodeTimerRef::Register(L); From 6f95bb1ef371c5e838f0df4d6e3edd9d6b132bf9 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 8 Nov 2015 16:19:34 -0500 Subject: [PATCH 067/531] Fix misc. MinGW and Valgrind warnings --- src/localplayer.cpp | 1 + src/minimap.cpp | 2 ++ src/threading/thread.cpp | 3 ++- src/util/serialize.cpp | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index e5546447..fd781f94 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -42,6 +42,7 @@ LocalPlayer::LocalPlayer(IGameDef *gamedef, const char *name): last_pitch(0), last_yaw(0), last_keyPressed(0), + camera_impact(0.f), last_animation(NO_ANIM), hotbar_image(""), hotbar_selected_image(""), diff --git a/src/minimap.cpp b/src/minimap.cpp index a6eff068..ded8470c 100644 --- a/src/minimap.cpp +++ b/src/minimap.cpp @@ -216,6 +216,8 @@ Mapper::Mapper(IrrlichtDevice *device, Client *client) this->m_shdrsrc = client->getShaderSource(); this->m_ndef = client->getNodeDefManager(); + m_angle = 0.f; + // Initialize static settings m_enable_shaders = g_settings->getBool("enable_shaders"); m_surface_mode_scan_height = diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp index 57b55150..8688c4cb 100644 --- a/src/threading/thread.cpp +++ b/src/threading/thread.cpp @@ -264,7 +264,8 @@ DWORD WINAPI Thread::threadProc(LPVOID param) thr->m_running = false; g_logger.deregisterThread(); - return NULL; + // 0 is returned here to avoid an unnecessary ifdef clause + return 0; } diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp index ced5fc7c..99cb990f 100644 --- a/src/util/serialize.cpp +++ b/src/util/serialize.cpp @@ -229,7 +229,7 @@ std::string deSerializeLongString(std::istream &is) Buffer buf2(s_size); is.read(&buf2[0], s_size); - if (is.gcount() != s_size) + if ((u32)is.gcount() != s_size) throw SerializationError("deSerializeLongString: couldn't read all chars"); s.reserve(s_size); From 4ae6e509ffe886492598610a3511179ad87c1f43 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 8 Nov 2015 22:23:16 +0100 Subject: [PATCH 068/531] Write new line character sequence at end of print() Fix regression of commit 5e507c9829942c434a6f1ae7a4f3a488c7e50bef "Add server side ncurses terminal" where no line termination character was printed after a lua print outside of terminal mode. Fixes #3350. --- src/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.cpp b/src/server.cpp index 6cb79c87..9315fcf8 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1473,7 +1473,7 @@ void Server::printToConsoleOnly(const std::string &text) m_admin_chat->outgoing_queue.push_back( new ChatEventChat("", utf8_to_wide(text))); } else { - std::cout << text; + std::cout << text << std::endl; } } From 88a3977954f537b391c714be2a52da6b19711154 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 8 Nov 2015 18:14:36 -0500 Subject: [PATCH 069/531] Add errno to socket creation failed exception --- src/socket.cpp | 11 +++++++---- src/socket.h | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/socket.cpp b/src/socket.cpp index 47fffcc4..17fa1924 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -44,8 +44,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include -typedef SOCKET socket_t; -typedef int socklen_t; + #define LAST_SOCKET_ERR() WSAGetLastError() + typedef SOCKET socket_t; + typedef int socklen_t; #else #include #include @@ -54,7 +55,8 @@ typedef int socklen_t; #include #include #include -typedef int socket_t; + #define LAST_SOCKET_ERR() (errno) + typedef int socket_t; #endif // Set to true to enable verbose debug output @@ -339,7 +341,8 @@ bool UDPSocket::init(bool ipv6, bool noExceptions) if (noExceptions) { return false; } else { - throw SocketException("Failed to create socket"); + throw SocketException(std::string("Failed to create socket: error ") + + itos(LAST_SOCKET_ERR())); } } diff --git a/src/socket.h b/src/socket.h index c7dd78f6..8d1ad70f 100644 --- a/src/socket.h +++ b/src/socket.h @@ -45,7 +45,7 @@ extern bool socket_enable_debug_output; class SocketException : public BaseException { public: - SocketException(const char *s): + SocketException(const std::string &s): BaseException(s) { } @@ -54,7 +54,7 @@ public: class ResolveError : public BaseException { public: - ResolveError(const char *s): + ResolveError(const std::string &s): BaseException(s) { } @@ -63,7 +63,7 @@ public: class SendFailedException : public BaseException { public: - SendFailedException(const char *s): + SendFailedException(const std::string &s): BaseException(s) { } From 889f893ff37021d97d1805c2e21128b5befa21f5 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 8 Nov 2015 23:08:53 -0500 Subject: [PATCH 070/531] Abort compile when attempting to build client with Irrlicht 1.8.2 --- src/main.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 5046181b..151ea714 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,11 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #ifdef _MSC_VER -#ifndef SERVER // Dedicated server isn't linked with Irrlicht - #pragma comment(lib, "Irrlicht.lib") - // This would get rid of the console window - //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") -#endif + #ifndef SERVER // Dedicated server isn't linked with Irrlicht + #pragma comment(lib, "Irrlicht.lib") + // This would get rid of the console window + //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") + #endif #pragma comment(lib, "zlibwapi.lib") #pragma comment(lib, "Shell32.lib") #endif @@ -59,7 +59,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif #ifdef HAVE_TOUCHSCREENGUI -#include "touchscreengui.h" + #include "touchscreengui.h" +#endif + +#if !defined(SERVER) && \ + (IRRLICHT_VERSION_MAJOR == 1) && \ + (IRRLICHT_VERSION_MINOR == 8) && \ + (IRRLICHT_VERSION_REVISION == 2) + #error "Irrlicht 1.8.2 is known to be broken - please update Irrlicht to version >= 1.8.3" #endif #define DEBUGFILE "debug.txt" From 63e7137e3bb3ef2531faac995e8817b2c3fedc8c Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 9 Nov 2015 06:04:24 +0100 Subject: [PATCH 071/531] Put ChatEvent handler into own function Comply with line limit. --- src/server.cpp | 35 ++++++++++++++++++++--------------- src/server.h | 2 ++ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 9315fcf8..c93abb10 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -585,21 +585,7 @@ void Server::AsyncRunStep(bool initial_step) MutexAutoLock lock(m_env_mutex); while (!m_admin_chat->command_queue.empty()) { ChatEvent *evt = m_admin_chat->command_queue.pop_frontNoEx(); - if (evt->type == CET_NICK_ADD) { - // The terminal informed us of its nick choice - m_admin_nick = ((ChatEventNick *)evt)->nick; - if (!m_script->getAuth(m_admin_nick, NULL, NULL)) { - errorstream << "You haven't set up an account." << std::endl - << "Please log in using the client as '" - << m_admin_nick << "' with a secure password." << std::endl - << "Until then, you can't execute admin tasks via the console," << std::endl - << "and everybody can claim the user account instead of you," << std::endl - << "giving them full control over this server." << std::endl; - } - } else { - assert(evt->type == CET_CHAT); - handleAdminChat((ChatEventChat *)evt); - } + handleChatInterfaceEvent(evt); delete evt; } } @@ -2749,6 +2735,25 @@ void Server::UpdateCrafting(Player* player) plist->changeItem(0, preview); } +void Server::handleChatInterfaceEvent(ChatEvent *evt) +{ + if (evt->type == CET_NICK_ADD) { + // The terminal informed us of its nick choice + m_admin_nick = ((ChatEventNick *)evt)->nick; + if (!m_script->getAuth(m_admin_nick, NULL, NULL)) { + errorstream << "You haven't set up an account." << std::endl + << "Please log in using the client as '" + << m_admin_nick << "' with a secure password." << std::endl + << "Until then, you can't execute admin tasks via the console," << std::endl + << "and everybody can claim the user account instead of you," << std::endl + << "giving them full control over this server." << std::endl; + } + } else { + assert(evt->type == CET_CHAT); + handleAdminChat((ChatEventChat *)evt); + } +} + std::wstring Server::handleChat(const std::string &name, const std::wstring &wname, const std::wstring &wmessage, u16 peer_id_to_avoid_sending) { diff --git a/src/server.h b/src/server.h index 6d66c938..5a19677c 100644 --- a/src/server.h +++ b/src/server.h @@ -476,6 +476,8 @@ private: void DeleteClient(u16 peer_id, ClientDeletionReason reason); void UpdateCrafting(Player *player); + void handleChatInterfaceEvent(ChatEvent *evt); + // This returns the answer to the sender of wmessage, or "" if there is none std::wstring handleChat(const std::string &name, const std::wstring &wname, const std::wstring &wmessage, From c3e179f256246b4b5a86cd908dfc567a7ec454ee Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 8 Nov 2015 08:18:47 +0000 Subject: [PATCH 072/531] Cavegen: Make mgfractal use mgv5 cavegen Remove CaveFractal Add a lava depth constant to CaveV5 to make it universal --- src/cavegen.cpp | 261 ++--------------------------------------- src/cavegen.h | 53 +-------- src/mapgen_fractal.cpp | 2 +- src/mapgen_fractal.h | 2 +- 4 files changed, 15 insertions(+), 303 deletions(-) diff --git a/src/cavegen.cpp b/src/cavegen.cpp index e0303900..e1516af0 100644 --- a/src/cavegen.cpp +++ b/src/cavegen.cpp @@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen_v5.h" #include "mapgen_v6.h" #include "mapgen_v7.h" -#include "mapgen_fractal.h" #include "cavegen.h" NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0); @@ -32,17 +31,18 @@ NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0 ///////////////////////////////////////// Caves V5 -CaveV5::CaveV5(MapgenV5 *mg, PseudoRandom *ps) +CaveV5::CaveV5(Mapgen *mg, PseudoRandom *ps) { this->mg = mg; this->vm = mg->vm; this->ndef = mg->ndef; this->water_level = mg->water_level; this->ps = ps; - this->c_water_source = mg->c_water_source; - this->c_lava_source = mg->c_lava_source; - this->c_ice = mg->c_ice; + c_water_source = ndef->getId("mapgen_water_source"); + c_lava_source = ndef->getId("mapgen_lava_source"); + c_ice = ndef->getId("mapgen_ice"); this->np_caveliquids = &nparams_caveliquids; + this->ystride = mg->csize.X; dswitchint = ps->range(1, 14); flooded = ps->range(1, 2) == 2; @@ -150,7 +150,7 @@ void CaveV5::makeTunnel(bool dirswitch) p = orpi + veci + of + rs / 2; if (p.Z >= node_min.Z && p.Z <= node_max.Z && p.X >= node_min.X && p.X <= node_max.X) { - u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X); + u32 index = (p.Z - node_min.Z) * ystride + (p.X - node_min.X); s16 h = mg->heightmap[index]; if (h < p.Y) return; @@ -161,7 +161,7 @@ void CaveV5::makeTunnel(bool dirswitch) p = orpi + of + rs / 2; if (p.Z >= node_min.Z && p.Z <= node_max.Z && p.X >= node_min.X && p.X <= node_max.X) { - u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X); + u32 index = (p.Z - node_min.Z) * ystride + (p.X - node_min.X); s16 h = mg->heightmap[index]; if (h < p.Y) return; @@ -215,7 +215,8 @@ void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz) float nval = NoisePerlin3D(np_caveliquids, startp.X, startp.Y, startp.Z, mg->seed); - MapNode liquidnode = nval < 0.40 ? lavanode : waternode; + MapNode liquidnode = (nval < 0.40 && node_max.Y < MGV5_LAVA_DEPTH) ? + lavanode : waternode; v3f fp = orp + vec * f; fp.X += 0.1 * ps->range(-10, 10); @@ -808,247 +809,3 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz) } } } - - -///////////////////////////////////////// Caves Fractal - - -CaveFractal::CaveFractal(MapgenFractal *mg, PseudoRandom *ps) -{ - this->mg = mg; - this->vm = mg->vm; - this->ndef = mg->ndef; - this->water_level = mg->water_level; - this->ps = ps; - this->c_water_source = mg->c_water_source; - this->c_lava_source = mg->c_lava_source; - this->c_ice = mg->c_ice; - this->np_caveliquids = &nparams_caveliquids; - - dswitchint = ps->range(1, 14); - flooded = ps->range(1, 2) == 2; - - part_max_length_rs = ps->range(2, 4); - tunnel_routepoints = ps->range(5, ps->range(15, 30)); - min_tunnel_diameter = 5; - max_tunnel_diameter = ps->range(7, ps->range(8, 24)); - - large_cave_is_flat = (ps->range(0, 1) == 0); -} - - -void CaveFractal::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height) -{ - node_min = nmin; - node_max = nmax; - main_direction = v3f(0, 0, 0); - - // Allowed route area size in nodes - ar = node_max - node_min + v3s16(1, 1, 1); - // Area starting point in nodes - of = node_min; - - // Allow a bit more - //(this should be more than the maximum radius of the tunnel) - s16 insure = 10; - s16 more = MYMAX(MAP_BLOCKSIZE - max_tunnel_diameter / 2 - insure, 1); - ar += v3s16(1,0,1) * more * 2; - of -= v3s16(1,0,1) * more; - - route_y_min = 0; - // Allow half a diameter + 7 over stone surface - route_y_max = -of.Y + max_stone_y + max_tunnel_diameter / 2 + 7; - - // Limit maximum to area - route_y_max = rangelim(route_y_max, 0, ar.Y - 1); - - s16 min = 0; - if (node_min.Y < water_level && node_max.Y > water_level) { - min = water_level - max_tunnel_diameter/3 - of.Y; - route_y_max = water_level + max_tunnel_diameter/3 - of.Y; - } - route_y_min = ps->range(min, min + max_tunnel_diameter); - route_y_min = rangelim(route_y_min, 0, route_y_max); - - s16 route_start_y_min = route_y_min; - s16 route_start_y_max = route_y_max; - - route_start_y_min = rangelim(route_start_y_min, 0, ar.Y - 1); - route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1); - - // Randomize starting position - orp = v3f( - (float)(ps->next() % ar.X) + 0.5, - (float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5, - (float)(ps->next() % ar.Z) + 0.5 - ); - - // Add generation notify begin event - v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z); - GenNotifyType notifytype = GENNOTIFY_LARGECAVE_BEGIN; - mg->gennotify.addEvent(notifytype, abs_pos); - - // Generate some tunnel starting from orp - for (u16 j = 0; j < tunnel_routepoints; j++) - makeTunnel(j % dswitchint == 0); - - // Add generation notify end event - abs_pos = v3s16(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z); - notifytype = GENNOTIFY_LARGECAVE_END; - mg->gennotify.addEvent(notifytype, abs_pos); -} - - -void CaveFractal::makeTunnel(bool dirswitch) -{ - // Randomize size - s16 min_d = min_tunnel_diameter; - s16 max_d = max_tunnel_diameter; - rs = ps->range(min_d, max_d); - s16 rs_part_max_length_rs = rs * part_max_length_rs; - - v3s16 maxlen; - maxlen = v3s16( - rs_part_max_length_rs, - rs_part_max_length_rs / 2, - rs_part_max_length_rs - ); - - v3f vec; - // Jump downward sometimes - vec = v3f( - (float)(ps->next() % maxlen.X) - (float)maxlen.X / 2, - (float)(ps->next() % maxlen.Y) - (float)maxlen.Y / 2, - (float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2 - ); - - // Do not make caves that are above ground. - // It is only necessary to check the startpoint and endpoint. - v3s16 orpi(orp.X, orp.Y, orp.Z); - v3s16 veci(vec.X, vec.Y, vec.Z); - v3s16 p; - - p = orpi + veci + of + rs / 2; - if (p.Z >= node_min.Z && p.Z <= node_max.Z && - p.X >= node_min.X && p.X <= node_max.X) { - u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X); - s16 h = mg->heightmap[index]; - if (h < p.Y) - return; - } else if (p.Y > water_level) { - return; // If it's not in our heightmap, use a simple heuristic - } - - p = orpi + of + rs / 2; - if (p.Z >= node_min.Z && p.Z <= node_max.Z && - p.X >= node_min.X && p.X <= node_max.X) { - u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X); - s16 h = mg->heightmap[index]; - if (h < p.Y) - return; - } else if (p.Y > water_level) { - return; - } - - vec += main_direction; - - v3f rp = orp + vec; - if (rp.X < 0) - rp.X = 0; - else if (rp.X >= ar.X) - rp.X = ar.X - 1; - - if (rp.Y < route_y_min) - rp.Y = route_y_min; - else if (rp.Y >= route_y_max) - rp.Y = route_y_max - 1; - - if (rp.Z < 0) - rp.Z = 0; - else if (rp.Z >= ar.Z) - rp.Z = ar.Z - 1; - - vec = rp - orp; - - float veclen = vec.getLength(); - if (veclen < 0.05) - veclen = 1.0; - - // Every second section is rough - bool randomize_xz = (ps->range(1, 2) == 1); - - // Carve routes - for (float f = 0; f < 1.0; f += 1.0 / veclen) - carveRoute(vec, f, randomize_xz); - - orp = rp; -} - - -void CaveFractal::carveRoute(v3f vec, float f, bool randomize_xz) -{ - MapNode airnode(CONTENT_AIR); - MapNode waternode(c_water_source); - MapNode lavanode(c_lava_source); - - v3s16 startp(orp.X, orp.Y, orp.Z); - startp += of; - - float nval = NoisePerlin3D(np_caveliquids, startp.X, - startp.Y, startp.Z, mg->seed); - MapNode liquidnode = (nval < 0.40 && node_max.Y < MGFRACTAL_LAVA_DEPTH) ? - lavanode : waternode; - - v3f fp = orp + vec * f; - fp.X += 0.1 * ps->range(-10, 10); - fp.Z += 0.1 * ps->range(-10, 10); - v3s16 cp(fp.X, fp.Y, fp.Z); - - s16 d0 = -rs/2; - s16 d1 = d0 + rs; - if (randomize_xz) { - d0 += ps->range(-1, 1); - d1 += ps->range(-1, 1); - } - - for (s16 z0 = d0; z0 <= d1; z0++) { - s16 si = rs / 2 - MYMAX(0, abs(z0) - rs / 7 - 1); - for (s16 x0 = -si - ps->range(0,1); x0 <= si - 1 + ps->range(0,1); x0++) { - s16 maxabsxz = MYMAX(abs(x0), abs(z0)); - - s16 si2 = rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1); - - for (s16 y0 = -si2; y0 <= si2; y0++) { - if (large_cave_is_flat) { - // Make large caves not so tall - if (rs > 7 && abs(y0) >= rs / 3) - continue; - } - - v3s16 p(cp.X + x0, cp.Y + y0, cp.Z + z0); - p += of; - - if (vm->m_area.contains(p) == false) - continue; - - u32 i = vm->m_area.index(p); - content_t c = vm->m_data[i].getContent(); - if (!ndef->get(c).is_ground_content) - continue; - - int full_ymin = node_min.Y - MAP_BLOCKSIZE; - int full_ymax = node_max.Y + MAP_BLOCKSIZE; - - if (flooded && full_ymin < water_level && - full_ymax > water_level) - vm->m_data[i] = (p.Y <= water_level) ? - waternode : airnode; - else if (flooded && full_ymax < water_level) - vm->m_data[i] = (p.Y < startp.Y - 4) ? - liquidnode : airnode; - else - vm->m_data[i] = airnode; - } - } - } -} diff --git a/src/cavegen.h b/src/cavegen.h index 22ee5804..a1124711 100644 --- a/src/cavegen.h +++ b/src/cavegen.h @@ -21,17 +21,16 @@ with this program; if not, write to the Free Software Foundation, Inc., #define CAVEGEN_HEADER #define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1 +#define MGV5_LAVA_DEPTH -256 #define MGV7_LAVA_DEPTH -256 -#define MGFRACTAL_LAVA_DEPTH -256 class MapgenV5; class MapgenV6; class MapgenV7; -class MapgenFractal; class CaveV5 { public: - MapgenV5 *mg; + Mapgen *mg; MMVManip *vm; INodeDefManager *ndef; @@ -66,9 +65,10 @@ public: content_t c_ice; int water_level; + int ystride; CaveV5() {} - CaveV5(MapgenV5 *mg, PseudoRandom *ps); + CaveV5(Mapgen *mg, PseudoRandom *ps); void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height); void makeTunnel(bool dirswitch); void carveRoute(v3f vec, float f, bool randomize_xz); @@ -163,49 +163,4 @@ public: void carveRoute(v3f vec, float f, bool randomize_xz); }; -class CaveFractal { -public: - MapgenFractal *mg; - MMVManip *vm; - INodeDefManager *ndef; - - NoiseParams *np_caveliquids; - - s16 min_tunnel_diameter; - s16 max_tunnel_diameter; - u16 tunnel_routepoints; - int dswitchint; - int part_max_length_rs; - - bool large_cave_is_flat; - bool flooded; - - s16 max_stone_y; - v3s16 node_min; - v3s16 node_max; - - v3f orp; // starting point, relative to caved space - v3s16 of; // absolute coordinates of caved space - v3s16 ar; // allowed route area - s16 rs; // tunnel radius size - v3f main_direction; - - s16 route_y_min; - s16 route_y_max; - - PseudoRandom *ps; - - content_t c_water_source; - content_t c_lava_source; - content_t c_ice; - - int water_level; - - CaveFractal() {} - CaveFractal(MapgenFractal *mg, PseudoRandom *ps); - void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height); - void makeTunnel(bool dirswitch); - void carveRoute(v3f vec, float f, bool randomize_xz); -}; - #endif diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index a33e1984..5eebc17b 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -634,7 +634,7 @@ void MapgenFractal::generateCaves(s16 max_stone_y) PseudoRandom ps(blockseed + 21343); u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0; for (u32 i = 0; i < bruises_count; i++) { - CaveFractal cave(this, &ps); + CaveV5 cave(this, &ps); cave.makeCave(node_min, node_max, max_stone_y); } } diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index ee947dba..f3c02308 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen.h" -#define MGFRACTAL_LARGE_CAVE_DEPTH -32 +#define MGFRACTAL_LARGE_CAVE_DEPTH -33 /////////////////// Mapgen Fractal flags #define MGFRACTAL_JULIA 0x01 From f3ac2517ea585d31d176070be25adf8a68624c87 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 8 Nov 2015 23:40:18 -0500 Subject: [PATCH 073/531] Convert usages of PseudoRandom to PcgRandom for ore and deco placement In addition to being a better random, this fixes #3228 --- src/mg_decoration.cpp | 8 ++++---- src/mg_decoration.h | 8 ++++---- src/mg_ore.cpp | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp index 846d6130..1e50ba0d 100644 --- a/src/mg_decoration.cpp +++ b/src/mg_decoration.cpp @@ -87,7 +87,7 @@ void Decoration::resolveNodeNames() size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) { - PseudoRandom ps(blockseed + 53); + PcgRandom ps(blockseed + 53); int carea_size = nmax.X - nmin.X + 1; // Divide area into parts @@ -170,7 +170,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) #if 0 void Decoration::placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) { - PseudoRandom pr(blockseed + 53); + PcgRandom pr(blockseed + 53); std::vector handled_cutoffs; // Copy over the cutoffs we're interested in so we don't needlessly hold a lock @@ -286,7 +286,7 @@ bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p) } -size_t DecoSimple::generate(MMVManip *vm, PseudoRandom *pr, v3s16 p) +size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p) { if (!canPlaceDecoration(vm, p)) return 0; @@ -327,7 +327,7 @@ DecoSchematic::DecoSchematic() } -size_t DecoSchematic::generate(MMVManip *vm, PseudoRandom *pr, v3s16 p) +size_t DecoSchematic::generate(MMVManip *vm, PcgRandom *pr, v3s16 p) { // Schematic could have been unloaded but not the decoration // In this case generate() does nothing (but doesn't *fail*) diff --git a/src/mg_decoration.h b/src/mg_decoration.h index 16af02a1..ba3e9d3b 100644 --- a/src/mg_decoration.h +++ b/src/mg_decoration.h @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class Mapgen; class MMVManip; -class PseudoRandom; +class PcgRandom; class Schematic; enum DecorationType { @@ -71,7 +71,7 @@ public: size_t placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); //size_t placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); - virtual size_t generate(MMVManip *vm, PseudoRandom *pr, v3s16 p) = 0; + virtual size_t generate(MMVManip *vm, PcgRandom *pr, v3s16 p) = 0; virtual int getHeight() = 0; u32 flags; @@ -90,7 +90,7 @@ public: class DecoSimple : public Decoration { public: - virtual size_t generate(MMVManip *vm, PseudoRandom *pr, v3s16 p); + virtual size_t generate(MMVManip *vm, PcgRandom *pr, v3s16 p); bool canPlaceDecoration(MMVManip *vm, v3s16 p); virtual int getHeight(); @@ -107,7 +107,7 @@ class DecoSchematic : public Decoration { public: DecoSchematic(); - virtual size_t generate(MMVManip *vm, PseudoRandom *pr, v3s16 p); + virtual size_t generate(MMVManip *vm, PcgRandom *pr, v3s16 p); virtual int getHeight(); Rotation rotation; diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp index 16d97685..6b6e0d7a 100644 --- a/src/mg_ore.cpp +++ b/src/mg_ore.cpp @@ -126,7 +126,7 @@ size_t Ore::placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) void OreScatter::generate(MMVManip *vm, int mapseed, u32 blockseed, v3s16 nmin, v3s16 nmax, u8 *biomemap) { - PseudoRandom pr(blockseed); + PcgRandom pr(blockseed); MapNode n_ore(c_ore, 0, ore_param2); u32 sizex = (nmax.X - nmin.X + 1); @@ -175,7 +175,7 @@ void OreScatter::generate(MMVManip *vm, int mapseed, u32 blockseed, void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed, v3s16 nmin, v3s16 nmax, u8 *biomemap) { - PseudoRandom pr(blockseed + 4234); + PcgRandom pr(blockseed + 4234); MapNode n_ore(c_ore, 0, ore_param2); u16 max_height = column_height_max; @@ -240,7 +240,7 @@ OrePuff::~OrePuff() void OrePuff::generate(MMVManip *vm, int mapseed, u32 blockseed, v3s16 nmin, v3s16 nmax, u8 *biomemap) { - PseudoRandom pr(blockseed + 4234); + PcgRandom pr(blockseed + 4234); MapNode n_ore(c_ore, 0, ore_param2); int y_start = pr.range(nmin.Y, nmax.Y); @@ -313,7 +313,7 @@ void OrePuff::generate(MMVManip *vm, int mapseed, u32 blockseed, void OreBlob::generate(MMVManip *vm, int mapseed, u32 blockseed, v3s16 nmin, v3s16 nmax, u8 *biomemap) { - PseudoRandom pr(blockseed + 2404); + PcgRandom pr(blockseed + 2404); MapNode n_ore(c_ore, 0, ore_param2); u32 sizex = (nmax.X - nmin.X + 1); @@ -391,7 +391,7 @@ OreVein::~OreVein() void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed, v3s16 nmin, v3s16 nmax, u8 *biomemap) { - PseudoRandom pr(blockseed + 520); + PcgRandom pr(blockseed + 520); MapNode n_ore(c_ore, 0, ore_param2); u32 sizex = (nmax.X - nmin.X + 1); From 76c9abe4c89f6c8170b82558182837259efdd2ea Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 30 Oct 2015 02:45:38 +0000 Subject: [PATCH 074/531] Mapgen: Add flat mapgen in hidden form --- build/android/jni/Android.mk | 1 + builtin/settingtypes.txt | 41 ++- minetest.conf.example | 54 +++- src/CMakeLists.txt | 1 + src/emerge.cpp | 2 + src/mapgen_flat.cpp | 581 +++++++++++++++++++++++++++++++++++ src/mapgen_flat.h | 125 ++++++++ 7 files changed, 803 insertions(+), 2 deletions(-) create mode 100644 src/mapgen_flat.cpp create mode 100644 src/mapgen_flat.h diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 324e1666..b8fd9db7 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -173,6 +173,7 @@ LOCAL_SRC_FILES := \ jni/src/mapblock.cpp \ jni/src/mapblock_mesh.cpp \ jni/src/mapgen.cpp \ + jni/src/mapgen_flat.cpp \ jni/src/mapgen_fractal.cpp \ jni/src/mapgen_singlenode.cpp \ jni/src/mapgen_v5.cpp \ diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 3c44ea66..8ac6ab6d 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -812,7 +812,7 @@ liquid_update (Liquid update tick) float 1.0 # Name of map generator to be used when creating a new world. # Creating a world in the main menu will override this. -mg_name (Mapgen name) enum v6 v5,v6,v7,fractal,singlenode +mg_name (Mapgen name) enum v6 v5,v6,v7,flat,fractal,singlenode # Water surface level of the world. water_level (Water level) int 1 @@ -928,6 +928,45 @@ mgv7_np_ridge (Mapgen v7 ridge noise parameters) noise_params 0, 1, (100, 100, 1 mgv7_np_cave1 (Mapgen v7 cave1 noise parameters) noise_params 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 +[***Mapgen flat] + +# Map generation attributes specific to Mapgen flat. +# Occasional lakes and hills added to the flat world. +# Flags that are not specified in the flag string are not modified from the default. +# Flags starting with "no" are used to explicitly disable them. +mgflat_spflags (Mapgen flat flags) flags nolakes,nohills lakes,hills,nolakes,nohills + +# Y of flat ground. +mgflat_ground_level (Mapgen flat ground level) int 8 + +# Y of upper limit of large pseudorandom caves. +mgflat_large_cave_depth (Mapgen flat large cave depth) int -33 + +# Terrain noise threshold for lakes. +# Controls proportion of world area covered by lakes. +# Adjust towards 0.0 for a larger proportion. +mgflat_lake_threshold (Mapgen flat lake threshold) float -0.45 + +# Controls steepness/depth of lake depressions. +mgflat_lake_steepness (Mapgen flat lake steepness) float 48.0 + +# Terrain noise threshold for hills. +# Controls proportion of world area covered by hills. +# Adjust towards 0.0 for a larger proportion. +mgflat_hill_threshold (Mapgen flat hill threshold) float 0.45 + +# Controls steepness/height of hills. +mgflat_hill_steepness (Mapgen flat hill steepness) float 64.0 + +# Determines terrain shape. +# The 3 numbers in brackets control the scale of the +# terrain, the 3 numbers should be identical. +mgflat_np_terrain (Mapgen flat terrain noise parameters) noise_params 0, 1, (600, 600, 600), 7244, 5, 0.6, 2.0 + +mgflat_np_filler_depth (Mapgen flat filler depth noise parameters) noise_params 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0 +mgflat_np_cave1 (Mapgen flat cave1 noise parameters) noise_params 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0 +mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0 + [***Mapgen fractal] # Map generation attributes specific to Mapgen fractal. diff --git a/minetest.conf.example b/minetest.conf.example index f590aefa..10b090be 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1000,7 +1000,7 @@ # Name of map generator to be used when creating a new world. # Creating a world in the main menu will override this. -# type: enum values: v5, v6, v7, fractal, singlenode +# type: enum values: v5, v6, v7, flat, fractal, singlenode # mg_name = v6 # Water surface level of the world. @@ -1179,6 +1179,58 @@ # type: noise_params # mgv7_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 +#### Mapgen flat + +# Map generation attributes specific to Mapgen flat. +# Occasional lakes and hills added to the flat world. +# Flags that are not specified in the flag string are not modified from the default. +# Flags starting with "no" are used to explicitly disable them. +# type: flags possible values: lakes, hills, nolakes, nohills +# mgflat_spflags = nolakes,nohills + +# Y of flat ground. +# type: int +# mgflat_ground_level = 8 + +# Y of upper limit of large pseudorandom caves. +# type: int +# mgflat_large_cave_depth = -33 + +# Terrain noise threshold for lakes. +# Controls proportion of world area covered by lakes. +# Adjust towards 0.0 for a larger proportion. +# type: float +# mgflat_lake_threshold = -0.45 + +# Controls steepness/depth of lake depressions. +# type: float +# mgflat_lake_steepness = 48.0 + +# Terrain noise threshold for hills. +# Controls proportion of world area covered by hills. +# Adjust towards 0.0 for a larger proportion. +# type: float +# mgflat_hill_threshold = 0.45 + +# Controls steepness/height of hills. +# type: float +# mgflat_hill_steepness = 64.0 + +# Determines terrain shape. +# The 3 numbers in brackets control the scale of the +# terrain, the 3 numbers should be identical. +# type: noise_params +# mgflat_np_terrain = 0, 1, (600, 600, 600), 7244, 5, 0.6, 2.0 + +# type: noise_params +# mgflat_np_filler_depth = 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0 + +# type: noise_params +# mgflat_np_cave1 = 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0 + +# type: noise_params +# mgflat_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0 + #### Mapgen fractal # Map generation attributes specific to Mapgen fractal. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 55f5d4ad..dfbd2f5d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -367,6 +367,7 @@ set(common_SRCS map.cpp mapblock.cpp mapgen.cpp + mapgen_flat.cpp mapgen_fractal.cpp mapgen_singlenode.cpp mapgen_v5.cpp diff --git a/src/emerge.cpp b/src/emerge.cpp index 392a9d81..a60f67ac 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "map.h" #include "mapblock.h" +#include "mapgen_flat.h" #include "mapgen_fractal.h" #include "mapgen_v5.h" #include "mapgen_v6.h" @@ -105,6 +106,7 @@ MapgenDesc g_reg_mapgens[] = { {"v5", new MapgenFactoryV5, true}, {"v6", new MapgenFactoryV6, true}, {"v7", new MapgenFactoryV7, true}, + {"flat", new MapgenFactoryFlat, false}, {"fractal", new MapgenFactoryFractal, false}, {"singlenode", new MapgenFactorySinglenode, false}, }; diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp new file mode 100644 index 00000000..7a8fe18a --- /dev/null +++ b/src/mapgen_flat.cpp @@ -0,0 +1,581 @@ +/* +Minetest +Copyright (C) 2010-2015 kwolekr, Ryan Kwolek +Copyright (C) 2010-2015 paramat, Matt Gregory + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + + +#include "mapgen.h" +#include "voxel.h" +#include "noise.h" +#include "mapblock.h" +#include "mapnode.h" +#include "map.h" +#include "content_sao.h" +#include "nodedef.h" +#include "voxelalgorithms.h" +//#include "profiler.h" // For TimeTaker +#include "settings.h" // For g_settings +#include "emerge.h" +#include "dungeongen.h" +#include "cavegen.h" +#include "treegen.h" +#include "mg_biome.h" +#include "mg_ore.h" +#include "mg_decoration.h" +#include "mapgen_flat.h" + + +FlagDesc flagdesc_mapgen_flat[] = { + {"lakes", MGFLAT_LAKES}, + {"hills", MGFLAT_HILLS}, + {NULL, 0} +}; + +/////////////////////////////////////////////////////////////////////////////////////// + + +MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge) + : Mapgen(mapgenid, params, emerge) +{ + this->m_emerge = emerge; + this->bmgr = emerge->biomemgr; + + //// amount of elements to skip for the next index + //// for noise/height/biome maps (not vmanip) + this->ystride = csize.X; + this->zstride = csize.X * (csize.Y + 2); + + this->biomemap = new u8[csize.X * csize.Z]; + this->heightmap = new s16[csize.X * csize.Z]; + this->heatmap = NULL; + this->humidmap = NULL; + + MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams; + this->spflags = sp->spflags; + + this->ground_level = sp->ground_level; + this->large_cave_depth = sp->large_cave_depth; + this->lake_threshold = sp->lake_threshold; + this->lake_steepness = sp->lake_steepness; + this->hill_threshold = sp->hill_threshold; + this->hill_steepness = sp->hill_steepness; + + //// 2D noise + noise_terrain = new Noise(&sp->np_terrain, seed, csize.X, csize.Z); + noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); + + //// 3D noise + noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z); + noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z); + + //// Biome noise + noise_heat = new Noise(¶ms->np_biome_heat, seed, csize.X, csize.Z); + noise_humidity = new Noise(¶ms->np_biome_humidity, seed, csize.X, csize.Z); + noise_heat_blend = new Noise(¶ms->np_biome_heat_blend, seed, csize.X, csize.Z); + noise_humidity_blend = new Noise(¶ms->np_biome_humidity_blend, seed, csize.X, csize.Z); + + //// Resolve nodes to be used + INodeDefManager *ndef = emerge->ndef; + + c_stone = ndef->getId("mapgen_stone"); + c_water_source = ndef->getId("mapgen_water_source"); + c_lava_source = ndef->getId("mapgen_lava_source"); + c_desert_stone = ndef->getId("mapgen_desert_stone"); + c_ice = ndef->getId("mapgen_ice"); + c_sandstone = ndef->getId("mapgen_sandstone"); + + c_cobble = ndef->getId("mapgen_cobble"); + c_stair_cobble = ndef->getId("mapgen_stair_cobble"); + c_mossycobble = ndef->getId("mapgen_mossycobble"); + c_sandstonebrick = ndef->getId("mapgen_sandstonebrick"); + c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick"); + + if (c_ice == CONTENT_IGNORE) + c_ice = CONTENT_AIR; + if (c_mossycobble == CONTENT_IGNORE) + c_mossycobble = c_cobble; + if (c_stair_cobble == CONTENT_IGNORE) + c_stair_cobble = c_cobble; + if (c_sandstonebrick == CONTENT_IGNORE) + c_sandstonebrick = c_sandstone; + if (c_stair_sandstonebrick == CONTENT_IGNORE) + c_stair_sandstonebrick = c_sandstone; +} + + +MapgenFlat::~MapgenFlat() +{ + delete noise_terrain; + delete noise_filler_depth; + delete noise_cave1; + delete noise_cave2; + + delete noise_heat; + delete noise_humidity; + delete noise_heat_blend; + delete noise_humidity_blend; + + delete[] heightmap; + delete[] biomemap; +} + + +MapgenFlatParams::MapgenFlatParams() +{ + spflags = 0; + + ground_level = 8; + large_cave_depth = -33; + lake_threshold = -0.45; + lake_steepness = 48.0; + hill_threshold = 0.45; + hill_steepness = 64.0; + + np_terrain = NoiseParams(0, 1, v3f(600, 600, 600), 7244, 5, 0.6, 2.0); + np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0); + np_cave1 = NoiseParams(0, 12, v3f(128, 128, 128), 52534, 4, 0.5, 2.0); + np_cave2 = NoiseParams(0, 12, v3f(128, 128, 128), 10325, 4, 0.5, 2.0); +} + + +void MapgenFlatParams::readParams(const Settings *settings) +{ + settings->getFlagStrNoEx("mgflat_spflags", spflags, flagdesc_mapgen_flat); + + settings->getS16NoEx("mgflat_ground_level", ground_level); + settings->getS16NoEx("mgflat_large_cave_depth", large_cave_depth); + settings->getFloatNoEx("mgflat_lake_threshold", lake_threshold); + settings->getFloatNoEx("mgflat_lake_steepness", lake_steepness); + settings->getFloatNoEx("mgflat_hill_threshold", hill_threshold); + settings->getFloatNoEx("mgflat_hill_steepness", hill_steepness); + + settings->getNoiseParams("mgflat_np_terrain", np_terrain); + settings->getNoiseParams("mgflat_np_filler_depth", np_filler_depth); + settings->getNoiseParams("mgflat_np_cave1", np_cave1); + settings->getNoiseParams("mgflat_np_cave2", np_cave2); +} + + +void MapgenFlatParams::writeParams(Settings *settings) const +{ + settings->setFlagStr("mgflat_spflags", spflags, flagdesc_mapgen_flat, U32_MAX); + + settings->setS16("mgflat_ground_level", ground_level); + settings->setS16("mgflat_large_cave_depth", large_cave_depth); + settings->setFloat("mgflat_lake_threshold", lake_threshold); + settings->setFloat("mgflat_lake_steepness", lake_steepness); + settings->setFloat("mgflat_hill_threshold", hill_threshold); + settings->setFloat("mgflat_hill_steepness", hill_steepness); + + settings->setNoiseParams("mgflat_np_terrain", np_terrain); + settings->setNoiseParams("mgflat_np_filler_depth", np_filler_depth); + settings->setNoiseParams("mgflat_np_cave1", np_cave1); + settings->setNoiseParams("mgflat_np_cave2", np_cave2); +} + + +///////////////////////////////////////////////////////////////// + + +int MapgenFlat::getGroundLevelAtPoint(v2s16 p) +{ + float n_terrain = NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed); + if ((spflags & MGFLAT_LAKES) && n_terrain < lake_threshold) { + s16 depress = (lake_threshold - n_terrain) * lake_steepness; + return ground_level - depress; + } else if ((spflags & MGFLAT_HILLS) && n_terrain > hill_threshold) { + s16 rise = (n_terrain - hill_threshold) * hill_steepness; + return ground_level + rise; + } else { + return ground_level; + } +} + + +void MapgenFlat::makeChunk(BlockMakeData *data) +{ + // Pre-conditions + assert(data->vmanip); + assert(data->nodedef); + assert(data->blockpos_requested.X >= data->blockpos_min.X && + data->blockpos_requested.Y >= data->blockpos_min.Y && + data->blockpos_requested.Z >= data->blockpos_min.Z); + assert(data->blockpos_requested.X <= data->blockpos_max.X && + data->blockpos_requested.Y <= data->blockpos_max.Y && + data->blockpos_requested.Z <= data->blockpos_max.Z); + + this->generating = true; + this->vm = data->vmanip; + this->ndef = data->nodedef; + //TimeTaker t("makeChunk"); + + v3s16 blockpos_min = data->blockpos_min; + v3s16 blockpos_max = data->blockpos_max; + node_min = blockpos_min * MAP_BLOCKSIZE; + node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1); + full_node_min = (blockpos_min - 1) * MAP_BLOCKSIZE; + full_node_max = (blockpos_max + 2) * MAP_BLOCKSIZE - v3s16(1, 1, 1); + + blockseed = getBlockSeed2(full_node_min, seed); + + // Make some noise + calculateNoise(); + + // Generate base terrain, mountains, and ridges with initial heightmaps + s16 stone_surface_max_y = generateTerrain(); + + // Create heightmap + updateHeightmap(node_min, node_max); + + // Create biomemap at heightmap surface + bmgr->calcBiomes(csize.X, csize.Z, noise_heat->result, + noise_humidity->result, heightmap, biomemap); + + // Actually place the biome-specific nodes + MgStoneType stone_type = generateBiomes(noise_heat->result, noise_humidity->result); + + if (flags & MG_CAVES) + generateCaves(stone_surface_max_y); + + if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) { + DungeonParams dp; + + dp.np_rarity = nparams_dungeon_rarity; + dp.np_density = nparams_dungeon_density; + dp.np_wetness = nparams_dungeon_wetness; + dp.c_water = c_water_source; + if (stone_type == STONE) { + dp.c_cobble = c_cobble; + dp.c_moss = c_mossycobble; + dp.c_stair = c_stair_cobble; + + dp.diagonal_dirs = false; + dp.mossratio = 3.0; + dp.holesize = v3s16(1, 2, 1); + dp.roomsize = v3s16(0, 0, 0); + dp.notifytype = GENNOTIFY_DUNGEON; + } else if (stone_type == DESERT_STONE) { + dp.c_cobble = c_desert_stone; + dp.c_moss = c_desert_stone; + dp.c_stair = c_desert_stone; + + dp.diagonal_dirs = true; + dp.mossratio = 0.0; + dp.holesize = v3s16(2, 3, 2); + dp.roomsize = v3s16(2, 5, 2); + dp.notifytype = GENNOTIFY_TEMPLE; + } else if (stone_type == SANDSTONE) { + dp.c_cobble = c_sandstonebrick; + dp.c_moss = c_sandstonebrick; + dp.c_stair = c_sandstonebrick; + + dp.diagonal_dirs = false; + dp.mossratio = 0.0; + dp.holesize = v3s16(2, 2, 2); + dp.roomsize = v3s16(2, 0, 2); + dp.notifytype = GENNOTIFY_DUNGEON; + } + + DungeonGen dgen(this, &dp); + dgen.generate(blockseed, full_node_min, full_node_max); + } + + // Generate the registered decorations + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + + // Generate the registered ores + m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); + + // Sprinkle some dust on top after everything else was generated + dustTopNodes(); + + //printf("makeChunk: %dms\n", t.stop()); + + updateLiquid(&data->transforming_liquid, full_node_min, full_node_max); + + if (flags & MG_LIGHT) + calcLighting(node_min - v3s16(0, 1, 0), node_max + v3s16(0, 1, 0), + full_node_min, full_node_max); + + //setLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE, + // node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE, 0xFF); + + this->generating = false; +} + + +void MapgenFlat::calculateNoise() +{ + //TimeTaker t("calculateNoise", NULL, PRECISION_MICRO); + int x = node_min.X; + int y = node_min.Y - 1; + int z = node_min.Z; + + if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS)) + noise_terrain->perlinMap2D(x, z); + + noise_filler_depth->perlinMap2D(x, z); + + if (flags & MG_CAVES) { + noise_cave1->perlinMap3D(x, y, z); + noise_cave2->perlinMap3D(x, y, z); + } + + noise_heat->perlinMap2D(x, z); + noise_humidity->perlinMap2D(x, z); + noise_heat_blend->perlinMap2D(x, z); + noise_humidity_blend->perlinMap2D(x, z); + + for (s32 i = 0; i < csize.X * csize.Z; i++) { + noise_heat->result[i] += noise_heat_blend->result[i]; + noise_humidity->result[i] += noise_humidity_blend->result[i]; + } + + heatmap = noise_heat->result; + humidmap = noise_humidity->result; + //printf("calculateNoise: %dus\n", t.stop()); +} + + +s16 MapgenFlat::generateTerrain() +{ + MapNode n_air(CONTENT_AIR); + MapNode n_stone(c_stone); + MapNode n_water(c_water_source); + + v3s16 em = vm->m_area.getExtent(); + s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT; + u32 ni2d = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, ni2d++) { + s16 stone_level = ground_level; + float n_terrain = 0.0f; + + if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS)) + n_terrain = noise_terrain->result[ni2d]; + + if ((spflags & MGFLAT_LAKES) && n_terrain < lake_threshold) { + s16 depress = (lake_threshold - n_terrain) * lake_steepness; + stone_level = ground_level - depress; + } else if ((spflags & MGFLAT_HILLS) && n_terrain > hill_threshold) { + s16 rise = (n_terrain - hill_threshold) * hill_steepness; + stone_level = ground_level + rise; + } + + u32 vi = vm->m_area.index(x, node_min.Y - 1, z); + for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { + if (vm->m_data[vi].getContent() == CONTENT_IGNORE) { + if (y <= stone_level) { + vm->m_data[vi] = n_stone; + if (y > stone_surface_max_y) + stone_surface_max_y = y; + } else if (y <= water_level) { + vm->m_data[vi] = n_water; + } else { + vm->m_data[vi] = n_air; + } + } + vm->m_area.add_y(em, vi, 1); + } + } + + return stone_surface_max_y; +} + + +MgStoneType MapgenFlat::generateBiomes(float *heat_map, float *humidity_map) +{ + v3s16 em = vm->m_area.getExtent(); + u32 index = 0; + MgStoneType stone_type = STONE; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index++) { + Biome *biome = NULL; + u16 depth_top = 0; + u16 base_filler = 0; + u16 depth_water_top = 0; + u32 vi = vm->m_area.index(x, node_max.Y, z); + + // Check node at base of mapchunk above, either a node of a previously + // generated mapchunk or if not, a node of overgenerated base terrain. + content_t c_above = vm->m_data[vi + em.X].getContent(); + bool air_above = c_above == CONTENT_AIR; + bool water_above = c_above == c_water_source; + + // If there is air or water above enable top/filler placement, otherwise force + // nplaced to stone level by setting a number exceeding any possible filler depth. + u16 nplaced = (air_above || water_above) ? 0 : U16_MAX; + + + for (s16 y = node_max.Y; y >= node_min.Y; y--) { + content_t c = vm->m_data[vi].getContent(); + + // Biome is recalculated each time an upper surface is detected while + // working down a column. The selected biome then remains in effect for + // all nodes below until the next surface and biome recalculation. + // Biome is recalculated: + // 1. At the surface of stone below air or water. + // 2. At the surface of water below air. + // 3. When stone or water is detected but biome has not yet been calculated. + if ((c == c_stone && (air_above || water_above || !biome)) || + (c == c_water_source && (air_above || !biome))) { + biome = bmgr->getBiome(heat_map[index], humidity_map[index], y); + depth_top = biome->depth_top; + base_filler = MYMAX(depth_top + biome->depth_filler + + noise_filler_depth->result[index], 0); + depth_water_top = biome->depth_water_top; + + // Detect stone type for dungeons during every biome calculation. + // This is more efficient than detecting per-node and will not + // miss any desert stone or sandstone biomes. + if (biome->c_stone == c_desert_stone) + stone_type = DESERT_STONE; + else if (biome->c_stone == c_sandstone) + stone_type = SANDSTONE; + } + + if (c == c_stone) { + content_t c_below = vm->m_data[vi - em.X].getContent(); + + // If the node below isn't solid, make this node stone, so that + // any top/filler nodes above are structurally supported. + // This is done by aborting the cycle of top/filler placement + // immediately by forcing nplaced to stone level. + if (c_below == CONTENT_AIR || c_below == c_water_source) + nplaced = U16_MAX; + + if (nplaced < depth_top) { + vm->m_data[vi] = MapNode(biome->c_top); + nplaced++; + } else if (nplaced < base_filler) { + vm->m_data[vi] = MapNode(biome->c_filler); + nplaced++; + } else { + vm->m_data[vi] = MapNode(biome->c_stone); + } + + air_above = false; + water_above = false; + } else if (c == c_water_source) { + vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) ? + biome->c_water_top : biome->c_water); + nplaced = 0; // Enable top/filler placement for next surface + air_above = false; + water_above = true; + } else if (c == CONTENT_AIR) { + nplaced = 0; // Enable top/filler placement for next surface + air_above = true; + water_above = false; + } else { // Possible various nodes overgenerated from neighbouring mapchunks + nplaced = U16_MAX; // Disable top/filler placement + air_above = false; + water_above = false; + } + + vm->m_area.add_y(em, vi, -1); + } + } + + return stone_type; +} + + +void MapgenFlat::dustTopNodes() +{ + if (node_max.Y < water_level) + return; + + v3s16 em = vm->m_area.getExtent(); + u32 index = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index++) { + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]); + + if (biome->c_dust == CONTENT_IGNORE) + continue; + + u32 vi = vm->m_area.index(x, full_node_max.Y, z); + content_t c_full_max = vm->m_data[vi].getContent(); + s16 y_start; + + if (c_full_max == CONTENT_AIR) { + y_start = full_node_max.Y - 1; + } else if (c_full_max == CONTENT_IGNORE) { + vi = vm->m_area.index(x, node_max.Y + 1, z); + content_t c_max = vm->m_data[vi].getContent(); + + if (c_max == CONTENT_AIR) + y_start = node_max.Y; + else + continue; + } else { + continue; + } + + vi = vm->m_area.index(x, y_start, z); + for (s16 y = y_start; y >= node_min.Y - 1; y--) { + if (vm->m_data[vi].getContent() != CONTENT_AIR) + break; + + vm->m_area.add_y(em, vi, -1); + } + + content_t c = vm->m_data[vi].getContent(); + if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) { + vm->m_area.add_y(em, vi, 1); + vm->m_data[vi] = MapNode(biome->c_dust); + } + } +} + + +void MapgenFlat::generateCaves(s16 max_stone_y) +{ + if (max_stone_y >= node_min.Y) { + u32 index = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { + u32 vi = vm->m_area.index(node_min.X, y, z); + for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { + float d1 = contour(noise_cave1->result[index]); + float d2 = contour(noise_cave2->result[index]); + if (d1 * d2 > 0.4f) { + content_t c = vm->m_data[vi].getContent(); + if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) + continue; + + vm->m_data[vi] = MapNode(CONTENT_AIR); + } + } + } + } + + if (node_max.Y > large_cave_depth) + return; + + PseudoRandom ps(blockseed + 21343); + u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0; + for (u32 i = 0; i < bruises_count; i++) { + CaveV5 cave(this, &ps); + cave.makeCave(node_min, node_max, max_stone_y); + } +} diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h new file mode 100644 index 00000000..0e15df78 --- /dev/null +++ b/src/mapgen_flat.h @@ -0,0 +1,125 @@ +/* +Minetest +Copyright (C) 2010-2015 kwolekr, Ryan Kwolek +Copyright (C) 2010-2015 paramat, Matt Gregory + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef MAPGEN_FLAT_HEADER +#define MAPGEN_FLAT_HEADER + +#include "mapgen.h" + +/////// Mapgen Flat flags +#define MGFLAT_LAKES 0x01 +#define MGFLAT_HILLS 0x02 + +class BiomeManager; + +extern FlagDesc flagdesc_mapgen_flat[]; + + +struct MapgenFlatParams : public MapgenSpecificParams { + u32 spflags; + + s16 ground_level; + s16 large_cave_depth; + float lake_threshold; + float lake_steepness; + float hill_threshold; + float hill_steepness; + + NoiseParams np_terrain; + NoiseParams np_filler_depth; + NoiseParams np_cave1; + NoiseParams np_cave2; + + MapgenFlatParams(); + ~MapgenFlatParams() {} + + void readParams(const Settings *settings); + void writeParams(Settings *settings) const; +}; + +class MapgenFlat : public Mapgen { +public: + EmergeManager *m_emerge; + BiomeManager *bmgr; + + int ystride; + int zstride; + u32 spflags; + + v3s16 node_min; + v3s16 node_max; + v3s16 full_node_min; + v3s16 full_node_max; + + s16 ground_level; + s16 large_cave_depth; + float lake_threshold; + float lake_steepness; + float hill_threshold; + float hill_steepness; + + Noise *noise_terrain; + Noise *noise_filler_depth; + Noise *noise_cave1; + Noise *noise_cave2; + + Noise *noise_heat; + Noise *noise_humidity; + Noise *noise_heat_blend; + Noise *noise_humidity_blend; + + content_t c_stone; + content_t c_water_source; + content_t c_lava_source; + content_t c_desert_stone; + content_t c_ice; + content_t c_sandstone; + + content_t c_cobble; + content_t c_stair_cobble; + content_t c_mossycobble; + content_t c_sandstonebrick; + content_t c_stair_sandstonebrick; + + MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge); + ~MapgenFlat(); + + virtual void makeChunk(BlockMakeData *data); + int getGroundLevelAtPoint(v2s16 p); + void calculateNoise(); + s16 generateTerrain(); + MgStoneType generateBiomes(float *heat_map, float *humidity_map); + void dustTopNodes(); + void generateCaves(s16 max_stone_y); +}; + +struct MapgenFactoryFlat : public MapgenFactory { + Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) + { + return new MapgenFlat(mgid, params, emerge); + }; + + MapgenSpecificParams *createMapgenParams() + { + return new MapgenFlatParams(); + }; +}; + +#endif From 0876623aedcd93100103d145788affcb5001bdaf Mon Sep 17 00:00:00 2001 From: Robert Zenz Date: Thu, 5 Nov 2015 19:56:19 +0100 Subject: [PATCH 075/531] Add the player name to dropped items The player name is now added in the field "dropped_by" on the created entity. --- builtin/game/item.lua | 3 ++- builtin/game/item_entity.lua | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index df5bb070..44ec35cc 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -348,7 +348,7 @@ function core.item_place(itemstack, placer, pointed_thing, param2) end function core.item_drop(itemstack, dropper, pos) - if dropper.is_player then + if dropper and dropper:is_player() then local v = dropper:get_look_dir() local p = {x=pos.x, y=pos.y+1.2, z=pos.z} local cs = itemstack:get_count() @@ -362,6 +362,7 @@ function core.item_drop(itemstack, dropper, pos) v.y = v.y*2 + 2 v.z = v.z*2 obj:setvelocity(v) + obj:get_luaentity().dropped_by = dropper:get_player_name() return itemstack end diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua index a8d7a186..be158c11 100644 --- a/builtin/game/item_entity.lua +++ b/builtin/game/item_entity.lua @@ -74,7 +74,8 @@ core.register_entity(":__builtin:item", { return core.serialize({ itemstring = self.itemstring, always_collect = self.always_collect, - age = self.age + age = self.age, + dropped_by = self.dropped_by }) end, @@ -89,6 +90,7 @@ core.register_entity(":__builtin:item", { else self.age = dtime_s end + self.dropped_by = data.dropped_by end else self.itemstring = staticdata From 36855522a5382614c525c69dd884560a197b875d Mon Sep 17 00:00:00 2001 From: BlockMen Date: Sun, 19 Apr 2015 22:06:34 +0200 Subject: [PATCH 076/531] Fix scrollbars --- src/guiFormSpecMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index c5edb967..3cef5079 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -450,7 +450,7 @@ void GUIFormSpecMenu::parseScrollBar(parserData* data, std::string element) if (parts.size() >= 5) { std::vector v_pos = split(parts[0],','); std::vector v_dim = split(parts[1],','); - std::string name = parts[2]; + std::string name = parts[3]; std::string value = parts[4]; MY_CHECKPOS("scrollbar",0); From 657a16d90c42afc212e70c594296b1e204545a4c Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 13 Nov 2015 01:35:54 +0100 Subject: [PATCH 077/531] Only allow players with shout to chat Fix regression of commit 5e507c9829942c434a6f1ae7a4f3a488c7e50bef "Add server side ncurses terminal" which allowed all players, even those without a shout priv, to chat. Fixes #3362. --- src/network/serverpackethandler.cpp | 3 ++- src/server.cpp | 16 +++++++++++----- src/server.h | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 3c446e31..a4fa502a 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1063,7 +1063,8 @@ void Server::handleCommand_ChatMessage(NetworkPacket* pkt) std::string name = player->getName(); std::wstring wname = narrow_to_wide(name); - std::wstring answer_to_sender = handleChat(name, wname, message, pkt->getPeerId()); + std::wstring answer_to_sender = handleChat(name, wname, message, + true, pkt->getPeerId()); if (!answer_to_sender.empty()) { // Send the answer to sender SendChatMessage(pkt->getPeerId(), answer_to_sender); diff --git a/src/server.cpp b/src/server.cpp index c93abb10..f6faccb1 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2755,7 +2755,8 @@ void Server::handleChatInterfaceEvent(ChatEvent *evt) } std::wstring Server::handleChat(const std::string &name, const std::wstring &wname, - const std::wstring &wmessage, u16 peer_id_to_avoid_sending) + const std::wstring &wmessage, bool check_shout_priv, + u16 peer_id_to_avoid_sending) { // If something goes wrong, this player is to blame RollbackScopeActor rollback_scope(m_rollback, @@ -2783,10 +2784,15 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna else line += L"-!- Invalid command: " + str_split(wcmd, L' ')[0]; } else { - line += L"<"; - line += wname; - line += L"> "; - line += wmessage; + if (check_shout_priv && !checkPriv(name, "shout")) { + line += L"-!- You don't have permission to shout."; + broadcast_line = false; + } else { + line += L"<"; + line += wname; + line += L"> "; + line += wmessage; + } } /* diff --git a/src/server.h b/src/server.h index 5a19677c..fd559ba1 100644 --- a/src/server.h +++ b/src/server.h @@ -481,6 +481,7 @@ private: // This returns the answer to the sender of wmessage, or "" if there is none std::wstring handleChat(const std::string &name, const std::wstring &wname, const std::wstring &wmessage, + bool check_shout_priv = false, u16 peer_id_to_avoid_sending = PEER_ID_INEXISTENT); void handleAdminChat(const ChatEventChat *evt); From 4434498367929f5fe67d7bf8a12e594d51b632ce Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 10 Nov 2015 06:50:22 +0000 Subject: [PATCH 078/531] Mgv6: Move global mapgen flag 'flat' into mgv6 spflags Add mgv6 spflag 'flat' Global flag is kept for backwards compatibility but is now undocumented --- builtin/settingtypes.txt | 6 +++--- minetest.conf.example | 6 +++--- src/mapgen_v6.cpp | 9 +++++---- src/mapgen_v6.h | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 8ac6ab6d..25849e0c 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -829,10 +829,10 @@ max_block_generate_distance (Max block generate distance) int 6 map_generation_limit (Map generation limit) int 31000 0 31000 # Global map generation attributes. +# The 'trees' flag only has effect in mgv6. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -# 'trees' and 'flat' flags only have effect in mgv6. -mg_flags (Mapgen flags) flags trees,caves,dungeons,light trees,caves,dungeons,light,flat,notrees,nocaves,nodungeons,nolight,noflat +mg_flags (Mapgen flags) flags trees,caves,dungeons,light trees,caves,dungeons,light,notrees,nocaves,nodungeons,nolight [**Advanced] @@ -889,7 +889,7 @@ mgv5_np_cave2 (Mapgen v5 cave2 noise parameters) noise_params 0, 12, (50, 50, 50 # When snowbiomes are enabled jungles are enabled and the jungles flag is ignored. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes jungles,biomeblend,mudflow,snowbiomes,nojungles,nobiomeblend,nomudflow,nosnowbiomes +mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes jungles,biomeblend,mudflow,snowbiomes,flat,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat # Controls size of deserts and beaches in Mapgen v6. # When snowbiomes are enabled 'mgv6_freq_desert' is ignored. diff --git a/minetest.conf.example b/minetest.conf.example index 10b090be..e5adc0e1 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1021,10 +1021,10 @@ # map_generation_limit = 31000 # Global map generation attributes. +# The 'trees' flag only has effect in mgv6. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -# 'trees' and 'flat' flags only have effect in mgv6. -# type: flags possible values: trees, caves, dungeons, light, flat, notrees, nocaves, nodungeons, nolight, noflat +# type: flags possible values: trees, caves, dungeons, light, notrees, nocaves, nodungeons, nolight # mg_flags = trees,caves,dungeons,light ### Advanced @@ -1093,7 +1093,7 @@ # When snowbiomes are enabled jungles are enabled and the jungles flag is ignored. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -# type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, nojungles, nobiomeblend, nomudflow, nosnowbiomes +# type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat # mgv6_spflags = jungles,biomeblend,mudflow,snowbiomes # Controls size of deserts and beaches in Mapgen v6. diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 82ed6c4d..3f3ccba4 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -42,6 +42,7 @@ FlagDesc flagdesc_mapgen_v6[] = { {"biomeblend", MGV6_BIOMEBLEND}, {"mudflow", MGV6_MUDFLOW}, {"snowbiomes", MGV6_SNOWBIOMES}, + {"flat", MGV6_FLAT}, {NULL, 0} }; @@ -263,7 +264,7 @@ float MapgenV6::baseTerrainLevel(float terrain_base, float terrain_higher, float MapgenV6::baseTerrainLevelFromNoise(v2s16 p) { - if (flags & MG_FLAT) + if ((spflags & MGV6_FLAT) || (flags & MG_FLAT)) return water_level; float terrain_base = NoisePerlin2D_PO(&noise_terrain_base->np, @@ -289,7 +290,7 @@ float MapgenV6::baseTerrainLevelFromMap(v2s16 p) float MapgenV6::baseTerrainLevelFromMap(int index) { - if (flags & MG_FLAT) + if ((spflags & MGV6_FLAT) || (flags & MG_FLAT)) return water_level; float terrain_base = noise_terrain_base->result[index]; @@ -386,7 +387,7 @@ bool MapgenV6::getHaveAppleTree(v2s16 p) float MapgenV6::getMudAmount(int index) { - if (flags & MG_FLAT) + if ((spflags & MGV6_FLAT) || (flags & MG_FLAT)) return MGV6_AVERAGE_MUD_AMOUNT; /*return ((float)AVERAGE_MUD_AMOUNT + 2.0 * noise2d_perlin( @@ -603,7 +604,7 @@ void MapgenV6::calculateNoise() int fx = full_node_min.X; int fz = full_node_min.Z; - if (!(flags & MG_FLAT)) { + if (!((spflags & MGV6_FLAT) || (flags & MG_FLAT))) { noise_terrain_base->perlinMap2D_PO(x, 0.5, z, 0.5); noise_terrain_higher->perlinMap2D_PO(x, 0.5, z, 0.5); noise_steepness->perlinMap2D_PO(x, 0.5, z, 0.5); diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 685fdad7..dec92ab4 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MGV6_BIOMEBLEND 0x02 #define MGV6_MUDFLOW 0x04 #define MGV6_SNOWBIOMES 0x08 +#define MGV6_FLAT 0x10 extern FlagDesc flagdesc_mapgen_v6[]; From 987d6a82f639126d5d8833739499150da286bdda Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 11 Nov 2015 05:05:20 +0000 Subject: [PATCH 079/531] Mgfractal: Create a choice of 4 mandelbrot formulas --- builtin/settingtypes.txt | 7 ++++++- minetest.conf.example | 8 +++++++- src/mapgen_fractal.cpp | 39 ++++++++++++++++++++++++++++++++++----- src/mapgen_fractal.h | 4 ++++ 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 25849e0c..e5fe5cb9 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -970,11 +970,16 @@ mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 1 [***Mapgen fractal] # Map generation attributes specific to Mapgen fractal. -# 'julia' selects a julia set to be generated instead of a mandelbrot set. +# The 'julia' flag results in the corresponding julia set being generated. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. mgfractal_spflags (Mapgen fractal flags) flags nojulia julia,nojulia +# Choice of 4 mandelbrot set variations. +# 1 = 4D "Roundy" mandelbrot set, 2 = 4D "Squarry" mandelbrot set, +# 3 = 4D "Mandy Cousin" mandelbrot set, 4 = 4D mandelbrot set variation. +mgfractal_formula (Mapgen fractal formula) int 1 1 4 + # Mandelbrot set: Iterations of the recursive function. # Controls scale of finest detail. mgfractal_m_iterations (Mapgen fractal mandelbrot iterations) int 9 diff --git a/minetest.conf.example b/minetest.conf.example index e5adc0e1..74f7006f 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1234,12 +1234,18 @@ #### Mapgen fractal # Map generation attributes specific to Mapgen fractal. -# 'julia' selects a julia set to be generated instead of a mandelbrot set. +# The 'julia' flag results in the corresponding julia set being generated. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. # type: flags possible values: julia, nojulia # mgfractal_spflags = nojulia +# Choice of 4 mandelbrot set variations. +# 1 = 4D "Roundy" mandelbrot set, 2 = 4D "Squarry" mandelbrot set, +# 3 = 4D "Mandy Cousin" mandelbrot set, 4 = 4D mandelbrot set variation. +# type: int +# mgfractal_formula = 1 + # Mandelbrot set: Iterations of the recursive function. # Controls scale of finest detail. # type: int diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 5eebc17b..37ed0d86 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -67,6 +67,8 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams; this->spflags = sp->spflags; + this->formula = sp->formula; + this->m_iterations = sp->m_iterations; this->m_scale = sp->m_scale; this->m_offset = sp->m_offset; @@ -145,6 +147,8 @@ MapgenFractalParams::MapgenFractalParams() { spflags = 0; + formula = 1; + m_iterations = 9; // Mandelbrot set only m_scale = v3f(1024.0, 256.0, 1024.0); m_offset = v3f(1.75, 0.0, 0.0); @@ -170,6 +174,8 @@ void MapgenFractalParams::readParams(const Settings *settings) { settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal); + settings->getU16NoEx("mgfractal_formula", formula); + settings->getU16NoEx("mgfractal_m_iterations", m_iterations); settings->getV3FNoEx("mgfractal_m_scale", m_scale); settings->getV3FNoEx("mgfractal_m_offset", m_offset); @@ -195,6 +201,8 @@ void MapgenFractalParams::writeParams(Settings *settings) const { settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX); + settings->setU16("mgfractal_formula", formula); + settings->setU16("mgfractal_m_iterations", m_iterations); settings->setV3F("mgfractal_m_scale", m_scale); settings->setV3F("mgfractal_m_offset", m_offset); @@ -403,11 +411,32 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) u16 iterations = spflags & MGFRACTAL_JULIA ? j_iterations : m_iterations; for (u16 iter = 0; iter < iterations; iter++) { - // 4D "Roundy" Mandelbrot set - float nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; - float ny = 2.0f * (ox * oy + oz * ow) + cy; - float nz = 2.0f * (ox * oz + oy * ow) + cz; - float nw = 2.0f * (ox * ow + oy * oz) + cw; + float nx = 0.0f; + float ny = 0.0f; + float nz = 0.0f; + float nw = 0.0f; + + if (formula == 1) { // 4D "Roundy" Mandelbrot Set + nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; + ny = 2.0f * (ox * oy + oz * ow) + cy; + nz = 2.0f * (ox * oz + oy * ow) + cz; + nw = 2.0f * (ox * ow + oy * oz) + cw; + } else if (formula == 2) { // 4D "Squarry" Mandelbrot Set + nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; + ny = 2.0f * (ox * oy + oz * ow) + cy; + nz = 2.0f * (ox * oz + oy * ow) + cz; + nw = 2.0f * (ox * ow - oy * oz) + cw; + } else if (formula == 3) { // 4D "Mandy Cousin" Mandelbrot Set + nx = ox * ox - oy * oy - oz * oz + ow * ow + cx; + ny = 2.0f * (ox * oy + oz * ow) + cy; + nz = 2.0f * (ox * oz + oy * ow) + cz; + nw = 2.0f * (ox * ow + oy * oz) + cw; + } else if (formula == 4) { // 4D Mandelbrot Set Variation + nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; + ny = 2.0f * (ox * oy + oz * ow) + cy; + nz = 2.0f * (ox * oz - oy * ow) + cz; + nw = 2.0f * (ox * ow + oy * oz) + cw; + } if (nx * nx + ny * ny + nz * nz + nw * nw > 4.0f) return false; diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index f3c02308..1b6683f1 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -36,6 +36,8 @@ extern FlagDesc flagdesc_mapgen_fractal[]; struct MapgenFractalParams : public MapgenSpecificParams { u32 spflags; + u16 formula; + u16 m_iterations; v3f m_scale; v3f m_offset; @@ -76,6 +78,8 @@ public: v3s16 full_node_min; v3s16 full_node_max; + u16 formula; + u16 m_iterations; v3f m_scale; v3f m_offset; From fc89f467009822b5294967e3e58dbb2fd792bc44 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 13 Nov 2015 07:16:15 +0000 Subject: [PATCH 080/531] Decoration API: Fix missing low density decorations For a decoration count between 0 and 1 calculate a chance for 1 --- src/mg_decoration.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp index 1e50ba0d..5959af25 100644 --- a/src/mg_decoration.cpp +++ b/src/mg_decoration.cpp @@ -117,7 +117,15 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) float nval = (flags & DECO_USE_NOISE) ? NoisePerlin2D(&np, p2d_center.X, p2d_center.Y, mapseed) : fill_ratio; - u32 deco_count = area * MYMAX(nval, 0.f); + u32 deco_count = 0; + float deco_count_f = (float)area * nval; + if (deco_count_f >= 1.f) { + deco_count = deco_count_f; + } else if (deco_count_f > 0.f) { + // For low density decorations calculate a chance for 1 decoration + if (ps.range(1000) <= deco_count_f * 1000.f) + deco_count = 1; + } for (u32 i = 0; i < deco_count; i++) { s16 x = ps.range(p2d_min.X, p2d_max.X); From 395ef21c86b3712bf45488b15d2d8dbc430e4c8e Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 14 Nov 2015 03:00:52 +0100 Subject: [PATCH 081/531] Load sound from memory * Remove trailing lines from src/sound_openal.cpp * Don't do a horribly ugly copy of the file's path, allocating and deallocating a 10 kb buffer in the process. This copy was needed for backwards compatibility with libvorbis 1.3.1 and earlier, as the removed comment explains. However, even Ubuntu precise has 1.3.2 already. Dropping support and sparing the ugly copy can therefore be considered safe. * Actually load sounds from the memory, not caching them at the disk first, removing the old hack. This is the main motivation for the commit. --- src/sound_openal.cpp | 147 +++++++++++++++++++++++++++++++------------ 1 file changed, 107 insertions(+), 40 deletions(-) diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp index df316fbf..ca102341 100644 --- a/src/sound_openal.cpp +++ b/src/sound_openal.cpp @@ -111,31 +111,19 @@ struct SoundBuffer std::vector buffer; }; -SoundBuffer* loadOggFile(const std::string &filepath) +SoundBuffer *load_opened_ogg_file(OggVorbis_File *oggFile, + const std::string &filename_for_logging) { int endian = 0; // 0 for Little-Endian, 1 for Big-Endian int bitStream; long bytes; char array[BUFFER_SIZE]; // Local fixed size array vorbis_info *pInfo; - OggVorbis_File oggFile; - - // Do a dumb-ass static string copy for old versions of ov_fopen - // because they expect a non-const char* - char nonconst[10000]; - snprintf(nonconst, 10000, "%s", filepath.c_str()); - // Try opening the given file - //if(ov_fopen(filepath.c_str(), &oggFile) != 0) - if(ov_fopen(nonconst, &oggFile) != 0) - { - infostream<<"Audio: Error opening "<channels == 1) @@ -150,12 +138,13 @@ SoundBuffer* loadOggFile(const std::string &filepath) do { // Read up to a buffer's worth of decoded sound data - bytes = ov_read(&oggFile, array, BUFFER_SIZE, endian, 2, 1, &bitStream); + bytes = ov_read(oggFile, array, BUFFER_SIZE, endian, 2, 1, &bitStream); if(bytes < 0) { - ov_clear(&oggFile); - infostream<<"Audio: Error decoding "<= 1.3.2, as + // previous versions expect a non-const char * + if (ov_fopen(path.c_str(), &oggFile) != 0) { + infostream << "Audio: Error opening " << path + << " for decoding" << std::endl; + return NULL; + } + + return load_opened_ogg_file(&oggFile, path); +} + +struct BufferSource { + const char *buf; + size_t cur_offset; + size_t len; +}; + +size_t buffer_sound_read_func(void *ptr, size_t size, size_t nmemb, void *datasource) +{ + BufferSource *s = (BufferSource *)datasource; + size_t copied_size = MYMIN(s->len - s->cur_offset, size); + memcpy(ptr, s->buf + s->cur_offset, copied_size); + s->cur_offset += copied_size; + return copied_size; +} + +int buffer_sound_seek_func(void *datasource, ogg_int64_t offset, int whence) +{ + BufferSource *s = (BufferSource *)datasource; + if (whence == SEEK_SET) { + if (offset < 0 || (size_t)MYMAX(offset, 0) >= s->len) { + // offset out of bounds + return -1; + } + s->cur_offset = offset; + return 0; + } else if (whence == SEEK_CUR) { + if ((size_t)MYMIN(-offset, 0) > s->cur_offset + || s->cur_offset + offset > s->len) { + // offset out of bounds + return -1; + } + s->cur_offset += offset; + return 0; + } + // invalid whence param (SEEK_END doesn't have to be supported) + return -1; +} + +long BufferSourceell_func(void *datasource) +{ + BufferSource *s = (BufferSource *)datasource; + return s->cur_offset; +} + +static ov_callbacks g_buffer_ov_callbacks = { + &buffer_sound_read_func, + &buffer_sound_seek_func, + NULL, + &BufferSourceell_func +}; + +SoundBuffer *load_ogg_from_buffer(const std::string &buf, const std::string &id_for_log) +{ + OggVorbis_File oggFile; + + BufferSource s; + s.buf = buf.c_str(); + s.cur_offset = 0; + s.len = buf.size(); + + if (ov_open_callbacks(&s, &oggFile, NULL, 0, g_buffer_ov_callbacks) != 0) { + infostream << "Audio: Error opening " << id_for_log + << " for decoding" << std::endl; + return NULL; + } + + return load_opened_ogg_file(&oggFile, id_for_log); +} + struct PlayingSound { ALuint source_id; @@ -211,7 +286,7 @@ public: m_is_initialized(false) { ALCenum error = ALC_NO_ERROR; - + infostream<<"Audio: Initializing..."< >::iterator i = @@ -375,7 +450,7 @@ public: m_sounds_playing[id] = sound; return id; } - + void deleteSound(int id) { std::map::iterator i = @@ -383,7 +458,7 @@ public: if(i == m_sounds_playing.end()) return; PlayingSound *sound = i->second; - + alDeleteSources(1, &sound->source_id); delete sound; @@ -411,7 +486,7 @@ public: } return getBuffer(name); } - + // Remove stopped sounds void maintain() { @@ -449,26 +524,18 @@ public: bool loadSoundFile(const std::string &name, const std::string &filepath) { - SoundBuffer *buf = loadOggFile(filepath); - if(buf) + SoundBuffer *buf = load_ogg_from_file(filepath); + if (buf) addBuffer(name, buf); return false; } bool loadSoundData(const std::string &name, const std::string &filedata) { - // The vorbis API sucks; just write it to a file and use vorbisfile - // TODO: Actually load it directly from memory - std::string basepath = porting::path_user + DIR_DELIM + "cache" + - DIR_DELIM + "tmp"; - std::string path = basepath + DIR_DELIM + "tmp.ogg"; - verbosestream<<"OpenALSoundManager::loadSoundData(): Writing " - <<"temporary file to ["< Date: Sun, 15 Nov 2015 08:17:32 +0100 Subject: [PATCH 082/531] sound_openal.cpp: remove unused header --- src/sound_openal.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp index ca102341..0c4ae885 100644 --- a/src/sound_openal.cpp +++ b/src/sound_openal.cpp @@ -39,7 +39,6 @@ with this program; ifnot, write to the Free Software Foundation, Inc., #include #include #include "log.h" -#include "filesys.h" #include "util/numeric.h" // myrand() #include "porting.h" #include From cb7da901383e2da6397444cb0acc93235b132d2b Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 14 Nov 2015 09:18:01 +0000 Subject: [PATCH 083/531] Mgfractal: Revert unnecessary duplication of parameters --- builtin/settingtypes.txt | 41 +++++++------------- minetest.conf.example | 51 +++++-------------------- src/mapgen_fractal.cpp | 80 +++++++++++++++------------------------- src/mapgen_fractal.h | 26 ++++--------- 4 files changed, 60 insertions(+), 138 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index e5fe5cb9..bf452915 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -980,49 +980,34 @@ mgfractal_spflags (Mapgen fractal flags) flags nojulia julia,nojulia # 3 = 4D "Mandy Cousin" mandelbrot set, 4 = 4D mandelbrot set variation. mgfractal_formula (Mapgen fractal formula) int 1 1 4 -# Mandelbrot set: Iterations of the recursive function. +# Iterations of the recursive function. # Controls scale of finest detail. -mgfractal_m_iterations (Mapgen fractal mandelbrot iterations) int 9 +mgfractal_iterations (Mapgen fractal iterations) int 9 -# Mandelbrot set: Approximate (X,Y,Z) scales in nodes. -mgfractal_m_scale (Mapgen fractal mandelbrot scale) v3f (1024.0, 256.0, 1024.0) +# Approximate (X,Y,Z) scales in nodes. +mgfractal_scale (Mapgen fractal scale) v3f (1024.0, 256.0, 1024.0) -# Mandelbrot set: (X,Y,Z) offsets from world centre. -# Range roughly -2 to 2, multiply by m_scale for offsets in nodes. -mgfractal_m_offset (Mapgen fractal mandelbrot offset) v3f (1.75, 0.0, 0.0) +# (X,Y,Z) offsets from world centre. +# Range roughly -2 to 2, multiply by 'scale' for offsets in nodes. +mgfractal_offset (Mapgen fractal offset) v3f (1.75, 0.0, 0.0) -# Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape. +# W co-ordinate of the generated 3D slice of the 4D shape. # Range roughly -2 to 2. -mgfractal_m_slice_w (Mapgen fractal mandelbrot slice w) float 0.0 +mgfractal_slice_w (Mapgen fractal slice w) float 0.0 -# Julia set: Iterations of the recursive function. -# Controls scale of finest detail. -mgfractal_j_iterations (Mapgen fractal julia iterations) int 9 - -# Julia set: Approximate (X,Y,Z) scales in nodes. -mgfractal_j_scale (Mapgen fractal julia scale) v3f (2048.0, 512.0, 2048.0) - -# Julia set: (X,Y,Z) offsets from world centre. -# Range roughly -2 to 2, multiply by j_scale for offsets in nodes. -mgfractal_j_offset (Mapgen fractal julia offset) v3f (0.0, 1.0, 0.0) - -# Julia set: W co-ordinate of the generated 3D slice of the 4D shape. -# Range roughly -2 to 2. -mgfractal_j_slice_w (Mapgen fractal julia slice w) float 0.0 - -# Julia set: X value determining the 4D shape. +# Julia set only: X value determining the 4D shape. # Range roughly -2 to 2. mgfractal_julia_x (Mapgen fractal julia x) float 0.33 -# Julia set: Y value determining the 4D shape. +# Julia set only: Y value determining the 4D shape. # Range roughly -2 to 2. mgfractal_julia_y (Mapgen fractal julia y) float 0.33 -# Julia set: Z value determining the 4D shape. +# Julia set only: Z value determining the 4D shape. # Range roughly -2 to 2. mgfractal_julia_z (Mapgen fractal julia z) float 0.33 -# Julia set: W value determining the 4D shape. +# Julia set only: W value determining the 4D shape. # Range roughly -2 to 2. mgfractal_julia_w (Mapgen fractal julia w) float 0.33 diff --git a/minetest.conf.example b/minetest.conf.example index 74f7006f..39f80bf6 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1246,62 +1246,31 @@ # type: int # mgfractal_formula = 1 -# Mandelbrot set: Iterations of the recursive function. +# Iterations of the recursive function. # Controls scale of finest detail. # type: int -# mgfractal_m_iterations = 9 +# mgfractal_iterations = 9 -# Mandelbrot set: Approximate (X,Y,Z) scales in nodes. +# Approximate (X,Y,Z) scales in nodes. # type: v3f -# mgfractal_m_scale = (1024.0, 256.0, 1024.0) +# mgfractal_scale = (1024.0, 256.0, 1024.0) -# Mandelbrot set: (X,Y,Z) offsets from world centre. -# Range roughly -2 to 2, multiply by m_scale for offsets in nodes. +# (X,Y,Z) offsets from world centre. +# Range roughly -2 to 2, multiply by 'scale' for offsets in nodes. # type: v3f -# mgfractal_m_offset = (1.75, 0.0, 0.0) +# mgfractal_offset = (1.75, 0.0, 0.0) -# Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape. +# W co-ordinate of the generated 3D slice of the 4D shape. # Range roughly -2 to 2. # type: float -# mgfractal_m_slice_w = 0.0 +# mgfractal_slice_w = 0.0 -# Julia set: Iterations of the recursive function. -# Controls scale of finest detail. -# type: int -# mgfractal_j_iterations = 9 - -# Julia set: Approximate (X,Y,Z) scales in nodes. -# type: v3f -# mgfractal_j_scale = (2048.0, 512.0, 2048.0) - -# Julia set: (X,Y,Z) offsets from world centre. -# Range roughly -2 to 2, multiply by j_scale for offsets in nodes. -# type: v3f -# mgfractal_j_offset = (0.0, 1.0, 0.0) - -# Julia set: W co-ordinate of the generated 3D slice of the 4D shape. -# Range roughly -2 to 2. -# type: float -# mgfractal_j_slice_w = 0.0 - -# Julia set: X value determining the 4D shape. +# Julia set only: 4 values determining the 4D shape. # Range roughly -2 to 2. # type: float # mgfractal_julia_x = 0.33 - -# Julia set: Y value determining the 4D shape. -# Range roughly -2 to 2. -# type: float # mgfractal_julia_y = 0.33 - -# Julia set: Z value determining the 4D shape. -# Range roughly -2 to 2. -# type: float # mgfractal_julia_z = 0.33 - -# Julia set: W value determining the 4D shape. -# Range roughly -2 to 2. -# type: float # mgfractal_julia_w = 0.33 # type: noise_params diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 37ed0d86..89d4e53d 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -59,25 +59,20 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * this->ystride = csize.X; this->zstride = csize.X * (csize.Y + 2); - this->biomemap = new u8[csize.X * csize.Z]; - this->heightmap = new s16[csize.X * csize.Z]; - this->heatmap = NULL; - this->humidmap = NULL; + this->biomemap = new u8[csize.X * csize.Z]; + this->heightmap = new s16[csize.X * csize.Z]; + this->heatmap = NULL; + this->humidmap = NULL; MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams; this->spflags = sp->spflags; - this->formula = sp->formula; + this->formula = sp->formula; + this->iterations = sp->iterations; + this->scale = sp->scale; + this->offset = sp->offset; + this->slice_w = sp->slice_w; - this->m_iterations = sp->m_iterations; - this->m_scale = sp->m_scale; - this->m_offset = sp->m_offset; - this->m_slice_w = sp->m_slice_w; - - this->j_iterations = sp->j_iterations; - this->j_scale = sp->j_scale; - this->j_offset = sp->j_offset; - this->j_slice_w = sp->j_slice_w; this->julia_x = sp->julia_x; this->julia_y = sp->julia_y; this->julia_z = sp->julia_z; @@ -148,16 +143,11 @@ MapgenFractalParams::MapgenFractalParams() spflags = 0; formula = 1; + iterations = 9; + scale = v3f(1024.0, 256.0, 1024.0); + offset = v3f(1.75, 0.0, 0.0); + slice_w = 0.0; - m_iterations = 9; // Mandelbrot set only - m_scale = v3f(1024.0, 256.0, 1024.0); - m_offset = v3f(1.75, 0.0, 0.0); - m_slice_w = 0.0; - - j_iterations = 9; // Julia set only - j_scale = v3f(2048.0, 512.0, 2048.0); - j_offset = v3f(0.0, 1.0, 0.0); - j_slice_w = 0.0; julia_x = 0.33; julia_y = 0.33; julia_z = 0.33; @@ -175,16 +165,11 @@ void MapgenFractalParams::readParams(const Settings *settings) settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal); settings->getU16NoEx("mgfractal_formula", formula); + settings->getU16NoEx("mgfractal_iterations", iterations); + settings->getV3FNoEx("mgfractal_scale", scale); + settings->getV3FNoEx("mgfractal_offset", offset); + settings->getFloatNoEx("mgfractal_slice_w", slice_w); - settings->getU16NoEx("mgfractal_m_iterations", m_iterations); - settings->getV3FNoEx("mgfractal_m_scale", m_scale); - settings->getV3FNoEx("mgfractal_m_offset", m_offset); - settings->getFloatNoEx("mgfractal_m_slice_w", m_slice_w); - - settings->getU16NoEx("mgfractal_j_iterations", j_iterations); - settings->getV3FNoEx("mgfractal_j_scale", j_scale); - settings->getV3FNoEx("mgfractal_j_offset", j_offset); - settings->getFloatNoEx("mgfractal_j_slice_w", j_slice_w); settings->getFloatNoEx("mgfractal_julia_x", julia_x); settings->getFloatNoEx("mgfractal_julia_y", julia_y); settings->getFloatNoEx("mgfractal_julia_z", julia_z); @@ -202,16 +187,11 @@ void MapgenFractalParams::writeParams(Settings *settings) const settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX); settings->setU16("mgfractal_formula", formula); + settings->setU16("mgfractal_iterations", iterations); + settings->setV3F("mgfractal_scale", scale); + settings->setV3F("mgfractal_offset", offset); + settings->setFloat("mgfractal_slice_w", slice_w); - settings->setU16("mgfractal_m_iterations", m_iterations); - settings->setV3F("mgfractal_m_scale", m_scale); - settings->setV3F("mgfractal_m_offset", m_offset); - settings->setFloat("mgfractal_m_slice_w", m_slice_w); - - settings->setU16("mgfractal_j_iterations", j_iterations); - settings->setV3F("mgfractal_j_scale", j_scale); - settings->setV3F("mgfractal_j_offset", j_offset); - settings->setFloat("mgfractal_j_slice_w", j_slice_w); settings->setFloat("mgfractal_julia_x", julia_x); settings->setFloat("mgfractal_julia_y", julia_y); settings->setFloat("mgfractal_julia_z", julia_z); @@ -393,23 +373,21 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) cy = julia_y; cz = julia_z; cw = julia_w; - ox = (float)x / j_scale.X - j_offset.X; - oy = (float)y / j_scale.Y - j_offset.Y; - oz = (float)z / j_scale.Z - j_offset.Z; - ow = j_slice_w; + ox = (float)x / scale.X - offset.X; + oy = (float)y / scale.Y - offset.Y; + oz = (float)z / scale.Z - offset.Z; + ow = slice_w; } else { // Mandelbrot set - cx = (float)x / m_scale.X - m_offset.X; - cy = (float)y / m_scale.Y - m_offset.Y; - cz = (float)z / m_scale.Z - m_offset.Z; - cw = m_slice_w; + cx = (float)x / scale.X - offset.X; + cy = (float)y / scale.Y - offset.Y; + cz = (float)z / scale.Z - offset.Z; + cw = slice_w; ox = 0.0f; oy = 0.0f; oz = 0.0f; ow = 0.0f; } - u16 iterations = spflags & MGFRACTAL_JULIA ? j_iterations : m_iterations; - for (u16 iter = 0; iter < iterations; iter++) { float nx = 0.0f; float ny = 0.0f; diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index 1b6683f1..5800ae20 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -37,16 +37,11 @@ struct MapgenFractalParams : public MapgenSpecificParams { u32 spflags; u16 formula; + u16 iterations; + v3f scale; + v3f offset; + float slice_w; - u16 m_iterations; - v3f m_scale; - v3f m_offset; - float m_slice_w; - - u16 j_iterations; - v3f j_scale; - v3f j_offset; - float j_slice_w; float julia_x; float julia_y; float julia_z; @@ -79,16 +74,11 @@ public: v3s16 full_node_max; u16 formula; + u16 iterations; + v3f scale; + v3f offset; + float slice_w; - u16 m_iterations; - v3f m_scale; - v3f m_offset; - float m_slice_w; - - u16 j_iterations; - v3f j_scale; - v3f j_offset; - float j_slice_w; float julia_x; float julia_y; float julia_z; From 3bf332d9f53025c3f8770d6f10a39589bf33bce9 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Sun, 8 Nov 2015 21:55:16 +0100 Subject: [PATCH 084/531] Translated using Weblate (French) Currently translated at 96.8% (762 of 787 strings) --- po/fr/minetest.po | 68 +++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 1581d11e..17a55690 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-10-28 12:55+0200\n" +"PO-Revision-Date: 2015-11-08 21:55+0000\n" "Last-Translator: Jean-Patrick G. \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -421,7 +421,7 @@ msgstr "Démarrer" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" n'est pas un drapeau valide." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -450,6 +450,7 @@ msgstr "Activé" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" +"Le format est 3 nombres séparés par des virgules et entre les parenthèses." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -1444,7 +1445,6 @@ msgstr "" "reste figé(e)." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." @@ -1609,6 +1609,12 @@ msgid "" "Note that this is not quite optimized and that smooth lighting on the\n" "water surface doesn't work with this." msgstr "" +"Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne " +"submerge pas\n" +"entièrement le bloc voisin.\n" +"Cette fonctionnalité est encore expérimentale et la lumière douce n’apparaît " +"pas à la\n" +"surface de l'eau." #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1764,13 +1770,12 @@ msgid "Fast movement" msgstr "Mouvement rapide" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" "Mouvement rapide (via la touche utiliser).\n" -"Nécessite le privilège \"fast\" sur un serveur. " +"Nécessite le privilège \"fast\" sur un serveur." #: src/settings_translation_file.cpp msgid "Field of view" @@ -1914,7 +1919,6 @@ msgid "Generate normalmaps" msgstr "Normal mapping" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " @@ -1924,7 +1928,7 @@ msgid "" msgstr "" "Attributs généraux de la génération de terrain.\n" "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent leurs " -"valeurs par défaut. " +"valeurs par défaut." #: src/settings_translation_file.cpp msgid "Graphics" @@ -2022,22 +2026,25 @@ msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" +"Si désactivé la touche \"Utiliser\" est utilisée pour voler + mode rapide (" +"si ceux-ci sont activés)." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" "Si activé avec le mode vol, le joueur sera capable de traverser les blocs " -"solides. " +"solides en volant." #: src/settings_translation_file.cpp msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" +"Si activé, la touche \"Utiliser\" est utilisée à la place de la touche \"" +"Sneak\" pour monter ou descendre." #: src/settings_translation_file.cpp msgid "" @@ -2629,7 +2636,6 @@ msgid "Map directory" msgstr "Chemin du monde" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen fractal.\n" "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" @@ -2641,10 +2647,9 @@ msgstr "" "'ridges' sont les rivières.\n" "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " "défaut.\n" -"Les drapeaux commençant par \"non\" sont désactivés. " +"Les drapeaux commençant par \"non\" sont désactivés." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" "When snowbiomes are enabled jungles are enabled and the jungles flag is " @@ -2658,10 +2663,9 @@ msgstr "" "drapeaux jungle est ignoré.\n" "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " "défaut.\n" -"Les drapeaux commençant par \"non\" sont désactivés. " +"Les drapeaux commençant par \"non\" sont désactivés." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" @@ -2673,7 +2677,7 @@ msgstr "" "'ridges' sont les rivières.\n" "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " "défaut.\n" -"Les drapeaux commençant par \"non\" sont désactivés. " +"Les drapeaux commençant par \"non\" sont désactivés." #: src/settings_translation_file.cpp msgid "Map generation limit" @@ -2712,34 +2716,28 @@ msgid "Mapgen flags" msgstr "Drapeaux de génération de terrain" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Drapeaux de génération de terrain" +msgstr "Fractales de la génération de terrain" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave1 noise parameters" msgstr "Mapgen V5 : paramètres de bruit cave1" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave2 noise parameters" msgstr "Mapgen V5 : paramètre de bruit cave2" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal filler depth noise parameters" msgstr "Mapgen V5 : paramètres de bruit sur la profondeur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal flags" -msgstr "Drapeaux de génération de terrain" +msgstr "Drapeaux des fractales de la génération de terrain" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal julia iterations" -msgstr "Nombre d'itérations sur l'occlusion parallaxe" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia offset" @@ -2770,9 +2768,8 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal mandelbrot iterations" -msgstr "Paquets maximum par itération" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot offset" @@ -2787,9 +2784,8 @@ msgid "Mapgen fractal mandelbrot slice w" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal seabed noise parameters" -msgstr "Mapgen : paramètres de mélange de la température" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -2970,6 +2966,12 @@ msgid "" "Smaller values may result in a suitable spawn point not being found,\n" "resulting in a spawn at (0, 0, 0) possibly buried underground." msgstr "" +"Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n" +"Des valeurs plus grandes aboutissent à des locations plus proches de (x = 0, " +"z = 0).\n" +"Des valeurs plus petites peut résulter à une location de spawn non-trouvée, " +"résultant\n" +"à une location située à (0, 0, 0) probablement enterrée sous le sol." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" @@ -3317,13 +3319,12 @@ msgid "Physics" msgstr "Physique" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the \"fly\" privilege on the server." msgstr "" "Le joueur est capable de voler sans être affecté par la gravité.\n" -"Nécessite le privilège \"fly\" sur un serveur. " +"Nécessite le privilège \"fly\" sur un serveur." #: src/settings_translation_file.cpp msgid "Player name" @@ -3589,7 +3590,6 @@ msgid "Smooth lighting" msgstr "Lumière douce" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." @@ -3835,7 +3835,7 @@ msgstr "Synchronisation verticale de la fenêtre de jeu." #: src/settings_translation_file.cpp msgid "Vertical spawn range" -msgstr "" +msgstr "Portée verticale du spawn" #: src/settings_translation_file.cpp msgid "Video driver" From 5c2efab0e40f8e893b7f210a09347694b24d03e4 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Sun, 8 Nov 2015 22:18:03 +0100 Subject: [PATCH 085/531] Translated using Weblate (French) Currently translated at 100.0% (787 of 787 strings) --- po/fr/minetest.po | 54 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 17a55690..c8739d4e 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-08 21:55+0000\n" +"PO-Revision-Date: 2015-11-08 22:26+0000\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -2134,46 +2134,61 @@ msgid "" "Julia set: (X,Y,Z) offsets from world centre.\n" "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." msgstr "" +"Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n" +"La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler en " +"nombre de blocs." #: src/settings_translation_file.cpp msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "" +msgstr "Série Julia : échelles (X,Y,Z) en blocs." #: src/settings_translation_file.cpp msgid "" "Julia set: Iterations of the recursive function.\n" "Controls scale of finest detail." msgstr "" +"Série Julia : itérations de la fonction récursive.\n" +"Contrôle l'échelle du détail le plus subtil." #: src/settings_translation_file.cpp msgid "" "Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Série Julia : coordonnée W de la couche 3D de la forme 4D.\n" +"La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp msgid "" "Julia set: W value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Série Julia : valeur W déterminant la forme 4D.\n" +"La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp msgid "" "Julia set: X value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Série Julia : valeur X déterminant la forme 4D.\n" +"La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp msgid "" "Julia set: Y value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Série Julia : valeur Y déterminant la forme 4D.\n" +"La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp msgid "" "Julia set: Z value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Série Julia : valeur Z déterminant la forme 4D.\n" +"La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp msgid "Jump key" @@ -2614,22 +2629,29 @@ msgid "" "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." msgstr "" +"Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n" +"La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler en " +"nombre de blocs." #: src/settings_translation_file.cpp msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" +msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs." #: src/settings_translation_file.cpp msgid "" "Mandelbrot set: Iterations of the recursive function.\n" "Controls scale of finest detail." msgstr "" +"Série Mandelbrot : itérations de la fonction récursive.\n" +"Contrôle l'échelle du détail le plus subtil." #: src/settings_translation_file.cpp msgid "" "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n" +"La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp msgid "Map directory" @@ -2737,55 +2759,55 @@ msgstr "Drapeaux des fractales de la génération de terrain" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia iterations" -msgstr "" +msgstr "Mapgen Julia : itérations fractales" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia offset" -msgstr "" +msgstr "Mapgen Julia : décalages fractals" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia scale" -msgstr "" +msgstr "Mapgen Julia : échelles fractales" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia slice w" -msgstr "" +msgstr "Mapgen Julia : couche fractale W" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "Mapgen Julia : fractale W" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "Mapgen Julia : fractale X" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "Mapgen Julia : fractale Y" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "Mapgen Julia : fractale Z" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +msgstr "Mapgen Mandelbrot : itérations fractales" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot offset" -msgstr "" +msgstr "Mapgen Mandelbrot : décalages fractals" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot scale" -msgstr "" +msgstr "Mapgen Mandelbrot : échelles fractales" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +msgstr "Mapgen Mandelbrot : couche fractale W" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" -msgstr "" +msgstr "Mapgen : paramètres de bruit du fond de l'eau" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" From 59c16b3dab185fceb507f7deee2ec8e13f0f8f32 Mon Sep 17 00:00:00 2001 From: Rui Date: Mon, 9 Nov 2015 10:38:10 +0100 Subject: [PATCH 086/531] Translated using Weblate (Japanese) Currently translated at 40.2% (317 of 787 strings) --- po/ja/minetest.po | 70 ++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 812e9928..08e4a5fe 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,10 +3,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-05 04:46+0000\n" -"Last-Translator: Onee Chan \n" -"Language-Team: Japanese \n" +"PO-Revision-Date: 2015-11-09 10:38+0000\n" +"Last-Translator: Rui \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,17 +43,16 @@ msgid "Loading..." msgstr "読み込み中..." #: builtin/mainmenu/common.lua -#, fuzzy msgid "Protocol version mismatch. " -msgstr "プロトコルバージョンの不一致、サーバー " +msgstr "プロトコルバージョンが一致していません。 " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "サーバーのプロトコルバージョンは$1が適用されます。 " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "サーバーは$1から$2までのプロトコルバージョンをサポートしています。 " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -61,11 +60,11 @@ msgstr "インターネット接続を確認し、公開サーバーリストを #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "プロトコルバージョンは$1のみサポートしています。" #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "プロトコルバージョンは$1から$2までをサポートしています。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -413,72 +412,78 @@ msgstr "ゲームスタート" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\"は有効なフラグではありません。" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(設定の説明はありません)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "参照" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "操作変更" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "無効化" +msgstr "無効" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "編集" + +#: builtin/mainmenu/tab_settings.lua +msgid "Enabled" +msgstr "有効" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "有効化" - -#: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "書式はカンマと内側の括弧で区切られた3つの数字です。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "" "Format: , , (, , ), , " ", " msgstr "" +"書式: , , (, , ), , , " +"" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" msgstr "ゲーム" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "空隙性随意大手カンマを付加することができます。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "フラグのリストはカンマで区切って入力してください。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Please enter a valid integer." -msgstr "" +msgstr "有効な整数を入力してください。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Please enter a valid number." -msgstr "" +msgstr "有効な数字を入力してください。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Possible values are: " -msgstr "" +msgstr "可能な値: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "初期設定に戻す" #: builtin/mainmenu/tab_settings.lua msgid "Select path" @@ -489,16 +494,19 @@ msgid "Settings" msgstr "設定" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Show technical names" -msgstr "" +msgstr "技術名称を表示" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "The value must be greater than $1." -msgstr "" +msgstr "$1より大きな値でなければいけません。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "The value must be lower than $1." -msgstr "" +msgstr "$1より小さい値でなければいけません。" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" From ca322b487df7f6d3ab524d2fe8ea1bb6363eecd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Maciejewski?= Date: Mon, 9 Nov 2015 19:10:07 +0100 Subject: [PATCH 087/531] Translated using Weblate (Polish) Currently translated at 25.4% (200 of 787 strings) --- po/pl/minetest.po | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/po/pl/minetest.po b/po/pl/minetest.po index 4d06c753..7b45f116 100644 --- a/po/pl/minetest.po +++ b/po/pl/minetest.po @@ -8,16 +8,17 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2013-10-08 21:22+0200\n" -"Last-Translator: Maciej Kasatkin \n" -"Language-Team: Polish <>\n" +"PO-Revision-Date: 2015-11-09 19:10+0000\n" +"Last-Translator: Jarosław Maciejewski \n" +"Language-Team: Polish " +"\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -25,10 +26,9 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "Wystąpił błąd:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Menu główne" @@ -37,9 +37,8 @@ msgid "Ok" msgstr "OK" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Połącz" +msgstr "Połącz ponownie" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" @@ -59,7 +58,7 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Serwer wspiera wersje protokołu od $1 do $2." #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -67,11 +66,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Wspieramy tylko protokół w wersji $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Wspieramy protokół w wersji od $1 do $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -84,14 +83,12 @@ msgid "Depends:" msgstr "Zależy od:" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Disable MP" -msgstr "Wyłącz wszystkie" +msgstr "Wyłącz MP" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable MP" -msgstr "Włącz wszystkie" +msgstr "Włącz MP" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" @@ -109,7 +106,7 @@ msgstr "Ukryj Grę" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "" +msgstr "Ukryj zawartość MP" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -138,7 +135,7 @@ msgstr "Utwórz" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" +msgstr "Ściągnij podgrę, taką jak minetest_game, z minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -158,7 +155,7 @@ msgstr "Nie podano nazwy świata lub nie wybrano gry" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" -msgstr "" +msgstr "Ziarno" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." @@ -170,7 +167,7 @@ msgstr "Nazwa świata" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "" +msgstr "Nie masz zainstalowanych żadnych podgier." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -209,13 +206,12 @@ msgid "Rename Modpack:" msgstr "Zmień nazwe Paczki Modów:" #: builtin/mainmenu/modmgr.lua -#, fuzzy msgid "" "\n" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"Instalacja moda: nieznany typ pliku \"$1\"" +"Instalacja moda: nieznany typ pliku \"$1\" lub archiwum uszkodzone" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" @@ -3690,8 +3686,9 @@ msgid "cURL parallel limit" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "cURL timeout" -msgstr "" +msgstr "Limit czasu cURL" #, fuzzy #~ msgid "Opaque Leaves" From ac99a2873da5a3eab14fee6a3e8b5ab276fda9f0 Mon Sep 17 00:00:00 2001 From: Rogier Date: Wed, 11 Nov 2015 20:55:19 +0100 Subject: [PATCH 088/531] Translated using Weblate (Dutch) Currently translated at 44.0% (347 of 787 strings) --- po/nl/minetest.po | 346 ++++++++++++++++++++++++++++------------------ 1 file changed, 208 insertions(+), 138 deletions(-) diff --git a/po/nl/minetest.po b/po/nl/minetest.po index 380fe73c..598d641d 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-10-27 16:44+0200\n" -"Last-Translator: PilzAdam \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2015-11-11 20:55+0000\n" +"Last-Translator: Rogier \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,22 +28,20 @@ msgid "An error occured:" msgstr "Er is een fout opgetreden:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" -msgstr "Hoofdmenu" +msgstr "Naar hoofdmenu" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" msgstr "Ok" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Verbinden" +msgstr "Opnieuw verbinding maken" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "De server heeft verzocht opnieuw verbinding te maken:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -51,15 +49,15 @@ msgstr "Bezig met laden..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Protocol versie stemt niet overeen. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "De server vereist protocol versie $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "De server ondersteunt protocol versies $1 tot en met $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -69,11 +67,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Wij ondersteunen enkel protocol versie $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Wij ondersteunen protocol versies $1 tot en met $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -102,6 +100,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Mod \"$1\" kan niet gebruikt worden: de naam bevat ongeldige karakters. " +"Enkel [a-z0-9_] zijn toegestaan." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -418,37 +418,37 @@ msgstr "Start Server" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" is geen geldige vlag." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Geen beschrijving beschikbaar)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Bladeren" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Toetsen" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "MP uitschakelen" +msgstr "uitgeschakeld" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Bewerken" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" msgstr "ingeschakeld" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" +"Formaat is 3 getallen, gescheiden door komma's en tussen vierkante haken " +"(bijvoorbeeld: [4,-34,138])." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -461,33 +461,36 @@ msgid "Games" msgstr "Spellen" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" +"Optioneel: de lacunaritie (uit de fractal-meetkunde: een maat voor " +"hoeveelheid en grootte van 'gaten') kan aan het einde toegevoegd worden, " +"voorafgegaan door een komma." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Geef een lijst van vlaggen, door komma's gescheiden." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Voer een geldig geheel getal in." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Voer een geldig getal in." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Mogelijke waarden zijn: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Standaardwaarde herstellen" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Selecteren" +msgstr "Pad selecteren" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -495,15 +498,15 @@ msgstr "Instellingen" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Technische namen weergeven" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "De waarde moet groter zijn dan $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "De waarde moet lager zijn dan $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -532,7 +535,7 @@ msgstr "Geen informatie aanwezig" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Geen" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -544,9 +547,8 @@ msgid "Texturepacks" msgstr "Texturen" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Fout bij verbinden (time out?)" +msgstr "Time-out bij opzetten verbinding." #: src/client.cpp msgid "Done!" @@ -677,6 +679,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Standaardbesturing:\n" +"Geen menu getoond:\n" +"- enkele tik: activeren\n" +"- dubbele tik: plaats / gebruik\n" +"- vinger schuiven: rondkijken\n" +"Menu of inventaris getoond:\n" +"- dubbele tik buiten menu:\n" +" --> sluiten\n" +"- aanraken stapel of slot:\n" +" --> stapel verplaatsen\n" +"- aanraken & slepen, tik met tweede vinger\n" +" --> plaats enkel object in slot\n" #: src/game.cpp msgid "Exit to Menu" @@ -786,7 +800,7 @@ msgstr "Toets is al in gebruik" msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" "Sneltoetsen. (Als dit menu stuk gaat, verwijder dan instellingen uit " -"minetest.conf)." +"minetest.conf)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -794,7 +808,7 @@ msgstr "Links" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp msgid "Print stacks" -msgstr "Print stacks" +msgstr "Print debug-stacks" #: src/guiKeyChangeMenu.cpp msgid "Range select" @@ -1150,19 +1164,21 @@ msgid "Zoom" msgstr "Zoom" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = parallax occlusie met helling-informatie (sneller).\n" +"1 = 'relief mapping' (lanzamer, nauwkeuriger)." #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "3D wolken" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "3D modus" #: src/settings_translation_file.cpp msgid "" @@ -1174,36 +1190,51 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"3D ondersteuning.\n" +"Op dit moment beschikbaar:\n" +"- none: geen 3D.\n" +"- anaglyph: 3D met de kleuren cyaan en magenta.\n" +"- interlaced: 3D voor polariserend scherm (even/oneven beeldlijnen).\n" +"- topbottom: 3D met horizontaal gedeeld scherm (boven/onder).\n" +"- sidebyside: 3D met vertikaal gedeeld scherm (links/rechts)." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Vooringestelde zaadwaarde voor de wereld. Indien leeg, wordt een " +"willekeurige waarde gekozen.\n" +"Wanneer in het hoofdmenu een nieuwe wereld gecreëerd wordt, kan een andere " +"waarde gekozen worden." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Een bericht dat wordt getoond aan alle verbonden spelers als de server " +"crasht." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Een bericht dat wordt getoond aan alle verbonden spelers als de server " +"afgesloten wordt." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Maximaal aantal 'emerge' blokken in de wachtrij" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Versnelling in lucht" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Bereik waarbinnen blokken actief zijn" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Bereik waarbinnen actieve objecten gestuurd worden" #: src/settings_translation_file.cpp msgid "" @@ -1211,18 +1242,27 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Standaard serveradres waarmee verbinding gemaakt moet worden.\n" +"Indien leeg, wordt een lokale server gestart.\n" +"In het hoofdmenu kan een ander adres opgegeven worden." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Aangepaste DPI (dots per inch) instelling voor het scherm, bijv. voor 4k " +"schermen (niet voor X11 of Android)." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Aangepaste gamma voor de licht-tabellen. Lagere waardes zijn helderder.\n" +"Deze instelling wordt enkel gebruikt door de cliënt, en wordt genegeerd door " +"de server." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1230,7 +1270,7 @@ msgstr "Geavanceerd" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Zet 'snel' altijd aan bij vliegen" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" @@ -1243,7 +1283,7 @@ msgstr "Anisotrope Filtering" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Meldt server aan bij de server-lijst" #: src/settings_translation_file.cpp msgid "" @@ -1251,23 +1291,25 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"URL van de serverlijst.\n" +"Voor het aanmelden van een ipv6 adres bij de minetest serverlijst, " +"configureer 'serverlist_url = v6.servers.minetest.net'." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Vraag om de verbinding te herstellen na een server-crash" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Meldt de server automatisch aan bij de serverlijst." #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" msgstr "Achteruit" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Basis" #: src/settings_translation_file.cpp #, fuzzy @@ -1275,18 +1317,17 @@ msgid "Bilinear filtering" msgstr "Bi-Lineaire Filtering" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "Adres" - -#: src/settings_translation_file.cpp -msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Adres te gebruiken door lokale server" #: src/settings_translation_file.cpp #, fuzzy +msgid "Bits per pixel (aka color depth) in fullscreen mode." +msgstr "Aantal bits per pixel (oftewel: kleurdiepte) in full-screen modus." + +#: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "Multiplayer" +msgstr "Bouwen op de plaats van de speler" #: src/settings_translation_file.cpp msgid "Bumpmapping" @@ -1294,39 +1335,35 @@ msgstr "Bumpmapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Vloeiender maken van de camerabeweging" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Vloeiender maken van de camerabeweging (in cinematic modus)" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Toets voor cameraverversing aan/uit" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Toetsen" +msgstr "Chat-toets" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Toetsen" +msgstr "Toets voor tonen/verbergen chat" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Chunk-grootte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Creatieve Modus" +msgstr "Cinematic modus" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Creatieve Modus" +msgstr "Cinematic modus aan/uit toets" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1338,44 +1375,44 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Klimsnelheid" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Hoogte van de wolken" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Diameter van de wolken" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D wolken" +msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Wolken bestaan enkel aan de kant van de cliënt." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Hoofdmenu" +msgstr "Wolken in het menu" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Gekleurde mist" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Lijst (met komma's gescheiden) van vertrouwde mods die onveilige functies " +"mogen gebruiken,\n" +"zelfs als mod-beveiliging aan staat (via request_insecure_environment())." #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Opdracht" +msgstr "Opdracht-toets" #: src/settings_translation_file.cpp #, fuzzy @@ -1383,41 +1420,36 @@ msgid "Connect glass" msgstr "Verbonden glas" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Verbinding met de server wordt gemaakt..." +msgstr "Gebruik van externe media-server toestaan" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Verbind glas-nodes met elkaar (indien ondersteund door het type node)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Console" +msgstr "Console-alpha" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Console" +msgstr "Console-kleur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Console" +msgstr "Console-toets" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Continu vooruit lopen" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Speler loopt continu vooruit (enkel gebruikt voor testen)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Control" +msgstr "Besturing" #: src/settings_translation_file.cpp msgid "" @@ -1425,87 +1457,96 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Bepaalt de lengte van de dag/nacht cyclus\n" +"Voorbeeld: 72 = 20min, 360 = 4min, 1 = 24 uur, 0 = de kloktijd (dag, nacht, " +"schemering) verandert niet." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Bepaalt de grootte van woestijnen en stranden in de wereld-generator (mapgen)" +" v6.\n" +"Als 'snowbiomes' aan staat, wordt deze instelling genegeerd." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Crash boodschap" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Draadkruis-alpha" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Draadkruis-alphawaarde. (ondoorzichtigheid; tussen 0 en 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Draadkruis-kleur" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Draadkruis-kleur (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Snelheid bij hurken" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "Scherm DPI" #: src/settings_translation_file.cpp #, fuzzy msgid "Damage" -msgstr "Schade inschakelen" +msgstr "Verwondingen" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Toets voor aan/uitzetten debug informatie" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Dedicated server step" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Default acceleration" -msgstr "" +msgstr "Debug logniveau" #: src/settings_translation_file.cpp #, fuzzy +msgid "Dedicated server step" +msgstr "Tijdsstaplengte van de server" + +#: src/settings_translation_file.cpp +msgid "Default acceleration" +msgstr "Standaardversnelling" + +#: src/settings_translation_file.cpp msgid "Default game" -msgstr "spel aanpassen" +msgstr "Standaardwereld" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Standaardnaam voor een nieuwe wereld.\n" +"In het hoofdmenu kan een andere naam opgegeven worden." #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Nieuw wachtwoord" +msgstr "Standaardwachtwoord" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Standaardrechten" #: src/settings_translation_file.cpp msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Standaard time-out voor cURL, in milliseconden.\n" +"Wordt alleen gebruikt indien gecompileerd met cURL ingebouwd." #: src/settings_translation_file.cpp msgid "" @@ -1516,49 +1557,54 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" +"Maximale afstand (in blokken van 16 nodes) waarbinnen andere spelers " +"zichtbaar zijn (0 = oneindig ver)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Vertraging bij het tonen van tooltips, in milliseconden." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Actie bij gebruik van verouderde Lua API functies" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Daalsnelheid" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" - -#: src/settings_translation_file.cpp -msgid "Desynchronize block animation" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Detailed mod profiling" -msgstr "" +"Beschrijving van de server. Wordt getoond in de server-lijst, en wanneer " +"spelers inloggen." #: src/settings_translation_file.cpp #, fuzzy +msgid "Desynchronize block animation" +msgstr "Textuur-animaties niet synchroniseren" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profile data. Useful for mod developers." +msgstr "Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Detailed mod profiling" +msgstr "Gedetailleerde profiling van mods" + +#: src/settings_translation_file.cpp msgid "Disable anticheat" -msgstr "Deeltjes aanzetten" +msgstr "Valsspeelbescherming uitschakelen" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Lege wachtwoorden niet toestaan" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Domeinnaam van de server, wordt getoond in de serverlijst." #: src/settings_translation_file.cpp #, fuzzy @@ -1572,24 +1618,28 @@ msgstr "2x \"springen\" om te vliegen" #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Weggooi-toets" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enable a bit lower water surface, so it doesn't \"fill\" the node " "completely.\n" "Note that this is not quite optimized and that smooth lighting on the\n" "water surface doesn't work with this." msgstr "" +"Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n" +"Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n" +"wateroppervlakte werkt niet als dit is ingeschakeld." #: src/settings_translation_file.cpp #, fuzzy msgid "Enable mod security" -msgstr "Online mod opslagplaats" +msgstr "Veilige modus voor mods aanzetten" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." @@ -1957,20 +2007,26 @@ msgid "" "If enabled, actions are recorded for rollback.\n" "This option is only read when server starts." msgstr "" +"Indien aangeschakeld worden speleracties opgeslagen zodat ze teruggerold " +"kunnen worden.\n" +"Deze instelling wordt alleen bij het starten van de server gelezen." #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "" +msgstr "Valsspeelbescherming uitschakelen multiplayer modus." #: src/settings_translation_file.cpp msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" +"Zorg dat de server niet stopt in geval van ongeldige wereld-data.\n" +"Alleen aan te schakelen door mensen die weten wat de consequenties zijn." #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." msgstr "" +"Spelers kunnen zich niet aanmelden zonder wachtwoord indien ingeschakeld." #: src/settings_translation_file.cpp msgid "" @@ -1978,14 +2034,17 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Indien ingeschakeld, kan een speler blokken plaatsen op de eigen positie (" +"niveau van de voeten en van de ogen).\n" +"Dit vergemakkelijkt het werken in nauwe ruimtes." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." -msgstr "" +msgstr "Indien ingeschakeld, dan spawnen spelers altijd op deze coördinaten." #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Wereldfouten negeren" #: src/settings_translation_file.cpp #, fuzzy @@ -2952,8 +3011,9 @@ msgid "Noclip" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Noclip key" -msgstr "" +msgstr "Noclip-toets" #: src/settings_translation_file.cpp #, fuzzy @@ -2974,7 +3034,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Number of emerge threads" -msgstr "" +msgstr "Aantal 'emerge' threads" #: src/settings_translation_file.cpp msgid "" @@ -2984,6 +3044,10 @@ msgid "" "speed greatly\n" "at the cost of slightly buggy caves." msgstr "" +"Aantal 'emerge' threads. Standaardwaarde hangt af van het aantal processoren." +"\n" +"Op multiprocessor systemen kan dit de generatie van de wereld versnellen.\n" +"Het kan echter vreemde grotten veroorzaken." #: src/settings_translation_file.cpp msgid "" @@ -2991,6 +3055,12 @@ msgid "" "This is a trade-off between sqlite transaction overhead and\n" "memory consumption (4096=100MB, as a rule of thumb)." msgstr "" +"Aantal extra blokken (van 16x16x16 nodes) dat door het commando '/" +"clearobjects' tegelijk\n" +"geladen mag worden.\n" +"Dit aantal is een compromis tussen snelheid enerzijds (vanwege de overhead " +"van een sqlite\n" +"transactie), en geheugengebruik anderzijds (4096 = ca. 100MB)." #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." From bba7fed23b751181a0c00c71fb2533ca7a2c4e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Wed, 11 Nov 2015 12:12:31 +0100 Subject: [PATCH 089/531] Translated using Weblate (Estonian) Currently translated at 21.4% (169 of 787 strings) --- po/et/minetest.po | 69 +++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 44 deletions(-) diff --git a/po/et/minetest.po b/po/et/minetest.po index 1bf9e2a9..249b40e9 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2013-12-18 21:28+0200\n" -"Last-Translator: Jabo Babo \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2015-11-11 12:12+0000\n" +"Last-Translator: Kristjan Räts \n" +"Language-Team: Estonian " +"\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -27,18 +28,16 @@ msgid "An error occured:" msgstr "" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" -msgstr "Menüü" +msgstr "Peamenüü" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" msgstr "kinnitama" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Liitu" +msgstr "Taasta ühendus" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" @@ -79,24 +78,20 @@ msgid "Cancel" msgstr "Tühista" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Depends:" -msgstr "Vajab:" +msgstr "Sõltub:" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Disable MP" -msgstr "Lülita kõik välja" +msgstr "Keela MP" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable MP" -msgstr "Lülita kõik sisse" +msgstr "Luba MP" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable all" -msgstr "Lülita kõik sisse" +msgstr "Luba kõik" #: builtin/mainmenu/dlg_config_world.lua msgid "" @@ -105,9 +100,8 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Hide Game" -msgstr "Mäng" +msgstr "Peida mäng" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" @@ -123,18 +117,16 @@ msgid "Save" msgstr "Salvesta" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "World:" -msgstr "Vali maailm:" +msgstr "Maailm:" #: builtin/mainmenu/dlg_config_world.lua msgid "enabled" msgstr "Sisse lülitatud" #: builtin/mainmenu/dlg_create_world.lua -#, fuzzy msgid "A world named \"$1\" already exists" -msgstr "Maailma loomine ebaõnnestus: Samanimeline maailm on juba olemas" +msgstr "Maailm nimega \"$1\" on juba olemas" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" @@ -153,9 +145,8 @@ msgid "Game" msgstr "Mäng" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen" -msgstr "Põlvkonna kaardid" +msgstr "Kaardi generaator" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -198,9 +189,8 @@ msgid "Yes" msgstr "Jah" #: builtin/mainmenu/dlg_delete_world.lua -#, fuzzy msgid "Delete World \"$1\"?" -msgstr "Kustuta maailm: \"$1\"?" +msgstr "Kas kustutada maailm \"$1\"?" #: builtin/mainmenu/dlg_delete_world.lua msgid "No" @@ -221,9 +211,8 @@ msgid "" msgstr "" #: builtin/mainmenu/modmgr.lua -#, fuzzy msgid "Failed to install $1 to $2" -msgstr "Maailma initsialiseerimine ebaõnnestus" +msgstr "$1 paigaldamine $2 nurjus" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" @@ -262,9 +251,8 @@ msgid "Search" msgstr "" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "Maailma nimi" +msgstr "Lühike nimi:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" @@ -295,9 +283,8 @@ msgid "Previous Contributors" msgstr "Early arendajad" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "Põhiline arendaja" +msgstr "Eelmised põhilised arendajad" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -320,9 +307,8 @@ msgid "Rename" msgstr "" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Select Mod File:" -msgstr "Vali maailm:" +msgstr "Vali modifikatsiooni fail:" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" @@ -333,9 +319,8 @@ msgid "Uninstall selected modpack" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "IP/Port" +msgstr "Aadress / Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -346,14 +331,12 @@ msgid "Connect" msgstr "Liitu" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" -msgstr "Kujunduslik mängumood" +msgstr "Loov režiim" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Damage enabled" -msgstr "Sisse lülitatud" +msgstr "Kahjustamine lubatud" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -361,14 +344,12 @@ msgid "Delete" msgstr "Kustuta" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "Nimi/Parool" +msgstr "Nimi / Parool:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Public Serverlist" -msgstr "Avatud serverite nimekiri:" +msgstr "Avalikud serverid" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy From c990dbece46139f001b36540decdd96f74afbae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Thu, 12 Nov 2015 12:49:26 +0100 Subject: [PATCH 090/531] Translated using Weblate (Catalan) Currently translated at 100% (0 of 0 strings) Created new translation. --- po/ca/minetest.po | 3578 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3578 insertions(+) create mode 100644 po/ca/minetest.po diff --git a/po/ca/minetest.po b/po/ca/minetest.po new file mode 100644 index 00000000..486f4997 --- /dev/null +++ b/po/ca/minetest.po @@ -0,0 +1,3578 @@ +# Catalan translations for minetest package. +# Copyright (C) 2015 THE minetest'S COPYRIGHT HOLDER +# This file is distributed under the same license as the minetest package. +# Automatically generated, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: minetest\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"PO-Revision-Date: 2015-11-08 21:23+0100\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: builtin/fstk/ui.lua +msgid "The server has requested a reconnect:" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "Main menu" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "Reconnect" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "An error occured in a Lua script, such as a mod:" +msgstr "" + +#: builtin/fstk/ui.lua +msgid "An error occured:" +msgstr "" + +#: builtin/fstk/ui.lua builtin/mainmenu/store.lua +msgid "Ok" +msgstr "" + +#: builtin/mainmenu/common.lua src/game.cpp +msgid "Loading..." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Try reenabling public serverlist and check your internet connection." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Server supports protocol versions between $1 and $2. " +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Server enforces protocol version $1. " +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "We support protocol versions between version $1 and $2." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "We only support protocol version $1." +msgstr "" + +#: builtin/mainmenu/common.lua +msgid "Protocol version mismatch. " +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "World:" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Hide Game" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Hide mp content" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Mod:" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua +msgid "Depends:" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua +#: src/guiKeyChangeMenu.cpp +msgid "Save" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Cancel" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Enable MP" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Disable MP" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "enabled" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Enable all" +msgstr "" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "" +"Failed to enable mod \"$1\" as it contains disallowed characters. Only " +"chararacters [a-z0-9_] are allowed." +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "World name" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Seed" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Mapgen" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Game" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Create" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "You have no subgames installed." +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Download one from minetest.net" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Warning: The minimal development test is meant for developers." +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Download a subgame, such as minetest_game, from minetest.net" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "A world named \"$1\" already exists" +msgstr "" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "No worldname given or no game selected" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "Are you sure you want to delete \"$1\"?" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +msgid "Yes" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "No of course not!" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "Modmgr: failed to delete \"$1\"" +msgstr "" + +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "Modmgr: invalid modpath \"$1\"" +msgstr "" + +#: builtin/mainmenu/dlg_delete_world.lua +msgid "Delete World \"$1\"?" +msgstr "" + +#: builtin/mainmenu/dlg_delete_world.lua +msgid "No" +msgstr "" + +#: builtin/mainmenu/dlg_rename_modpack.lua +msgid "Rename Modpack:" +msgstr "" + +#: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp +msgid "Accept" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: file: \"$1\"" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "" +"\n" +"Install Mod: unsupported filetype \"$1\" or broken archive" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Failed to install $1 to $2" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: unable to find suitable foldername for modpack $1" +msgstr "" + +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: unable to find real modname for: $1" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Unsorted" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Search" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Downloading $1, please wait..." +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Successfully installed:" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Shortname:" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Rating" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "re-Install" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Install" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Close store" +msgstr "" + +#: builtin/mainmenu/store.lua +msgid "Page $1 of $2" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Credits" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Core Developers" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Active Contributors" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Previous Core Developers" +msgstr "" + +#: builtin/mainmenu/tab_credits.lua +msgid "Previous Contributors" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Installed Mods:" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "No mod description available" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Mod information:" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Rename" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Uninstall selected modpack" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Uninstall selected mod" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua +msgid "Select Mod File:" +msgstr "" + +#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua +msgid "Address / Port :" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua +msgid "Name / Password :" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Public Serverlist" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua +#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp +msgid "Delete" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Connect" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Creative mode" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Damage enabled" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "PvP enabled" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp +msgid "Client" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "New" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "Configure" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Start Game" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "Select World:" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_singleplayer.lua +msgid "Creative Mode" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_singleplayer.lua +msgid "Enable Damage" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Public" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +msgid "Name/Password" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Bind Address" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Port" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Server Port" +msgstr "" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "No world created or selected!" +msgstr "" + +#: builtin/mainmenu/tab_server.lua +msgid "Server" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Games" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Disabled" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Enabled" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "The value must be lower than $1." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Change keys" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Settings" +msgstr "" + +#: builtin/mainmenu/tab_simple_main.lua +msgid "Start Singleplayer" +msgstr "" + +#: builtin/mainmenu/tab_simple_main.lua +msgid "Config mods" +msgstr "" + +#: builtin/mainmenu/tab_simple_main.lua +msgid "Main" +msgstr "" + +#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp +msgid "Play" +msgstr "" + +#: builtin/mainmenu/tab_singleplayer.lua +msgid "Singleplayer" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "Select texture pack:" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "No information available" +msgstr "" + +#: builtin/mainmenu/tab_texturepacks.lua +msgid "Texturepacks" +msgstr "" + +#: src/client.cpp +msgid "Connection timed out." +msgstr "" + +#: src/client.cpp +msgid "Loading textures..." +msgstr "" + +#: src/client.cpp +msgid "Rebuilding shaders..." +msgstr "" + +#: src/client.cpp +msgid "Initializing nodes..." +msgstr "" + +#: src/client.cpp +msgid "Initializing nodes" +msgstr "" + +#: src/client.cpp +msgid "Item textures..." +msgstr "" + +#: src/client.cpp +msgid "Done!" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Main Menu" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Player name too long." +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Connection error (timed out?)" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "No world selected and no address provided. Nothing to do." +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Provided world path doesn't exist: " +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Could not find or load game \"" +msgstr "" + +#: src/client/clientlauncher.cpp +msgid "Invalid gamespec." +msgstr "" + +#: src/fontengine.cpp +msgid "needs_fallback_font" +msgstr "" + +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "Proceed" +msgstr "" + +#: src/game.cpp +msgid "You died." +msgstr "" + +#: src/game.cpp +msgid "Respawn" +msgstr "" + +#: src/game.cpp +msgid "" +"Default Controls:\n" +"No menu visible:\n" +"- single tap: button activate\n" +"- double tap: place/use\n" +"- slide finger: look around\n" +"Menu/Inventory visible:\n" +"- double tap (outside):\n" +" -->close\n" +"- touch stack, touch slot:\n" +" --> move stack\n" +"- touch&drag, tap 2nd finger\n" +" --> place single item to slot\n" +msgstr "" + +#: src/game.cpp +msgid "" +"Default Controls:\n" +"- WASD: move\n" +"- Space: jump/climb\n" +"- Shift: sneak/go down\n" +"- Q: drop item\n" +"- I: inventory\n" +"- Mouse: turn/look\n" +"- Mouse left: dig/punch\n" +"- Mouse right: place/use\n" +"- Mouse wheel: select item\n" +"- T: chat\n" +msgstr "" + +#: src/game.cpp +msgid "Continue" +msgstr "" + +#: src/game.cpp +msgid "Change Password" +msgstr "" + +#: src/game.cpp +msgid "Sound Volume" +msgstr "" + +#: src/game.cpp +msgid "Change Keys" +msgstr "" + +#: src/game.cpp +msgid "Exit to Menu" +msgstr "" + +#: src/game.cpp +msgid "Exit to OS" +msgstr "" + +#: src/game.cpp +msgid "Shutting down..." +msgstr "" + +#: src/game.cpp +msgid "Creating server..." +msgstr "" + +#: src/game.cpp +msgid "Creating client..." +msgstr "" + +#: src/game.cpp +msgid "Resolving address..." +msgstr "" + +#: src/game.cpp +msgid "Connecting to server..." +msgstr "" + +#: src/game.cpp +msgid "Item definitions..." +msgstr "" + +#: src/game.cpp +msgid "Node definitions..." +msgstr "" + +#: src/game.cpp +msgid "Media..." +msgstr "" + +#: src/game.cpp +msgid "KiB/s" +msgstr "" + +#: src/game.cpp +msgid "MiB/s" +msgstr "" + +#: src/game.cpp +msgid "" +"\n" +"Check debug.txt for details." +msgstr "" + +#: src/guiFormSpecMenu.cpp +msgid "Enter " +msgstr "" + +#: src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "\"Use\" = climb down" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Double tap \"jump\" to toggle fly" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Key already in use" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "press key" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Forward" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Backward" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Left" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Right" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Use" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Jump" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Sneak" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Drop" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Inventory" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Chat" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Command" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Console" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fly" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fast" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle Cinematic" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle noclip" +msgstr "" + +#: src/guiKeyChangeMenu.cpp +msgid "Range select" +msgstr "" + +#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp +msgid "Print stacks" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Old Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "New Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Confirm Password" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Change" +msgstr "" + +#: src/guiPasswordChange.cpp +msgid "Passwords do not match!" +msgstr "" + +#: src/guiVolumeChange.cpp +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp +msgid "Exit" +msgstr "" + +#: src/keycode.cpp +msgid "Left Button" +msgstr "" + +#: src/keycode.cpp +msgid "Middle Button" +msgstr "" + +#: src/keycode.cpp +msgid "Right Button" +msgstr "" + +#: src/keycode.cpp +msgid "X Button 1" +msgstr "" + +#: src/keycode.cpp +msgid "Back" +msgstr "" + +#: src/keycode.cpp +msgid "Clear" +msgstr "" + +#: src/keycode.cpp +msgid "Return" +msgstr "" + +#: src/keycode.cpp +msgid "Tab" +msgstr "" + +#: src/keycode.cpp +msgid "X Button 2" +msgstr "" + +#: src/keycode.cpp +msgid "Capital" +msgstr "" + +#: src/keycode.cpp +msgid "Control" +msgstr "" + +#: src/keycode.cpp +msgid "Kana" +msgstr "" + +#: src/keycode.cpp +msgid "Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Pause" +msgstr "" + +#: src/keycode.cpp +msgid "Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Convert" +msgstr "" + +#: src/keycode.cpp +msgid "Escape" +msgstr "" + +#: src/keycode.cpp +msgid "Final" +msgstr "" + +#: src/keycode.cpp +msgid "Junja" +msgstr "" + +#: src/keycode.cpp +msgid "Kanji" +msgstr "" + +#: src/keycode.cpp +msgid "Nonconvert" +msgstr "" + +#: src/keycode.cpp +msgid "End" +msgstr "" + +#: src/keycode.cpp +msgid "Home" +msgstr "" + +#: src/keycode.cpp +msgid "Mode Change" +msgstr "" + +#: src/keycode.cpp +msgid "Next" +msgstr "" + +#: src/keycode.cpp +msgid "Prior" +msgstr "" + +#: src/keycode.cpp +msgid "Space" +msgstr "" + +#: src/keycode.cpp +msgid "Down" +msgstr "" + +#: src/keycode.cpp +msgid "Execute" +msgstr "" + +#: src/keycode.cpp +msgid "Print" +msgstr "" + +#: src/keycode.cpp +msgid "Select" +msgstr "" + +#: src/keycode.cpp +msgid "Up" +msgstr "" + +#: src/keycode.cpp +msgid "Help" +msgstr "" + +#: src/keycode.cpp +msgid "Insert" +msgstr "" + +#: src/keycode.cpp +msgid "Snapshot" +msgstr "" + +#: src/keycode.cpp +msgid "Left Windows" +msgstr "" + +#: src/keycode.cpp +msgid "Apps" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 0" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 1" +msgstr "" + +#: src/keycode.cpp +msgid "Right Windows" +msgstr "" + +#: src/keycode.cpp +msgid "Sleep" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 2" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 3" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 4" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 5" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 6" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 7" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad *" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad +" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad -" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad /" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 8" +msgstr "" + +#: src/keycode.cpp +msgid "Numpad 9" +msgstr "" + +#: src/keycode.cpp +msgid "Num Lock" +msgstr "" + +#: src/keycode.cpp +msgid "Scroll Lock" +msgstr "" + +#: src/keycode.cpp +msgid "Left Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Right Shift" +msgstr "" + +#: src/keycode.cpp +msgid "Left Control" +msgstr "" + +#: src/keycode.cpp +msgid "Left Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Right Control" +msgstr "" + +#: src/keycode.cpp +msgid "Right Menu" +msgstr "" + +#: src/keycode.cpp +msgid "Comma" +msgstr "" + +#: src/keycode.cpp +msgid "Minus" +msgstr "" + +#: src/keycode.cpp +msgid "Period" +msgstr "" + +#: src/keycode.cpp +msgid "Plus" +msgstr "" + +#: src/keycode.cpp +msgid "Attn" +msgstr "" + +#: src/keycode.cpp +msgid "CrSel" +msgstr "" + +#: src/keycode.cpp +msgid "Erase OEF" +msgstr "" + +#: src/keycode.cpp +msgid "ExSel" +msgstr "" + +#: src/keycode.cpp +msgid "OEM Clear" +msgstr "" + +#: src/keycode.cpp +msgid "PA1" +msgstr "" + +#: src/keycode.cpp +msgid "Zoom" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Build inside player" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, you can place blocks at the position (feet + eye level) where " +"you stand.\n" +"This is helpful when working with nodeboxes in small areas." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Flying" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Player is able to fly without being affected by gravity.\n" +"This requires the \"fly\" privilege on the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast movement" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Fast movement (via use key).\n" +"This requires the \"fast\" privilege on the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled together with fly mode, player is able to fly through solid " +"nodes.\n" +"This requires the \"noclip\" privilege on the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Smooths camera when moving and looking around.\n" +"Useful for recording videos." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera smoothing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera. 0 to disable." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera smoothing in cinematic mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera in cinematic mode. 0 to disable." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Invert mouse" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Invert vertical mouse movement." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity multiplier." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Key use for climbing/descending" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Double tap jump for fly" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Double-tapping the jump key toggles fly mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Always fly and fast" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Rightclick repetition interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time in seconds it takes between repeated right clicks when holding the " +"right mouse button." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Random input" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable random user input (only used for testing)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Continuous forward" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Continuous forward movement (only used for testing)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Forward key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player forward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Backward key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player backward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Left key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player left.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Right key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player right.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Jump key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for jumping.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Sneak key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for sneaking.\n" +"Also used for climbing down and descending in water if aux1_descends is " +"disabled.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Inventory key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the inventory.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving fast in fast mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Command key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window to type commands.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat console.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Range select key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling unlimited view range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fly key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling flying.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling fast mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling noclip mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling cinematic mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling display of minimap.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for taking screenshots.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Drop item key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for dropping the currently selected item.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "HUD toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the HUD.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the chat.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the fog.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Camera update toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the camrea update. Only used for development\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Debug info toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of debug info.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the profiler. Used for development.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Toggle camera mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for switching between first- and third-person camera.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range increase key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range decrease key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for printing debug stacks. Used for development.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Network" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Address to connect to.\n" +"Leave this blank to start a local server.\n" +"Note that the address field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Port to connect to (UDP).\n" +"Note that the port field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Saving map received from server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Save the map received by the client on disk." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect to external media server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable usage of remote media server (if provided by server).\n" +"Remote servers offer a significantly faster way to download media (e.g. " +"textures)\n" +"when connecting to the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "URL to the server list displayed in the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist file" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"File in client/serverlist/ that contains your favorite servers displayed in " +"the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Graphics" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-Game" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Basic" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to fog out the end of the visible area." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "New style water" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable a bit lower water surface, so it doesn't \"fill\" the node " +"completely.\n" +"Note that this is not quite optimized and that smooth lighting on the\n" +"water surface doesn't work with this." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Leaves style" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Leaves style:\n" +"- Fancy: all faces visible\n" +"- Simple: only outer faces, if defined special_tiles are used\n" +"- Opaque: disable transparency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect glass" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connects glass if supported by node." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooth lighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable smooth lighting with simple ambient occlusion.\n" +"Disable for speed or for different looks." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds are a client side effect." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "3D clouds" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use 3D cloud look instead of flat." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mipmapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use mip mapping to scale textures. May slightly increase performance." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Anisotropic filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use anisotropic filtering when viewing at textures from an angle." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use bilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use trilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clean transparent textures" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Filtered textures can blend RGB values with fully-transparent neighbors,\n" +"which PNG optimizers usually discard, sometimes resulting in a dark or\n" +"light edge to transparent textures. Apply this filter to clean that up\n" +"at texture load time." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimum texture size for filters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" +"can be blurred, so automatically upscale them with nearest-neighbor\n" +"interpolation to preserve crisp pixels. This sets the minimum texture size\n" +"for the upscaled textures; higher values look sharper, but require more\n" +"memory. Powers of 2 are recommended. Setting this higher than 1 may not\n" +"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" +"enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Preload inventory textures" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Pre-generate all item visuals used in the inventory.\n" +"This increases startup time, but runs smoother in-game.\n" +"The generated textures can easily exceed your VRAM, causing artifacts in the " +"inventory." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FSAA" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Experimental option, might cause visible spaces between blocks\n" +"when set to higher number than 0." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shaders" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Shaders allow advanced visul effects and may increase performance on some " +"video cards.\n" +"Thy only work with the OpenGL video backend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables bumpmapping for textures. Normalmaps need to be supplied by the " +"texture pack\n" +"or need to be auto-generated.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Generate normalmaps" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables on the fly normalmap generation (Emboss effect).\n" +"Requires bumpmapping to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps strength" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of generated normalmaps." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps sampling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Defines sampling step of texture.\n" +"A higher value results in smoother normal maps." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables parallax occlusion mapping.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"0 = parallax occlusion with slope information (faster).\n" +"1 = relief mapping (slower, more accurate)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion strength" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of parallax." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Number of parallax occlusion iterations." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion Scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Overall scale of parallax occlusion effect." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Parallax occlusion bias" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Overall bias of parallax occlusion effect, usually scale/2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving Nodes" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set to true enables waving water.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water length" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving leaves" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set to true enables waving leaves.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving plants" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set to true enables waving plants.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Advanced" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Wanted FPS" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Minimum wanted FPS.\n" +"The amount of rendered stuff is dynamically set according to this. and " +"viewing range min and max." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If FPS would go higher than this, limit it by sleeping\n" +"to not waste CPU power for no benefit." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FPS in pause menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS when game is paused." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Viewing range maximum" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The allowed adjustment range for the automatic rendering range adjustment.\n" +"Set this to be equal to viewing range minimum to disable the auto-adjustment " +"algorithm." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Viewing range minimum" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical initial window size." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Horizontal initial window size." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Full screen" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fullscreen mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Full screen BPP" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bits per pixel (aka color depth) in fullscreen mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "V-Sync" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical screen synchronization." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Field of view" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Field of view in degrees." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" +"This setting is for the client only and is ignored by the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Path to texture directory. All textures are first searched from here." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Video driver" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The rendering back-end for Irrlicht." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Height on which clouds are appearing." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud radius" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Radius of cloud area stated in number of 64 node cloud squares.\n" +"Values larger than 26 will start to produce sharp cutoffs at cloud area " +"corners." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for view bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fall bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for fall bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "3D mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"3D support.\n" +"Currently supported:\n" +"- none: no 3d output.\n" +"- anaglyph: cyan/magenta color 3d.\n" +"- interlaced: odd/even line based polarisation screen support.\n" +"- topbottom: split screen top/bottom.\n" +"- sidebyside: split screen side by side." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box border color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Width of the selectionbox's lines around nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Desynchronize block animation" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether node texture animations should be desynchronized per mapblock." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum hotbar width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum proportion of current window to be used for hotbar.\n" +"Useful if there's something to be displayed right or left of hotbar." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Node highlighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable selection highlighting for nodes (disables selectionbox)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mesh cache" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables caching of facedir rotated meshes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables minimap." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Round minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shape of the minimap. Enabled = round, disabled = square." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap scan height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"True = 256\n" +"False = 128\n" +"Useable to make minimap smoother on slower machines." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Colored fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Make fog and sky colors depend on daytime (dawn/sunset) and view direction." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ambient occlusion gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The strength (darkness) of node ambient-occlusion shading.\n" +"Lower is darker, Higher is lighter. The valid range of values for this\n" +"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" +"set to the nearest valid value." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Menus" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds in menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use a cloud animation for the main menu background." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Scale gui by a user specified value.\n" +"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" +"This will smooth over some of the rough edges, and blend\n" +"pixels when scaling down, at the cost of blurring some\n" +"edge pixels when images are scaled by non-integer sizes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter is true, all GUI images need to be\n" +"filtered in software, but some images are generated directly\n" +"to hardware (e.g. render-to-texture for nodes in inventory)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter txr2img" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter_txr2img is true, copy those images\n" +"from hardware to software for scaling. When false, fall back\n" +"to the old scaling method, for video drivers that don't\n" +"propery support downloading textures back from hardware." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Tooltip delay" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Delay showing tooltips, stated in milliseconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Freetype fonts" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether freetype fonts are used, requires freetype support to be compiled in." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Path to TrueTypeFont or bitmap." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow offset, if 0 then shadow will not be drawn." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "This font will be used for certain languages." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot folder" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Path to save screenshots at." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "DPI" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " +"screens." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Sound" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Volume" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapblock unload timeout" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Timeout for client to remove unused map data from memory." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapblock limit" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of mapblocks for client to be kept in memory.\n" +"Set to -1 for unlimited amount." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Show debug info" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to show the client debug info (has the same effect as hitting F5)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server / Singleplayer" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the server, to be displayed when players join and in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server description" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Description of server, to be displayed when players join and in the " +"serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Domain name of server, to be displayed in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Homepage of server, to be displayed in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Announce server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Automaticaly report to the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Announce to this serverlist.\n" +"If you want to announce your ipv6 address, use serverlist_url = v6.servers." +"minetest.net." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Network port to listen (UDP).\n" +"This value will be overridden when starting from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bind address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The network interface that the server listens on." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strict protocol checking" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable to disallow old clients from connecting.\n" +"Older clients are compatible in the sense that they will not crash when " +"connecting\n" +"to new servers, but they may not support all new features that you are " +"expecting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote media" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Specifies URL from which client fetches media instead of using UDP.\n" +"$filename should be accessible from $remote_media$filename via cURL\n" +"(obviously, remote_media should end with a slash).\n" +"Files that are not present will be fetched the usual way." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6 server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable/disable running an IPv6 server. An IPv6 server may be restricted\n" +"to IPv6 clients, depending on system configuration.\n" +"Ignored if bind_address is set." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously blocks send per client" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How many blocks are flying in the wire simultaneously per client." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously bocks send total" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How many blocks are flying in the wire simultaneously for the whole server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"To reduce lag, block transfers are slowed down when a player is building " +"something.\n" +"This determines how long they are slowed down after placing or removing a " +"node." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. packets per iteration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of packets sent per send step, if you have a slow connection\n" +"try reducing it, but don't reduce it to a number below double of targeted\n" +"client number." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default game" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Default game when creating a new world.\n" +"This will be overridden when creating a world from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day displayed to players connecting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum users" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of players that can connect simultaneously." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Map directory" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"World directory (everything in the world is stored here).\n" +"Not needed if starting from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Item entity TTL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Time in seconds for item entity (dropped items) to live.\n" +"Setting it to -1 disables the feature." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Damage" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable players getting damage and dying." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fixed map seed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"A chosen map seed for a new map, leave empty for random.\n" +"Will be overridden when creating a new world in the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default password" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "New users need to input this password." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default privileges" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The privileges that new users automatically get.\n" +"See /privs in game for a full list on your server and mod configuration." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unlimited player transfer distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether players are shown to clients without any range limit.\n" +"Deprecated, use the setting player_transfer_distance instead." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Player transfer distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Player versus Player" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to allow players to damage and kill each other." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Static spawnpoint" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If this is set, players will always (re)spawn at the given position." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical spawn range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum distance above water level for player spawn.\n" +"Larger values result in spawn points closer to (x = 0, z = 0).\n" +"Smaller values may result in a suitable spawn point not being found,\n" +"resulting in a spawn at (0, 0, 0) possibly buried underground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Disallow empty passwords" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If enabled, new players cannot join with an empty password." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Disable anticheat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If enabled, disable cheat prevention in multiplayer." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Rollback recording" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, actions are recorded for rollback.\n" +"This option is only read when server starts." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shutdown message" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "A message to be displayed to all clients when the server shuts down." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crash message" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "A message to be displayed to all clients when the server crashes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ask to reconnect after crash" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to ask clients to reconnect after a (Lua) crash.\n" +"Set this to true if your server is set up to restart automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active object send range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far clients know about objects, stated in mapblocks (16 nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active block range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How large area of blocks are subject to the active block stuff, stated in " +"mapblocks (16 nodes).\n" +"In active blocks objects are loaded and ABMs run." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block send distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far blocks are sent to clients, stated in mapblocks (16 nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum forceloaded blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of forceloaded mapblocks." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time send interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of sending time of day to clients." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Controls length of day/night cycle.\n" +"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " +"unchanged." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Map save interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of saving important changes in the world, stated in seconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Physics" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default acceleration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Acceleration in air" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode acceleration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Walking speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crouch speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Climbing speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Jumping speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Descending speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid fluidity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid fluidity smoothing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid sink" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Gravity" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Deprecated Lua API handling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Handling for deprecated lua api calls:\n" +"- legacy: (try to) mimic old behaviour (default for release).\n" +"- log: mimic and log backtrace of deprecated call (default for debug).\n" +"- error: abort on usage of deprecated call (suggested for mod developers)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mod profiling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profiling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profile data. Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiling print interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler data print interval. 0 = disable. Useful for developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. clearobjects extra blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Number of extra blocks that can be loaded by /clearobjects at once.\n" +"This is a trade-off between sqlite transaction overhead and\n" +"memory consumption (4096=100MB, as a rule of thumb)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unload unused server data" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How much the server will wait before unloading unused mapblocks.\n" +"Higher value is smoother, but will use more RAM." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maxmimum objects per block" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of statically stored objects in a block." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Synchronous SQLite" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Dedicated server step" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Length of a server tick and the interval at which objects are generally " +"updated over network." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ignore world errors" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, invalid world data won't cause the server to shut down.\n" +"Only enable this if you know what you are doing." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid loop max" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max liquids processed per step." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid queue purge time" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time (in seconds) that the liquids queue may grow beyond processing\n" +"capacity until an attempt is made to decrease its size by dumping old queue\n" +"items. A value of 0 disables the functionality." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid update tick" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Liquid update interval in seconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of map generator to be used when creating a new world.\n" +"Creating a world in the main menu will override this." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water surface level of the world." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block generate distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far blocks are generated for clients, stated in mapblocks (16 " +"nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Map generation limit" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Where the map generator stops.\n" +"Please note:\n" +"- Limited to 31000 (setting above has no effect)\n" +"- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n" +"- Those groups have an offset of -32, -32 nodes from the origin.\n" +"- Only groups which are within the map_generation_limit are generated" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Global map generation attributes.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"'trees' and 'flat' flags only have effect in mgv6." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chunk size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " +"nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen debug" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Dump the mapgen debug infos." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Absolute limit of emerge queues" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of blocks that can be queued for loading." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Limit of emerge queues on disk" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of blocks to be queued that are to be loaded from file.\n" +"Set to blank for an appropriate amount to be chosen automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Limit of emerge queues to generate" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of blocks to be queued that are to be generated.\n" +"Set to blank for an appropriate amount to be chosen automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Number of emerge threads" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Number of emerge threads to use. Make this field blank, or increase this " +"number\n" +"to use multiple threads. On multiprocessor systems, this will improve mapgen " +"speed greatly\n" +"at the cost of slightly buggy caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome heat noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noise parameters for biome API temperature, humidity and biome blend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen heat blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome humidity noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome humidity blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 factor noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 desert frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Controls size of deserts and beaches in Mapgen v6.\n" +"When snowbiomes are enabled 'mgv6_freq_desert' is ignored." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 steepness noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 mud noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 biome noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 cave noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 humidity noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 apple trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" +"'ridges' are the rivers.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain persistation noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mount height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge water noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mountain noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen fractal.\n" +"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal mandelbrot slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Iterations of the recursive function.\n" +"Controls scale of finest detail." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: (X,Y,Z) offsets from world centre.\n" +"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: X value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Y value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: Z value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Julia set: W value determining the 4D shape.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Security" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable mod security" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Prevent mods from doing insecure things like running shell commands." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trusted mods" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Comma-separated list of trusted mods that are allowed to access insecure\n" +"functions even when mod security is on (via request_insecure_environment())." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Client and Server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Player name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the player.\n" +"When running a server, clients connecting with this name are admins.\n" +"When starting from the main menu, this is overridden." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Language" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Set the language. Leave empty to use the system language.\n" +"A restart is required after changing this." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Debug log level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Level of logging to be written to debug.txt:\n" +"- (no logging)\n" +"- none (messages with no level)\n" +"- error\n" +"- warning\n" +"- action\n" +"- info\n" +"- verbose" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6 support." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "cURL timeout" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Default timeout for cURL, stated in milliseconds.\n" +"Only has an effect if compiled with cURL." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "cURL parallel limit" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Limits number of parallel HTTP requests. Affects:\n" +"- Media fetch if server uses remote_media setting.\n" +"- Serverlist download and server announcement.\n" +"- Downloads performed by main menu (e.g. mod manager).\n" +"Only has an effect if compiled with cURL." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "cURL file download timeout" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum time in ms a file download (e.g. a mod download) may take." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "High-precision FPU" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu script" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Replaces the default main menu with a custom one." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu game manager" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu mod manager" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore download URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore mods list URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore details URL" +msgstr "" From 28fd913058b36db005c5241423bc1bfffde91192 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 12 Nov 2015 16:56:25 +0100 Subject: [PATCH 091/531] Translated using Weblate (German) Currently translated at 100.0% (787 of 787 strings) --- po/de/minetest.po | 175 +++++++++++++++++++++++++++------------------- 1 file changed, 103 insertions(+), 72 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index f038f6ca..3881b586 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-10-30 19:48+0200\n" -"Last-Translator: hybriddog \n" -"Language-Team: German \n" +"PO-Revision-Date: 2015-11-12 16:56+0000\n" +"Last-Translator: Wuzzy \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -421,7 +421,7 @@ msgstr "Spiel starten" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "„$1“ ist kein gültiger Bitschalter." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -450,6 +450,8 @@ msgstr "Aktiviert" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" +"Das Format besteht aus 3 mit Komma getrennten Zahlen, die sich\n" +"in Klammern befinden." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -1453,13 +1455,13 @@ msgstr "" "Veränderung." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"Verändert die Größe der Wüsten und Strände in Kartengenerator V6.\n" -"Wenn Schneebiome aktiviert sind, wird diese Einstellung ignoriert." +"Verändert die Größe der Wüsten und Strände im\n" +"Kartengenerator v6. Wenn Schneebiome aktiviert sind, wird\n" +"diese Einstellung ignoriert." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1619,6 +1621,10 @@ msgid "" "Note that this is not quite optimized and that smooth lighting on the\n" "water surface doesn't work with this." msgstr "" +"Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n" +"nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n" +"optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n" +"nicht mit dieser Einstellung funktioniert." #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1774,13 +1780,12 @@ msgid "Fast movement" msgstr "Schnell bewegen" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" -"Schnelles Laufen (aux1 Taste).\n" -"Das benötigt das " +"Schnelle Bewegung (mittels Benutzen-Taste).\n" +"Dazu wird das „fast“-Privileg auf dem Server benötigt." #: src/settings_translation_file.cpp msgid "Field of view" @@ -1925,7 +1930,6 @@ msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "Flags that are not specified in the flag string are not modified from the " @@ -1933,11 +1937,13 @@ msgid "" "Flags starting with \"no\" are used to explicitly disable them.\n" "'trees' and 'flat' flags only have effect in mgv6." msgstr "" -"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" -"'ridges' sind die Flüsse.\n" -"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " -"zugewiesen.\n" -"Flags, die mit starten " +"Globale Kartengenerierungsattribute.\n" +"Bitschalter, welche nicht in der Bitschalterzeichenkette festgelegt sind, " +"werden\n" +"nicht von der Standardeinstellung abweichen.\n" +"Bitschalter, die mit „no“ beginnen, werden benutzt, um sie explizit zu " +"deaktivieren.\n" +"Die Bitschalter „trees“ und „flat“ haben nur mit mgv6 eine Wirkung." #: src/settings_translation_file.cpp msgid "Graphics" @@ -2040,23 +2046,27 @@ msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" +"Falls deaktiviert, wird die „Benutzen“-Taste benutzt, um schnell zu fliegen," +"\n" +"wenn sowohl der Flug- als auch der Schnellmodus aktiviert ist." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "If enabled together with fly mode, player is able to fly through solid " "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" -"Falls es aktiviert ist, kann der Spieler im Flugmodus durch solide Blöcke " +"Falls es aktiviert ist, kann der Spieler im Flugmodus durch feste Blöcke " "fliegen.\n" -"Es benötigt den " +"Dafür wird das „noclip“-Privileg auf dem Server benötigt." #: src/settings_translation_file.cpp msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" +"Falls aktiviert, wird die „Benutzen“-Taste statt der „Schleichen“-Taste zum\n" +"Herunterklettern und Sinken benutzt." #: src/settings_translation_file.cpp msgid "" @@ -2153,46 +2163,61 @@ msgid "" "Julia set: (X,Y,Z) offsets from world centre.\n" "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." msgstr "" +"Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" +"Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n" +"Nodes multipliziert." #: src/settings_translation_file.cpp msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "" +msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Nodes." #: src/settings_translation_file.cpp msgid "" "Julia set: Iterations of the recursive function.\n" "Controls scale of finest detail." msgstr "" +"Julia-Menge: Iterationen der rekursiven Funktion.\n" +"Steuert die Skalierung mit einem sehr hohem Detailgrad." #: src/settings_translation_file.cpp msgid "" "Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Julia-Menge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" +"Die Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "" "Julia set: W value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Julia-Menge: W-Wert, der die 4D-Form festlegt.\n" +"Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "" "Julia set: X value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Julia-Menge: X-Wert, der die 4D-Form festlegt.\n" +"Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "" "Julia set: Y value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Julia-Menge: Y-Wert, der die 4D-Form festlegt.\n" +"Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "" "Julia set: Z value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Julia-Menge: Z-Wert, der die 4D-Form festlegt.\n" +"Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "Jump key" @@ -2635,29 +2660,35 @@ msgid "" "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." msgstr "" +"Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" +"Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n" +"Versätze in Nodes multipliziert." #: src/settings_translation_file.cpp msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" +msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes." #: src/settings_translation_file.cpp msgid "" "Mandelbrot set: Iterations of the recursive function.\n" "Controls scale of finest detail." msgstr "" +"Mandelbrotmenge: Iterationen der rekursiven Funktion.\n" +"Steuert die Skalierung mit einem sehr hohem Detailgrad." #: src/settings_translation_file.cpp msgid "" "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" +"Die Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Weltordner" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen fractal.\n" "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" @@ -2665,14 +2696,16 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" -"'ridges' sind die Flüsse.\n" -"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " -"zugewiesen.\n" -"Flags, die mit starten " +"Kartengenerierungsattribute, die für den Kartengenertor „fractal“\n" +"spezifisch sind.\n" +"„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n" +"Mandelbrotmenge aus.\n" +"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"werden von der Standardeinstellung unverändert gelassen.\n" +"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"zu deaktivieren." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" "When snowbiomes are enabled jungles are enabled and the jungles flag is " @@ -2681,14 +2714,15 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" -"'ridges' sind die Flüsse.\n" -"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " -"zugewiesen.\n" -"Flags, die mit starten " +"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" +"Falls Schneebiome aktiviert sind, werden Dschungel aktiviert und der\n" +"„jungles“-Bitschalter wird ignoriert.\n" +"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"werden von der Standardeinstellung unverändert gelassen.\n" +"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"zu deaktivieren." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" "'ridges' are the rivers.\n" @@ -2696,11 +2730,12 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für Kartengenerator V7.\n" -"'ridges' sind die Flüsse.\n" -"Flags, die nicht im flag text angegeben wurden, werden ihre Standartwerte " -"zugewiesen.\n" -"Flags, die mit starten " +"Kartengenerierungsattribute speziell für Kartengenerator v7.\n" +"„ridges“ sind die Flüsse.\n" +"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"werden von der Standardeinstellung unverändert gelassen.\n" +"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"zu deaktivieren." #: src/settings_translation_file.cpp msgid "Map generation limit" @@ -2739,84 +2774,76 @@ msgid "Mapgen flags" msgstr "Kartengenerator-Flags" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Kartengenerator-Flags" +msgstr "Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave1 noise parameters" -msgstr "Höhlen-Rauschparameter 1" +msgstr "cave1-Rauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave2 noise parameters" -msgstr "Höhlen-Rauschparameter 2" +msgstr "cave2-Rauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal filler depth noise parameters" -msgstr "Fülltiefen-Rauschparameter" +msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal flags" -msgstr "Kartengenerator-Flags" +msgstr "Bitschalter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal julia iterations" -msgstr "Parallax-Occlusion-Iterationen" +msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia offset" -msgstr "" +msgstr "Julia-Versatz für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia scale" -msgstr "" +msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia slice w" -msgstr "" +msgstr "w-Ausschnitt für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "w-Parameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "x-Parameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "y-Parameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "z-Parameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal mandelbrot iterations" -msgstr "Max. Pakete pro Iteration" +msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot offset" -msgstr "" +msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot scale" -msgstr "" +msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal seabed noise parameters" -msgstr "Hitzenübergangs-Rauschparameter" +msgstr "Meeresgrundrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -2997,6 +3024,12 @@ msgid "" "Smaller values may result in a suitable spawn point not being found,\n" "resulting in a spawn at (0, 0, 0) possibly buried underground." msgstr "" +"Höchstabstand über dem Meeresspiegel für den Spieler-\n" +"startpunkt. Größere Werte führen zu Startpunkten näher an\n" +"(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n" +"brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n" +"Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n" +"eingegraben ist." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" @@ -3357,13 +3390,12 @@ msgid "Physics" msgstr "Physik" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the \"fly\" privilege on the server." msgstr "" "Der Spieler kann unabhängig von der Schwerkraft fliegen.\n" -"Das benötigt die " +"Dafür wird das „fly“-Privileg auf dem Server benötigt." #: src/settings_translation_file.cpp msgid "Player name" @@ -3632,13 +3664,12 @@ msgid "Smooth lighting" msgstr "Geglättetes Licht" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" -"Glättet Kamerabewegungen beim Umsehen.\n" -"Nützlich zum Aufnehmen von Videos." +"Glättet Kamerabewegungen bei der Fortbewegung und\n" +"beim Umsehen. Nützlich zum Aufnehmen von Videos." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." @@ -3889,7 +3920,7 @@ msgstr "Vertikale Bildschirmsynchronisation." #: src/settings_translation_file.cpp msgid "Vertical spawn range" -msgstr "" +msgstr "Vertikaler Startpunktbereich" #: src/settings_translation_file.cpp msgid "Video driver" From 564ebf04999968b6694201ed9801ee5958fe1752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Thu, 12 Nov 2015 17:52:35 +0100 Subject: [PATCH 092/531] Translated using Weblate (Catalan) Currently translated at 9.2% (73 of 787 strings) --- po/ca/minetest.po | 153 +++++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 69 deletions(-) diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 486f4997..9269ebf1 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -8,236 +8,251 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-08 21:23+0100\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2015-11-12 17:52+0000\n" +"Last-Translator: Joan Ciprià Moreno \n" +"Language-Team: Catalan " +"\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "El servidor ha sol·licitat una reconnexió:" #: builtin/fstk/ui.lua msgid "Main menu" -msgstr "" +msgstr "Menú principal" #: builtin/fstk/ui.lua msgid "Reconnect" -msgstr "" +msgstr "Torneu a connectar" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "S'ha produït un error en un script Lua, com per exemple un mod :" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "Ha ocorregut un error:" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" -msgstr "" +msgstr "D'acord" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." -msgstr "" +msgstr "Carregant ..." #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Intenta tornar a habilitar la llista de servidors públics i comprovi la seva " +"connexió a Internet ." #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " msgstr "" +"El servidor es compatible amb les versions de protocol entre $ 1 i $ 2 . " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "El servidor fa complir la versió $1 del protocol. " #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Nosaltres suportem versions del protocol entre la versió $1 i la $2." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Nosaltres sols suportem la versió $1 del protocol." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Desajust de la versió del protocol. " #: builtin/mainmenu/dlg_config_world.lua msgid "World:" -msgstr "" +msgstr "Món:" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" -msgstr "" +msgstr "Ocultar Joc" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "" +msgstr "Ocultar contingut MP" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" -msgstr "" +msgstr "Mod:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua msgid "Depends:" -msgstr "" +msgstr "Dependències:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp msgid "Save" -msgstr "" +msgstr "Guardar" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Cancel" -msgstr "" +msgstr "Cancel·lar" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" -msgstr "" +msgstr "Activar MP" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" -msgstr "" +msgstr "Desactivar MP" #: builtin/mainmenu/dlg_config_world.lua msgid "enabled" -msgstr "" +msgstr "Activat" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" -msgstr "" +msgstr "Activar tot" #: builtin/mainmenu/dlg_config_world.lua msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Error al habilitar el mod \"$1\" perquè conté caràcters no permesos. Només " +"estan permesos els caràcters [a-z0-9_]." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" -msgstr "" +msgstr "Nom del món" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" -msgstr "" +msgstr "Llavor" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "" +msgstr "Generador de mapes" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" -msgstr "" +msgstr "Joc" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" -msgstr "" +msgstr "Crear" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "" +msgstr "No tens subjocs instal·lats." #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "" +msgstr "Descarrega'n alguns des de minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." msgstr "" +"Advertència: El joc \"Minimal development test\" esta dissenyat per a " +"desenvolupadors." #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" msgstr "" +"Descarrega un subjoc, com per exemple minetest_game, des de minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "A world named \"$1\" already exists" -msgstr "" +msgstr "Ja existeix un món anomenat \"$1\"" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" -msgstr "" +msgstr "No s'ha donat un nom al món o no s'ha seleccionat ningun" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "" +msgstr "Realment desitja esborrar \"$1\"?" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua msgid "Yes" -msgstr "" +msgstr "Sí" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "" +msgstr "No, per descomptat que no!" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "" +msgstr "Modmgr: Error al esborrar \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "" +msgstr "Modmgr: Ruta del mod \"$1\" invàlida" #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" -msgstr "" +msgstr "Eliminar el món \"$1\"?" #: builtin/mainmenu/dlg_delete_world.lua msgid "No" -msgstr "" +msgstr "No" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "" +msgstr "Reanomenar el ModPack:" #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" -msgstr "" +msgstr "Acceptar" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" -msgstr "" +msgstr "Instal·lar mod: Arxiu: \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "" "\n" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" +"\n" +"Instal·lar mod: Format de arxiu \"$1\" no suportat o arxiu corrupte" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" -msgstr "" +msgstr "Error al instal·lar $1 en $2" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" +"Instal·lar mod: Impossible de trobar el nom de la carpeta adequat per al " +"modpack $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" -msgstr "" +msgstr "Instal·lar mod: Impossible trobar el nom real del mod per a: $1" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "" +msgstr "Sense ordenar" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "" +msgstr "Buscar" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "" +msgstr "Descarregant $1, si us plau esperi ..." #: builtin/mainmenu/store.lua msgid "Successfully installed:" -msgstr "" +msgstr "Instal·lat amb èxit:" #: builtin/mainmenu/store.lua msgid "Shortname:" @@ -245,79 +260,79 @@ msgstr "" #: builtin/mainmenu/store.lua msgid "Rating" -msgstr "" +msgstr "Classificació" #: builtin/mainmenu/store.lua msgid "re-Install" -msgstr "" +msgstr "Reinstal·lar" #: builtin/mainmenu/store.lua msgid "Install" -msgstr "" +msgstr "Instal·lar" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "" +msgstr "Tancar repositori" #: builtin/mainmenu/store.lua msgid "Page $1 of $2" -msgstr "" +msgstr "Pàgina $1 de $2" #: builtin/mainmenu/tab_credits.lua msgid "Credits" -msgstr "" +msgstr "Crèdits" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" -msgstr "" +msgstr "Desenvolupadors del nucli" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" -msgstr "" +msgstr "Col·laboradors Actius" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "" +msgstr "Antics Desenvolupadors del nucli" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" -msgstr "" +msgstr "Antics Col·laboradors" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" -msgstr "" +msgstr "Mods Instal·lats:" #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" -msgstr "" +msgstr "Cap descripció del mod disponible" #: builtin/mainmenu/tab_mods.lua msgid "Mod information:" -msgstr "" +msgstr "Informació del mod:" #: builtin/mainmenu/tab_mods.lua msgid "Rename" -msgstr "" +msgstr "Reanomenar" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" -msgstr "" +msgstr "Desinstal·lar el paquet de mods seleccionat" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" -msgstr "" +msgstr "Desinstal·lar el mod seleccionat" #: builtin/mainmenu/tab_mods.lua msgid "Select Mod File:" -msgstr "" +msgstr "Selecciona el fitxer del mod:" #: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua msgid "Mods" -msgstr "" +msgstr "Mods" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" -msgstr "" +msgstr "Adreça / Port:" #: builtin/mainmenu/tab_multiplayer.lua msgid "Name / Password :" From fd84a388f89178c3f22c1ef69fcbc3c49b9103cf Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 12 Nov 2015 17:52:14 +0100 Subject: [PATCH 093/531] Translated using Weblate (German) Currently translated at 100.0% (787 of 787 strings) --- po/de/minetest.po | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 3881b586..42ed1b23 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 16:56+0000\n" +"PO-Revision-Date: 2015-11-12 17:52+0000\n" "Last-Translator: Wuzzy \n" "Language-Team: German " "\n" @@ -334,7 +334,7 @@ msgstr "Adresse / Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" -msgstr "Klient" +msgstr "Client" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" @@ -474,7 +474,9 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "Bitte geben Sie eine mit Kommata getrennte Liste von Flags an." +msgstr "" +"Bitte geben Sie eine mit Kommata getrennte Liste von\n" +"Bitschaltern an." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." @@ -2696,8 +2698,8 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute, die für den Kartengenertor „fractal“\n" -"spezifisch sind.\n" +"Kartengenerierungsattribute, die speziell für den Fraktale-\n" +"Kartenerzeuger sind.\n" "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n" "Mandelbrotmenge aus.\n" "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" @@ -2771,7 +2773,7 @@ msgstr "Kartengenerator-Debugging" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "Kartengenerator-Flags" +msgstr "Kartenerzeuger-Bitschalter" #: src/settings_translation_file.cpp msgid "Mapgen fractal" @@ -2907,7 +2909,7 @@ msgstr "Wüsten-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "Flags" +msgstr "v6-Kartengenerator-Bitschalter" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" @@ -2955,7 +2957,7 @@ msgstr "Fülltiefen-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "Flags" +msgstr "v7-Kartengenerator-Bitschalter" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" @@ -3116,7 +3118,7 @@ msgstr "Max. gleichzeitig versendete Kartenblöcke" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" -"Maximale Zeit in ms, die das Herunterladen einer Datei (z.B. eine Mod) " +"Maximale Zeit in ms, die das Herunterladen einer Datei (z.B. einer Mod) " "dauern darf." #: src/settings_translation_file.cpp From 1e8286467f78f9a65450fd51005d2acd1a068f51 Mon Sep 17 00:00:00 2001 From: nobb Date: Thu, 12 Nov 2015 02:44:58 +0100 Subject: [PATCH 094/531] Translated using Weblate (Japanese) Currently translated at 41.4% (326 of 787 strings) --- po/ja/minetest.po | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 08e4a5fe..fdb72fdf 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-09 10:38+0000\n" -"Last-Translator: Rui \n" +"PO-Revision-Date: 2015-11-12 02:44+0000\n" +"Last-Translator: nobb \n" "Language-Team: Japanese " "\n" "Language: ja\n" @@ -439,12 +439,10 @@ msgid "Enabled" msgstr "有効" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "書式はカンマと内側の括弧で区切られた3つの数字です。" +msgstr "書式は、コンマとかっこで区切られた 3 つの数字です。" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "" "Format: , , (, , ), , " ", " @@ -462,17 +460,14 @@ msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "空隙性随意大手カンマを付加することができます。" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Please enter a comma seperated list of flags." msgstr "フラグのリストはカンマで区切って入力してください。" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Please enter a valid integer." msgstr "有効な整数を入力してください。" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Please enter a valid number." msgstr "有効な数字を入力してください。" @@ -499,12 +494,10 @@ msgid "Show technical names" msgstr "技術名称を表示" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "The value must be greater than $1." msgstr "$1より大きな値でなければいけません。" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "The value must be lower than $1." msgstr "$1より小さい値でなければいけません。" @@ -1193,27 +1186,30 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "サーバークラッシュ時に全てのクライアントへ表示するメッセージ。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" +msgstr "サーバー終了時に全てのクライアントへ表示するメッセージ。" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Acceleration in air" -msgstr "" +msgstr "空中での加速" #: src/settings_translation_file.cpp +#, fuzzy msgid "Active block range" -msgstr "" +msgstr "アクティブなブロックの範囲" #: src/settings_translation_file.cpp +#, fuzzy msgid "Active object send range" -msgstr "" +msgstr "アクティブなオブジェクトの送信の範囲" #: src/settings_translation_file.cpp msgid "" From c0e2bc30e5b6adab8fab7b03326d462120cd7707 Mon Sep 17 00:00:00 2001 From: Maciej Kasatkin Date: Thu, 12 Nov 2015 13:08:42 +0100 Subject: [PATCH 095/531] Translated using Weblate (Polish) Currently translated at 31.6% (249 of 787 strings) --- po/pl/minetest.po | 118 +++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 64 deletions(-) diff --git a/po/pl/minetest.po b/po/pl/minetest.po index 7b45f116..17888d00 100644 --- a/po/pl/minetest.po +++ b/po/pl/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-09 19:10+0000\n" -"Last-Translator: Jarosław Maciejewski \n" +"PO-Revision-Date: 2015-11-12 13:08+0000\n" +"Last-Translator: Maciej Kasatkin \n" "Language-Team: Polish " "\n" "Language: pl\n" @@ -42,7 +42,7 @@ msgstr "Połącz ponownie" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Serwer zażądał ponownego połączenia:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -50,19 +50,19 @@ msgstr "Ładowanie..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Wesje protokołu niezgodne. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Serwer narzuca wersję protokołu $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "Serwer wspiera wersje protokołu od $1 do $2." +msgstr "Serwer wspiera wersje protokołu od $1 do $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." -msgstr "" +msgstr "Spróbuj włączyć ponownie publiczną listę serwerów i sprawdź połączenie." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." @@ -99,6 +99,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Nie można włączyć moda \"$1\" gdyż nazwa zawiera niedozwolone znaki. " +"Dozwolone są znaki [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -139,7 +141,7 @@ msgstr "Ściągnij podgrę, taką jak minetest_game, z minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "" +msgstr "Ściągninj z minetest.net" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -159,7 +161,7 @@ msgstr "Ziarno" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "" +msgstr "Ostrzeżenie: Gra minimalna jest przeznaczona dla dewelperów." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -232,11 +234,11 @@ msgstr "" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "" +msgstr "Zamknij sklep" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "" +msgstr "Ściąganie $1, czekaj..." #: builtin/mainmenu/store.lua msgid "Install" @@ -252,20 +254,19 @@ msgstr "Ocena" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "" +msgstr "Szukaj" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "Nazwa świata" +msgstr "Nazwa świata:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" -msgstr "" +msgstr "Udana instalacja:" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "" +msgstr "Nieposortowane" #: builtin/mainmenu/store.lua msgid "re-Install" @@ -297,18 +298,16 @@ msgid "Installed Mods:" msgstr "Zainstalowane Mody:" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Mod information:" -msgstr "Brak informacjii" +msgstr "Informacje o modzie:" #: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua msgid "Mods" msgstr "Mody" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "No mod description available" -msgstr "Brak informacjii" +msgstr "Brak informacji o modzie" #: builtin/mainmenu/tab_mods.lua msgid "Rename" @@ -325,12 +324,11 @@ msgstr "Usuń zaznaczony mod" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" -msgstr "" +msgstr "Usuń zaznaczony modpack" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "Adres/Port" +msgstr "Adres / Port :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -346,9 +344,8 @@ msgid "Creative mode" msgstr "Tryb kreatywny" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Damage enabled" -msgstr "włączone" +msgstr "Obrażenia włączone" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -356,18 +353,16 @@ msgid "Delete" msgstr "Usuń" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "Nazwa gracza/Hasło" +msgstr "Nazwa gracza / Hasło :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" msgstr "Lista publicznych serwerów" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "PvP enabled" -msgstr "włączone" +msgstr "PvP włączone" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" @@ -396,13 +391,12 @@ msgid "New" msgstr "Nowy" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -#, fuzzy msgid "No world created or selected!" -msgstr "Nie podano nazwy świata lub nie wybrano gry" +msgstr "Nie stworzono lub nie wybrano świata!" #: builtin/mainmenu/tab_server.lua msgid "Port" -msgstr "" +msgstr "Port" #: builtin/mainmenu/tab_server.lua msgid "Public" @@ -426,43 +420,43 @@ msgstr "Rozpocznij grę/Połącz" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" nie jest poprawną flagą." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Brak opisu ustawienia)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Przeglądaj" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Zmień klawisze" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Wyłącz wszystkie" +msgstr "Wyłączone" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Edytuj" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "włączone" +msgstr "Włączone" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "Składnia to 3 liczby oddzielone przecinkami i w nawiasach." #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Składnia: , , (, , ), , " +", " #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -474,28 +468,27 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Wprowadź listę flag oddzielonych przecinkami." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Wprowadź poprawną liczbę całkowitą." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Wprowadź poprawną liczbę." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Możliwe wartości: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Przywróć domyślne" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Select" +msgstr "Wybierz ścieżkę" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -503,20 +496,19 @@ msgstr "Ustawienia" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Pokaż nazwy ustawień" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Wartość musi być większa od $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Wartość musi być mniejsza od $1." #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Config mods" -msgstr "Ustaw" +msgstr "Skonfiguruj mody" #: builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -542,7 +534,7 @@ msgstr "Brak informacjii" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Brak" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -560,29 +552,27 @@ msgstr "Błąd połączenia (brak odpowiedzi?)" #: src/client.cpp msgid "Done!" -msgstr "" +msgstr "Zrobione!" #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "Initializownie nod" #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "Initializowanie nod..." #: src/client.cpp msgid "Item textures..." msgstr "Tekstury przedmiotów..." #: src/client.cpp -#, fuzzy msgid "Loading textures..." -msgstr "Ładowanie..." +msgstr "Ładowanie tekstur..." #: src/client.cpp -#, fuzzy msgid "Rebuilding shaders..." -msgstr "Sprawdzanie adresu..." +msgstr "Kompilowanie shaderów..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -606,15 +596,15 @@ msgstr "Nie wybrano świata ani adresu." #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "" +msgstr "Nazwa gracza zbyt długa." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " -msgstr "" +msgstr "Podana ścieżka do świata nie istnieje: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "" +msgstr "yes" #: src/game.cpp msgid "" From b54f5ddfec1765351e5ef14eb8f630da3d0a122a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Thu, 12 Nov 2015 12:48:26 +0100 Subject: [PATCH 096/531] Translated using Weblate (Spanish) Currently translated at 31.6% (249 of 787 strings) --- po/es/minetest.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 3c74911a..01fc9a2e 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-10-27 19:39+0200\n" -"Last-Translator: ShadowNinja \n" -"Language-Team: Spanish \n" +"PO-Revision-Date: 2015-11-12 12:48+0000\n" +"Last-Translator: Joan Ciprià Moreno \n" +"Language-Team: Spanish " +"\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,7 +72,7 @@ msgstr "Sólo soportamos protocolos versión $1" #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua From ea1af74d319199aaf6a7268727a73ba619d4f2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Thu, 12 Nov 2015 18:07:38 +0100 Subject: [PATCH 097/531] Translated using Weblate (Catalan) Currently translated at 11.8% (93 of 787 strings) --- po/ca/minetest.po | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 9269ebf1..c61a0521 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 17:52+0000\n" +"PO-Revision-Date: 2015-11-12 18:07+0000\n" "Last-Translator: Joan Ciprià Moreno \n" "Language-Team: Catalan " "\n" @@ -206,7 +206,7 @@ msgstr "No" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "Reanomenar el ModPack:" +msgstr "Reanomenar el paquet de mods:" #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" @@ -231,8 +231,8 @@ msgstr "Error al instal·lar $1 en $2" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" -"Instal·lar mod: Impossible de trobar el nom de la carpeta adequat per al " -"modpack $1" +"Instal·lar mod: Impossible de trobar el nom de la carpeta adequat per al " +"paquet de mods $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" @@ -336,86 +336,86 @@ msgstr "Adreça / Port:" #: builtin/mainmenu/tab_multiplayer.lua msgid "Name / Password :" -msgstr "" +msgstr "Nom / Contrasenya:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" -msgstr "" +msgstr "Llista de servidors públics" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Delete" -msgstr "" +msgstr "Esborrar" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" -msgstr "" +msgstr "Connectar" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" -msgstr "" +msgstr "Mode creatiu" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Damage enabled" -msgstr "" +msgstr "Dany activat" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" -msgstr "" +msgstr "PvP activat" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" -msgstr "" +msgstr "Client" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "New" -msgstr "" +msgstr "Nou" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" -msgstr "" +msgstr "Configurar" #: builtin/mainmenu/tab_server.lua msgid "Start Game" -msgstr "" +msgstr "Començar Joc" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Select World:" -msgstr "" +msgstr "Seleccionar un món:" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Creative Mode" -msgstr "" +msgstr "Mode Creatiu" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Enable Damage" -msgstr "" +msgstr "Permetre Danys" #: builtin/mainmenu/tab_server.lua msgid "Public" -msgstr "" +msgstr "Públic" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua msgid "Name/Password" -msgstr "" +msgstr "Nom/Contrasenya" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" -msgstr "" +msgstr "Adreça BIND" #: builtin/mainmenu/tab_server.lua msgid "Port" -msgstr "" +msgstr "Port" #: builtin/mainmenu/tab_server.lua msgid "Server Port" -msgstr "" +msgstr "Port del Servidor" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "" +msgstr "No s'ha creat ningun món o no s'ha seleccionat!" #: builtin/mainmenu/tab_server.lua msgid "Server" From 84b72b112068d2ff28028e1aa9d2cc46c7c3bd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Thu, 12 Nov 2015 22:13:34 +0100 Subject: [PATCH 098/531] Translated using Weblate (Catalan) Currently translated at 26.3% (207 of 787 strings) - --- po/ca/minetest.po | 249 +++++++++++++++++++++++++--------------------- 1 file changed, 138 insertions(+), 111 deletions(-) diff --git a/po/ca/minetest.po b/po/ca/minetest.po index c61a0521..9b68842b 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 18:07+0000\n" +"PO-Revision-Date: 2015-11-12 22:13+0000\n" "Last-Translator: Joan Ciprià Moreno \n" "Language-Team: Catalan " "\n" @@ -419,11 +419,11 @@ msgstr "No s'ha creat ningun món o no s'ha seleccionat!" #: builtin/mainmenu/tab_server.lua msgid "Server" -msgstr "" +msgstr "Servidor" #: builtin/mainmenu/tab_settings.lua msgid "Games" -msgstr "" +msgstr "Jocs" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -435,7 +435,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Els possibles valors són: " #: builtin/mainmenu/tab_settings.lua msgid "" @@ -449,151 +449,151 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "El format és 3 números separats per comes i aquests dins de parèntesis." #: builtin/mainmenu/tab_settings.lua msgid "Disabled" -msgstr "" +msgstr "Desactivat" #: builtin/mainmenu/tab_settings.lua msgid "Enabled" -msgstr "" +msgstr "Activat" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Navegar" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Si us plau, introduïu un enter vàlid." #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "El valor ha de ser major que $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "El valor ha de ser menor que $1." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Si us plau, introduïu un nombre vàlid." #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" no és un indicador vàlid." #: builtin/mainmenu/tab_settings.lua msgid "Select path" -msgstr "" +msgstr "Seleccioneu la ruta" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" -msgstr "" +msgstr "Configurar controls" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Editar" #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Restablir per defecte" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Mostrar els noms tècnics" #: builtin/mainmenu/tab_settings.lua msgid "Settings" -msgstr "" +msgstr "Configuració" #: builtin/mainmenu/tab_simple_main.lua msgid "Start Singleplayer" -msgstr "" +msgstr "Començar Un Jugador" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" -msgstr "" +msgstr "Configurar mods" #: builtin/mainmenu/tab_simple_main.lua msgid "Main" -msgstr "" +msgstr "Principal" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" -msgstr "" +msgstr "Jugar" #: builtin/mainmenu/tab_singleplayer.lua msgid "Singleplayer" -msgstr "" +msgstr "Un jugador" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Ningun" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" -msgstr "" +msgstr "Selecciona un paquet de textures:" #: builtin/mainmenu/tab_texturepacks.lua msgid "No information available" -msgstr "" +msgstr "Sense informació disponible" #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" -msgstr "" +msgstr "Textures" #: src/client.cpp msgid "Connection timed out." -msgstr "" +msgstr "Temps d'espera de la connexió esgotat." #: src/client.cpp msgid "Loading textures..." -msgstr "" +msgstr "Carregant textures ..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "" +msgstr "Reconstruint ombreig ..." #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "Inicialitzant nodes ..." #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "Inicialitzant nodes" #: src/client.cpp msgid "Item textures..." -msgstr "" +msgstr "Textures de objectes ..." #: src/client.cpp msgid "Done!" -msgstr "" +msgstr "Completat!" #: src/client/clientlauncher.cpp msgid "Main Menu" -msgstr "" +msgstr "Menú principal" #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "" +msgstr "Nom del jugador massa llarg." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" -msgstr "" +msgstr "Error de connexió (¿temps esgotat?)" #: src/client/clientlauncher.cpp msgid "No world selected and no address provided. Nothing to do." -msgstr "" +msgstr "Cap món seleccionat i cap adreça facilitada. Res a fer." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " -msgstr "" +msgstr "La ruta del món especificat no existeix: " #: src/client/clientlauncher.cpp msgid "Could not find or load game \"" -msgstr "" +msgstr "No es pot trobar o carregar el joc \"" #: src/client/clientlauncher.cpp msgid "Invalid gamespec." @@ -601,19 +601,19 @@ msgstr "" #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "" +msgstr "no" #: src/game.cpp src/guiFormSpecMenu.cpp msgid "Proceed" -msgstr "" +msgstr "Continuar" #: src/game.cpp msgid "You died." -msgstr "" +msgstr "Has mort." #: src/game.cpp msgid "Respawn" -msgstr "" +msgstr "Reaparèixer" #: src/game.cpp msgid "" @@ -630,6 +630,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Controls predeterminats:\n" +"Amb el menú ocult:\n" +"- Toc simple: botó activar\n" +"- Toc doble: posar / utilitzar\n" +"- Lliscar dit: mirar al voltant\n" +"Amb el menú / inventari visible:\n" +"- Toc doble (fora):\n" +" -> tancar\n" +"- Toc a la pila d'objectes:\n" +" -> moure la pila\n" +"- Toc i arrossegar, toc amb 2 dits:\n" +" -> col·locar només un objecte\n" #: src/game.cpp msgid "" @@ -645,248 +657,263 @@ msgid "" "- Mouse wheel: select item\n" "- T: chat\n" msgstr "" +"Controls predeterminats:\n" +"- WASD: moure\n" +"- Espai: botar / pujar\n" +"- Maj .: puntetes / baixar\n" +"- Q: deixar anar objecte\n" +"- I: inventari\n" +"- Ratolí: girar / mirar\n" +"- Ratolí esq .: excavar / colpejar\n" +"- Ratolí dre .: col·locar / utilitzar\n" +"- Roda ratolí: triar objecte\n" +"- T: xat\n" #: src/game.cpp msgid "Continue" -msgstr "" +msgstr "Continuar" #: src/game.cpp msgid "Change Password" -msgstr "" +msgstr "Canviar contrasenya" #: src/game.cpp msgid "Sound Volume" -msgstr "" +msgstr "Volum del so" #: src/game.cpp msgid "Change Keys" -msgstr "" +msgstr "Configurar Controls" #: src/game.cpp msgid "Exit to Menu" -msgstr "" +msgstr "Eixir al menú" #: src/game.cpp msgid "Exit to OS" -msgstr "" +msgstr "Eixir al S.O" #: src/game.cpp msgid "Shutting down..." -msgstr "" +msgstr "Tancant ..." #: src/game.cpp msgid "Creating server..." -msgstr "" +msgstr "Creant servidor ..." #: src/game.cpp msgid "Creating client..." -msgstr "" +msgstr "Creant client ..." #: src/game.cpp msgid "Resolving address..." -msgstr "" +msgstr "Resolent adreça ..." #: src/game.cpp msgid "Connecting to server..." -msgstr "" +msgstr "Connectant al servidor ..." #: src/game.cpp msgid "Item definitions..." -msgstr "" +msgstr "Definicions d'objectes ..." #: src/game.cpp msgid "Node definitions..." -msgstr "" +msgstr "Definicions dels nodes ..." #: src/game.cpp msgid "Media..." -msgstr "" +msgstr "Media ..." #: src/game.cpp msgid "KiB/s" -msgstr "" +msgstr "KiB/s" #: src/game.cpp msgid "MiB/s" -msgstr "" +msgstr "MiB/s" #: src/game.cpp msgid "" "\n" "Check debug.txt for details." msgstr "" +"\n" +"Comprovi debug.txt per a detalls." #: src/guiFormSpecMenu.cpp msgid "Enter " -msgstr "" +msgstr "Introdueix " #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "" +msgstr "Acceptar" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" +"Combinacions de tecles. (Si aquest menú espatlla, esborrar coses de " +"minetest.conf)" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" -msgstr "" +msgstr "\"Utilitzar\" = Descendir" #: src/guiKeyChangeMenu.cpp msgid "Double tap \"jump\" to toggle fly" -msgstr "" +msgstr "Dos tocs \"botar\" per volar" #: src/guiKeyChangeMenu.cpp msgid "Key already in use" -msgstr "" +msgstr "La tecla s'està utilitzant" #: src/guiKeyChangeMenu.cpp msgid "press key" -msgstr "" +msgstr "Premsa una tecla" #: src/guiKeyChangeMenu.cpp msgid "Forward" -msgstr "" +msgstr "Avant" #: src/guiKeyChangeMenu.cpp msgid "Backward" -msgstr "" +msgstr "Arrere" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" -msgstr "" +msgstr "Esquerra" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Right" -msgstr "" +msgstr "Dreta" #: src/guiKeyChangeMenu.cpp msgid "Use" -msgstr "" +msgstr "Utilitzar" #: src/guiKeyChangeMenu.cpp msgid "Jump" -msgstr "" +msgstr "Botar" #: src/guiKeyChangeMenu.cpp msgid "Sneak" -msgstr "" +msgstr "Discreció" #: src/guiKeyChangeMenu.cpp msgid "Drop" -msgstr "" +msgstr "Amollar" #: src/guiKeyChangeMenu.cpp msgid "Inventory" -msgstr "" +msgstr "Inventari" #: src/guiKeyChangeMenu.cpp msgid "Chat" -msgstr "" +msgstr "Xat" #: src/guiKeyChangeMenu.cpp msgid "Command" -msgstr "" +msgstr "Comandament" #: src/guiKeyChangeMenu.cpp msgid "Console" -msgstr "" +msgstr "Consola" #: src/guiKeyChangeMenu.cpp msgid "Toggle fly" -msgstr "" +msgstr "Activar volar" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" -msgstr "" +msgstr "Activar ràpid" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" -msgstr "" +msgstr "Activar Cinematogràfic" #: src/guiKeyChangeMenu.cpp msgid "Toggle noclip" -msgstr "" +msgstr "Activar noclip" #: src/guiKeyChangeMenu.cpp msgid "Range select" -msgstr "" +msgstr "Seleccionar distancia" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp msgid "Print stacks" -msgstr "" +msgstr "Imprimir piles" #: src/guiPasswordChange.cpp msgid "Old Password" -msgstr "" +msgstr "Contrasenya vella" #: src/guiPasswordChange.cpp msgid "New Password" -msgstr "" +msgstr "Nova contrasenya" #: src/guiPasswordChange.cpp msgid "Confirm Password" -msgstr "" +msgstr "Confirma contrasenya" #: src/guiPasswordChange.cpp msgid "Change" -msgstr "" +msgstr "Canviar" #: src/guiPasswordChange.cpp msgid "Passwords do not match!" -msgstr "" +msgstr "Les contrasenyes no coincideixen!" #: src/guiVolumeChange.cpp msgid "Sound Volume: " -msgstr "" +msgstr "Volum de so: " #: src/guiVolumeChange.cpp msgid "Exit" -msgstr "" +msgstr "Tancar" #: src/keycode.cpp msgid "Left Button" -msgstr "" +msgstr "Botó esquerre" #: src/keycode.cpp msgid "Middle Button" -msgstr "" +msgstr "Botó del mig" #: src/keycode.cpp msgid "Right Button" -msgstr "" +msgstr "Botó dret" #: src/keycode.cpp msgid "X Button 1" -msgstr "" +msgstr "X Botó 1" #: src/keycode.cpp msgid "Back" -msgstr "" +msgstr "Enrere" #: src/keycode.cpp msgid "Clear" -msgstr "" +msgstr "Netejar" #: src/keycode.cpp msgid "Return" -msgstr "" +msgstr "Tornar" #: src/keycode.cpp msgid "Tab" -msgstr "" +msgstr "Tabulador" #: src/keycode.cpp msgid "X Button 2" -msgstr "" +msgstr "X Botó 2" #: src/keycode.cpp msgid "Capital" -msgstr "" +msgstr "Bloq Maj" #: src/keycode.cpp msgid "Control" -msgstr "" +msgstr "Control" #: src/keycode.cpp msgid "Kana" @@ -894,27 +921,27 @@ msgstr "" #: src/keycode.cpp msgid "Menu" -msgstr "" +msgstr "Menú" #: src/keycode.cpp msgid "Pause" -msgstr "" +msgstr "Pausa" #: src/keycode.cpp msgid "Shift" -msgstr "" +msgstr "Shift" #: src/keycode.cpp msgid "Convert" -msgstr "" +msgstr "Convertir" #: src/keycode.cpp msgid "Escape" -msgstr "" +msgstr "Esc" #: src/keycode.cpp msgid "Final" -msgstr "" +msgstr "Final" #: src/keycode.cpp msgid "Junja" @@ -1222,7 +1249,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "Utilitzar la tecla \"utilitzar\" per escalar/descendir" #: src/settings_translation_file.cpp msgid "" @@ -3578,7 +3605,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Main menu mod manager" -msgstr "" +msgstr "Menú principal del gestor de mods" #: src/settings_translation_file.cpp msgid "Modstore download URL" From 013e8e6adca04a2bc2a0ecdb398dbc8562ce0e3f Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 12 Nov 2015 18:10:23 +0100 Subject: [PATCH 099/531] Translated using Weblate (German) Currently translated at 100.0% (787 of 787 strings) --- po/de/minetest.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index 42ed1b23..e7ff472e 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 17:52+0000\n" +"PO-Revision-Date: 2015-11-12 18:10+0000\n" "Last-Translator: Wuzzy \n" "Language-Team: German " "\n" @@ -1365,7 +1365,7 @@ msgstr "Transparente Texturen säubern" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "Klient und Server" +msgstr "Client und Server" #: src/settings_translation_file.cpp msgid "Climbing speed" @@ -2010,7 +2010,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." msgstr "" -"Wie viele Kartenblöcke gleichzeitig pro Klient auf der Leitung unterwegs " +"Wie viele Kartenblöcke gleichzeitig pro Client auf der Leitung unterwegs " "sind." #: src/settings_translation_file.cpp @@ -2524,7 +2524,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "\"Benutzen\"-Taste zum runterklettern" +msgstr "„Benutzen“-Taste zum Runterklettern" #: src/settings_translation_file.cpp msgid "Language" @@ -2889,7 +2889,7 @@ msgstr "Apfelbaum-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "Standhäufigkeit" +msgstr "Strandhäufigkeit" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" @@ -3072,8 +3072,8 @@ msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" -"Maximale Anzahl der Kartenblöcke, die der Klient im Speicher vorhalten " -"soll.\n" +"Maximale Anzahl der Kartenblöcke, die der Client im Speicher vorhalten soll." +"\n" "Auf -1 setzen, um keine Obergrenze zu verwenden." #: src/settings_translation_file.cpp @@ -3109,7 +3109,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "Max. gleichzeitig versendete Kartenblöcke pro Klient" +msgstr "Max. gleichzeitig versendete Kartenblöcke pro Client" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" @@ -3816,7 +3816,7 @@ msgstr "Zeitgeschwindigkeit" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." msgstr "" -"Zeit, nach der der Klient nicht benutzte Kartendaten aus\n" +"Zeit, nach der der Client nicht benutzte Kartendaten aus\n" "dem Speicher löscht." #: src/settings_translation_file.cpp From 71fc4040a978ac20fccd23aef249bdb953c09e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Fri, 13 Nov 2015 21:05:40 +0100 Subject: [PATCH 100/531] Translated using Weblate (Spanish) Currently translated at 45.6% (359 of 787 strings) --- po/es/minetest.po | 273 ++++++++++++++++++---------------------------- 1 file changed, 107 insertions(+), 166 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 01fc9a2e..fda4f6e1 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 12:48+0000\n" +"PO-Revision-Date: 2015-11-13 21:05+0000\n" "Last-Translator: Joan Ciprià Moreno \n" "Language-Team: Spanish " "\n" @@ -21,7 +21,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Ha ocurrido un error en un script de Lua, por ejemplo en un mod:" +msgstr "Ha ocurrido un error en un script Lua, por ejemplo un mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -37,7 +37,7 @@ msgstr "Aceptar" #: builtin/fstk/ui.lua msgid "Reconnect" -msgstr "Volver a conectar" +msgstr "Reconectar" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" @@ -48,22 +48,21 @@ msgid "Loading..." msgstr "Cargando..." #: builtin/mainmenu/common.lua -#, fuzzy msgid "Protocol version mismatch. " -msgstr "No concuerda la versión del protocolo, servidor " +msgstr "Desajuste con la versión del protocolo. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "El servidor hace cumplir la versión $1 del protocolo " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "El servidor soporta versiones del protocolo entre $1 y $2." #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" -"Intenta re-habilitar la lista de servidores públicos y verifica tu conexión " +"Intente re-habilitar la lista de servidores públicos y verifique su conexión " "a Internet." #: builtin/mainmenu/common.lua @@ -425,11 +424,11 @@ msgstr "Iniciar juego" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$ 1\" no es un indicador válido." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Ninguna descripción de ajuste dada)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" @@ -440,22 +439,21 @@ msgid "Change keys" msgstr "Configurar teclas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Desactivar paquete" +msgstr "Desactivado" #: builtin/mainmenu/tab_settings.lua msgid "Edit" msgstr "Editar" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" msgstr "Activado" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" +"El formato es 3 números separados por comas y éstos dentro de paréntesis." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -473,28 +471,27 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Por favor, introduzca una lista separada por comas de indicadores." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Por favor, introduzca un entero válido." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Por favor, introduzca un número válido." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Los posibles valores son: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Restablecer por defecto" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Seleccionar" +msgstr "Seleccionar ruta" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -502,15 +499,15 @@ msgstr "Configuración" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Mostrar los nombres técnicos" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "El valor debe ser mayor que $ 1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "El valor debe ser menor que $ 1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -612,13 +609,12 @@ msgid "needs_fallback_font" msgstr "no" #: src/game.cpp -#, fuzzy msgid "" "\n" "Check debug.txt for details." msgstr "" "\n" -"Revisa el archivo debug.txt para más detalles." +"Revisa debug.txt para más detalles." #: src/game.cpp msgid "Change Keys" @@ -1176,14 +1172,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" -msgstr "Nubes 3D" +msgstr "Nubes en 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D mode" -msgstr "Modo vuelo" +msgstr "Modo 3D" #: src/settings_translation_file.cpp msgid "" @@ -1205,10 +1199,13 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Un mensaje para ser mostrado a todos los clientes cuando el servidor cae." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Un mensaje para ser mostrado a todos los clientes cuando el servidor se " +"apaga." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1216,11 +1213,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Aceleración en el aire" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Rango de bloque activo" #: src/settings_translation_file.cpp msgid "Active object send range" @@ -1247,11 +1244,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Advanced" -msgstr "" +msgstr "Avanzado" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Siempre volar y rápido" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" @@ -1263,7 +1260,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Anunciar servidor" #: src/settings_translation_file.cpp msgid "" @@ -1274,34 +1271,33 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Preguntar para volver a conectar despues de una caída" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Automáticamente informar a la lista del servidor." #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "Atrás" +msgstr "Tecla retroceso" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Básico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" -msgstr "Filtro bi-lineal" +msgstr "Filtrado bilineal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "Asociar dirección" +msgstr "Dirección BIND" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." msgstr "" +"Bits por píxel (también conocido como profundidad de color) en modo de " +"pantalla completa." #: src/settings_translation_file.cpp msgid "Build inside player" @@ -1313,77 +1309,71 @@ msgstr "Mapeado de relieve" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Suavizado de cámara" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Suavizado de cámara en modo cinematográfico" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Tecla alternativa para la actualización de la cámara" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Configurar teclas" +msgstr "Tecla del Chat" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Configurar teclas" +msgstr "Tecla alternativa para el chat" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Tamaño del chunk" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Modo creativo" +msgstr "Modo cinematográfico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Modo creativo" +msgstr "Tecla modo cinematográfico" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Limpiar texturas transparentes" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Cliente y servidor" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Velocidad de escalada" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Altura de la nube" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Radio de nube" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "Nubes 3D" +msgstr "Nubes" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Las nubes son un efecto del lado del cliente." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Menú principal" +msgstr "Nubes en el menú" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Niebla colorida" #: src/settings_translation_file.cpp msgid "" @@ -1392,9 +1382,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Comando" +msgstr "Tecla comando" #: src/settings_translation_file.cpp #, fuzzy @@ -1402,9 +1391,8 @@ msgid "Connect glass" msgstr "Vidrios conectados" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Conectando al servidor..." +msgstr "Conectar a un servidor media externo" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." @@ -1416,27 +1404,24 @@ msgid "Console alpha" msgstr "Consola" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Consola" +msgstr "Color de la consola" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Consola" +msgstr "Tecla de la consola" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Avance continuo" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Avance continuo (sólo utilizado para la testing)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Control" +msgstr "Controles" #: src/settings_translation_file.cpp msgid "" @@ -1453,7 +1438,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Mensaje de error" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1465,11 +1450,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Color de la cruz" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Color de la cruz (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" @@ -1477,16 +1462,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Permitir daños" +msgstr "Daño" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Tecla alternativa para la información de la depuración" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1498,11 +1482,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Aceleración por defecto" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "" +msgstr "Juego por defecto" #: src/settings_translation_file.cpp msgid "" @@ -1511,13 +1495,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Contraseña nueva" +msgstr "Contraseña por defecto" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Privilegios por defecto" #: src/settings_translation_file.cpp msgid "" @@ -1566,9 +1549,8 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Habilitar partículas" +msgstr "Desactivar Anticheat" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" @@ -1579,14 +1561,12 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" msgstr "Pulsar dos veces \"saltar\" para volar" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Pulsar dos veces \"saltar\" para volar" +msgstr "Pulsar dos veces \"saltar\" alterna el modo vuelo." #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1605,9 +1585,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Repositorio de mods en línea" +msgstr "Activar seguridad de mods" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." @@ -1664,9 +1643,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Permitir daños" +msgstr "Activar mini-mapa." #: src/settings_translation_file.cpp msgid "" @@ -1760,18 +1738,16 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Sin filtro" +msgstr "Filtrado" #: src/settings_translation_file.cpp msgid "Fixed map seed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fly key" -msgstr "Modo vuelo" +msgstr "Tecla vuelo" #: src/settings_translation_file.cpp msgid "Flying" @@ -1810,9 +1786,8 @@ msgid "Font size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Adelante" +msgstr "Tecla Avanzar" #: src/settings_translation_file.cpp msgid "Freetype fonts" @@ -1864,7 +1839,6 @@ msgid "Gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "Generar mapas normales" @@ -2029,9 +2003,8 @@ msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Inventario" +msgstr "Tecla Inventario" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -2092,9 +2065,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Saltar" +msgstr "Tecla Saltar" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2326,9 +2298,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Menú izq." +msgstr "Tecla izquierda" #: src/settings_translation_file.cpp msgid "" @@ -2398,14 +2369,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Menú principal" +msgstr "Menú principal del gestor de mods" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Menú principal" +msgstr "Script del menú principal" #: src/settings_translation_file.cpp msgid "" @@ -2499,9 +2468,8 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Generador de mapas" +msgstr "Depuración del generador de mapas" #: src/settings_translation_file.cpp #, fuzzy @@ -2843,9 +2811,8 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" -msgstr "Menú" +msgstr "Menús" #: src/settings_translation_file.cpp msgid "Mesh cache" @@ -2976,9 +2943,8 @@ msgid "Noclip key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" -msgstr "Resaltar nodos" +msgstr "Resaltado de los nodos" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -3081,9 +3047,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Nombre de jugador demasiado largo." +msgstr "Nombre del jugador" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -3108,9 +3073,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Cargando texturas..." +msgstr "Precarga de las texturas del inventario" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." @@ -3140,9 +3104,8 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Seleccionar distancia" +msgstr "Tecla seleccionar rango de visión" #: src/settings_translation_file.cpp msgid "Remote media" @@ -3157,9 +3120,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Menú der." +msgstr "Tecla derecha" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3199,7 +3161,6 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" msgstr "Captura de pantalla" @@ -3228,44 +3189,36 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Comenzar un jugador" +msgstr "Servidor / Un jugador" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Servidor" +msgstr "URL del servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Puerto del servidor" +msgstr "Dirección del servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Puerto del servidor" +msgstr "Descripción del servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Servidor" +msgstr "Nombre del servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Puerto del servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Lista de servidores públicos" +msgstr "Lista de las URLs de servidores" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Lista de servidores públicos" +msgstr "Archivo de la lista de servidores" #: src/settings_translation_file.cpp msgid "" @@ -3321,7 +3274,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" msgstr "Iluminación suave" @@ -3340,9 +3292,8 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Caminar" +msgstr "Tecla sigilo" #: src/settings_translation_file.cpp msgid "Sound" @@ -3379,9 +3330,8 @@ msgstr "" # No cabe "Paquetes de texturas". #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Texturas" +msgstr "Ruta de la textura" #: src/settings_translation_file.cpp msgid "" @@ -3464,9 +3414,8 @@ msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" -msgstr "Filtro tri-lineal" +msgstr "Filtrado trilineal" #: src/settings_translation_file.cpp msgid "" @@ -3508,9 +3457,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "pulsa una tecla" +msgstr "Usa la tecla" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -3521,9 +3469,8 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Antiguos desarrolladores" +msgstr "Útil para los desarrolladores de mods." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3566,14 +3513,12 @@ msgid "Viewing range minimum" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" -msgstr "Volumen del sonido" +msgstr "Volumen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Movimiento de hojas" +msgstr "Velocidad del caminar" #: src/settings_translation_file.cpp msgid "Wanted FPS" @@ -3593,17 +3538,14 @@ msgid "Waving Nodes" msgstr "Movimiento de hojas" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" msgstr "Movimiento de hojas" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" msgstr "Movimiento de plantas" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "Oleaje en el agua" @@ -3618,9 +3560,8 @@ msgid "Waving water length" msgstr "Oleaje en el agua" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Oleaje en el agua" +msgstr "Velocidad del oleaje en el agua" #: src/settings_translation_file.cpp msgid "" From 132e06199d6c6a965a188f9b03845a64d1ef7c12 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 13 Nov 2015 21:06:24 +0100 Subject: [PATCH 101/531] Translated using Weblate (Spanish) Currently translated at 45.7% (360 of 787 strings) --- po/es/minetest.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index fda4f6e1..43d8db5a 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-13 21:05+0000\n" -"Last-Translator: Joan Ciprià Moreno \n" +"PO-Revision-Date: 2015-11-13 21:06+0000\n" +"Last-Translator: ShadowNinja \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -460,6 +460,8 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Formato: (, Y, ), " +", , " #: builtin/mainmenu/tab_settings.lua msgid "Games" From a8d2aa9c817945f87d37ab49189fdb43de4650b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Fri, 13 Nov 2015 22:39:38 +0100 Subject: [PATCH 102/531] Translated using Weblate (Catalan) Currently translated at 32.4% (255 of 787 strings) --- po/ca/minetest.po | 100 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 9b68842b..db1b4f19 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 22:13+0000\n" +"PO-Revision-Date: 2015-11-13 22:39+0000\n" "Last-Translator: Joan Ciprià Moreno \n" "Language-Team: Catalan " "\n" @@ -941,7 +941,7 @@ msgstr "Esc" #: src/keycode.cpp msgid "Final" -msgstr "Final" +msgstr "Fi" #: src/keycode.cpp msgid "Junja" @@ -957,183 +957,183 @@ msgstr "" #: src/keycode.cpp msgid "End" -msgstr "" +msgstr "Fi" #: src/keycode.cpp msgid "Home" -msgstr "" +msgstr "Inici" #: src/keycode.cpp msgid "Mode Change" -msgstr "" +msgstr "Canvi de mode" #: src/keycode.cpp msgid "Next" -msgstr "" +msgstr "Següent" #: src/keycode.cpp msgid "Prior" -msgstr "" +msgstr "Anterior" #: src/keycode.cpp msgid "Space" -msgstr "" +msgstr "Espai" #: src/keycode.cpp msgid "Down" -msgstr "" +msgstr "Avall" #: src/keycode.cpp msgid "Execute" -msgstr "" +msgstr "Executar" #: src/keycode.cpp msgid "Print" -msgstr "" +msgstr "Imprimir" #: src/keycode.cpp msgid "Select" -msgstr "" +msgstr "Seleccionar" #: src/keycode.cpp msgid "Up" -msgstr "" +msgstr "Amunt" #: src/keycode.cpp msgid "Help" -msgstr "" +msgstr "Ajuda" #: src/keycode.cpp msgid "Insert" -msgstr "" +msgstr "Introduir" #: src/keycode.cpp msgid "Snapshot" -msgstr "" +msgstr "Captura de pantalla" #: src/keycode.cpp msgid "Left Windows" -msgstr "" +msgstr "Windows esquerre" #: src/keycode.cpp msgid "Apps" -msgstr "" +msgstr "Aplicacions" #: src/keycode.cpp msgid "Numpad 0" -msgstr "" +msgstr "Teclat Num. 0" #: src/keycode.cpp msgid "Numpad 1" -msgstr "" +msgstr "Teclat Num. 1" #: src/keycode.cpp msgid "Right Windows" -msgstr "" +msgstr "Windows dret" #: src/keycode.cpp msgid "Sleep" -msgstr "" +msgstr "Dormir" #: src/keycode.cpp msgid "Numpad 2" -msgstr "" +msgstr "Teclat Num. 2" #: src/keycode.cpp msgid "Numpad 3" -msgstr "" +msgstr "Teclat Num. 3" #: src/keycode.cpp msgid "Numpad 4" -msgstr "" +msgstr "Teclat Num. 4" #: src/keycode.cpp msgid "Numpad 5" -msgstr "" +msgstr "Teclat Num. 5" #: src/keycode.cpp msgid "Numpad 6" -msgstr "" +msgstr "Teclat Num. 6" #: src/keycode.cpp msgid "Numpad 7" -msgstr "" +msgstr "Teclat Num. 7" #: src/keycode.cpp msgid "Numpad *" -msgstr "" +msgstr "Teclat Num. *" #: src/keycode.cpp msgid "Numpad +" -msgstr "" +msgstr "Teclat Num. +" #: src/keycode.cpp msgid "Numpad -" -msgstr "" +msgstr "Teclat Num. -" #: src/keycode.cpp msgid "Numpad /" -msgstr "" +msgstr "Teclat Num. /" #: src/keycode.cpp msgid "Numpad 8" -msgstr "" +msgstr "Teclat Num. 8" #: src/keycode.cpp msgid "Numpad 9" -msgstr "" +msgstr "Teclat Num. 9" #: src/keycode.cpp msgid "Num Lock" -msgstr "" +msgstr "Bloq Num" #: src/keycode.cpp msgid "Scroll Lock" -msgstr "" +msgstr "Bloq Despl" #: src/keycode.cpp msgid "Left Shift" -msgstr "" +msgstr "Shift esq" #: src/keycode.cpp msgid "Right Shift" -msgstr "" +msgstr "Shift Dta" #: src/keycode.cpp msgid "Left Control" -msgstr "" +msgstr "Control esq" #: src/keycode.cpp msgid "Left Menu" -msgstr "" +msgstr "Menú esq" #: src/keycode.cpp msgid "Right Control" -msgstr "" +msgstr "Control dta" #: src/keycode.cpp msgid "Right Menu" -msgstr "" +msgstr "Menú dta" #: src/keycode.cpp msgid "Comma" -msgstr "" +msgstr "Coma" #: src/keycode.cpp msgid "Minus" -msgstr "" +msgstr "Menys" #: src/keycode.cpp msgid "Period" -msgstr "" +msgstr "Període" #: src/keycode.cpp msgid "Plus" -msgstr "" +msgstr "Més" #: src/keycode.cpp msgid "Attn" -msgstr "" +msgstr "Atentament" #: src/keycode.cpp msgid "CrSel" @@ -1141,15 +1141,15 @@ msgstr "" #: src/keycode.cpp msgid "Erase OEF" -msgstr "" +msgstr "Esborrar OEF" #: src/keycode.cpp msgid "ExSel" -msgstr "" +msgstr "ExSel" #: src/keycode.cpp msgid "OEM Clear" -msgstr "" +msgstr "Netejar OEM" #: src/keycode.cpp msgid "PA1" From fd1b83712208ee27e8673a3f7c8febae627c22da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Fri, 13 Nov 2015 21:07:16 +0100 Subject: [PATCH 103/531] Translated using Weblate (Spanish) Currently translated at 45.8% (361 of 787 strings) --- po/es/minetest.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 43d8db5a..a5aefebb 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-13 21:06+0000\n" -"Last-Translator: ShadowNinja \n" +"PO-Revision-Date: 2015-11-13 21:07+0000\n" +"Last-Translator: Joan Ciprià Moreno \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -885,7 +885,7 @@ msgstr "Aplicaciones" #: src/keycode.cpp msgid "Attn" -msgstr "Attn" +msgstr "Atentamente" #: src/keycode.cpp msgid "Back" @@ -1258,7 +1258,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" -msgstr "" +msgstr "Filtrado anisotrópico" #: src/settings_translation_file.cpp msgid "Announce server" From c19b43d4f79a3c4181a2abcd1b121f7bd83539ee Mon Sep 17 00:00:00 2001 From: LelixSuperHD Date: Sat, 14 Nov 2015 22:10:37 +0100 Subject: [PATCH 104/531] Translated using Weblate (Italian) Currently translated at 42.0% (331 of 787 strings) --- po/it/minetest.po | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index f3ea35bd..577f791e 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-06 17:28+0000\n" -"Last-Translator: Elia Argentieri \n" -"Language-Team: Italian \n" +"PO-Revision-Date: 2015-11-14 22:10+0000\n" +"Last-Translator: LelixSuperHD \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" msgstr "" -"Si è verificato un errore in uno script Lua, come ad esempio un modulo:" +"Si è verificato un errore in uno script in Lua, come ad esempio una mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -427,7 +427,7 @@ msgstr "Avviare il gioco" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" non è una bandiera valida." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -442,18 +442,16 @@ msgid "Change keys" msgstr "Cambiare i tasti" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Disatt. pacch." +msgstr "Disabilitato" #: builtin/mainmenu/tab_settings.lua msgid "Edit" msgstr "Modifica" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "attivata" +msgstr "Attivato" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." @@ -464,6 +462,8 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Formato: , , (, , ), , " +", " #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -494,9 +494,8 @@ msgid "Restore Default" msgstr "Ripristina predefiniti" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Selezionare" +msgstr "Selezionare il percorso" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -541,14 +540,13 @@ msgstr "Nessuna informazione disponibile" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Niente" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selezionare un pacchetto di immagini:" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Texturepacks" msgstr "Pacch. Texture" From 3f8eb5e0d0a7dd30bfd6b805d6c03e0f45182e9a Mon Sep 17 00:00:00 2001 From: TeTpaAka Date: Sat, 14 Nov 2015 12:00:52 +0100 Subject: [PATCH 105/531] Allow craft replacements to use groups --- src/craftdef.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/craftdef.cpp b/src/craftdef.cpp index a39bfb37..67c3ae62 100644 --- a/src/craftdef.cpp +++ b/src/craftdef.cpp @@ -214,7 +214,7 @@ static void craftDecrementOrReplaceInput(CraftInput &input, for (std::vector >::iterator j = pairs.begin(); j != pairs.end(); ++j) { - if (item.name == craftGetItemName(j->first, gamedef)) { + if (inputItemMatchesRecipe(item.name, j->first, gamedef->idef())) { if (item.count == 1) { item.deSerialize(j->second, gamedef->idef()); found_replacement = true; From e664abeb887fe74ff1966e93ed5201c6e19a5c31 Mon Sep 17 00:00:00 2001 From: Amaz Date: Mon, 9 Nov 2015 11:52:52 +0000 Subject: [PATCH 106/531] Add a status text for autorun --- src/game.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 1738517b..e6a1a225 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1496,6 +1496,7 @@ protected: void toggleFast(float *statustext_time); void toggleNoClip(float *statustext_time); void toggleCinematic(float *statustext_time); + void toggleAutorun(float *statustext_time); void toggleChat(float *statustext_time, bool *flag); void toggleHud(float *statustext_time, bool *flag); @@ -2618,10 +2619,8 @@ void Game::processKeyboardInput(VolatileRunFlags *flags, if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DROP])) { dropSelectedItem(); - // Add WoW-style autorun by toggling continuous forward. } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_AUTORUN])) { - bool autorun_setting = g_settings->getBool("continuous_forward"); - g_settings->setBool("continuous_forward", !autorun_setting); + toggleAutorun(statustext_time); } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INVENTORY])) { openInventory(); } else if (input->wasKeyDown(EscapeKey) || input->wasKeyDown(CancelKey)) { @@ -2851,6 +2850,16 @@ void Game::toggleCinematic(float *statustext_time) statustext = msg[cinematic]; } +// Add WoW-style autorun by toggling continuous forward. +void Game::toggleAutorun(float *statustext_time) +{ + static const wchar_t *msg[] = { L"autorun disabled", L"autorun enabled" }; + bool autorun_enabled = !g_settings->getBool("continuous_forward"); + g_settings->set("continuous_forward", bool_to_cstr(autorun_enabled)); + + *statustext_time = 0; + statustext = msg[autorun_enabled ? 1 : 0]; +} void Game::toggleChat(float *statustext_time, bool *flag) { From 2f58e4d9624b4f31c5064dc640e0ad40d8adb9ea Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 16 Nov 2015 17:11:32 +0100 Subject: [PATCH 107/531] Android: hardcode irrlicht revision, update other dependencies Recent irrlicht revisions break the build, hardcode the revision to a working one until upstream publishes a working version. See issue #3366 for a discussion about this. Also update dependencies to current versions. --- build/android/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index 66d12ac8..9f107602 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -104,13 +104,14 @@ OGG_TIMESTAMP = $(OGG_DIR)timestamp OGG_TIMESTAMP_INT = $(ROOT)/deps/ogg_timestamp OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android +IRRLICHT_REVISION = 5122 IRRLICHT_DIR = $(ROOT)/deps/irrlicht/ IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp -IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/ +IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) -OPENSSL_VERSION = 1.0.1l +OPENSSL_VERSION = 1.0.1p OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 @@ -118,14 +119,14 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.41.0 +CURL_VERSION = 7.45.0 CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp CURL_TIMESTAMP_INT = $(ROOT)/deps/curl_timestamp CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 -GMP_VERSION = 6.0.0 +GMP_VERSION = 6.1.0 GMP_DIR = $(ROOT)/deps/gmp-$(GMP_VERSION) GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so GMP_TIMESTAMP = $(GMP_DIR)/timestamp @@ -145,8 +146,8 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz -SQLITE3_FOLDER = sqlite-amalgamation-3080704 -SQLITE3_URL = http://www.sqlite.org/2014/$(SQLITE3_FOLDER).zip +SQLITE3_FOLDER = sqlite-amalgamation-3090200 +SQLITE3_URL = http://www.sqlite.org/2015/$(SQLITE3_FOLDER).zip -include $(PATHCFGFILE) From 4fd394b657fbaf6f1966024553a45c4e5401542a Mon Sep 17 00:00:00 2001 From: Rui Date: Sun, 11 Oct 2015 21:25:58 +0900 Subject: [PATCH 108/531] Log static_spawn error only once --- builtin/game/static_spawn.lua | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/builtin/game/static_spawn.lua b/builtin/game/static_spawn.lua index 492ab6ca..10033422 100644 --- a/builtin/game/static_spawn.lua +++ b/builtin/game/static_spawn.lua @@ -3,31 +3,23 @@ local function warn_invalid_static_spawnpoint() if core.setting_get("static_spawnpoint") and not core.setting_get_pos("static_spawnpoint") then - core.log('error', "The static_spawnpoint setting is invalid: \"".. + core.log("error", "The static_spawnpoint setting is invalid: \"".. core.setting_get("static_spawnpoint").."\"") end end warn_invalid_static_spawnpoint() -local function put_player_in_spawn(obj) - warn_invalid_static_spawnpoint() +local function put_player_in_spawn(player_obj) local static_spawnpoint = core.setting_get_pos("static_spawnpoint") if not static_spawnpoint then return false end - core.log('action', "Moving "..obj:get_player_name().. - " to static spawnpoint at ".. - core.pos_to_string(static_spawnpoint)) - obj:setpos(static_spawnpoint) + core.log("action", "Moving " .. player_obj:get_player_name() .. + " to static spawnpoint at " .. core.pos_to_string(static_spawnpoint)) + player_obj:setpos(static_spawnpoint) return true end -core.register_on_newplayer(function(obj) - put_player_in_spawn(obj) -end) - -core.register_on_respawnplayer(function(obj) - return put_player_in_spawn(obj) -end) - +core.register_on_newplayer(put_player_in_spawn) +core.register_on_respawnplayer(put_player_in_spawn) From d7bbe81726f46b46d88b188298155dc7519ae1a4 Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 15 Nov 2015 11:55:45 +0000 Subject: [PATCH 109/531] Mapgen: Add global 'decorations' flag Flag is set by default in MapgenParams The global 'trees' flag remains but is now undocumented and unset by default in MapgenParams Add mgv6_spflag 'trees' set by default in defaultsettings.cpp to affect new worlds only This is automatically backwards compatible for existing worlds --- builtin/settingtypes.txt | 7 ++++--- minetest.conf.example | 11 ++++++----- src/defaultsettings.cpp | 2 +- src/mapgen.cpp | 11 ++++++----- src/mapgen.h | 13 +++++++------ src/mapgen_flat.cpp | 3 ++- src/mapgen_fractal.cpp | 3 ++- src/mapgen_v5.cpp | 3 ++- src/mapgen_v6.cpp | 6 ++++-- src/mapgen_v6.h | 1 + src/mapgen_v7.cpp | 3 ++- 11 files changed, 37 insertions(+), 26 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index bf452915..cb38ec11 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -829,10 +829,11 @@ max_block_generate_distance (Max block generate distance) int 6 map_generation_limit (Map generation limit) int 31000 0 31000 # Global map generation attributes. -# The 'trees' flag only has effect in mgv6. +# In Mapgen v6 the 'decorations' flag controls all decorations except trees +# and junglegrass, in all other mapgens this flag controls all decorations. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -mg_flags (Mapgen flags) flags trees,caves,dungeons,light trees,caves,dungeons,light,notrees,nocaves,nodungeons,nolight +mg_flags (Mapgen flags) flags caves,dungeons,light,decorations caves,dungeons,light,decorations,nocaves,nodungeons,nolight,nodecorations [**Advanced] @@ -889,7 +890,7 @@ mgv5_np_cave2 (Mapgen v5 cave2 noise parameters) noise_params 0, 12, (50, 50, 50 # When snowbiomes are enabled jungles are enabled and the jungles flag is ignored. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes jungles,biomeblend,mudflow,snowbiomes,flat,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat +mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes,trees jungles,biomeblend,mudflow,snowbiomes,flat,trees,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees # Controls size of deserts and beaches in Mapgen v6. # When snowbiomes are enabled 'mgv6_freq_desert' is ignored. diff --git a/minetest.conf.example b/minetest.conf.example index 39f80bf6..d8534a0f 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1021,11 +1021,12 @@ # map_generation_limit = 31000 # Global map generation attributes. -# The 'trees' flag only has effect in mgv6. +# In Mapgen v6 the 'decorations' flag controls all decorations except trees +# and junglegrass, in all other mapgens this flag controls all decorations. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -# type: flags possible values: trees, caves, dungeons, light, notrees, nocaves, nodungeons, nolight -# mg_flags = trees,caves,dungeons,light +# type: flags possible values: caves, dungeons, light, decorations, nocaves, nodungeons, nolight, nodecorations +# mg_flags = caves,dungeons,light,decorations ### Advanced @@ -1093,8 +1094,8 @@ # When snowbiomes are enabled jungles are enabled and the jungles flag is ignored. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -# type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat -# mgv6_spflags = jungles,biomeblend,mudflow,snowbiomes +# type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, trees, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat, notrees +# mgv6_spflags = jungles,biomeblend,mudflow,snowbiomes,trees # Controls size of deserts and beaches in Mapgen v6. # When snowbiomes are enabled 'mgv6_freq_desert' is ignored. diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 3315f4aa..42eddb8c 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -313,7 +313,7 @@ void set_default_settings(Settings *settings) settings->setDefault("water_level", "1"); settings->setDefault("chunksize", "5"); settings->setDefault("mg_flags", "dungeons"); - settings->setDefault("mgv6_spflags", "jungles, snowbiomes"); + settings->setDefault("mgv6_spflags", "jungles, snowbiomes, trees"); // IPv6 settings->setDefault("enable_ipv6", "true"); diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 8a77000f..5a209edd 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -41,11 +41,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" FlagDesc flagdesc_mapgen[] = { - {"trees", MG_TREES}, - {"caves", MG_CAVES}, - {"dungeons", MG_DUNGEONS}, - {"flat", MG_FLAT}, - {"light", MG_LIGHT}, + {"trees", MG_TREES}, + {"caves", MG_CAVES}, + {"dungeons", MG_DUNGEONS}, + {"flat", MG_FLAT}, + {"light", MG_LIGHT}, + {"decorations", MG_DECORATIONS}, {NULL, 0} }; diff --git a/src/mapgen.h b/src/mapgen.h index 57e99584..31cf7dc1 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -29,11 +29,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #define DEFAULT_MAPGEN "v6" /////////////////// Mapgen flags -#define MG_TREES 0x01 -#define MG_CAVES 0x02 -#define MG_DUNGEONS 0x04 -#define MG_FLAT 0x08 -#define MG_LIGHT 0x10 +#define MG_TREES 0x01 +#define MG_CAVES 0x02 +#define MG_DUNGEONS 0x04 +#define MG_FLAT 0x08 +#define MG_LIGHT 0x10 +#define MG_DECORATIONS 0x20 class Settings; class MMVManip; @@ -126,7 +127,7 @@ struct MapgenParams { chunksize(5), seed(0), water_level(1), - flags(MG_TREES | MG_CAVES | MG_LIGHT), + flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS), np_biome_heat(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 5349, 3, 0.5, 2.0)), np_biome_heat_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0)), np_biome_humidity(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 842, 3, 0.5, 2.0)), diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index 7a8fe18a..1b41d0ac 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -296,7 +296,8 @@ void MapgenFlat::makeChunk(BlockMakeData *data) } // Generate the registered decorations - m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + if (flags & MG_DECORATIONS) + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); // Generate the registered ores m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 89d4e53d..26ebec35 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -310,7 +310,8 @@ void MapgenFractal::makeChunk(BlockMakeData *data) } // Generate the registered decorations - m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + if (flags & MG_DECORATIONS) + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); // Generate the registered ores m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 10e9f5e6..3d7e3bf8 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -296,7 +296,8 @@ void MapgenV5::makeChunk(BlockMakeData *data) } // Generate the registered decorations - m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + if (flags & MG_DECORATIONS) + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); // Generate the registered ores m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 3f3ccba4..3b5915bd 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -43,6 +43,7 @@ FlagDesc flagdesc_mapgen_v6[] = { {"mudflow", MGV6_MUDFLOW}, {"snowbiomes", MGV6_SNOWBIOMES}, {"flat", MGV6_FLAT}, + {"trees", MGV6_TREES}, {NULL, 0} }; @@ -580,11 +581,12 @@ void MapgenV6::makeChunk(BlockMakeData *data) growGrass(); // Generate some trees, and add grass, if a jungle - if (flags & MG_TREES) + if ((spflags & MGV6_TREES) || (flags & MG_TREES)) placeTreesAndJungleGrass(); // Generate the registered decorations - m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + if (flags & MG_DECORATIONS) + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); // Generate the registered ores m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index dec92ab4..612e2322 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -37,6 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MGV6_MUDFLOW 0x04 #define MGV6_SNOWBIOMES 0x08 #define MGV6_FLAT 0x10 +#define MGV6_TREES 0x20 extern FlagDesc flagdesc_mapgen_v6[]; diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 77b9721c..679d860d 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -317,7 +317,8 @@ void MapgenV7::makeChunk(BlockMakeData *data) } // Generate the registered decorations - m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + if (flags & MG_DECORATIONS) + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); // Generate the registered ores m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); From a4e3ed013611aead302a82836d5702640b2811a0 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 22 Nov 2015 16:15:47 +0100 Subject: [PATCH 110/531] Update HUD flags on server like on client Fixes bug for which commit 6c37e89f08f962eaba788a31f5d3c798ceaa65e6 "Fix old client showing duplicated health bar on new server" by @sapier laid the groundwork, where the server has updated its copy of the hud flags without respecting the mask. Fixes #3395. --- src/server.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server.cpp b/src/server.cpp index f6faccb1..86096055 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3034,7 +3034,8 @@ bool Server::hudSetFlags(Player *player, u32 flags, u32 mask) return false; SendHUDSetFlags(player->peer_id, flags, mask); - player->hud_flags = flags; + player->hud_flags &= ~mask; + player->hud_flags |= flags; PlayerSAO* playersao = player->getPlayerSAO(); From c24f3b0a65afc7654a8377fde29dec0709b1fc49 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 21 Nov 2015 20:22:45 +0000 Subject: [PATCH 111/531] Mgfractal: Move julia set selection into formula parameter Improve default parameters Update and improve documentation Unhide mapgen, but is still unstable --- builtin/settingtypes.txt | 36 ++++++++++++++++------------- minetest.conf.example | 49 ++++++++++++++++++++++++++-------------- src/emerge.cpp | 2 +- src/mapgen_fractal.cpp | 25 ++++++++++---------- src/mapgen_fractal.h | 3 --- 5 files changed, 65 insertions(+), 50 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index cb38ec11..2929b860 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -970,29 +970,33 @@ mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 1 [***Mapgen fractal] -# Map generation attributes specific to Mapgen fractal. -# The 'julia' flag results in the corresponding julia set being generated. -# Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. -mgfractal_spflags (Mapgen fractal flags) flags nojulia julia,nojulia - -# Choice of 4 mandelbrot set variations. -# 1 = 4D "Roundy" mandelbrot set, 2 = 4D "Squarry" mandelbrot set, -# 3 = 4D "Mandy Cousin" mandelbrot set, 4 = 4D mandelbrot set variation. -mgfractal_formula (Mapgen fractal formula) int 1 1 4 +# Choice of 8 4-dimensional fractals. +# 1 = "Roundy" mandelbrot set. +# 2 = "Roundy" julia set. +# 3 = "Squarry" mandelbrot set. +# 4 = "Squarry" julia set. +# 5 = "Mandy Cousin" mandelbrot set. +# 6 = "Mandy Cousin" julia set. +# 7 = "Variation" mandelbrot set. +# 8 = "Variation" julia set. +mgfractal_formula (Mapgen fractal formula) int 1 1 8 # Iterations of the recursive function. # Controls scale of finest detail. -mgfractal_iterations (Mapgen fractal iterations) int 9 +mgfractal_iterations (Mapgen fractal iterations) int 11 -# Approximate (X,Y,Z) scales in nodes. -mgfractal_scale (Mapgen fractal scale) v3f (1024.0, 256.0, 1024.0) +# Approximate (X,Y,Z) scale of fractal in nodes. +mgfractal_scale (Mapgen fractal scale) v3f (4096.0, 1024.0, 4096.0) -# (X,Y,Z) offsets from world centre. -# Range roughly -2 to 2, multiply by 'scale' for offsets in nodes. -mgfractal_offset (Mapgen fractal offset) v3f (1.75, 0.0, 0.0) +# (X,Y,Z) offset of fractal from world centre. +# Used to move a suitable spawn area of low land close to (0, 0). +# The default is suitable for mandelbrot sets, it needs to be edited for julia sets, +# do this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0). +# Range roughly -2 to 2. Multiply by 'scale' for offset in nodes. +mgfractal_offset (Mapgen fractal offset) v3f (1.79, 0.0, 0.0) # W co-ordinate of the generated 3D slice of the 4D shape. +# Alters the generated 3D shape. # Range roughly -2 to 2. mgfractal_slice_w (Mapgen fractal slice w) float 0.0 diff --git a/minetest.conf.example b/minetest.conf.example index d8534a0f..37d622d3 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1234,44 +1234,59 @@ #### Mapgen fractal -# Map generation attributes specific to Mapgen fractal. -# The 'julia' flag results in the corresponding julia set being generated. -# Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. -# type: flags possible values: julia, nojulia -# mgfractal_spflags = nojulia - -# Choice of 4 mandelbrot set variations. -# 1 = 4D "Roundy" mandelbrot set, 2 = 4D "Squarry" mandelbrot set, -# 3 = 4D "Mandy Cousin" mandelbrot set, 4 = 4D mandelbrot set variation. +# Choice of 8 4-dimensional fractals. +# 1 = "Roundy" mandelbrot set. +# 2 = "Roundy" julia set. +# 3 = "Squarry" mandelbrot set. +# 4 = "Squarry" julia set. +# 5 = "Mandy Cousin" mandelbrot set. +# 6 = "Mandy Cousin" julia set. +# 7 = "Variation" mandelbrot set. +# 8 = "Variation" julia set. # type: int # mgfractal_formula = 1 # Iterations of the recursive function. # Controls scale of finest detail. # type: int -# mgfractal_iterations = 9 +# mgfractal_iterations = 11 -# Approximate (X,Y,Z) scales in nodes. +# Approximate (X,Y,Z) scale of fractal in nodes. # type: v3f -# mgfractal_scale = (1024.0, 256.0, 1024.0) +# mgfractal_scale = (4096.0, 1024.0, 4096.0) -# (X,Y,Z) offsets from world centre. -# Range roughly -2 to 2, multiply by 'scale' for offsets in nodes. +# (X,Y,Z) offset of fractal from world centre. +# Used to move a suitable spawn area of low land close to (0, 0). +# The default is suitable for mandelbrot sets, it needs to be edited for julia sets, +# do this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0). +# Range roughly -2 to 2. Multiply by 'scale' for offset in nodes. # type: v3f -# mgfractal_offset = (1.75, 0.0, 0.0) +# mgfractal_offset = (1.79, 0.0, 0.0) # W co-ordinate of the generated 3D slice of the 4D shape. +# Alters the generated 3D shape. # Range roughly -2 to 2. # type: float # mgfractal_slice_w = 0.0 -# Julia set only: 4 values determining the 4D shape. +# Julia set only: X value determining the 4D shape. # Range roughly -2 to 2. # type: float # mgfractal_julia_x = 0.33 + +# Julia set only: Y value determining the 4D shape. +# Range roughly -2 to 2. +# type: float # mgfractal_julia_y = 0.33 + +# Julia set only: Z value determining the 4D shape. +# Range roughly -2 to 2. +# type: float # mgfractal_julia_z = 0.33 + +# Julia set only: W value determining the 4D shape. +# Range roughly -2 to 2. +# type: float # mgfractal_julia_w = 0.33 # type: noise_params diff --git a/src/emerge.cpp b/src/emerge.cpp index a60f67ac..6d4d84d7 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -107,7 +107,7 @@ MapgenDesc g_reg_mapgens[] = { {"v6", new MapgenFactoryV6, true}, {"v7", new MapgenFactoryV7, true}, {"flat", new MapgenFactoryFlat, false}, - {"fractal", new MapgenFactoryFractal, false}, + {"fractal", new MapgenFactoryFractal, true}, {"singlenode", new MapgenFactorySinglenode, false}, }; diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 26ebec35..676e2f44 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_sao.h" #include "nodedef.h" #include "voxelalgorithms.h" -#include "profiler.h" // For TimeTaker +//#include "profiler.h" // For TimeTaker #include "settings.h" // For g_settings #include "emerge.h" #include "dungeongen.h" @@ -41,7 +41,6 @@ with this program; if not, write to the Free Software Foundation, Inc., FlagDesc flagdesc_mapgen_fractal[] = { - {"julia", MGFRACTAL_JULIA}, {NULL, 0} }; @@ -143,9 +142,9 @@ MapgenFractalParams::MapgenFractalParams() spflags = 0; formula = 1; - iterations = 9; - scale = v3f(1024.0, 256.0, 1024.0); - offset = v3f(1.75, 0.0, 0.0); + iterations = 11; + scale = v3f(4096.0, 1024.0, 4096.0); + offset = v3f(1.79, 0.0, 0.0); slice_w = 0.0; julia_x = 0.33; @@ -236,7 +235,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data) this->generating = true; this->vm = data->vmanip; this->ndef = data->nodedef; - TimeTaker t("makeChunk"); + //TimeTaker t("makeChunk"); v3s16 blockpos_min = data->blockpos_min; v3s16 blockpos_max = data->blockpos_max; @@ -319,7 +318,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data) // Sprinkle some dust on top after everything else was generated dustTopNodes(); - printf("makeChunk: %dms\n", t.stop()); + //printf("makeChunk: %dms\n", t.stop()); updateLiquid(&data->transforming_liquid, full_node_min, full_node_max); @@ -369,7 +368,7 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) { float cx, cy, cz, cw, ox, oy, oz, ow; - if (spflags & MGFRACTAL_JULIA) { // Julia set + if (formula % 2 == 0) { // Julia sets, formula = 2, 4, 6, 8 cx = julia_x; cy = julia_y; cz = julia_z; @@ -378,7 +377,7 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) oy = (float)y / scale.Y - offset.Y; oz = (float)z / scale.Z - offset.Z; ow = slice_w; - } else { // Mandelbrot set + } else { // Mandelbrot sets, formula = 1, 3, 5, 7 cx = (float)x / scale.X - offset.X; cy = (float)y / scale.Y - offset.Y; cz = (float)z / scale.Z - offset.Z; @@ -395,22 +394,22 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) float nz = 0.0f; float nw = 0.0f; - if (formula == 1) { // 4D "Roundy" Mandelbrot Set + if (formula == 1 || formula == 2) { // 4D "Roundy" Mandelbrot/Julia Set nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz + oy * ow) + cz; nw = 2.0f * (ox * ow + oy * oz) + cw; - } else if (formula == 2) { // 4D "Squarry" Mandelbrot Set + } else if (formula == 3 || formula == 4) { // 4D "Squarry" Mandelbrot/Julia Set nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz + oy * ow) + cz; nw = 2.0f * (ox * ow - oy * oz) + cw; - } else if (formula == 3) { // 4D "Mandy Cousin" Mandelbrot Set + } else if (formula == 5 || formula == 6) { // 4D "Mandy Cousin" Mandelbrot/Julia Set nx = ox * ox - oy * oy - oz * oz + ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz + oy * ow) + cz; nw = 2.0f * (ox * ow + oy * oz) + cw; - } else if (formula == 4) { // 4D Mandelbrot Set Variation + } else if (formula == 7 || formula == 8) { // 4D "Variation" Mandelbrot/Julia Set nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz - oy * ow) + cz; diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index 5800ae20..7d31a43b 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -25,9 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MGFRACTAL_LARGE_CAVE_DEPTH -33 -/////////////////// Mapgen Fractal flags -#define MGFRACTAL_JULIA 0x01 - class BiomeManager; extern FlagDesc flagdesc_mapgen_fractal[]; From 0cf15470fc16e1ebc13a7d8445cfd4278c3caf8b Mon Sep 17 00:00:00 2001 From: Robert Zenz Date: Sat, 7 Nov 2015 16:31:32 +0100 Subject: [PATCH 112/531] Simplify regex used in check_modname_prefix and other improvements. Simplified the regex used, added comments and changed the error message to contain the correct mod name. --- builtin/game/register.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/builtin/game/register.lua b/builtin/game/register.lua index 840ade12..00bb2327 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -51,20 +51,24 @@ local forbidden_item_names = { local function check_modname_prefix(name) if name:sub(1,1) == ":" then - -- Escape the modname prefix enforcement mechanism + -- If the name starts with a colon, we can skip the modname prefix + -- mechanism. return name:sub(2) else - -- Modname prefix enforcement + -- Enforce that the name starts with the correct mod name. local expected_prefix = core.get_current_modname() .. ":" if name:sub(1, #expected_prefix) ~= expected_prefix then error("Name " .. name .. " does not follow naming conventions: " .. - "\"modname:\" or \":\" prefix required") + "\"" .. expected_prefix .. "\" or \":\" prefix required") end + + -- Enforce that the name only contains letters, numbers and underscores. local subname = name:sub(#expected_prefix+1) - if subname:find("[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]") then + if subname:find("[^%w_]") then error("Name " .. name .. " does not follow naming conventions: " .. "contains unallowed characters") end + return name end end From 900db310638531a8b9fb1a587f75a02a15ae0c24 Mon Sep 17 00:00:00 2001 From: Aaron Suen Date: Sun, 13 Sep 2015 21:04:22 -0400 Subject: [PATCH 113/531] Re-enable texture pre-filters on wielditems, fixing #3178. --- src/wieldmesh.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp index bc2977a0..a022754a 100644 --- a/src/wieldmesh.cpp +++ b/src/wieldmesh.cpp @@ -283,7 +283,7 @@ void WieldMeshSceneNode::setExtruded(const std::string &imagename, // Customize material video::SMaterial &material = m_meshnode->getMaterial(0); - material.setTexture(0, tsrc->getTexture(imagename)); + material.setTexture(0, tsrc->getTextureForMesh(imagename)); material.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE; material.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE; material.MaterialType = m_material_type; From 452c88308c80dc52df95d5c2a9e0e105154684d0 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 28 Nov 2015 14:51:22 +0000 Subject: [PATCH 114/531] Dungeongen: Also preserve river water nodes For future river mapgens Dungeons will not generate in river water, to avoid dungeons filling and blocking river channels --- src/dungeongen.cpp | 5 ++++- src/dungeongen.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp index 9c6e24a6..bfaad9fa 100644 --- a/src/dungeongen.cpp +++ b/src/dungeongen.cpp @@ -65,6 +65,9 @@ DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams) dp.np_wetness = nparams_dungeon_wetness; dp.np_density = nparams_dungeon_density; } + + // For mapgens using river water + dp.c_river_water = mg->ndef->getId("mapgen_river_water_source"); } @@ -87,7 +90,7 @@ void DungeonGen::generate(u32 bseed, v3s16 nmin, v3s16 nmax) u32 i = vm->m_area.index(nmin.X, y, z); for (s16 x = nmin.X; x <= nmax.X; x++) { content_t c = vm->m_data[i].getContent(); - if (c == CONTENT_AIR || c == dp.c_water) + if (c == CONTENT_AIR || c == dp.c_water || c == dp.c_river_water) vm->m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE; i++; } diff --git a/src/dungeongen.h b/src/dungeongen.h index 4e1201d8..d209dd4b 100644 --- a/src/dungeongen.h +++ b/src/dungeongen.h @@ -40,6 +40,7 @@ int dir_to_facedir(v3s16 d); struct DungeonParams { content_t c_water; + content_t c_river_water; content_t c_cobble; content_t c_moss; content_t c_stair; From 5292ba7391cd611c60ca55df55246af7edefb16c Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 28 Nov 2015 19:49:11 +0000 Subject: [PATCH 115/531] Lua_api.txt: Add documentation for biome definition --- doc/lua_api.txt | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index f82c3c2a..9ffb497d 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3578,6 +3578,51 @@ Definition tables -- ^ Can be a list of (or a single) biome names, IDs, or definitions. } +### Biome definition (`register_biome`) + + { + name = "tundra", + node_dust = "default:snow", + -- ^ Node dropped onto upper surface after all else is generated. + node_top = "default:dirt_with_snow", + depth_top = 1, + -- ^ Node forming surface layer of biome and thickness of this layer. + node_filler = "default:permafrost", + depth_filler = 3, + -- ^ Node forming lower layer of biome and thickness of this layer. + node_stone = "default:bluestone", + -- ^ Node that replaces all stone nodes between roughly y_min and y_max. + node_water_top = "default:ice", + depth_water_top = 10, + -- ^ Node forming a surface layer in seawater with the defined thickness. + node_water = "", + -- ^ Node that replaces all seawater nodes not in the defined surface layer. + node_river_water = "default:ice", + -- ^ Node that replaces river water in mapgens that use default:river_water. + y_min = 1, + y_max = 31000, + -- ^ Lower and upper limits for biome. + -- ^ Because biome is not recalculated for every node in a node column + -- ^ some biome materials can exceed their limits, especially stone. + -- ^ For each node column in a mapchunk, biome is only recalculated at column + -- ^ top and at each of these surfaces: + -- ^ Ground below air, water below air, ground below water. + -- ^ The selected biome then stays in effect for all nodes below until + -- ^ column base or the next biome recalculation. + heat_point = 0, + humidity_point = 50, + -- ^ Characteristic average temperature and humidity for the biome. + -- ^ These values create 'biome points' on a voronoi diagram that has heat + -- ^ and humidity as axes. The resulting voronoi cells determine which + -- ^ heat/humidity points belong to which biome, and therefore determine + -- ^ the area and location of each biome in the world. + -- ^ The biome points need to be carefully and evenly spaced on the voronoi + -- ^ diagram to result in roughly equal size biomes. + -- ^ Heat and humidity have average values of 50, vary mostly between + -- ^ 0 and 100 but also often exceed these values. + -- ^ Heat is not in degrees celcius, both values are abstract. + } + ### Decoration definition (`register_decoration`) { From 6fead2818acf00a63c89ec613230a59bc0c4cab5 Mon Sep 17 00:00:00 2001 From: Jay Arndt Date: Sun, 29 Nov 2015 17:57:12 -0600 Subject: [PATCH 116/531] Remove unused OpenALSoundManager::m_can_vorbis and EXT_vorbis check --- src/sound_openal.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp index 0c4ae885..e2b6d937 100644 --- a/src/sound_openal.cpp +++ b/src/sound_openal.cpp @@ -269,7 +269,6 @@ private: OnDemandSoundFetcher *m_fetcher; ALCdevice *m_device; ALCcontext *m_context; - bool m_can_vorbis; int m_next_id; std::map > m_buffers; std::map m_sounds_playing; @@ -280,7 +279,6 @@ public: m_fetcher(fetcher), m_device(NULL), m_context(NULL), - m_can_vorbis(false), m_next_id(1), m_is_initialized(false) { @@ -295,14 +293,6 @@ public: return; } - if(alcIsExtensionPresent(m_device, "EXT_vorbis")){ - infostream<<"Audio: Vorbis extension present"< Date: Mon, 30 Nov 2015 01:43:28 +0000 Subject: [PATCH 117/531] Dungeongen: Fix rarely triggered segfault A segfault exposed a missing 'vm->m_area.contains()' check in makeCorridor that allowed the calculation of vm index for a node outside the vm area. The huge and invalid index number caused getContent to fail --- src/dungeongen.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp index bfaad9fa..cb5ea97b 100644 --- a/src/dungeongen.cpp +++ b/src/dungeongen.cpp @@ -392,7 +392,8 @@ void DungeonGen::makeCorridor(v3s16 doorplace, v3s16 doordir, if (partcount != 0) p.Y += make_stairs; - if (vm->m_area.contains(p) && vm->m_area.contains(p + v3s16(0, 1, 0))) { + if (vm->m_area.contains(p) && vm->m_area.contains(p + v3s16(0, 1, 0)) && + vm->m_area.contains(v3s16(p.X - dir.X, p.Y - 1, p.Z - dir.Z))) { if (make_stairs) { makeFill(p + v3s16(-1, -1, -1), dp.holesize + v3s16(2, 3, 2), From 97908cc65670d3f6cf2e286390bfea10f653aaa8 Mon Sep 17 00:00:00 2001 From: Alex Ford Date: Wed, 18 Nov 2015 12:26:09 -0700 Subject: [PATCH 118/531] Add on_secondary_use when right clicking an item in the air --- builtin/game/item.lua | 7 +++++++ builtin/game/register.lua | 1 + doc/lua_api.txt | 5 +++++ src/client.cpp | 1 + src/game.cpp | 12 ++++++++++++ src/network/serverpackethandler.cpp | 17 +++++++++++++++++ src/script/cpp_api/s_item.cpp | 26 ++++++++++++++++++++++++++ src/script/cpp_api/s_item.h | 2 ++ 8 files changed, 71 insertions(+) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index 44ec35cc..6c2214ef 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -347,6 +347,10 @@ function core.item_place(itemstack, placer, pointed_thing, param2) return itemstack end +function core.item_secondary_use(itemstack, placer) + return itemstack +end + function core.item_drop(itemstack, dropper, pos) if dropper and dropper:is_player() then local v = dropper:get_look_dir() @@ -605,6 +609,7 @@ core.craftitemdef_default = { -- Interaction callbacks on_place = redef_wrapper(core, 'item_place'), -- core.item_place on_drop = redef_wrapper(core, 'item_drop'), -- core.item_drop + on_secondary_use = redef_wrapper(core, 'item_secondary_use'), on_use = nil, } @@ -622,6 +627,7 @@ core.tooldef_default = { -- Interaction callbacks on_place = redef_wrapper(core, 'item_place'), -- core.item_place + on_secondary_use = redef_wrapper(core, 'item_secondary_use'), on_drop = redef_wrapper(core, 'item_drop'), -- core.item_drop on_use = nil, } @@ -640,6 +646,7 @@ core.noneitemdef_default = { -- This is used for the hand and unknown items -- Interaction callbacks on_place = redef_wrapper(core, 'item_place'), + on_secondary_use = redef_wrapper(core, 'item_secondary_use'), on_drop = nil, on_use = nil, } diff --git a/builtin/game/register.lua b/builtin/game/register.lua index 00bb2327..992fdf74 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -272,6 +272,7 @@ core.register_item(":unknown", { description = "Unknown Item", inventory_image = "unknown_item.png", on_place = core.item_place, + on_secondary_use = core.item_secondary_use, on_drop = core.item_drop, groups = {not_in_creative_inventory=1}, diggable = true, diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 9ffb497d..11f90ba0 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3303,6 +3303,11 @@ Definition tables --[[ ^ Shall place item and return the leftover itemstack ^ default: minetest.item_place ]] + on_secondary_use = func(itemstack, user, pointed_thing), + --[[ + ^ Same as on_place but called when pointing at nothing. + ^ pointed_thing : always { type = "nothing" } + ]] on_drop = func(itemstack, dropper, pos), --[[ ^ Shall drop item and return the leftover itemstack diff --git a/src/client.cpp b/src/client.cpp index 5c04632d..8e49ee3b 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -946,6 +946,7 @@ void Client::interact(u8 action, const PointedThing& pointed) 2: digging completed 3: place block or item (to abovesurface) 4: use item + 5: perform secondary action of item */ NetworkPacket pkt(TOSERVER_INTERACT, 1 + 2 + 0); diff --git a/src/game.cpp b/src/game.cpp index e6a1a225..5e4f4cac 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1525,6 +1525,7 @@ protected: void processPlayerInteraction(std::vector &highlight_boxes, GameRunData *runData, f32 dtime, bool show_hud, bool show_debug); + void handlePointingAtNothing(GameRunData *runData, const ItemStack &playerItem); void handlePointingAtNode(GameRunData *runData, const PointedThing &pointed, const ItemDefinition &playeritem_def, const ToolCapabilities &playeritem_toolcap, f32 dtime); @@ -3603,6 +3604,8 @@ void Game::processPlayerInteraction(std::vector &highlight_boxes, } else if (input->getLeftState()) { // When button is held down in air, show continuous animation runData->left_punch = true; + } else if (input->getRightClicked()) { + handlePointingAtNothing(runData, playeritem); } runData->pointed_old = pointed; @@ -3618,6 +3621,15 @@ void Game::processPlayerInteraction(std::vector &highlight_boxes, } +void Game::handlePointingAtNothing(GameRunData *runData, const ItemStack &playerItem) +{ + infostream << "Right Clicked in Air" << std::endl; + PointedThing fauxPointed; + fauxPointed.type = POINTEDTHING_NOTHING; + client->interact(5, fauxPointed); +} + + void Game::handlePointingAtNode(GameRunData *runData, const PointedThing &pointed, const ItemDefinition &playeritem_def, const ToolCapabilities &playeritem_toolcap, f32 dtime) diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index a4fa502a..a5aaf1ec 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1653,6 +1653,23 @@ void Server::handleCommand_Interact(NetworkPacket* pkt) } } // action == 4 + + /* + 5: rightclick air + */ + else if (action == 5) { + ItemStack item = playersao->getWieldedItem(); + + actionstream << player->getName() << " activates " + << item.name << std::endl; + + if (m_script->item_OnSecondaryUse( + item, playersao)) { + if( playersao->setWieldedItem(item)) { + SendInventory(playersao); + } + } + } /* diff --git a/src/script/cpp_api/s_item.cpp b/src/script/cpp_api/s_item.cpp index d9a545b4..3c84fb8c 100644 --- a/src/script/cpp_api/s_item.cpp +++ b/src/script/cpp_api/s_item.cpp @@ -110,6 +110,32 @@ bool ScriptApiItem::item_OnUse(ItemStack &item, return true; } +bool ScriptApiItem::item_OnSecondaryUse(ItemStack &item, ServerActiveObject *user) +{ + SCRIPTAPI_PRECHECKHEADER + + int error_handler = PUSH_ERROR_HANDLER(L); + + if (!getItemCallback(item.name.c_str(), "on_secondary_use")) + return false; + + LuaItemStack::create(L, item); + objectrefGetOrCreate(L, user); + PointedThing pointed; + pointed.type = POINTEDTHING_NOTHING; + pushPointedThing(pointed); + PCALL_RES(lua_pcall(L, 3, 1, error_handler)); + if (!lua_isnil(L, -1)) { + try { + item = read_item(L, -1, getServer()); + } catch (LuaError &e) { + throw LuaError(std::string(e.what()) + ". item=" + item.name); + } + } + lua_pop(L, 2); // Pop item and error handler + return true; +} + bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user, const InventoryList *old_craft_grid, const InventoryLocation &craft_inv) { diff --git a/src/script/cpp_api/s_item.h b/src/script/cpp_api/s_item.h index 88cc1909..7350a71c 100644 --- a/src/script/cpp_api/s_item.h +++ b/src/script/cpp_api/s_item.h @@ -42,6 +42,8 @@ public: ServerActiveObject *placer, const PointedThing &pointed); bool item_OnUse(ItemStack &item, ServerActiveObject *user, const PointedThing &pointed); + bool item_OnSecondaryUse(ItemStack &item, + ServerActiveObject *user); bool item_OnCraft(ItemStack &item, ServerActiveObject *user, const InventoryList *old_craft_grid, const InventoryLocation &craft_inv); bool item_CraftPredict(ItemStack &item, ServerActiveObject *user, From e51ea66bd087e56b2e446f64bd4d185b4786325c Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 30 Nov 2015 02:31:43 +0000 Subject: [PATCH 119/531] Mgv5/v7/flat/fractal: More large pseudorandom caves Mgv7/flat/fractal: Reduce tunnel noise spreads to 96 --- src/mapgen_flat.cpp | 8 ++++---- src/mapgen_fractal.cpp | 8 ++++---- src/mapgen_v5.cpp | 4 ++-- src/mapgen_v7.cpp | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index 1b41d0ac..c961d755 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -148,8 +148,8 @@ MapgenFlatParams::MapgenFlatParams() np_terrain = NoiseParams(0, 1, v3f(600, 600, 600), 7244, 5, 0.6, 2.0); np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0); - np_cave1 = NoiseParams(0, 12, v3f(128, 128, 128), 52534, 4, 0.5, 2.0); - np_cave2 = NoiseParams(0, 12, v3f(128, 128, 128), 10325, 4, 0.5, 2.0); + np_cave1 = NoiseParams(0, 12, v3f(96, 96, 96), 52534, 4, 0.5, 2.0); + np_cave2 = NoiseParams(0, 12, v3f(96, 96, 96), 10325, 4, 0.5, 2.0); } @@ -559,7 +559,7 @@ void MapgenFlat::generateCaves(s16 max_stone_y) for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { float d1 = contour(noise_cave1->result[index]); float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.4f) { + if (d1 * d2 > 0.3f) { content_t c = vm->m_data[vi].getContent(); if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) continue; @@ -574,7 +574,7 @@ void MapgenFlat::generateCaves(s16 max_stone_y) return; PseudoRandom ps(blockseed + 21343); - u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0; + u32 bruises_count = ps.range(0, 2); for (u32 i = 0; i < bruises_count; i++) { CaveV5 cave(this, &ps); cave.makeCave(node_min, node_max, max_stone_y); diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 676e2f44..14dfe5c8 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -154,8 +154,8 @@ MapgenFractalParams::MapgenFractalParams() np_seabed = NoiseParams(-14, 9, v3f(600, 600, 600), 41900, 5, 0.6, 2.0); np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0); - np_cave1 = NoiseParams(0, 12, v3f(128, 128, 128), 52534, 4, 0.5, 2.0); - np_cave2 = NoiseParams(0, 12, v3f(128, 128, 128), 10325, 4, 0.5, 2.0); + np_cave1 = NoiseParams(0, 12, v3f(96, 96, 96), 52534, 4, 0.5, 2.0); + np_cave2 = NoiseParams(0, 12, v3f(96, 96, 96), 10325, 4, 0.5, 2.0); } @@ -624,7 +624,7 @@ void MapgenFractal::generateCaves(s16 max_stone_y) for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { float d1 = contour(noise_cave1->result[index]); float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.4f) { + if (d1 * d2 > 0.3f) { content_t c = vm->m_data[vi].getContent(); if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) continue; @@ -639,7 +639,7 @@ void MapgenFractal::generateCaves(s16 max_stone_y) return; PseudoRandom ps(blockseed + 21343); - u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0; + u32 bruises_count = ps.range(0, 2); for (u32 i = 0; i < bruises_count; i++) { CaveV5 cave(this, &ps); cave.makeCave(node_min, node_max, max_stone_y); diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 3d7e3bf8..92cf0020 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -518,7 +518,7 @@ void MapgenV5::generateCaves(int max_stone_y) for (s16 x = node_min.X; x <= node_max.X; x++, i++, index++) { float d1 = contour(noise_cave1->result[index]); float d2 = contour(noise_cave2->result[index]); - if (d1*d2 > 0.125) { + if (d1 * d2 > 0.125f) { content_t c = vm->m_data[i].getContent(); if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) continue; @@ -533,7 +533,7 @@ void MapgenV5::generateCaves(int max_stone_y) return; PseudoRandom ps(blockseed + 21343); - u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0; + u32 bruises_count = ps.range(0, 2); for (u32 i = 0; i < bruises_count; i++) { CaveV5 cave(this, &ps); cave.makeCave(node_min, node_max, max_stone_y); diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 679d860d..3842b1a9 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -157,8 +157,8 @@ MapgenV7Params::MapgenV7Params() np_ridge_uwater = NoiseParams(0, 1, v3f(1000, 1000, 1000), 85039, 5, 0.6, 2.0); np_mountain = NoiseParams(-0.6, 1, v3f(250, 350, 250), 5333, 5, 0.63, 2.0); np_ridge = NoiseParams(0, 1, v3f(100, 100, 100), 6467, 4, 0.75, 2.0); - np_cave1 = NoiseParams(0, 12, v3f(100, 100, 100), 52534, 4, 0.5, 2.0); - np_cave2 = NoiseParams(0, 12, v3f(100, 100, 100), 10325, 4, 0.5, 2.0); + np_cave1 = NoiseParams(0, 12, v3f(96, 96, 96), 52534, 4, 0.5, 2.0); + np_cave2 = NoiseParams(0, 12, v3f(96, 96, 96), 10325, 4, 0.5, 2.0); } @@ -870,7 +870,7 @@ void MapgenV7::generateCaves(s16 max_stone_y) for (s16 x = node_min.X; x <= node_max.X; x++, i++, index++) { float d1 = contour(noise_cave1->result[index]); float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.3) { + if (d1 * d2 > 0.3f) { content_t c = vm->m_data[i].getContent(); if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) continue; @@ -882,7 +882,7 @@ void MapgenV7::generateCaves(s16 max_stone_y) } PseudoRandom ps(blockseed + 21343); - u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0; + u32 bruises_count = ps.range(0, 2); for (u32 i = 0; i < bruises_count; i++) { CaveV7 cave(this, &ps); cave.makeCave(node_min, node_max, max_stone_y); From 89168a7ec8fe31715a4ca321a6e0ccb2d4972257 Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 2 Dec 2015 18:26:09 +0100 Subject: [PATCH 120/531] Document limitations of minetest.get_password_hash --- doc/lua_api.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 11f90ba0..4799a30f 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1921,7 +1921,11 @@ Call these functions only at load time! * Should be called by the authentication handler if privileges changes. * To report everybody, set `name=nil`. * `minetest.get_password_hash(name, raw_password)` - * Convert a name-password pair to a password hash that Minetest can use + * Convert a name-password pair to a password hash that Minetest can use. + * The returned value alone is not a good basis for password checks based + * on comparing the password hash in the database with the password hash + * from the function, with an externally provided password, as the hash + * in the db might use the new SRP verifier format. * `minetest.string_to_privs(str)`: returns `{priv1=true,...}` * `minetest.privs_to_string(privs)`: returns `"priv1,priv2,..."` * Convert between two privilege representations From d8975eabf95fac1881f75ab149d0cebeff3d10f3 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 3 Dec 2015 21:34:46 +0100 Subject: [PATCH 121/531] Fix build if BUILD_SHARED_LIBS defaults to "ON" openSUSE sets that option to ON. Fixes #3420. --- src/cguittfont/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cguittfont/CMakeLists.txt b/src/cguittfont/CMakeLists.txt index 7717a2f9..6cd35f31 100644 --- a/src/cguittfont/CMakeLists.txt +++ b/src/cguittfont/CMakeLists.txt @@ -2,7 +2,7 @@ # Do not add CGUITTFont.cpp to the line below. # xCGUITTFont.cpp is a wrapper file that includes # additional required headers. -add_library(cguittfont xCGUITTFont.cpp) +add_library(cguittfont STATIC xCGUITTFont.cpp) if(FREETYPE_PKGCONFIG_FOUND) set_target_properties(cguittfont From 5643b9b9ed3ec39f90e3a7c9bf09bc255e0bcef3 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 5 Dec 2015 17:51:56 +0100 Subject: [PATCH 122/531] Make travis work again Now we do sudo apt-get update to download package sources. This fixes travis build with the new GCE based infrastructure. Closes #3427. Closes #3426. --- util/travis/before_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index b6111804..20f6674a 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -8,6 +8,7 @@ if [[ $CC == "clang" ]]; then sudo apt-get install llvm-3.1 sudo apt-get install clang fi +sudo apt-get update sudo apt-get install p7zip-full if [[ $PLATFORM == "Linux" ]]; then sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \ From 70ece71ee4e8f8bff5cbc572710c0fa6fc3b355f Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 3 Dec 2015 21:18:39 +0100 Subject: [PATCH 123/531] Improve LuaJIT detection On openSUSE luajit is not detected correctly. This is because openSUSE is using a lua version suffix, like other Linux distributions do it also. So the include directory is: include/luajit-5_1-2.0 --- cmake/Modules/FindLua.cmake | 25 ----------------- cmake/Modules/FindLuaJIT.cmake | 50 ++++++++++++++++++++++++++++++++++ src/CMakeLists.txt | 19 +++++++++++-- 3 files changed, 67 insertions(+), 27 deletions(-) delete mode 100644 cmake/Modules/FindLua.cmake create mode 100644 cmake/Modules/FindLuaJIT.cmake diff --git a/cmake/Modules/FindLua.cmake b/cmake/Modules/FindLua.cmake deleted file mode 100644 index 479dfcf4..00000000 --- a/cmake/Modules/FindLua.cmake +++ /dev/null @@ -1,25 +0,0 @@ - -option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE) -mark_as_advanced(LUA_LIBRARY LUA_INCLUDE_DIR) -set(USE_LUAJIT FALSE) - -if(ENABLE_LUAJIT) - find_library(LUA_LIBRARY luajit - NAMES luajit-5.1) - find_path(LUA_INCLUDE_DIR luajit.h - NAMES luajit.h - PATH_SUFFIXES luajit-2.0) - if(LUA_LIBRARY AND LUA_INCLUDE_DIR) - set(USE_LUAJIT TRUE) - endif() -else() - message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)") -endif() - -if(NOT USE_LUAJIT) - message(STATUS "LuaJIT not found, using bundled Lua.") - set(LUA_LIBRARY "lua") - set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") - add_subdirectory(lua) -endif() - diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake new file mode 100644 index 00000000..e4335d83 --- /dev/null +++ b/cmake/Modules/FindLuaJIT.cmake @@ -0,0 +1,50 @@ +# Locate LuaJIT library +# This module defines +# LUAJIT_FOUND, if false, do not try to link to Lua +# LUA_INCLUDE_DIR, where to find lua.h +# LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8) +# +# This module is similar to FindLua51.cmake except that it finds LuaJit instead. + +FIND_PATH(LUA_INCLUDE_DIR luajit.h + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES include/luajit-2.0 include/luajit-5_1-2.0 include + PATHS + ~/Library/Frameworks + /Library/Frameworks + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave + /opt +) + +FIND_LIBRARY(LUA_LIBRARY + NAMES luajit-5.1 + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib + PATHS + ~/Library/Frameworks + /Library/Frameworks + /sw + /opt/local + /opt/csw + /opt +) + +IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h") + FILE(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT .+\"") + + STRING(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}") + UNSET(lua_version_str) +ENDIF() + +INCLUDE(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if +# all listed variables are TRUE +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJit + REQUIRED_VARS LUA_LIBRARY LUA_INCLUDE_DIR + VERSION_VAR LUA_VERSION_STRING) + +MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dfbd2f5d..6256a850 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -155,8 +155,23 @@ if(ENABLE_FREETYPE) endif() endif(ENABLE_FREETYPE) - -find_package(Lua REQUIRED) +# LuaJIT +option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE) +set(USE_LUAJIT FALSE) +if(ENABLE_LUAJIT) + find_package(LuaJIT) + if(LUAJIT_FOUND) + set(USE_LUAJIT TRUE) + endif(LUAJIT_FOUND) +else() + message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)") +endif() +if(NOT USE_LUAJIT) + message(STATUS "LuaJIT not found, using bundled Lua.") + set(LUA_LIBRARY "lua") + set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") + add_subdirectory(lua) +endif() find_package(GMP REQUIRED) From a78dd7f2b6b0e1fefdbaa1ae21b722dd4459e4f4 Mon Sep 17 00:00:00 2001 From: Jun Zhang Date: Sat, 5 Dec 2015 21:00:11 +0800 Subject: [PATCH 124/531] Fix spelling of noise_threshold --- doc/lua_api.txt | 6 +++--- games/minimal/mods/default/mapgen.lua | 2 +- src/mg_ore.h | 2 +- src/noise.cpp | 8 ++++---- src/script/lua_api/l_mapgen.cpp | 11 ++++++++++- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 4799a30f..6e7a5446 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -763,7 +763,7 @@ Creates veins of ore varying in density by according to the intersection of two instances of 3d perlin noise with diffferent seeds, both described by `noise_params`. `random_factor` varies the influence random chance has on placement of an ore inside the vein, which is `1` by default. Note that -modifying this parameter may require adjusting `noise_threshhold`. +modifying this parameter may require adjusting `noise_threshold`. The parameters `clust_scarcity`, `clust_num_ores`, and `clust_size` are ignored by this ore type. This ore type is difficult to control since it is sensitive to small changes. The following is a decent set of parameters to work from: @@ -777,7 +777,7 @@ to small changes. The following is a decent set of parameters to work from: persist = 0.5, flags = "eased", }, - noise_threshhold = 1.6 + noise_threshold = 1.6 WARNING: Use this ore type *very* sparingly since it is ~200x more computationally expensive than any other ore. @@ -3572,7 +3572,7 @@ Definition tables y_max = 64, flags = "", -- ^ Attributes for this ore generation - noise_threshhold = 0.5, + noise_threshold = 0.5, -- ^ If noise is above this threshold, ore is placed. Not needed for a uniform distribution noise_params = {offset=0, scale=1, spread={x=100, y=100, z=100}, seed=23, octaves=3, persist=0.70} -- ^ NoiseParams structure describing the perlin noise used for ore distribution. diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua index 2082d598..65b67dae 100644 --- a/games/minimal/mods/default/mapgen.lua +++ b/games/minimal/mods/default/mapgen.lua @@ -36,7 +36,7 @@ minetest.register_ore({ clust_size = 7, y_min = -15, y_max = 0, - noise_threshhold = 0, + noise_threshold = 0, noise_params = { offset=0.35, scale=0.2, diff --git a/src/mg_ore.h b/src/mg_ore.h index 8ffb8fca..2e065cee 100644 --- a/src/mg_ore.h +++ b/src/mg_ore.h @@ -61,7 +61,7 @@ public: s16 y_max; u8 ore_param2; // to set node-specific attributes u32 flags; // attributes for this ore - float nthresh; // threshhold for noise at which an ore is placed + float nthresh; // threshold for noise at which an ore is placed NoiseParams np; // noise for distribution of clusters (NULL for uniform scattering) Noise *noise; std::set biomes; diff --git a/src/noise.cpp b/src/noise.cpp index b1b70253..2ddc3926 100644 --- a/src/noise.cpp +++ b/src/noise.cpp @@ -99,17 +99,17 @@ u32 PcgRandom::range(u32 bound) Using rand() % 3, the number 0 would be twice as likely to appear. With a very large RNG range, the effect becomes less prevalent but still present. This can be solved by modifying the range of the RNG - to become a multiple of bound by dropping values above the a threshhold. - In our example, threshhold == 4 - 3 = 1 % 3 == 1, so reject 0, thus + to become a multiple of bound by dropping values above the a threshold. + In our example, threshold == 4 - 3 = 1 % 3 == 1, so reject 0, thus making the range 3 with no bias. This loop looks dangerous, but will always terminate due to the RNG's property of uniformity. */ - u32 threshhold = -bound % bound; + u32 threshold = -bound % bound; u32 r; - while ((r = next()) < threshhold) + while ((r = next()) < threshold) ; return r % bound; diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index d5cf54f2..b29fd96c 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -944,10 +944,19 @@ int ModApiMapgen::l_register_ore(lua_State *L) ore->clust_scarcity = getintfield_default(L, index, "clust_scarcity", 1); ore->clust_num_ores = getintfield_default(L, index, "clust_num_ores", 1); ore->clust_size = getintfield_default(L, index, "clust_size", 0); - ore->nthresh = getfloatfield_default(L, index, "noise_threshhold", 0); ore->noise = NULL; ore->flags = 0; + //// Get noise_threshold + warn_if_field_exists(L, index, "noise_threshhold", + "Deprecated: new name is \"noise_threshold\"."); + + int nthresh; + if (!getintfield(L, index, "noise_threshold", nthresh) && + !getintfield(L, index, "noise_threshhold", nthresh)) + nthresh = 0; + ore->nthresh = nthresh; + //// Get y_min/y_max warn_if_field_exists(L, index, "height_min", "Deprecated: new name is \"y_min\"."); From 49073ba2c34dfd8e286865ed2d108a4ec1eb3e3c Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 2 Dec 2015 03:28:03 +0000 Subject: [PATCH 125/531] Mapgen: Add propagate_shadow bool to calcLighting To terminate unwanted shadows from floatlands or realms above Also add to LuaVoxelManip calc_lighting for use in mapgen mods Remove the 2 argument calcLighting, mapgens now use the 5 argument form to specify the volumes for propagateSunlight and spreadLight In mgsinglenode replace calcLighting with setLighting and clean-up use of tabs and spaces --- doc/lua_api.txt | 8 +++++--- src/mapgen.cpp | 29 ++++++----------------------- src/mapgen.h | 9 +++------ src/mapgen_singlenode.cpp | 24 ++++++++++++++---------- src/mapgen_singlenode.h | 1 + src/mapgen_v6.cpp | 4 +++- src/script/lua_api/l_vmanip.cpp | 3 ++- 7 files changed, 34 insertions(+), 44 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 6e7a5446..98442f39 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2996,7 +2996,7 @@ will place the schematic inside of the VoxelManip. * `update_map()`: Update map after writing chunk back to map. * To be used only by `VoxelManip` objects created by the mod itself; not a `VoxelManip` that was retrieved from `minetest.get_mapgen_object` -* `set_lighting(light, p1, p2)`: Set the lighting within the `VoxelManip` to a uniform value +* `set_lighting(light, [p1, p2])`: Set the lighting within the `VoxelManip` to a uniform value * `light` is a table, `{day=<0...15>, night=<0...15>}` * To be used only by a `VoxelManip` object from `minetest.get_mapgen_object` * (`p1`, `p2`) is the area in which lighting is set; @@ -3010,10 +3010,12 @@ will place the schematic inside of the VoxelManip. * expects lighting data in the same format that `get_light_data()` returns * `get_param2_data()`: Gets the raw `param2` data read into the `VoxelManip` object * `set_param2_data(param2_data)`: Sets the `param2` contents of each node in the `VoxelManip` -* `calc_lighting(p1, p2)`: Calculate lighting within the `VoxelManip` +* `calc_lighting([p1, p2], [propagate_shadow])`: Calculate lighting within the `VoxelManip` * To be used only by a `VoxelManip` object from `minetest.get_mapgen_object` * (`p1`, `p2`) is the area in which lighting is set; defaults to the whole area - if left out + if left out or nil + * `propagate_shadow` is an optional boolean deciding whether shadows in a generated + mapchunk above are propagated down into the mapchunk; defaults to `true` if left out * `update_liquids()`: Update liquid flow * `was_modified()`: Returns `true` or `false` if the data in the voxel manipulator had been modified since the last read from map, due to a call to diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 5a209edd..36d19bfa 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -264,37 +264,20 @@ void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light) } -void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax, v3s16 full_nmin, v3s16 full_nmax) +void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax, v3s16 full_nmin, v3s16 full_nmax, + bool propagate_shadow) { ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG); //TimeTaker t("updateLighting"); - propagateSunlight(nmin, nmax); + propagateSunlight(nmin, nmax, propagate_shadow); spreadLight(full_nmin, full_nmax); //printf("updateLighting: %dms\n", t.stop()); } - -void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) -{ - ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG); - //TimeTaker t("updateLighting"); - - propagateSunlight( - nmin - v3s16(1, 1, 1) * MAP_BLOCKSIZE, - nmax + v3s16(1, 0, 1) * MAP_BLOCKSIZE); - - spreadLight( - nmin - v3s16(1, 1, 1) * MAP_BLOCKSIZE, - nmax + v3s16(1, 1, 1) * MAP_BLOCKSIZE); - - //printf("updateLighting: %dms\n", t.stop()); -} - - -void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax) +void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow) { //TimeTaker t("propagateSunlight"); VoxelArea a(nmin, nmax); @@ -308,7 +291,8 @@ void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax) if (vm->m_data[i].getContent() == CONTENT_IGNORE) { if (block_is_underground) continue; - } else if ((vm->m_data[i].param1 & 0x0F) != LIGHT_SUN) { + } else if ((vm->m_data[i].param1 & 0x0F) != LIGHT_SUN && + propagate_shadow) { continue; } vm->m_area.add_y(em, i, -1); @@ -326,7 +310,6 @@ void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax) } - void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax) { //TimeTaker t("spreadLight"); diff --git a/src/mapgen.h b/src/mapgen.h index 31cf7dc1..9bb7d03b 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -173,12 +173,9 @@ public: void setLighting(u8 light, v3s16 nmin, v3s16 nmax); void lightSpread(VoxelArea &a, v3s16 p, u8 light); - - void calcLighting(v3s16 nmin, v3s16 nmax); - void calcLighting(v3s16 nmin, v3s16 nmax, - v3s16 full_nmin, v3s16 full_nmax); - - void propagateSunlight(v3s16 nmin, v3s16 nmax); + void calcLighting(v3s16 nmin, v3s16 nmax, v3s16 full_nmin, v3s16 full_nmax, + bool propagate_shadow = true); + void propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow); void spreadLight(v3s16 nmin, v3s16 nmax); virtual void makeChunk(BlockMakeData *data) {} diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp index 8b6c25a5..f8711526 100644 --- a/src/mapgen_singlenode.cpp +++ b/src/mapgen_singlenode.cpp @@ -38,6 +38,9 @@ MapgenSinglenode::MapgenSinglenode(int mapgenid, c_node = ndef->getId("mapgen_singlenode"); if (c_node == CONTENT_IGNORE) c_node = CONTENT_AIR; + + MapNode n_node(c_node); + set_light = (ndef->get(n_node).sunlight_propagates) ? LIGHT_SUN : 0x00; } @@ -45,6 +48,7 @@ MapgenSinglenode::~MapgenSinglenode() { } + //////////////////////// Map generator void MapgenSinglenode::makeChunk(BlockMakeData *data) @@ -53,11 +57,11 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) assert(data->vmanip); assert(data->nodedef); assert(data->blockpos_requested.X >= data->blockpos_min.X && - data->blockpos_requested.Y >= data->blockpos_min.Y && - data->blockpos_requested.Z >= data->blockpos_min.Z); + data->blockpos_requested.Y >= data->blockpos_min.Y && + data->blockpos_requested.Z >= data->blockpos_min.Z); assert(data->blockpos_requested.X <= data->blockpos_max.X && - data->blockpos_requested.Y <= data->blockpos_max.Y && - data->blockpos_requested.Z <= data->blockpos_max.Z); + data->blockpos_requested.Y <= data->blockpos_max.Y && + data->blockpos_requested.Z <= data->blockpos_max.Z); this->generating = true; this->vm = data->vmanip; @@ -67,8 +71,8 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) v3s16 blockpos_max = data->blockpos_max; // Area of central chunk - v3s16 node_min = blockpos_min*MAP_BLOCKSIZE; - v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1); + v3s16 node_min = blockpos_min * MAP_BLOCKSIZE; + v3s16 node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1); blockseed = getBlockSeed2(node_min, data->seed); @@ -87,15 +91,15 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) // Add top and bottom side of water to transforming_liquid queue updateLiquid(&data->transforming_liquid, node_min, node_max); - // Calculate lighting - if (flags & MG_LIGHT) - calcLighting(node_min, node_max); + // Set lighting + if ((flags & MG_LIGHT) && set_light == LIGHT_SUN) + setLighting(LIGHT_SUN, node_min, node_max); this->generating = false; } + int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p) { return 0; } - diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h index bd3576dc..f9c97b50 100644 --- a/src/mapgen_singlenode.h +++ b/src/mapgen_singlenode.h @@ -35,6 +35,7 @@ class MapgenSinglenode : public Mapgen { public: u32 flags; content_t c_node; + u8 set_light; MapgenSinglenode(int mapgenid, MapgenParams *params, EmergeManager *emerge); ~MapgenSinglenode(); diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 3b5915bd..0a9f80dc 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -593,7 +593,9 @@ void MapgenV6::makeChunk(BlockMakeData *data) // Calculate lighting if (flags & MG_LIGHT) - calcLighting(node_min, node_max); + calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE, + node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE, + full_node_min, full_node_max); this->generating = false; } diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp index ec9be8fb..f1386640 100644 --- a/src/script/lua_api/l_vmanip.cpp +++ b/src/script/lua_api/l_vmanip.cpp @@ -181,6 +181,7 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L) v3s16 fpmax = vm->m_area.MaxEdge; v3s16 pmin = lua_istable(L, 2) ? check_v3s16(L, 2) : fpmin + yblock; v3s16 pmax = lua_istable(L, 3) ? check_v3s16(L, 3) : fpmax - yblock; + bool propagate_shadow = lua_isboolean(L, 4) ? lua_toboolean(L, 4) : true; sortBoxVerticies(pmin, pmax); if (!vm->m_area.contains(VoxelArea(pmin, pmax))) @@ -191,7 +192,7 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L) mg.ndef = ndef; mg.water_level = emerge->params.water_level; - mg.calcLighting(pmin, pmax, fpmin, fpmax); + mg.calcLighting(pmin, pmax, fpmin, fpmax, propagate_shadow); return 0; } From 9a5a538e8d1981fb3c2dd69ca3d37e4f9c426cf5 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 7 Dec 2015 07:26:12 +0100 Subject: [PATCH 126/531] lua_api.txt: add blank lines before * lists If rendered as markdown, lists need a blank line before them so that they are recognized as such. --- doc/lua_api.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 98442f39..56dc84d2 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1305,10 +1305,12 @@ mentioned in "Nodes". However, it is possible to insert extra data into a node. It is called "node metadata"; See "`NodeMetaRef`". Metadata contains two things: + * A key-value store * An inventory Some of the values in the key-value store are handled specially: + * `formspec`: Defines a right-click inventory menu. See "Formspec". * `infotext`: Text shown on the screen when the node is pointed at @@ -2938,6 +2940,7 @@ core.CONTENT_IGNORE (ID for "ignore" nodes) Inside of `on_generated()` callbacks, it is possible to retrieve the same VoxelManip object used by the core's Map Generator (commonly abbreviated Mapgen). Most of the rules previously described still apply but with a few differences: + * The Mapgen VoxelManip object is retrieved using: `minetest.get_mapgen_object("voxelmanip")` * This VoxelManip object already has the region of map just generated loaded into it; it's not necessary to call `VoxelManip:read_from_map()` before using a Mapgen VoxelManip. From 51e8c2b27786c050f0271eeeaed5eea17d62f0a0 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 7 Dec 2015 09:42:39 +0100 Subject: [PATCH 127/531] Fix threshold type Fix the type of the threshold value for mapgen. The commit a78dd7f2b6b0e1fefdbaa1ae21b722dd4459e4f4 "Fix spelling of noise_threshold" has changed it to be read as int, but it can have non-integral values too. Thanks to @kwolekr for pointing this out. --- src/script/lua_api/l_mapgen.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index b29fd96c..fb839176 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -951,9 +951,9 @@ int ModApiMapgen::l_register_ore(lua_State *L) warn_if_field_exists(L, index, "noise_threshhold", "Deprecated: new name is \"noise_threshold\"."); - int nthresh; - if (!getintfield(L, index, "noise_threshold", nthresh) && - !getintfield(L, index, "noise_threshhold", nthresh)) + float nthresh; + if (!getfloatfield(L, index, "noise_threshold", nthresh) && + !getfloatfield(L, index, "noise_threshhold", nthresh)) nthresh = 0; ore->nthresh = nthresh; From ea2964f5a168cb52d1b9f74a08f00c7c068c6649 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Mon, 24 Aug 2015 17:00:06 -0400 Subject: [PATCH 128/531] Add seperate cache path This is set to the XDG cache path where possible. It's set to the app's cache path on Android. --- src/clientmedia.cpp | 2 +- src/filesys.cpp | 5 +++ src/filesys.h | 2 ++ src/main.cpp | 12 +++---- src/porting.cpp | 38 +++++++++++++++++++++- src/porting.h | 11 +++++++ src/porting_android.cpp | 72 ++++++++++++++++++++++++++++++----------- src/porting_android.h | 6 ++-- 8 files changed, 118 insertions(+), 30 deletions(-) diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp index ea11ad23..bca3f67c 100644 --- a/src/clientmedia.cpp +++ b/src/clientmedia.cpp @@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., static std::string getMediaCacheDir() { - return porting::path_user + DIR_DELIM + "cache" + DIR_DELIM + "media"; + return porting::path_cache + DIR_DELIM + "media"; } /* diff --git a/src/filesys.cpp b/src/filesys.cpp index 4cefdb80..5fdc9763 100644 --- a/src/filesys.cpp +++ b/src/filesys.cpp @@ -707,5 +707,10 @@ bool safeWriteToFile(const std::string &path, const std::string &content) } } +bool Rename(const std::string &from, const std::string &to) +{ + return rename(from.c_str(), to.c_str()) == 0; +} + } // namespace fs diff --git a/src/filesys.h b/src/filesys.h index cc6f43ec..94d0c874 100644 --- a/src/filesys.h +++ b/src/filesys.h @@ -115,6 +115,8 @@ const char *GetFilenameFromPath(const char *path); bool safeWriteToFile(const std::string &path, const std::string &content); +bool Rename(const std::string &from, const std::string &to); + } // namespace fs #endif diff --git a/src/main.cpp b/src/main.cpp index 151ea714..72daaef0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -164,7 +164,13 @@ int main(int argc, char *argv[]) setup_log_params(cmd_args); porting::signal_handler_init(); + +#ifdef __ANDROID__ + porting::initAndroid(); + porting::initializePathsAndroid(); +#else porting::initializePaths(); +#endif if (!create_userdata_path()) { errorstream << "Cannot create user data directory" << std::endl; @@ -422,9 +428,6 @@ static bool create_userdata_path() bool success; #ifdef __ANDROID__ - porting::initAndroid(); - - porting::setExternalStorageDir(porting::jnienv); if (!fs::PathExists(porting::path_user)) { success = fs::CreateDir(porting::path_user); } else { @@ -436,9 +439,6 @@ static bool create_userdata_path() success = fs::CreateDir(porting::path_user); #endif - infostream << "path_share = " << porting::path_share << std::endl; - infostream << "path_user = " << porting::path_user << std::endl; - return success; } diff --git a/src/porting.cpp b/src/porting.cpp index 3e39fc81..4a72e90f 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -139,6 +139,7 @@ void signal_handler_init(void) std::string path_share = ".."; std::string path_user = ".."; std::string path_locale = path_share + DIR_DELIM + "locale"; +std::string path_cache = path_user + DIR_DELIM + "cache"; std::string getDataPath(const char *subpath) @@ -463,6 +464,25 @@ bool setSystemPaths() #endif +void migrateCachePath() +{ + const std::string local_cache_path = path_user + DIR_DELIM + "cache"; + + // Delete tmp folder if it exists (it only ever contained + // a temporary ogg file, which is no longer used). + if (fs::PathExists(local_cache_path + DIR_DELIM + "tmp")) + fs::RecursiveDelete(local_cache_path + DIR_DELIM + "tmp"); + + // Bail if migration impossible + if (path_cache == local_cache_path || !fs::PathExists(local_cache_path) + || fs::PathExists(path_cache)) { + return; + } + if (!fs::Rename(local_cache_path, path_cache)) { + errorstream << "Failed to migrate local cache path " + "to system path!" << std::endl; + } +} void initializePaths() { @@ -513,10 +533,27 @@ void initializePaths() if (!setSystemPaths()) errorstream << "Failed to get one or more system-wide path" << std::endl; + // Initialize path_cache + // First try $XDG_CACHE_HOME/PROJECT_NAME + const char *cache_dir = getenv("XDG_CACHE_HOME"); + if (cache_dir) { + path_cache = std::string(cache_dir) + DIR_DELIM + PROJECT_NAME; + } else { + // Then try $HOME/.cache/PROJECT_NAME + const char *home_dir = getenv("HOME"); + if (home_dir) { + path_cache = std::string(home_dir) + DIR_DELIM + ".cache" + + DIR_DELIM + PROJECT_NAME; + } + // If neither works, leave it at $PATH_USER/cache + } + // Migrate cache folder to new location if possible + migrateCachePath(); #endif infostream << "Detected share path: " << path_share << std::endl; infostream << "Detected user path: " << path_user << std::endl; + infostream << "Detected cache path: " << path_cache << std::endl; bool found_localedir = false; #ifdef STATIC_LOCALEDIR @@ -542,7 +579,6 @@ void initializePaths() if (!found_localedir) { errorstream << "Couldn't find a locale directory!" << std::endl; } - } diff --git a/src/porting.h b/src/porting.h index 1e89cd04..5da32607 100644 --- a/src/porting.h +++ b/src/porting.h @@ -147,12 +147,23 @@ extern std::string path_user; */ extern std::string path_locale; +/* + Path to directory for storing caches. +*/ +extern std::string path_cache; + /* Get full path of stuff in data directory. Example: "stone.png" -> "../data/stone.png" */ std::string getDataPath(const char *subpath); +/* + Move cache folder from path_user to the + system cache location if possible. +*/ +void migrateCachePath(); + /* Initialize path_*. */ diff --git a/src/porting_android.cpp b/src/porting_android.cpp index c7e28cc9..72b625d7 100644 --- a/src/porting_android.cpp +++ b/src/porting_android.cpp @@ -164,29 +164,63 @@ void cleanupAndroid() jvm->DetachCurrentThread(); } -void setExternalStorageDir(JNIEnv* lJNIEnv) +static std::string javaStringToUTF8(jstring js) { - // Android: Retrieve ablsolute path to external storage device (sdcard) - jclass ClassEnv = lJNIEnv->FindClass("android/os/Environment"); - jmethodID MethodDir = - lJNIEnv->GetStaticMethodID(ClassEnv, - "getExternalStorageDirectory","()Ljava/io/File;"); - jobject ObjectFile = lJNIEnv->CallStaticObjectMethod(ClassEnv, MethodDir); - jclass ClassFile = lJNIEnv->FindClass("java/io/File"); + std::string str; + // Get string as a UTF-8 c-string + const char *c_str = jnienv->GetStringUTFChars(js, NULL); + // Save it + str = c_str; + // And free the c-string + jnienv->ReleaseStringUTFChars(js, c_str); + return str; +} - jmethodID MethodPath = - lJNIEnv->GetMethodID(ClassFile, "getAbsolutePath", - "()Ljava/lang/String;"); - jstring StringPath = - (jstring) lJNIEnv->CallObjectMethod(ObjectFile, MethodPath); +// Calls static method if obj is NULL +static std::string getAndroidPath(jclass cls, jobject obj, jclass cls_File, + jmethodID mt_getAbsPath, const char *getter) +{ + // Get getter method + jmethodID mt_getter; + if (obj) + mt_getter = jnienv->GetMethodID(cls, getter, + "()Ljava/io/File;"); + else + mt_getter = jnienv->GetStaticMethodID(cls, getter, + "()Ljava/io/File;"); - const char *externalPath = lJNIEnv->GetStringUTFChars(StringPath, NULL); - std::string userPath(externalPath); - lJNIEnv->ReleaseStringUTFChars(StringPath, externalPath); + // Call getter + jobject ob_file; + if (obj) + ob_file = jnienv->CallObjectMethod(obj, mt_getter); + else + ob_file = jnienv->CallStaticObjectMethod(cls, mt_getter); - path_storage = userPath; - path_user = userPath + DIR_DELIM + PROJECT_NAME_C; - path_share = userPath + DIR_DELIM + PROJECT_NAME_C; + // Call getAbsolutePath + jstring js_path = (jstring) jnienv->CallObjectMethod(ob_file, + mt_getAbsPath); + + return javaStringToUTF8(js_path); +} + +void initializePathsAndroid() +{ + // Get Environment class + jclass cls_Env = jnienv->FindClass("android/os/Environment"); + // Get File class + jclass cls_File = jnienv->FindClass("java/io/File"); + // Get getAbsolutePath method + jmethodID mt_getAbsPath = jnienv->GetMethodID(cls_File, + "getAbsolutePath", "()Ljava/lang/String;"); + + path_cache = getAndroidPath(nativeActivity, app_global->activity->clazz, + cls_File, mt_getAbsPath, "getCacheDir"); + path_storage = getAndroidPath(cls_Env, NULL, cls_File, mt_getAbsPath, + "getExternalStorageDirectory"); + path_user = path_storage + DIR_DELIM + PROJECT_NAME_C; + path_share = path_storage + DIR_DELIM + PROJECT_NAME_C; + + migrateCachePath(); } void showInputDialog(const std::string& acceptButton, const std::string& hint, diff --git a/src/porting_android.h b/src/porting_android.h index bfdadfbf..e4be0740 100644 --- a/src/porting_android.h +++ b/src/porting_android.h @@ -43,10 +43,10 @@ void initAndroid(); void cleanupAndroid(); /** - * set storage dir on external sdcard# - * @param lJNIEnv environment from android + * Initializes path_* variables for Android + * @param env Android JNI environment */ -void setExternalStorageDir(JNIEnv* lJNIEnv); +void initializePathsAndroid(); /** * use java function to copy media from assets to external storage From 696148e29889b2923f926b27f76979454676506d Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 29 Nov 2015 00:17:51 -0500 Subject: [PATCH 129/531] Fix Event implementation On non-windows platforms this just used a semaphore, which meant that multiple calls to signal() would result in wait() returning multiple times. --- src/threading/CMakeLists.txt | 1 + src/threading/event.cpp | 95 ++++++++++++++++++++++++++++++++++++ src/threading/event.h | 38 ++++++++++----- 3 files changed, 121 insertions(+), 13 deletions(-) create mode 100644 src/threading/event.cpp diff --git a/src/threading/CMakeLists.txt b/src/threading/CMakeLists.txt index f3d0efc1..5dd60ef1 100644 --- a/src/threading/CMakeLists.txt +++ b/src/threading/CMakeLists.txt @@ -1,4 +1,5 @@ set(JTHREAD_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mutex.cpp ${CMAKE_CURRENT_SOURCE_DIR}/thread.cpp ${CMAKE_CURRENT_SOURCE_DIR}/semaphore.cpp diff --git a/src/threading/event.cpp b/src/threading/event.cpp new file mode 100644 index 00000000..1c458bf1 --- /dev/null +++ b/src/threading/event.cpp @@ -0,0 +1,95 @@ +/* +This file is a part of the JThread package, which contains some object- +oriented thread wrappers for different thread implementations. + +Copyright (c) 2000-2006 Jori Liesenborgs (jori.liesenborgs@gmail.com) + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +*/ + +#include "threading/event.h" + +#if defined(_WIN32) + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include +#endif + + +#if __cplusplus < 201103L +Event::Event() +{ +#ifdef _WIN32 + event = CreateEvent(NULL, false, false, NULL); +#else + pthread_cond_init(&cv, NULL); + pthread_mutex_init(&mutex, NULL); +#endif +} + +Event::~Event() +{ +#ifdef _WIN32 + CloseHandle(event); +#else + pthread_cond_destroy(&cv); + pthread_mutex_destroy(&mutex); +#endif +} +#endif + + +void Event::wait() +{ +#if __cplusplus >= 201103L + MutexAutoLock lock(mutex); + while (!notified) { + cv.wait(lock); + } + notified = false; +#elif defined(_WIN32) + WaitForSingleObject(event, INFINITE); +#else + pthread_mutex_lock(&mutex); + while (!notified) { + pthread_cond_wait(&cv, &mutex); + } + notified = false; + pthread_mutex_unlock(&mutex); +#endif +} + + +void Event::signal() +{ +#if __cplusplus >= 201103L + MutexAutoLock lock(mutex); + notified = true; + cv.notify_one(); +#elif defined(_WIN32) + SetEvent(event); +#else + pthread_mutex_lock(&mutex); + notified = true; + pthread_cond_signal(&cv); + pthread_mutex_unlock(&mutex); +#endif +} + diff --git a/src/threading/event.h b/src/threading/event.h index 0105630e..ea087e53 100644 --- a/src/threading/event.h +++ b/src/threading/event.h @@ -26,30 +26,42 @@ DEALINGS IN THE SOFTWARE. #ifndef THREADING_EVENT_H #define THREADING_EVENT_H -#ifdef _WIN32 - #include +#if __cplusplus >= 201103L + #include + #include "threading/mutex.h" +#elif defined(_WIN32) + #include #else - #include "threading/semaphore.h" + #include #endif +/** A syncronization primitive that will wake up one waiting thread when signaled. + * Calling @c signal() multiple times before a waiting thread has had a chance + * to notice the signal will wake only one thread. Additionally, if no threads + * are waiting on the event when it is signaled, the next call to @c wait() + * will return (almost) immediately. + */ class Event { public: -#ifdef _WIN32 - Event() { event = CreateEvent(NULL, false, false, NULL); } - ~Event() { CloseHandle(event); } - void wait() { WaitForSingleObject(event, INFINITE); } - void signal() { SetEvent(event); } -#else - void wait() { sem.wait(); } - void signal() { sem.post(); } +#if __cplusplus < 201103L + Event(); + ~Event(); #endif + void wait(); + void signal(); private: -#ifdef _WIN32 +#if __cplusplus >= 201103L + std::condition_variable cv; + Mutex mutex; + bool notified; +#elif defined(_WIN32) HANDLE event; #else - Semaphore sem; + pthread_cond_t cv; + pthread_mutex_t mutex; + bool notified; #endif }; From a64d78a37e95b99f32c29c8dec2e0cdae85a8b41 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Wed, 9 Dec 2015 23:08:55 +0100 Subject: [PATCH 130/531] Speed up and make more accurate relief mapping using linear + binary search. --- .../shaders/nodes_shader/opengl_fragment.glsl | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl index 424d3217..b3789e1c 100644 --- a/client/shaders/nodes_shader/opengl_fragment.glsl +++ b/client/shaders/nodes_shader/opengl_fragment.glsl @@ -47,15 +47,29 @@ vec4 get_normal_map(vec2 uv) float find_intersection(vec2 dp, vec2 ds) { - const float depth_step = 1.0 / 24.0; float depth = 1.0; - for (int i = 0 ; i < 24 ; i++) { + float best_depth = 0.0; + float size = 0.0625; + for (int i = 0; i < 15; i++) { + depth -= size; float h = texture2D(normalTexture, dp + ds * depth).a; - if (h >= depth) + if (depth <= h) { + best_depth = depth; break; - depth -= depth_step; + } } - return depth; + depth = best_depth; + for (int i = 0; i < 4; i++) { + size *= 0.5; + float h = texture2D(normalTexture,dp + ds * depth).a; + if (depth <= h) { + best_depth = depth; + depth += size; + } else { + depth -= size; + } + } + return best_depth; } float find_intersectionRGB(vec2 dp, vec2 ds) From 8e3602f6949026b740bd190c0d21a75cf5720eeb Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 10 Dec 2015 18:25:28 +0100 Subject: [PATCH 131/531] Fix some setting documentation * Horizontal and vertical are used wrongly. Use height and width because horizontal/vertical describes different things. Thanks @kilbith for pointing out. * Update minetest.conf.example and settings_translation_file.cpp * Correct maximum/minimum copy paste mistake. --- builtin/settingtypes.txt | 6 +-- minetest.conf.example | 8 ++-- src/settings_translation_file.cpp | 64 ++++++++++++++++++------------- 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 2929b860..4a714e1a 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -401,13 +401,13 @@ pause_fps_max (FPS in pause menu) int 20 viewing_range_nodes_max (Viewing range maximum) int 160 # The allowed adjustment range for the automatic rendering range adjustment. -# Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm. +# Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm. viewing_range_nodes_min (Viewing range minimum) int 35 -# Vertical initial window size. +# Width component of the initial window size. screenW (Screen width) int 800 -# Horizontal initial window size. +# Height component of the initial window size. screenH (Screen height) int 600 # Fullscreen mode. diff --git a/minetest.conf.example b/minetest.conf.example index 37d622d3..34d618fd 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -451,15 +451,15 @@ # viewing_range_nodes_max = 160 # The allowed adjustment range for the automatic rendering range adjustment. -# Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm. +# Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm. # type: int # viewing_range_nodes_min = 35 -# Vertical initial window size. +# Width component of the initial window size. # type: int # screenW = 800 -# Horizontal initial window size. +# Height component of the initial window size. # type: int # screenH = 600 @@ -1243,7 +1243,7 @@ # 6 = "Mandy Cousin" julia set. # 7 = "Variation" mandelbrot set. # 8 = "Variation" julia set. -# type: int +# type: int min: 1 max: 8 # mgfractal_formula = 1 # Iterations of the recursive function. diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index 89bd192e..b078e4d1 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -185,11 +185,11 @@ fake_function() { gettext("Viewing range maximum"); gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range minimum to disable the auto-adjustment algorithm."); gettext("Viewing range minimum"); - gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range minimum to disable the auto-adjustment algorithm."); + gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range maximum to disable the auto-adjustment algorithm."); gettext("Screen width"); - gettext("Vertical initial window size."); + gettext("Width component of the initial window size."); gettext("Screen height"); - gettext("Horizontal initial window size."); + gettext("Height component of the initial window size."); gettext("Full screen"); gettext("Fullscreen mode."); gettext("Full screen BPP"); @@ -424,7 +424,7 @@ fake_function() { gettext("Map generation limit"); gettext("Where the map generator stops.\nPlease note:\n- Limited to 31000 (setting above has no effect)\n- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n- Those groups have an offset of -32, -32 nodes from the origin.\n- Only groups which are within the map_generation_limit are generated"); gettext("Mapgen flags"); - gettext("Global map generation attributes.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.\n'trees' and 'flat' flags only have effect in mgv6."); + gettext("Global map generation attributes.\nIn Mapgen v6 the 'decorations' flag controls all decorations except trees\nand junglegrass, in all other mapgens this flag controls all decorations.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); gettext("Advanced"); gettext("Chunk size"); gettext("Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes)."); @@ -480,33 +480,45 @@ fake_function() { gettext("Mapgen v7 ridge noise parameters"); gettext("Mapgen v7 cave1 noise parameters"); gettext("Mapgen v7 cave2 noise parameters"); + gettext("Mapgen flat"); + gettext("Mapgen flat flags"); + gettext("Map generation attributes specific to Mapgen flat.\nOccasional lakes and hills added to the flat world.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Mapgen flat ground level"); + gettext("Y of flat ground."); + gettext("Mapgen flat large cave depth"); + gettext("Y of upper limit of large pseudorandom caves."); + gettext("Mapgen flat lake threshold"); + gettext("Terrain noise threshold for lakes.\nControls proportion of world area covered by lakes.\nAdjust towards 0.0 for a larger proportion."); + gettext("Mapgen flat lake steepness"); + gettext("Controls steepness/depth of lake depressions."); + gettext("Mapgen flat hill threshold"); + gettext("Terrain noise threshold for hills.\nControls proportion of world area covered by hills.\nAdjust towards 0.0 for a larger proportion."); + gettext("Mapgen flat hill steepness"); + gettext("Controls steepness/height of hills."); + gettext("Mapgen flat terrain noise parameters"); + gettext("Determines terrain shape.\nThe 3 numbers in brackets control the scale of the\nterrain, the 3 numbers should be identical."); + gettext("Mapgen flat filler depth noise parameters"); + gettext("Mapgen flat cave1 noise parameters"); + gettext("Mapgen flat cave2 noise parameters"); gettext("Mapgen fractal"); - gettext("Mapgen fractal flags"); - gettext("Map generation attributes specific to Mapgen fractal.\n'julia' selects a julia set to be generated instead of a mandelbrot set.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); - gettext("Mapgen fractal mandelbrot iterations"); - gettext("Mandelbrot set: Iterations of the recursive function.\nControls scale of finest detail."); - gettext("Mapgen fractal mandelbrot scale"); - gettext("Mandelbrot set: Approximate (X,Y,Z) scales in nodes."); - gettext("Mapgen fractal mandelbrot offset"); - gettext("Mandelbrot set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by m_scale for offsets in nodes."); - gettext("Mapgen fractal mandelbrot slice w"); - gettext("Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2."); - gettext("Mapgen fractal julia iterations"); - gettext("Julia set: Iterations of the recursive function.\nControls scale of finest detail."); - gettext("Mapgen fractal julia scale"); - gettext("Julia set: Approximate (X,Y,Z) scales in nodes."); - gettext("Mapgen fractal julia offset"); - gettext("Julia set: (X,Y,Z) offsets from world centre.\nRange roughly -2 to 2, multiply by j_scale for offsets in nodes."); - gettext("Mapgen fractal julia slice w"); - gettext("Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\nRange roughly -2 to 2."); + gettext("Mapgen fractal formula"); + gettext("Choice of 8 4-dimensional fractals.\n1 = \"Roundy\" mandelbrot set.\n2 = \"Roundy\" julia set.\n3 = \"Squarry\" mandelbrot set.\n4 = \"Squarry\" julia set.\n5 = \"Mandy Cousin\" mandelbrot set.\n6 = \"Mandy Cousin\" julia set.\n7 = \"Variation\" mandelbrot set.\n8 = \"Variation\" julia set."); + gettext("Mapgen fractal iterations"); + gettext("Iterations of the recursive function.\nControls scale of finest detail."); + gettext("Mapgen fractal scale"); + gettext("Approximate (X,Y,Z) scale of fractal in nodes."); + gettext("Mapgen fractal offset"); + gettext("(X,Y,Z) offset of fractal from world centre.\nUsed to move a suitable spawn area of low land close to (0, 0).\nThe default is suitable for mandelbrot sets, it needs to be edited for julia sets,\ndo this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0).\nRange roughly -2 to 2. Multiply by 'scale' for offset in nodes."); + gettext("Mapgen fractal slice w"); + gettext("W co-ordinate of the generated 3D slice of the 4D shape.\nAlters the generated 3D shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia x"); - gettext("Julia set: X value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: X value determining the 4D shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia y"); - gettext("Julia set: Y value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: Y value determining the 4D shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia z"); - gettext("Julia set: Z value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: Z value determining the 4D shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia w"); - gettext("Julia set: W value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: W value determining the 4D shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal seabed noise parameters"); gettext("Mapgen fractal filler depth noise parameters"); gettext("Mapgen fractal cave1 noise parameters"); From 6133b2bc4518d0b7cf5836fef0d7317f677bf8e0 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 11 Dec 2015 11:22:05 +0100 Subject: [PATCH 132/531] Fix android build Fix android build since commit 696148e29889b2923f926b27f76979454676506d "Fix Event implementation" by @ShadowNinja. Fixes #3444. Thanks @kwolekr for pointing out the fix. --- build/android/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index b8fd9db7..435dfa3b 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -349,6 +349,7 @@ LOCAL_SRC_FILES += deps/sqlite/sqlite3.c # Threading LOCAL_SRC_FILES += \ + jni/src/threading/event.cpp \ jni/src/threading/mutex.cpp \ jni/src/threading/semaphore.cpp \ jni/src/threading/thread.cpp From aed10765f208aedf324128972c74ecc033bb5035 Mon Sep 17 00:00:00 2001 From: BlockMen Date: Fri, 11 Dec 2015 22:40:37 +0100 Subject: [PATCH 133/531] Fix events on Windows --- src/threading/event.cpp | 9 --------- src/threading/event.h | 6 ++++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/threading/event.cpp b/src/threading/event.cpp index 1c458bf1..c3c2ca02 100644 --- a/src/threading/event.cpp +++ b/src/threading/event.cpp @@ -25,14 +25,6 @@ DEALINGS IN THE SOFTWARE. #include "threading/event.h" -#if defined(_WIN32) - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif - #include -#endif - - #if __cplusplus < 201103L Event::Event() { @@ -92,4 +84,3 @@ void Event::signal() pthread_mutex_unlock(&mutex); #endif } - diff --git a/src/threading/event.h b/src/threading/event.h index ea087e53..dba3ddb4 100644 --- a/src/threading/event.h +++ b/src/threading/event.h @@ -30,7 +30,10 @@ DEALINGS IN THE SOFTWARE. #include #include "threading/mutex.h" #elif defined(_WIN32) - #include + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include #else #include #endif @@ -66,4 +69,3 @@ private: }; #endif - From c26eb87aec7438d167fa2f460a3f412db09c0ac5 Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 8 Dec 2015 05:40:36 +0000 Subject: [PATCH 134/531] Mgfractal: Add 3D and 4D fractals 3D Mandelbrot/Mandelbar 3D Christmas Tree 3D Mandelbulb 3D Cosine Mandelbulb 4D Mandelbulb Plus corresponding julia set for each Add credits for formulas Rename parameter 'formula' to 'fractal' Speed optimisations --- builtin/settingtypes.txt | 51 ++++++++++++++--------- minetest.conf.example | 53 ++++++++++++++---------- src/mapgen_fractal.cpp | 88 +++++++++++++++++++++++++++++++++------- src/mapgen_fractal.h | 12 ++++-- 4 files changed, 145 insertions(+), 59 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 4a714e1a..62f81706 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -970,49 +970,60 @@ mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 1 [***Mapgen fractal] -# Choice of 8 4-dimensional fractals. -# 1 = "Roundy" mandelbrot set. -# 2 = "Roundy" julia set. -# 3 = "Squarry" mandelbrot set. -# 4 = "Squarry" julia set. -# 5 = "Mandy Cousin" mandelbrot set. -# 6 = "Mandy Cousin" julia set. -# 7 = "Variation" mandelbrot set. -# 8 = "Variation" julia set. -mgfractal_formula (Mapgen fractal formula) int 1 1 8 +# Choice of 18 fractals from 9 formulas. +# 1 = 4D "Roundy" mandelbrot set. +# 2 = 4D "Roundy" julia set. +# 3 = 4D "Squarry" mandelbrot set. +# 4 = 4D "Squarry" julia set. +# 5 = 4D "Mandy Cousin" mandelbrot set. +# 6 = 4D "Mandy Cousin" julia set. +# 7 = 4D "Variation" mandelbrot set. +# 8 = 4D "Variation" julia set. +# 9 = 3D "Mandelbrot/Mandelbar" mandelbrot set. +# 10 = 3D "Mandelbrot/Mandelbar" julia set. +# 11 = 3D "Christmas Tree" mandelbrot set. +# 12 = 3D "Christmas Tree" julia set. +# 13 = 3D "Mandelbulb" mandelbrot set. +# 14 = 3D "Mandelbulb" julia set. +# 15 = 3D "Cosine Mandelbulb" mandelbrot set. +# 16 = 3D "Cosine Mandelbulb" julia set. +# 17 = 4D "Mandelbulb" mandelbrot set. +# 18 = 4D "Mandelbulb" julia set. +mgfractal_fractal (Mapgen fractal fractal) int 1 1 18 # Iterations of the recursive function. -# Controls scale of finest detail. +# Controls the amount of fine detail. mgfractal_iterations (Mapgen fractal iterations) int 11 # Approximate (X,Y,Z) scale of fractal in nodes. mgfractal_scale (Mapgen fractal scale) v3f (4096.0, 1024.0, 4096.0) -# (X,Y,Z) offset of fractal from world centre. +# (X,Y,Z) offset of fractal from world centre in units of 'scale'. # Used to move a suitable spawn area of low land close to (0, 0). -# The default is suitable for mandelbrot sets, it needs to be edited for julia sets, -# do this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0). +# The default is suitable for mandelbrot sets, it needs to be edited for julia sets. # Range roughly -2 to 2. Multiply by 'scale' for offset in nodes. mgfractal_offset (Mapgen fractal offset) v3f (1.79, 0.0, 0.0) -# W co-ordinate of the generated 3D slice of the 4D shape. -# Alters the generated 3D shape. +# W co-ordinate of the generated 3D slice of a 4D fractal. +# Determines which 3D slice of the 4D shape is generated. +# Has no effect on 3D fractals. # Range roughly -2 to 2. mgfractal_slice_w (Mapgen fractal slice w) float 0.0 -# Julia set only: X value determining the 4D shape. +# Julia set only: X component of hypercomplex constant determining julia shape. # Range roughly -2 to 2. mgfractal_julia_x (Mapgen fractal julia x) float 0.33 -# Julia set only: Y value determining the 4D shape. +# Julia set only: Y component of hypercomplex constant determining julia shape. # Range roughly -2 to 2. mgfractal_julia_y (Mapgen fractal julia y) float 0.33 -# Julia set only: Z value determining the 4D shape. +# Julia set only: Z component of hypercomplex constant determining julia shape. # Range roughly -2 to 2. mgfractal_julia_z (Mapgen fractal julia z) float 0.33 -# Julia set only: W value determining the 4D shape. +# Julia set only: W component of hypercomplex constant determining julia shape. +# Has no effect on 3D fractals. # Range roughly -2 to 2. mgfractal_julia_w (Mapgen fractal julia w) float 0.33 diff --git a/minetest.conf.example b/minetest.conf.example index 34d618fd..40456f95 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1234,20 +1234,30 @@ #### Mapgen fractal -# Choice of 8 4-dimensional fractals. -# 1 = "Roundy" mandelbrot set. -# 2 = "Roundy" julia set. -# 3 = "Squarry" mandelbrot set. -# 4 = "Squarry" julia set. -# 5 = "Mandy Cousin" mandelbrot set. -# 6 = "Mandy Cousin" julia set. -# 7 = "Variation" mandelbrot set. -# 8 = "Variation" julia set. -# type: int min: 1 max: 8 -# mgfractal_formula = 1 +# Choice of 18 fractals from 9 formulas. +# 1 = 4D "Roundy" mandelbrot set. +# 2 = 4D "Roundy" julia set. +# 3 = 4D "Squarry" mandelbrot set. +# 4 = 4D "Squarry" julia set. +# 5 = 4D "Mandy Cousin" mandelbrot set. +# 6 = 4D "Mandy Cousin" julia set. +# 7 = 4D "Variation" mandelbrot set. +# 8 = 4D "Variation" julia set. +# 9 = 3D "Mandelbrot/Mandelbar" mandelbrot set. +# 10 = 3D "Mandelbrot/Mandelbar" julia set. +# 11 = 3D "Christmas Tree" mandelbrot set. +# 12 = 3D "Christmas Tree" julia set. +# 13 = 3D "Mandelbulb" mandelbrot set. +# 14 = 3D "Mandelbulb" julia set. +# 15 = 3D "Cosine Mandelbulb" mandelbrot set. +# 16 = 3D "Cosine Mandelbulb" julia set. +# 17 = 4D "Mandelbulb" mandelbrot set. +# 18 = 4D "Mandelbulb" julia set. +# type: int min: 1 max: 18 +# mgfractal_fractal = 1 # Iterations of the recursive function. -# Controls scale of finest detail. +# Controls the amount of fine detail. # type: int # mgfractal_iterations = 11 @@ -1255,36 +1265,37 @@ # type: v3f # mgfractal_scale = (4096.0, 1024.0, 4096.0) -# (X,Y,Z) offset of fractal from world centre. +# (X,Y,Z) offset of fractal from world centre in units of 'scale'. # Used to move a suitable spawn area of low land close to (0, 0). -# The default is suitable for mandelbrot sets, it needs to be edited for julia sets, -# do this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0). +# The default is suitable for mandelbrot sets, it needs to be edited for julia sets. # Range roughly -2 to 2. Multiply by 'scale' for offset in nodes. # type: v3f # mgfractal_offset = (1.79, 0.0, 0.0) -# W co-ordinate of the generated 3D slice of the 4D shape. -# Alters the generated 3D shape. +# W co-ordinate of the generated 3D slice of a 4D fractal. +# Determines which 3D slice of the 4D shape is generated. +# Has no effect on 3D fractals. # Range roughly -2 to 2. # type: float # mgfractal_slice_w = 0.0 -# Julia set only: X value determining the 4D shape. +# Julia set only: X component of hypercomplex constant determining julia shape. # Range roughly -2 to 2. # type: float # mgfractal_julia_x = 0.33 -# Julia set only: Y value determining the 4D shape. +# Julia set only: Y component of hypercomplex constant determining julia shape. # Range roughly -2 to 2. # type: float # mgfractal_julia_y = 0.33 -# Julia set only: Z value determining the 4D shape. +# Julia set only: Z component of hypercomplex constant determining julia shape. # Range roughly -2 to 2. # type: float # mgfractal_julia_z = 0.33 -# Julia set only: W value determining the 4D shape. +# Julia set only: W component of hypercomplex constant determining julia shape. +# Has no effect on 3D fractals. # Range roughly -2 to 2. # type: float # mgfractal_julia_w = 0.33 diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 14dfe5c8..6c03c4ca 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -66,7 +66,7 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams; this->spflags = sp->spflags; - this->formula = sp->formula; + this->fractal = sp->fractal; this->iterations = sp->iterations; this->scale = sp->scale; this->offset = sp->offset; @@ -77,6 +77,9 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * this->julia_z = sp->julia_z; this->julia_w = sp->julia_w; + this->formula = fractal / 2 + fractal % 2; + this->julia = fractal % 2 == 0; + //// 2D terrain noise noise_seabed = new Noise(&sp->np_seabed, seed, csize.X, csize.Z); noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); @@ -141,7 +144,7 @@ MapgenFractalParams::MapgenFractalParams() { spflags = 0; - formula = 1; + fractal = 1; iterations = 11; scale = v3f(4096.0, 1024.0, 4096.0); offset = v3f(1.79, 0.0, 0.0); @@ -163,7 +166,7 @@ void MapgenFractalParams::readParams(const Settings *settings) { settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal); - settings->getU16NoEx("mgfractal_formula", formula); + settings->getU16NoEx("mgfractal_fractal", fractal); settings->getU16NoEx("mgfractal_iterations", iterations); settings->getV3FNoEx("mgfractal_scale", scale); settings->getV3FNoEx("mgfractal_offset", offset); @@ -185,7 +188,7 @@ void MapgenFractalParams::writeParams(Settings *settings) const { settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX); - settings->setU16("mgfractal_formula", formula); + settings->setU16("mgfractal_fractal", fractal); settings->setU16("mgfractal_iterations", iterations); settings->setV3F("mgfractal_scale", scale); settings->setV3F("mgfractal_offset", offset); @@ -368,7 +371,7 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) { float cx, cy, cz, cw, ox, oy, oz, ow; - if (formula % 2 == 0) { // Julia sets, formula = 2, 4, 6, 8 + if (julia) { // Julia set cx = julia_x; cy = julia_y; cz = julia_z; @@ -377,7 +380,7 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) oy = (float)y / scale.Y - offset.Y; oz = (float)z / scale.Z - offset.Z; ow = slice_w; - } else { // Mandelbrot sets, formula = 1, 3, 5, 7 + } else { // Mandelbrot set cx = (float)x / scale.X - offset.X; cy = (float)y / scale.Y - offset.Y; cz = (float)z / scale.Z - offset.Z; @@ -388,32 +391,87 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z) ow = 0.0f; } - for (u16 iter = 0; iter < iterations; iter++) { - float nx = 0.0f; - float ny = 0.0f; - float nz = 0.0f; - float nw = 0.0f; + float nx = 0.0f; + float ny = 0.0f; + float nz = 0.0f; + float nw = 0.0f; - if (formula == 1 || formula == 2) { // 4D "Roundy" Mandelbrot/Julia Set + for (u16 iter = 0; iter < iterations; iter++) { + + if (formula == 1) { // 4D "Roundy" nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz + oy * ow) + cz; nw = 2.0f * (ox * ow + oy * oz) + cw; - } else if (formula == 3 || formula == 4) { // 4D "Squarry" Mandelbrot/Julia Set + } else if (formula == 2) { // 4D "Squarry" nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz + oy * ow) + cz; nw = 2.0f * (ox * ow - oy * oz) + cw; - } else if (formula == 5 || formula == 6) { // 4D "Mandy Cousin" Mandelbrot/Julia Set + } else if (formula == 3) { // 4D "Mandy Cousin" nx = ox * ox - oy * oy - oz * oz + ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz + oy * ow) + cz; nw = 2.0f * (ox * ow + oy * oz) + cw; - } else if (formula == 7 || formula == 8) { // 4D "Variation" Mandelbrot/Julia Set + } else if (formula == 4) { // 4D "Variation" nx = ox * ox - oy * oy - oz * oz - ow * ow + cx; ny = 2.0f * (ox * oy + oz * ow) + cy; nz = 2.0f * (ox * oz - oy * ow) + cz; nw = 2.0f * (ox * ow + oy * oz) + cw; + } else if (formula == 5) { // 3D "Mandelbrot/Mandelbar" + nx = ox * ox - oy * oy - oz * oz + cx; + ny = 2.0f * ox * oy + cy; + nz = -2.0f * ox * oz + cz; + } else if (formula == 6) { // 3D "Christmas Tree" + // Altering the formula here is necessary to avoid division by zero + if (fabs(oz) < 0.000000001f) { + nx = ox * ox - oy * oy - oz * oz + cx; + ny = 2.0f * oy * ox + cy; + nz = 4.0f * oz * ox + cz; + } else { + float a = (2.0f * ox) / (sqrt(oy * oy + oz * oz)); + nx = ox * ox - oy * oy - oz * oz + cx; + ny = a * (oy * oy - oz * oz) + cy; + nz = a * 2.0f * oy * oz + cz; + } + } else if (formula == 7) { // 3D "Mandelbulb" + if (fabs(oy) < 0.000000001f) { + nx = ox * ox - oz * oz + cx; + ny = cy; + nz = -2.0f * oz * sqrt(ox * ox) + cz; + } else { + float a = 1.0f - (oz * oz) / (ox * ox + oy * oy); + nx = (ox * ox - oy * oy) * a + cx; + ny = 2.0f * ox * oy * a + cy; + nz = -2.0f * oz * sqrt(ox * ox + oy * oy) + cz; + } + } else if (formula == 8) { // 3D "Cosine Mandelbulb" + if (fabs(oy) < 0.000000001f) { + nx = 2.0f * ox * oz + cx; + ny = 4.0f * oy * oz + cy; + nz = oz * oz - ox * ox - oy * oy + cz; + } else { + float a = (2.0f * oz) / sqrt(ox * ox + oy * oy); + nx = (ox * ox - oy * oy) * a + cx; + ny = 2.0f * ox * oy * a + cy; + nz = oz * oz - ox * ox - oy * oy + cz; + } + } else if (formula == 9) { // 4D "Mandelbulb" + float rxy = sqrt(ox * ox + oy * oy); + float rxyz = sqrt(ox * ox + oy * oy + oz * oz); + if (fabs(ow) < 0.000000001f && fabs(oz) < 0.000000001f) { + nx = (ox * ox - oy * oy) + cx; + ny = 2.0f * ox * oy + cy; + nz = -2.0f * rxy * oz + cz; + nw = 2.0f * rxyz * ow + cw; + } else { + float a = 1.0f - (ow * ow) / (rxyz * rxyz); + float b = a * (1.0f - (oz * oz) / (rxy * rxy)); + nx = (ox * ox - oy * oy) * b + cx; + ny = 2.0f * ox * oy * b + cy; + nz = -2.0f * rxy * oz * a + cz; + nw = 2.0f * rxyz * ow + cw; + } } if (nx * nx + ny * ny + nz * nz + nw * nw > 4.0f) diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index 7d31a43b..3d4f7ee8 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -3,6 +3,9 @@ Minetest Copyright (C) 2010-2015 kwolekr, Ryan Kwolek Copyright (C) 2010-2015 paramat, Matt Gregory +Fractal formulas from http://www.bugman123.com/Hypercomplex/index.html +by Paul Nylander, and from http://www.fractalforums.com, thank you. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or @@ -33,7 +36,7 @@ extern FlagDesc flagdesc_mapgen_fractal[]; struct MapgenFractalParams : public MapgenSpecificParams { u32 spflags; - u16 formula; + u16 fractal; u16 iterations; v3f scale; v3f offset; @@ -63,14 +66,17 @@ public: int ystride; int zstride; - u32 spflags; + u16 formula; + bool julia; v3s16 node_min; v3s16 node_max; v3s16 full_node_min; v3s16 full_node_max; - u16 formula; + u32 spflags; + + u16 fractal; u16 iterations; v3f scale; v3f offset; From 19f73e4efc14622b4d020c9d373176cd7801e37f Mon Sep 17 00:00:00 2001 From: asl97 Date: Wed, 2 Dec 2015 10:45:57 +0800 Subject: [PATCH 135/531] Get movement setting instead of hard coded value --- src/player.cpp | 17 +++++++++++++++++ src/player.h | 5 +---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/player.cpp b/src/player.cpp index 3ee34d41..dd5e0450 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -261,6 +261,23 @@ void Player::clearHud() } } +RemotePlayer::RemotePlayer(IGameDef *gamedef, const char *name): + Player(gamedef, name), + m_sao(NULL) +{ + movement_acceleration_default = g_settings->getFloat("movement_acceleration_default") * BS; + movement_acceleration_air = g_settings->getFloat("movement_acceleration_air") * BS; + movement_acceleration_fast = g_settings->getFloat("movement_acceleration_fast") * BS; + movement_speed_walk = g_settings->getFloat("movement_speed_walk") * BS; + movement_speed_crouch = g_settings->getFloat("movement_speed_crouch") * BS; + movement_speed_fast = g_settings->getFloat("movement_speed_fast") * BS; + movement_speed_climb = g_settings->getFloat("movement_speed_climb") * BS; + movement_speed_jump = g_settings->getFloat("movement_speed_jump") * BS; + movement_liquid_fluidity = g_settings->getFloat("movement_liquid_fluidity") * BS; + movement_liquid_fluidity_smooth = g_settings->getFloat("movement_liquid_fluidity_smooth") * BS; + movement_liquid_sink = g_settings->getFloat("movement_liquid_sink") * BS; + movement_gravity = g_settings->getFloat("movement_gravity") * BS; +} void RemotePlayer::save(std::string savedir) { diff --git a/src/player.h b/src/player.h index c1126187..48b0a499 100644 --- a/src/player.h +++ b/src/player.h @@ -424,10 +424,7 @@ private: class RemotePlayer : public Player { public: - RemotePlayer(IGameDef *gamedef, const char *name): - Player(gamedef, name), - m_sao(NULL) - {} + RemotePlayer(IGameDef *gamedef, const char *name); virtual ~RemotePlayer() {} void save(std::string savedir); From 9eee3c3f465c071bb9908749cf48be3c131a1bdf Mon Sep 17 00:00:00 2001 From: BlockMen Date: Fri, 20 Nov 2015 23:46:33 +0100 Subject: [PATCH 136/531] Add option to give every object a nametag or change the nametag text of players --- doc/lua_api.txt | 26 +++++---- src/content_cao.cpp | 22 ++++---- src/content_cao.h | 1 - src/content_sao.cpp | 24 +-------- src/content_sao.h | 11 ++-- src/object_properties.cpp | 11 +++- src/object_properties.h | 2 + src/script/common/c_content.cpp | 13 +++++ src/script/lua_api/l_object.cpp | 96 +++++++++++++++++++-------------- 9 files changed, 111 insertions(+), 95 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 56dc84d2..45a47c9a 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2544,6 +2544,19 @@ This is basically a reference to a C++ `ServerActiveObject` * `set_properties(object property table)` * `get_properties()`: returns object property table * `is_player()`: returns true for players, false otherwise +* `get_nametag_attributes()` + * returns a table with the attributes of the nametag of an object + * { + color = {a=0..255, r=0..255, g=0..255, b=0..255}, + text = "", + } +* `set_nametag_attributes(attributes)` + * sets the attributes of the nametag of an object + * `attributes`: + { + color = ColorSpec, + text = "My Nametag", + } ##### LuaEntitySAO-only (no-op for other objects) * `setvelocity({x=num, y=num, z=num})` @@ -2644,17 +2657,6 @@ This is basically a reference to a C++ `ServerActiveObject` * in first person view * in third person view (max. values `{x=-10/10,y=-10,15,z=-5/5}`) * `get_eye_offset()`: returns offset_first and offset_third -* `get_nametag_attributes()` - * returns a table with the attributes of the nametag of the player - * { - color = {a=0..255, r=0..255, g=0..255, b=0..255}, - } -* `set_nametag_attributes(attributes)` - * sets the attributes of the nametag of the player - * `attributes`: - { - color = ColorSpec, - } ### `InvRef` An `InvRef` is a reference to an inventory. @@ -3232,6 +3234,8 @@ Definition tables automatic_face_movement_dir = 0.0, -- ^ automatically set yaw to movement direction; offset in degrees; false to disable backface_culling = true, -- false to disable backface_culling for model + nametag = "", -- by default empty, for players their name is shown if empty + nametag_color = , -- sets color of nametag as ColorSpec } ### Entity definition (`register_entity`) diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 72f6145b..ed4e3b71 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -551,7 +551,6 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env): m_animated_meshnode(NULL), m_wield_meshnode(NULL), m_spritenode(NULL), - m_nametag_color(video::SColor(255, 255, 255, 255)), m_textnode(NULL), m_position(v3f(0,10*BS,0)), m_velocity(v3f(0,0,0)), @@ -972,19 +971,19 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, updateTextures(""); scene::ISceneNode *node = getSceneNode(); - if (node && m_is_player && !m_is_local_player) { + if (node && m_prop.nametag != "" && !m_is_local_player) { // Add a text node for showing the name gui::IGUIEnvironment* gui = irr->getGUIEnvironment(); - std::wstring wname = utf8_to_wide(m_name); + std::wstring nametag_text = utf8_to_wide(m_prop.nametag); m_textnode = smgr->addTextSceneNode(gui->getSkin()->getFont(), - wname.c_str(), m_nametag_color, node); + nametag_text.c_str(), m_prop.nametag_color, node); m_textnode->grab(); m_textnode->setPosition(v3f(0, BS*1.1, 0)); // Enforce hiding nametag, // because if freetype is enabled, a grey // shadow can remain. - m_textnode->setVisible(m_nametag_color.getAlpha() > 0); + m_textnode->setVisible(m_prop.nametag_color.getAlpha() > 0); } updateNodePos(); @@ -1594,6 +1593,9 @@ void GenericCAO::processMessage(const std::string &data) m_tx_basepos = m_prop.initial_sprite_basepos; } + if ((m_is_player && !m_is_local_player) && m_prop.nametag == "") + m_prop.nametag = m_name; + expireVisuals(); } else if(cmd == GENERIC_CMD_UPDATE_POSITION) @@ -1772,15 +1774,15 @@ void GenericCAO::processMessage(const std::string &data) m_armor_groups[name] = rating; } } else if (cmd == GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) { + // Deprecated, for backwards compatibility only. readU8(is); // version - m_nametag_color = readARGB8(is); + m_prop.nametag_color = readARGB8(is); if (m_textnode != NULL) { - m_textnode->setTextColor(m_nametag_color); + m_textnode->setTextColor(m_prop.nametag_color); // Enforce hiding nametag, - // because if freetype is enabled, a grey - // shadow can remain. - m_textnode->setVisible(m_nametag_color.getAlpha() > 0); + // because if freetype is enabled, a grey shadow can remain. + m_textnode->setVisible(m_prop.nametag_color.getAlpha() > 0); } } } diff --git a/src/content_cao.h b/src/content_cao.h index 299d6c73..d9145c5f 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -70,7 +70,6 @@ private: scene::IAnimatedMeshSceneNode *m_animated_meshnode; WieldMeshSceneNode *m_wield_meshnode; scene::IBillboardSceneNode *m_spritenode; - video::SColor m_nametag_color; scene::ITextSceneNode* m_textnode; v3f m_position; v3f m_velocity; diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 0fa806c1..0a1cfe77 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -757,8 +757,6 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, m_bone_position_sent(false), m_attachment_parent_id(0), m_attachment_sent(false), - m_nametag_color(video::SColor(255, 255, 255, 255)), - m_nametag_sent(false), // public m_physics_override_speed(1), m_physics_override_jump(1), @@ -857,7 +855,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version) os< getAttachmentChildIds(); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); - void setNametagColor(video::SColor color); - video::SColor getNametagColor(); /* Inventory interface @@ -292,7 +290,7 @@ public: private: std::string getPropertyPacket(); - + Player *m_player; u16 m_peer_id; Inventory *m_inventory; @@ -333,8 +331,6 @@ private: v3f m_attachment_rotation; bool m_attachment_sent; - video::SColor m_nametag_color; - bool m_nametag_sent; public: float m_physics_override_speed; @@ -346,4 +342,3 @@ public: }; #endif - diff --git a/src/object_properties.cpp b/src/object_properties.cpp index dc1eddf4..3cec5167 100644 --- a/src/object_properties.cpp +++ b/src/object_properties.cpp @@ -43,7 +43,9 @@ ObjectProperties::ObjectProperties(): stepheight(0), automatic_face_movement_dir(false), automatic_face_movement_dir_offset(0.0), - backface_culling(true) + backface_culling(true), + nametag(""), + nametag_color(255, 255, 255, 255) { textures.push_back("unknown_object.png"); colors.push_back(video::SColor(255,255,255,255)); @@ -76,6 +78,9 @@ std::string ObjectProperties::dump() os<<", makes_footstep_sound="<backface_culling); + getstringfield(L, -1, "nametag", prop->nametag); + lua_getfield(L, -1, "nametag_color"); + if (!lua_isnil(L, -1)) { + video::SColor color = prop->nametag_color; + if (read_color(L, -1, &color)) + prop->nametag_color = color; + } + lua_pop(L, 1); } /******************************************************************************/ @@ -261,6 +269,11 @@ void push_object_properties(lua_State *L, ObjectProperties *prop) lua_setfield(L, -2, "automatic_face_movement_dir"); lua_pushboolean(L, prop->backface_culling); lua_setfield(L, -2, "backface_culling"); + lua_pushlstring(L, prop->nametag.c_str(), prop->nametag.size()); + lua_setfield(L, -2, "nametag"); + lua_newtable(L); + push_ARGB8(L, prop->nametag_color); + lua_setfield(L, -2, "nametag_color"); } /******************************************************************************/ diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index 52190d60..6d6614e7 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -767,6 +767,59 @@ int ObjectRef::l_is_player(lua_State *L) return 1; } +// set_nametag_attributes(self, attributes) +int ObjectRef::l_set_nametag_attributes(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + ObjectRef *ref = checkobject(L, 1); + ServerActiveObject *co = getobject(ref); + + if (co == NULL) + return 0; + ObjectProperties *prop = co->accessObjectProperties(); + if (!prop) + return 0; + + lua_getfield(L, 2, "color"); + if (!lua_isnil(L, -1)) { + video::SColor color = prop->nametag_color; + read_color(L, -1, &color); + prop->nametag_color = color; + } + lua_pop(L, 1); + + std::string nametag = getstringfield_default(L, 2, "text", ""); + if (nametag != "") + prop->nametag = nametag; + + co->notifyObjectPropertiesModified(); + lua_pushboolean(L, true); + return 1; +} + +// get_nametag_attributes(self) +int ObjectRef::l_get_nametag_attributes(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + ObjectRef *ref = checkobject(L, 1); + ServerActiveObject *co = getobject(ref); + + if (co == NULL) + return 0; + ObjectProperties *prop = co->accessObjectProperties(); + if (!prop) + return 0; + + video::SColor color = prop->nametag_color; + + lua_newtable(L); + push_ARGB8(L, color); + lua_setfield(L, -2, "color"); + lua_pushstring(L, prop->nametag.c_str()); + lua_setfield(L, -2, "text"); + return 1; +} + /* LuaEntitySAO-only */ // setvelocity(self, {x=num, y=num, z=num}) @@ -1593,45 +1646,6 @@ int ObjectRef::l_get_day_night_ratio(lua_State *L) return 1; } -// set_nametag_attributes(self, attributes) -int ObjectRef::l_set_nametag_attributes(lua_State *L) -{ - NO_MAP_LOCK_REQUIRED; - ObjectRef *ref = checkobject(L, 1); - PlayerSAO *playersao = getplayersao(ref); - if (playersao == NULL) - return 0; - - lua_getfield(L, 2, "color"); - if (!lua_isnil(L, -1)) { - video::SColor color = playersao->getNametagColor(); - if (!read_color(L, -1, &color)) - return 0; - playersao->setNametagColor(color); - } - - lua_pushboolean(L, true); - return 1; -} - -// get_nametag_attributes(self) -int ObjectRef::l_get_nametag_attributes(lua_State *L) -{ - NO_MAP_LOCK_REQUIRED; - ObjectRef *ref = checkobject(L, 1); - PlayerSAO *playersao = getplayersao(ref); - if (playersao == NULL) - return 0; - - video::SColor color = playersao->getNametagColor(); - - lua_newtable(L); - push_ARGB8(L, color); - lua_setfield(L, -2, "color"); - - return 1; -} - ObjectRef::ObjectRef(ServerActiveObject *object): m_object(object) { @@ -1719,6 +1733,8 @@ const luaL_reg ObjectRef::methods[] = { luamethod(ObjectRef, set_detach), luamethod(ObjectRef, set_properties), luamethod(ObjectRef, get_properties), + luamethod(ObjectRef, set_nametag_attributes), + luamethod(ObjectRef, get_nametag_attributes), // LuaEntitySAO-only luamethod(ObjectRef, setvelocity), luamethod(ObjectRef, getvelocity), @@ -1768,7 +1784,5 @@ const luaL_reg ObjectRef::methods[] = { luamethod(ObjectRef, get_local_animation), luamethod(ObjectRef, set_eye_offset), luamethod(ObjectRef, get_eye_offset), - luamethod(ObjectRef, set_nametag_attributes), - luamethod(ObjectRef, get_nametag_attributes), {0,0} }; From 6a7e1667f6e696f152191d9fdd74947ceefcfd3a Mon Sep 17 00:00:00 2001 From: Sapier Date: Thu, 17 Dec 2015 20:43:25 +0100 Subject: [PATCH 137/531] Android: Fix pressed buttons not beeing cleared on opening menu --- src/game.cpp | 17 ++++--- src/touchscreengui.cpp | 111 ++++++++++++++++++++++++----------------- src/touchscreengui.h | 3 ++ 3 files changed, 78 insertions(+), 53 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 5e4f4cac..f6d59e4e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2569,7 +2569,17 @@ void Game::processUserInput(VolatileRunFlags *flags, || noMenuActive() == false || guienv->hasFocus(gui_chat_console)) { input->clear(); +#ifdef HAVE_TOUCHSCREENGUI + g_touchscreengui->Hide(); +#endif } +#ifdef HAVE_TOUCHSCREENGUI + else if (g_touchscreengui) { + /* on touchscreengui step may generate own input events which ain't + * what we want in case we just did clear them */ + g_touchscreengui->step(dtime); + } +#endif if (!guienv->hasFocus(gui_chat_console) && gui_chat_console->isOpen()) { gui_chat_console->closeConsoleAtOnce(); @@ -2578,13 +2588,6 @@ void Game::processUserInput(VolatileRunFlags *flags, // Input handler step() (used by the random input generator) input->step(dtime); -#ifdef HAVE_TOUCHSCREENGUI - - if (g_touchscreengui) { - g_touchscreengui->step(dtime); - } - -#endif #ifdef __ANDROID__ if (current_formspec != 0) diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp index e4f785f6..f0ad002d 100644 --- a/src/touchscreengui.cpp +++ b/src/touchscreengui.cpp @@ -417,6 +417,57 @@ void TouchScreenGUI::ButtonEvent(touch_gui_button_id button, delete translated; } + +void TouchScreenGUI::handleReleaseEvent(int evt_id) +{ + touch_gui_button_id button = getButtonID(evt_id); + + /* handle button events */ + if (button != after_last_element_id) { + ButtonEvent(button, evt_id, false); + } + /* handle hud button events */ + else if (isReleaseHUDButton(evt_id)) { + /* nothing to do here */ + } + /* handle the point used for moving view */ + else if (evt_id == m_move_id) { + m_move_id = -1; + + /* if this pointer issued a mouse event issue symmetric release here */ + if (m_move_sent_as_mouse_event) { + SEvent* translated = new SEvent; + memset(translated,0,sizeof(SEvent)); + translated->EventType = EET_MOUSE_INPUT_EVENT; + translated->MouseInput.X = m_move_downlocation.X; + translated->MouseInput.Y = m_move_downlocation.Y; + translated->MouseInput.Shift = false; + translated->MouseInput.Control = false; + translated->MouseInput.ButtonStates = 0; + translated->MouseInput.Event = EMIE_LMOUSE_LEFT_UP; + m_receiver->OnEvent(*translated); + delete translated; + } + else { + /* do double tap detection */ + doubleTapDetection(); + } + } + else { + infostream + << "TouchScreenGUI::translateEvent released unknown button: " + << evt_id << std::endl; + } + + for (std::vector::iterator iter = m_known_ids.begin(); + iter != m_known_ids.end(); ++iter) { + if (iter->id == evt_id) { + m_known_ids.erase(iter); + break; + } + } +} + void TouchScreenGUI::translateEvent(const SEvent &event) { if (!m_visible) { @@ -470,52 +521,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event) else if (event.TouchInput.Event == ETIE_LEFT_UP) { verbosestream << "Up event for pointerid: " << event.TouchInput.ID << std::endl; - touch_gui_button_id button = getButtonID(event.TouchInput.ID); - - /* handle button events */ - if (button != after_last_element_id) { - ButtonEvent(button,event.TouchInput.ID,false); - } - /* handle hud button events */ - else if (isReleaseHUDButton(event.TouchInput.ID)) { - /* nothing to do here */ - } - /* handle the point used for moving view */ - else if (event.TouchInput.ID == m_move_id) { - m_move_id = -1; - - /* if this pointer issued a mouse event issue symmetric release here */ - if (m_move_sent_as_mouse_event) { - SEvent* translated = new SEvent; - memset(translated,0,sizeof(SEvent)); - translated->EventType = EET_MOUSE_INPUT_EVENT; - translated->MouseInput.X = m_move_downlocation.X; - translated->MouseInput.Y = m_move_downlocation.Y; - translated->MouseInput.Shift = false; - translated->MouseInput.Control = false; - translated->MouseInput.ButtonStates = 0; - translated->MouseInput.Event = EMIE_LMOUSE_LEFT_UP; - m_receiver->OnEvent(*translated); - delete translated; - } - else { - /* do double tap detection */ - doubleTapDetection(); - } - } - else { - infostream - << "TouchScreenGUI::translateEvent released unknown button: " - << event.TouchInput.ID << std::endl; - } - - for (std::vector::iterator iter = m_known_ids.begin(); - iter != m_known_ids.end(); ++iter) { - if (iter->id == event.TouchInput.ID) { - m_known_ids.erase(iter); - break; - } - } + handleReleaseEvent(event.TouchInput.ID); } else { assert(event.TouchInput.Event == ETIE_MOVED); @@ -765,14 +771,27 @@ void TouchScreenGUI::Toggle(bool visible) btn->guibutton->setVisible(visible); } } + + /* clear all active buttons */ + if (!visible) { + while (m_known_ids.size() > 0) { + handleReleaseEvent(m_known_ids.begin()->id); + } + } } void TouchScreenGUI::Hide() { + if (!m_visible) + return; + Toggle(false); } void TouchScreenGUI::Show() { + if (m_visible) + return; + Toggle(true); } diff --git a/src/touchscreengui.h b/src/touchscreengui.h index bb323179..1e69a41e 100644 --- a/src/touchscreengui.h +++ b/src/touchscreengui.h @@ -153,6 +153,9 @@ private: /* handle double taps */ bool doubleTapDetection(); + /* handle release event */ + void handleReleaseEvent(int evt_id); + /* doubleclick detection variables */ struct key_event { unsigned int down_time; From a3fd167ddab4fa02d8d84554c3339459ac65cf81 Mon Sep 17 00:00:00 2001 From: Sapier Date: Tue, 15 Dec 2015 21:41:03 +0100 Subject: [PATCH 138/531] Android: Remove non freetype fonts from apk --- build/android/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/android/Makefile b/build/android/Makefile index 9f107602..441c8bda 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -753,7 +753,8 @@ assets : $(ASSETS_TIMESTAMP) cp -r ${ROOT}/../../builtin ${ROOT}/assets/Minetest; \ cp -r ${ROOT}/../../client ${ROOT}/assets/Minetest; \ cp -r ${ROOT}/../../doc ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../fonts ${ROOT}/assets/Minetest; \ + mkdir ${ROOT}/assets/Minetest/fonts; \ + cp -r ${ROOT}/../../fonts/*.ttf ${ROOT}/assets/Minetest/fonts/; \ mkdir ${ROOT}/assets/Minetest/games; \ for game in ${GAMES_TO_COPY}; do \ cp -r ${ROOT}/../../games/$$game ${ROOT}/assets/Minetest/games/; \ From dcb91cf0c0c9a20622feeb4e5e8104ffbc9fa8ec Mon Sep 17 00:00:00 2001 From: Sapier Date: Wed, 16 Dec 2015 00:59:44 +0100 Subject: [PATCH 139/531] Android: Don't put html docs to apk --- build/android/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/android/Makefile b/build/android/Makefile index 441c8bda..0a817c97 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -753,6 +753,7 @@ assets : $(ASSETS_TIMESTAMP) cp -r ${ROOT}/../../builtin ${ROOT}/assets/Minetest; \ cp -r ${ROOT}/../../client ${ROOT}/assets/Minetest; \ cp -r ${ROOT}/../../doc ${ROOT}/assets/Minetest; \ + rm -rf ${ROOT}/assets/Minetest/doc/html; \ mkdir ${ROOT}/assets/Minetest/fonts; \ cp -r ${ROOT}/../../fonts/*.ttf ${ROOT}/assets/Minetest/fonts/; \ mkdir ${ROOT}/assets/Minetest/games; \ From bde6194638e8856c4df28d80ae6e15d2e9e31e91 Mon Sep 17 00:00:00 2001 From: Sapier Date: Thu, 17 Dec 2015 20:51:54 +0100 Subject: [PATCH 140/531] Android: Remove unused build target curl_binary --- build/android/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index 0a817c97..dd6c89ad 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -168,7 +168,7 @@ endif $(ASSETS_TIMESTAMP) $(LEVELDB_TIMESTAMP) \ $(OPENAL_TIMESTAMP) $(OGG_TIMESTAMP) \ $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \ - $(OPENSSL_TIMESTAMP) curl_binary \ + $(OPENSSL_TIMESTAMP) \ $(ROOT)/jni/src/android_version.h \ $(ROOT)/jni/src/android_version_githash.h @@ -625,18 +625,6 @@ clean_curl : $(RM) -rf deps/curl-${CURL_VERSION} \ $(RM) -f deps/curl - -curl_binary: - @if [ ! -d "deps/curl-${CURL_VERSION_BINARY}" ] ; then \ - echo "curl binary missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd deps; \ - wget http://curl.haxx.se/gknw.net/7.34.0/dist-android/curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\ - tar -xzf curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz || exit 1;\ - mv curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android curl-${CURL_VERSION_BINARY};\ - rm curl-7.34.0-rtmp-ssh2-ssl-zlib-static-bin-android.tar.gz; \ - fi - $(GMP_TIMESTAMP) : gmp_download @LAST_MODIF=$$(find ${GMP_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ] ; then \ From 06632205d8765b5417c36df798617721bab0d02f Mon Sep 17 00:00:00 2001 From: Sapier Date: Sun, 13 Dec 2015 23:00:05 +0100 Subject: [PATCH 141/531] Android: Implement Autohiding button bars to cleanup screen --- src/game.cpp | 4 +- src/modalMenu.h | 2 +- src/touchscreengui.cpp | 510 +++++++++++++++++++++------ src/touchscreengui.h | 113 +++++- textures/base/pack/drop_btn.png | Bin 539 -> 1035 bytes textures/base/pack/gear_icon.png | Bin 0 -> 1005 bytes textures/base/pack/rare_controls.png | Bin 0 -> 349 bytes 7 files changed, 500 insertions(+), 129 deletions(-) create mode 100644 textures/base/pack/gear_icon.png create mode 100644 textures/base/pack/rare_controls.png diff --git a/src/game.cpp b/src/game.cpp index f6d59e4e..3f025f6d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2173,7 +2173,7 @@ bool Game::initGui() #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) - g_touchscreengui->init(texture_src, porting::getDisplayDensity()); + g_touchscreengui->init(texture_src); #endif @@ -2570,7 +2570,7 @@ void Game::processUserInput(VolatileRunFlags *flags, || guienv->hasFocus(gui_chat_console)) { input->clear(); #ifdef HAVE_TOUCHSCREENGUI - g_touchscreengui->Hide(); + g_touchscreengui->hide(); #endif } #ifdef HAVE_TOUCHSCREENGUI diff --git a/src/modalMenu.h b/src/modalMenu.h index 72ecedcb..d5e975a8 100644 --- a/src/modalMenu.h +++ b/src/modalMenu.h @@ -108,7 +108,7 @@ public: this->remove(); #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) - g_touchscreengui->Show(); + g_touchscreengui->show(); #endif } diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp index f0ad002d..f51b2d5f 100644 --- a/src/touchscreengui.cpp +++ b/src/touchscreengui.cpp @@ -44,17 +44,8 @@ const char** touchgui_button_imagenames = (const char*[]) { "down_arrow.png", "left_arrow.png", "right_arrow.png", - "inventory_btn.png", - "drop_btn.png", "jump_btn.png", - "down.png", - "fly_btn.png", - "noclip_btn.png", - "fast_btn.png", - "debug_btn.png", - "chat_btn.png", - "camera_btn.png", - "rangeview_btn.png" + "down.png" }; static irr::EKEY_CODE id2keycode(touch_gui_button_id id) @@ -113,29 +104,13 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id) TouchScreenGUI *g_touchscreengui; -TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver): - m_device(device), - m_guienv(device->getGUIEnvironment()), - m_camera_yaw(0.0), - m_camera_pitch(0.0), - m_visible(false), - m_move_id(-1), - m_receiver(receiver) -{ - for (unsigned int i=0; i < after_last_element_id; i++) { - m_buttons[i].guibutton = 0; - m_buttons[i].repeatcounter = -1; - m_buttons[i].repeatdelay = BUTTON_REPEAT_DELAY; - } - - m_screensize = m_device->getVideoDriver()->getScreenSize(); -} - -void TouchScreenGUI::loadButtonTexture(button_info* btn, const char* path, rect button_rect) +static void load_button_texture(button_info* btn, const char* path, + rect button_rect, ISimpleTextureSource* tsrc, video::IVideoDriver *driver) { unsigned int tid; - video::ITexture *texture = guiScalingImageButton(m_device->getVideoDriver(), - m_texturesource->getTexture(path, &tid), button_rect.getWidth(), button_rect.getHeight()); + video::ITexture *texture = guiScalingImageButton(driver, + tsrc->getTexture(path, &tid), button_rect.getWidth(), + button_rect.getHeight()); if (texture) { btn->guibutton->setUseAlphaChannel(true); if (g_settings->getBool("gui_scaling_filter")) { @@ -153,6 +128,314 @@ void TouchScreenGUI::loadButtonTexture(button_info* btn, const char* path, rect< } } +AutoHideButtonBar::AutoHideButtonBar(IrrlichtDevice *device, + IEventReceiver* receiver) : + m_texturesource(NULL), + m_driver(device->getVideoDriver()), + m_guienv(device->getGUIEnvironment()), + m_receiver(receiver), + m_active(false), + m_visible(true), + m_timeout(0), + m_timeout_value(3), + m_initialized(false), + m_dir(AHBB_Dir_Right_Left) +{ + m_screensize = device->getVideoDriver()->getScreenSize(); + +} + +void AutoHideButtonBar::init(ISimpleTextureSource* tsrc, + const char* starter_img, int button_id, v2s32 UpperLeft, + v2s32 LowerRight, autohide_button_bar_dir dir, float timeout) +{ + m_texturesource = tsrc; + + m_upper_left = UpperLeft; + m_lower_right = LowerRight; + + /* init settings bar */ + + irr::core::rect current_button = rect(UpperLeft.X, UpperLeft.Y, + LowerRight.X, LowerRight.Y); + + m_starter.guibutton = m_guienv->addButton(current_button, 0, button_id, L"", 0); + m_starter.guibutton->grab(); + m_starter.repeatcounter = -1; + m_starter.keycode = KEY_OEM_8; // use invalid keycode as it's not relevant + m_starter.immediate_release = true; + m_starter.ids.clear(); + + load_button_texture(&m_starter, starter_img, current_button, + m_texturesource, m_driver); + + m_dir = dir; + m_timeout_value = timeout; + + m_initialized = true; +} + +AutoHideButtonBar::~AutoHideButtonBar() +{ + m_starter.guibutton->setVisible(false); + m_starter.guibutton->drop(); +} + +void AutoHideButtonBar::addButton(touch_gui_button_id button_id, + const wchar_t* caption, const char* btn_image) +{ + + if (!m_initialized) { + errorstream << "AutoHideButtonBar::addButton not yet initialized!" + << std::endl; + return; + } + int button_size = 0; + + if ((m_dir == AHBB_Dir_Top_Bottom) || (m_dir == AHBB_Dir_Bottom_Top)) { + button_size = m_lower_right.X - m_upper_left.X; + } else { + button_size = m_lower_right.Y - m_upper_left.Y; + } + + irr::core::rect current_button; + + if ((m_dir == AHBB_Dir_Right_Left) || (m_dir == AHBB_Dir_Left_Right)) { + + int x_start = 0; + int x_end = 0; + + if (m_dir == AHBB_Dir_Left_Right) { + x_start = m_lower_right.X + (button_size * 1.25 * m_buttons.size()) + + (button_size * 0.25); + x_end = x_start + button_size; + } else { + x_end = m_upper_left.X - (button_size * 1.25 * m_buttons.size()) + - (button_size * 0.25); + x_start = x_end - button_size; + } + + current_button = rect(x_start, m_upper_left.Y, x_end, + m_lower_right.Y); + } else { + int y_start = 0; + int y_end = 0; + + if (m_dir == AHBB_Dir_Top_Bottom) { + y_start = m_lower_right.X + (button_size * 1.25 * m_buttons.size()) + + (button_size * 0.25); + y_end = y_start + button_size; + } else { + y_end = m_upper_left.X - (button_size * 1.25 * m_buttons.size()) + - (button_size * 0.25); + y_start = y_end - button_size; + } + + current_button = rect(m_upper_left.X, y_start, m_lower_right.Y, + y_end); + } + + button_info* btn = new button_info(); + btn->guibutton = m_guienv->addButton(current_button, 0, button_id, caption, 0); + btn->guibutton->grab(); + btn->guibutton->setVisible(false); + btn->guibutton->setEnabled(false); + btn->repeatcounter = -1; + btn->keycode = id2keycode(button_id); + btn->immediate_release = true; + btn->ids.clear(); + + load_button_texture(btn, btn_image, current_button, m_texturesource, + m_driver); + + m_buttons.push_back(btn); +} + +bool AutoHideButtonBar::isButton(const SEvent &event) +{ + IGUIElement* rootguielement = m_guienv->getRootGUIElement(); + + if (rootguielement == NULL) { + return false; + } + + gui::IGUIElement *element = rootguielement->getElementFromPoint( + core::position2d(event.TouchInput.X, event.TouchInput.Y)); + + if (element == NULL) { + return false; + } + + if (m_active) { + /* check for all buttons in vector */ + + std::vector::iterator iter = m_buttons.begin(); + + while (iter != m_buttons.end()) { + if ((*iter)->guibutton == element) { + + SEvent* translated = new SEvent(); + memset(translated, 0, sizeof(SEvent)); + translated->EventType = irr::EET_KEY_INPUT_EVENT; + translated->KeyInput.Key = (*iter)->keycode; + translated->KeyInput.Control = false; + translated->KeyInput.Shift = false; + translated->KeyInput.Char = 0; + + /* add this event */ + translated->KeyInput.PressedDown = true; + m_receiver->OnEvent(*translated); + + /* remove this event */ + translated->KeyInput.PressedDown = false; + m_receiver->OnEvent(*translated); + + delete translated; + + (*iter)->ids.push_back(event.TouchInput.ID); + + m_timeout = 0; + + return true; + } + ++iter; + } + } else { + /* check for starter button only */ + if (element == m_starter.guibutton) { + m_starter.ids.push_back(event.TouchInput.ID); + m_starter.guibutton->setVisible(false); + m_starter.guibutton->setEnabled(false); + m_active = true; + m_timeout = 0; + + std::vector::iterator iter = m_buttons.begin(); + + while (iter != m_buttons.end()) { + (*iter)->guibutton->setVisible(true); + (*iter)->guibutton->setEnabled(true); + ++iter; + } + + return true; + } + } + return false; +} + +bool AutoHideButtonBar::isReleaseButton(int eventID) +{ + std::vector::iterator id = std::find(m_starter.ids.begin(), + m_starter.ids.end(), eventID); + + if (id != m_starter.ids.end()) { + m_starter.ids.erase(id); + return true; + } + + std::vector::iterator iter = m_buttons.begin(); + + while (iter != m_buttons.end()) { + std::vector::iterator id = std::find((*iter)->ids.begin(), + (*iter)->ids.end(), eventID); + + if (id != (*iter)->ids.end()) { + (*iter)->ids.erase(id); + // TODO handle settings button release + return true; + } + ++iter; + } + + return false; +} + +void AutoHideButtonBar::step(float dtime) +{ + if (m_active) { + m_timeout += dtime; + + if (m_timeout > m_timeout_value) { + deactivate(); + } + } +} + +void AutoHideButtonBar::deactivate() +{ + if (m_visible == true) { + m_starter.guibutton->setVisible(true); + m_starter.guibutton->setEnabled(true); + } + m_active = false; + + std::vector::iterator iter = m_buttons.begin(); + + while (iter != m_buttons.end()) { + (*iter)->guibutton->setVisible(false); + (*iter)->guibutton->setEnabled(false); + ++iter; + } +} + +void AutoHideButtonBar::hide() +{ + m_visible = false; + m_starter.guibutton->setVisible(false); + m_starter.guibutton->setEnabled(false); + + std::vector::iterator iter = m_buttons.begin(); + + while (iter != m_buttons.end()) { + (*iter)->guibutton->setVisible(false); + (*iter)->guibutton->setEnabled(false); + ++iter; + } +} + +void AutoHideButtonBar::show() +{ + m_visible = true; + + if (m_active) { + std::vector::iterator iter = m_buttons.begin(); + + while (iter != m_buttons.end()) { + (*iter)->guibutton->setVisible(true); + (*iter)->guibutton->setEnabled(true); + ++iter; + } + } else { + m_starter.guibutton->setVisible(true); + m_starter.guibutton->setEnabled(true); + } +} + +TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver): + m_device(device), + m_guienv(device->getGUIEnvironment()), + m_camera_yaw(0.0), + m_camera_pitch(0.0), + m_visible(false), + m_move_id(-1), + m_receiver(receiver), + m_move_has_really_moved(false), + m_move_downtime(0), + m_move_sent_as_mouse_event(false), + // use some downlocation way off screen as init value to avoid invalid behaviour + m_move_downlocation(v2s32(-10000, -10000)), + m_settingsbar(device, receiver), + m_rarecontrolsbar(device, receiver) +{ + for (unsigned int i=0; i < after_last_element_id; i++) { + m_buttons[i].guibutton = 0; + m_buttons[i].repeatcounter = -1; + m_buttons[i].repeatdelay = BUTTON_REPEAT_DELAY; + } + + m_screensize = m_device->getVideoDriver()->getScreenSize(); +} + void TouchScreenGUI::initButton(touch_gui_button_id id, rect button_rect, std::wstring caption, bool immediate_release, float repeat_delay) { @@ -166,21 +449,27 @@ void TouchScreenGUI::initButton(touch_gui_button_id id, rect button_rect, btn->immediate_release = immediate_release; btn->ids.clear(); - loadButtonTexture(btn,touchgui_button_imagenames[id], button_rect); + load_button_texture(btn,touchgui_button_imagenames[id],button_rect, + m_texturesource, m_device->getVideoDriver()); } static int getMaxControlPadSize(float density) { return 200 * density * g_settings->getFloat("hud_scaling"); } -void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density) +int TouchScreenGUI::getGuiButtonSize() +{ + u32 control_pad_size = MYMIN((2 * m_screensize.Y) / 3, + getMaxControlPadSize(porting::getDisplayDensity())); + + return control_pad_size / 3; +} + +void TouchScreenGUI::init(ISimpleTextureSource* tsrc) { assert(tsrc != 0); - u32 control_pad_size = - MYMIN((2 * m_screensize.Y) / 3,getMaxControlPadSize(density)); - - u32 button_size = control_pad_size / 3; + u32 button_size = getGuiButtonSize(); m_visible = true; m_texturesource = tsrc; m_control_pad_rect = rect(0, m_screensize.Y - 3 * button_size, @@ -223,16 +512,6 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density) } } - /* init inventory button */ - initButton(inventory_id, - rect(0, m_screensize.Y - (button_size/2), - (button_size/2), m_screensize.Y), L"inv", true); - - /* init drop button */ - initButton(drop_id, - rect(2.5*button_size, m_screensize.Y - (button_size/2), - 3*button_size, m_screensize.Y), L"drop", true); - /* init jump button */ initButton(jump_id, rect(m_screensize.X-(1.75*button_size), @@ -249,48 +528,37 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density) m_screensize.Y), L"H",false); - /* init fly button */ - initButton(fly_id, - rect(m_screensize.X - (0.75*button_size), - m_screensize.Y - (2.25*button_size), - m_screensize.X, m_screensize.Y - (button_size*1.5)), - L"fly", false, SLOW_BUTTON_REPEAT); + m_settingsbar.init(m_texturesource, "gear_icon.png", settings_starter_id, + v2s32(m_screensize.X - (button_size / 2), + m_screensize.Y - ((SETTINGS_BAR_Y_OFFSET + 1) * button_size) + + (button_size * 0.5)), + v2s32(m_screensize.X, + m_screensize.Y - (SETTINGS_BAR_Y_OFFSET * button_size) + + (button_size * 0.5)), AHBB_Dir_Right_Left, + 3.0); - /* init noclip button */ - initButton(noclip_id, - rect(m_screensize.X - (0.75*button_size), 2.25*button_size, - m_screensize.X, 3*button_size), - L"clip", false, SLOW_BUTTON_REPEAT); + m_settingsbar.addButton(fly_id, L"fly", "fly_btn.png"); + m_settingsbar.addButton(noclip_id, L"noclip", "noclip_btn.png"); + m_settingsbar.addButton(fast_id, L"fast", "fast_btn.png"); + m_settingsbar.addButton(debug_id, L"debug", "debug_btn.png"); + m_settingsbar.addButton(camera_id, L"camera", "camera_btn.png"); + m_settingsbar.addButton(range_id, L"rangeview", "rangeview_btn.png"); - /* init fast button */ - initButton(fast_id, - rect(m_screensize.X - (0.75*button_size), 1.5*button_size, - m_screensize.X, 2.25*button_size), - L"fast", false, SLOW_BUTTON_REPEAT); + m_rarecontrolsbar.init(m_texturesource, "rare_controls.png", + rare_controls_starter_id, + v2s32(0, + m_screensize.Y + - ((RARE_CONTROLS_BAR_Y_OFFSET + 1) * button_size) + + (button_size * 0.5)), + v2s32(button_size / 2, + m_screensize.Y - (RARE_CONTROLS_BAR_Y_OFFSET * button_size) + + (button_size * 0.5)), AHBB_Dir_Left_Right, + 2); - /* init debug button */ - initButton(debug_id, - rect(m_screensize.X - (0.75*button_size), 0.75*button_size, - m_screensize.X, 1.5*button_size), - L"dbg", false, SLOW_BUTTON_REPEAT); + m_rarecontrolsbar.addButton(chat_id, L"Chat", "chat_btn.png"); + m_rarecontrolsbar.addButton(inventory_id, L"inv", "inventory_btn.png"); + m_rarecontrolsbar.addButton(drop_id, L"drop", "drop_btn.png"); - /* init chat button */ - initButton(chat_id, - rect(m_screensize.X - (0.75*button_size), 0, - m_screensize.X, 0.75*button_size), - L"Chat", true); - - /* init camera button */ - initButton(camera_id, - rect(m_screensize.X - (1.5*button_size), 0, - m_screensize.X - (0.75*button_size), 0.75*button_size), - L"cam", false, SLOW_BUTTON_REPEAT); - - /* init rangeselect button */ - initButton(range_id, - rect(m_screensize.X - (2.25*button_size), 0, - m_screensize.X - (1.5*button_size), 0.75*button_size), - L"far", false, SLOW_BUTTON_REPEAT); } touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y) @@ -374,7 +642,7 @@ bool TouchScreenGUI::isReleaseHUDButton(int eventID) return false; } -void TouchScreenGUI::ButtonEvent(touch_gui_button_id button, +void TouchScreenGUI::handleButtonEvent(touch_gui_button_id button, int eventID, bool action) { button_info* btn = &m_buttons[button]; @@ -424,11 +692,15 @@ void TouchScreenGUI::handleReleaseEvent(int evt_id) /* handle button events */ if (button != after_last_element_id) { - ButtonEvent(button, evt_id, false); + handleButtonEvent(button, evt_id, false); } /* handle hud button events */ else if (isReleaseHUDButton(evt_id)) { /* nothing to do here */ + } else if (m_settingsbar.isReleaseButton(evt_id)) { + /* nothing to do here */ + } else if (m_rarecontrolsbar.isReleaseButton(evt_id)) { + /* nothing to do here */ } /* handle the point used for moving view */ else if (evt_id == m_move_id) { @@ -498,14 +770,24 @@ void TouchScreenGUI::translateEvent(const SEvent &event) /* handle button events */ if (button != after_last_element_id) { - ButtonEvent(button,eventID,true); - } - else if (isHUDButton(event)) - { + handleButtonEvent(button, eventID, true); + m_settingsbar.deactivate(); + m_rarecontrolsbar.deactivate(); + } else if (isHUDButton(event)) { + m_settingsbar.deactivate(); + m_rarecontrolsbar.deactivate(); /* already handled in isHUDButton() */ + } else if (m_settingsbar.isButton(event)) { + m_rarecontrolsbar.deactivate(); + /* already handled in isSettingsBarButton() */ + } else if (m_rarecontrolsbar.isButton(event)) { + m_settingsbar.deactivate(); + /* already handled in isSettingsBarButton() */ } /* handle non button events */ else { + m_settingsbar.deactivate(); + m_rarecontrolsbar.deactivate(); /* if we don't already have a moving point make this the moving one */ if (m_move_id == -1) { m_move_id = event.TouchInput.ID; @@ -520,7 +802,6 @@ void TouchScreenGUI::translateEvent(const SEvent &event) } else if (event.TouchInput.Event == ETIE_LEFT_UP) { verbosestream << "Up event for pointerid: " << event.TouchInput.ID << std::endl; - handleReleaseEvent(event.TouchInput.ID); } else { @@ -582,8 +863,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event) ->getRayFromScreenCoordinates( v2s32(event.TouchInput.X,event.TouchInput.Y)); } - } - else { + } else { handleChangedButton(event); } } @@ -596,7 +876,7 @@ void TouchScreenGUI::handleChangedButton(const SEvent &event) if (m_buttons[i].ids.empty()) { continue; } - for(std::vector::iterator iter = m_buttons[i].ids.begin(); + for (std::vector::iterator iter = m_buttons[i].ids.begin(); iter != m_buttons[i].ids.end(); ++iter) { if (event.TouchInput.ID == *iter) { @@ -609,12 +889,12 @@ void TouchScreenGUI::handleChangedButton(const SEvent &event) } /* remove old button */ - ButtonEvent((touch_gui_button_id) i,*iter,false); + handleButtonEvent((touch_gui_button_id) i,*iter,false); if (current_button_id == after_last_element_id) { return; } - ButtonEvent((touch_gui_button_id) current_button_id,*iter,true); + handleButtonEvent((touch_gui_button_id) current_button_id,*iter,true); return; } @@ -628,8 +908,11 @@ void TouchScreenGUI::handleChangedButton(const SEvent &event) } button_info* btn = &m_buttons[current_button_id]; - if (std::find(btn->ids.begin(),btn->ids.end(), event.TouchInput.ID) == btn->ids.end()) { - ButtonEvent((touch_gui_button_id) current_button_id,event.TouchInput.ID,true); + if (std::find(btn->ids.begin(),btn->ids.end(), event.TouchInput.ID) + == btn->ids.end()) + { + handleButtonEvent((touch_gui_button_id) current_button_id, + event.TouchInput.ID, true); } } @@ -643,7 +926,7 @@ bool TouchScreenGUI::doubleTapDetection() m_key_events[1].x = m_move_downlocation.X; m_key_events[1].y = m_move_downlocation.Y; - u32 delta = porting::getDeltaMs(m_key_events[0].down_time,getTimeMs()); + u32 delta = porting::getDeltaMs(m_key_events[0].down_time, getTimeMs()); if (delta > 400) return false; @@ -652,11 +935,11 @@ bool TouchScreenGUI::doubleTapDetection() (m_key_events[0].y - m_key_events[1].y) * (m_key_events[0].y - m_key_events[1].y)); - if (distance >(20 + g_settings->getU16("touchscreen_threshold"))) + if (distance > (20 + g_settings->getU16("touchscreen_threshold"))) return false; SEvent* translated = new SEvent(); - memset(translated,0,sizeof(SEvent)); + memset(translated, 0, sizeof(SEvent)); translated->EventType = EET_MOUSE_INPUT_EVENT; translated->MouseInput.X = m_key_events[0].x; translated->MouseInput.Y = m_key_events[0].y; @@ -685,7 +968,7 @@ bool TouchScreenGUI::doubleTapDetection() TouchScreenGUI::~TouchScreenGUI() { - for (unsigned int i=0; i < after_last_element_id; i++) { + for (unsigned int i = 0; i < after_last_element_id; i++) { button_info* btn = &m_buttons[i]; if (btn->guibutton != 0) { btn->guibutton->drop(); @@ -697,7 +980,7 @@ TouchScreenGUI::~TouchScreenGUI() void TouchScreenGUI::step(float dtime) { /* simulate keyboard repeats */ - for (unsigned int i=0; i < after_last_element_id; i++) { + for (unsigned int i = 0; i < after_last_element_id; i++) { button_info* btn = &m_buttons[i]; if (btn->ids.size() > 0) { @@ -711,7 +994,7 @@ void TouchScreenGUI::step(float dtime) btn->repeatcounter = 0; SEvent translated; - memset(&translated,0,sizeof(SEvent)); + memset(&translated, 0, sizeof(SEvent)); translated.EventType = irr::EET_KEY_INPUT_EVENT; translated.KeyInput.Key = btn->keycode; translated.KeyInput.PressedDown = false; @@ -737,7 +1020,7 @@ void TouchScreenGUI::step(float dtime) v2s32(m_move_downlocation.X,m_move_downlocation.Y)); SEvent translated; - memset(&translated,0,sizeof(SEvent)); + memset(&translated, 0, sizeof(SEvent)); translated.EventType = EET_MOUSE_INPUT_EVENT; translated.MouseInput.X = m_move_downlocation.X; translated.MouseInput.Y = m_move_downlocation.Y; @@ -750,6 +1033,9 @@ void TouchScreenGUI::step(float dtime) m_move_sent_as_mouse_event = true; } } + + m_settingsbar.step(dtime); + m_rarecontrolsbar.step(dtime); } void TouchScreenGUI::resetHud() @@ -765,7 +1051,7 @@ void TouchScreenGUI::registerHudItem(int index, const rect &rect) void TouchScreenGUI::Toggle(bool visible) { m_visible = visible; - for (unsigned int i=0; i < after_last_element_id; i++) { + for (unsigned int i = 0; i < after_last_element_id; i++) { button_info* btn = &m_buttons[i]; if (btn->guibutton != 0) { btn->guibutton->setVisible(visible); @@ -777,10 +1063,16 @@ void TouchScreenGUI::Toggle(bool visible) while (m_known_ids.size() > 0) { handleReleaseEvent(m_known_ids.begin()->id); } + + m_settingsbar.hide(); + m_rarecontrolsbar.hide(); + } else { + m_settingsbar.show(); + m_rarecontrolsbar.show(); } } -void TouchScreenGUI::Hide() +void TouchScreenGUI::hide() { if (!m_visible) return; @@ -788,7 +1080,7 @@ void TouchScreenGUI::Hide() Toggle(false); } -void TouchScreenGUI::Show() +void TouchScreenGUI::show() { if (m_visible) return; diff --git a/src/touchscreengui.h b/src/touchscreengui.h index 1e69a41e..d8106a26 100644 --- a/src/touchscreengui.h +++ b/src/touchscreengui.h @@ -38,26 +38,105 @@ typedef enum { backward_id, left_id, right_id, - inventory_id, - drop_id, jump_id, crunch_id, + after_last_element_id, + settings_starter_id, + rare_controls_starter_id, fly_id, noclip_id, fast_id, debug_id, - chat_id, camera_id, range_id, - after_last_element_id + chat_id, + inventory_id, + drop_id } touch_gui_button_id; +typedef enum { + AHBB_Dir_Top_Bottom, + AHBB_Dir_Bottom_Top, + AHBB_Dir_Left_Right, + AHBB_Dir_Right_Left +} autohide_button_bar_dir; + #define MIN_DIG_TIME_MS 500 #define MAX_TOUCH_COUNT 64 #define BUTTON_REPEAT_DELAY 0.2f +#define SETTINGS_BAR_Y_OFFSET 6.5 +#define RARE_CONTROLS_BAR_Y_OFFSET 4 + extern const char** touchgui_button_imagenames; +struct button_info { + float repeatcounter; + float repeatdelay; + irr::EKEY_CODE keycode; + std::vector ids; + IGUIButton* guibutton; + bool immediate_release; +}; + +class AutoHideButtonBar +{ +public: + + AutoHideButtonBar( IrrlichtDevice *device, IEventReceiver* receiver ); + + void init(ISimpleTextureSource* tsrc, const char* starter_img, + int button_id, v2s32 UpperLeft, v2s32 LowerRight, + autohide_button_bar_dir dir, float timeout); + + ~AutoHideButtonBar(); + + /* add button to be shown */ + void addButton(touch_gui_button_id id, const wchar_t* caption, + const char* btn_image); + + /* detect settings bar button events */ + bool isButton(const SEvent &event); + + /* handle released hud buttons */ + bool isReleaseButton(int eventID); + + /* step handler */ + void step(float dtime); + + /* deactivate button bar */ + void deactivate(); + + /* hide the whole buttonbar */ + void hide(); + + /* unhide the buttonbar */ + void show(); + +private: + ISimpleTextureSource* m_texturesource; + irr::video::IVideoDriver* m_driver; + IGUIEnvironment* m_guienv; + IEventReceiver* m_receiver; + v2u32 m_screensize; + button_info m_starter; + std::vector m_buttons; + + v2s32 m_upper_left; + v2s32 m_lower_right; + + /* show settings bar */ + bool m_active; + + bool m_visible; + + /* settings bar timeout */ + float m_timeout; + float m_timeout_value; + bool m_initialized; + autohide_button_bar_dir m_dir; +}; + class TouchScreenGUI { public: @@ -66,7 +145,7 @@ public: void translateEvent(const SEvent &event); - void init(ISimpleTextureSource* tsrc,float density); + void init(ISimpleTextureSource* tsrc); double getYaw() { return m_camera_yaw; } double getPitch() { return m_camera_pitch; } @@ -77,8 +156,8 @@ public: void registerHudItem(int index, const rect &rect); void Toggle(bool visible); - void Hide(); - void Show(); + void hide(); + void show(); private: IrrlichtDevice* m_device; @@ -104,15 +183,6 @@ private: bool m_move_sent_as_mouse_event; v2s32 m_move_downlocation; - struct button_info { - float repeatcounter; - float repeatdelay; - irr::EKEY_CODE keycode; - std::vector ids; - IGUIButton* guibutton; - bool immediate_release; - }; - button_info m_buttons[after_last_element_id]; /* gui button detection */ @@ -142,7 +212,7 @@ private: std::vector m_known_ids; /* handle a button event */ - void ButtonEvent(touch_gui_button_id bID, int eventID, bool action); + void handleButtonEvent(touch_gui_button_id bID, int eventID, bool action); /* handle pressed hud buttons */ bool isHUDButton(const SEvent &event); @@ -156,6 +226,9 @@ private: /* handle release event */ void handleReleaseEvent(int evt_id); + /* get size of regular gui control button */ + int getGuiButtonSize(); + /* doubleclick detection variables */ struct key_event { unsigned int down_time; @@ -168,6 +241,12 @@ private: /* array for doubletap detection */ key_event m_key_events[2]; + + /* settings bar */ + AutoHideButtonBar m_settingsbar; + + /* rare controls bar */ + AutoHideButtonBar m_rarecontrolsbar; }; extern TouchScreenGUI *g_touchscreengui; #endif diff --git a/textures/base/pack/drop_btn.png b/textures/base/pack/drop_btn.png index 2db4a08fcbf266e106a895d8cb42daf77aad50cd..5d777108a6dde8cbc6658b9cbe6224d996264060 100644 GIT binary patch delta 1024 zcmV+b1poV+1d9le8Gi-<0063Kaozv`1JX%EK~#9!?U_$#9aR*@es&PsBC9*xy zG~<^etu`PmWE`0EufGC|3CHgS9`)@>Gy9;j08$#S4G44dTBq??5N2jo0MHlNp7WbO z;6~CKKj6ootK1au2sr6|W8Tu{fOEjKZ=b131cU(40f;!`0K0$}{oK2O0q_48_yf2M zoCoI2?5{Edh<^hSXS}6x;8|eD8rNO{ZUOVa1z^g|u9p!&JBT>rEgknLNUMKh0AbBBOEz<*#ujv56%m-KQkAoP*5%xu}r zX3XquGaK_LIRec3qcWr?fhkF&l?M<5WEyx5cpjJmRs%yH2R`j~PUvfU%ymQKSt0{? z4LB7O4f}z2B@Olpz*rZ|AITUI*MWC{j{*=3c-14NdjLFPO*()#*8yT2IOFCgv#tZo zY#I0%_JeLI+rZn210q)0woPfx)!+pt)5MTH9+KE1Wou64$}mAE?5ZwI7U+>>1F`H z_mzJWOrcP*WVlHHE(ZD@sXYKmn|Rs*St}CKs{Frv48Bh4p3XpZ>^gr_B4k@SkN80Ng1Oz=wqY u<;hE{z|lfOQPNhRs9OEqtbe@JM)v@rY_|4V`h$@G0000(Z zFPK5FcJjSiA#F1XX`^S)3JM%#-``^~(=kn&6eXW8FlS7j7;W6&N=xaDU6<(8v7q3lmpB15;Df{a>uB&PFM4 zuQ7Mo_LFypS>S3dPM)7@LVmLJ7%kT;YH(I*F+cEq&mxfvFZQx9?)fG=*)#M)OTuiX zjGWdL;xkhIy{J4qgL(4G4{5~@Pv8H*x4)lNwnjnVfE-5xKg$MorW?tOZxZ|3zC|!p z-^kthDe@H8>zg-TDKeC?++uccKETLe#bm-DBUr$6;AS`b9&P5xnKyL4OMw9>m diff --git a/textures/base/pack/gear_icon.png b/textures/base/pack/gear_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..71825eb8df3dd9bbf2d2512649f16c20397e5198 GIT binary patch literal 1005 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00UJ?L_t(|+U=XYQrs{Ug|8S2 zc#>4RbZfdz$rBk;8LDgvZxouW%iVIH1R6LgA~TL-N!PY)fqlN2ongktl8&VNXIX?0 zLI@#*5JCtcgb+dqA%qY@2q9$Vn5i2CuoaQ-j?2G{G0(GB9KarK_Dfg+@OH?UN&9p* z@!$&)K|r74D=zB-z)3Uv8WhhteF~ufYygx1-t7+nR*ri!=*b+P<1*T#kY{pSt3wm0_7KLL1i%wDw;wvGSU*{$OB0`{I=Q@qBro4f&d zn%tT@I5Y;m4|Luq;=V2hfJ0xqF}6RiI($_#id_dC5~HxszG``P@AzSe8+@+0w1>)n z+u0~0#u?Q!ifX29Th*S2?Mo6baH_1ZZ+VWuq2`57L&k8XaB~2Vx49-`%r|>qDI)6$ zwO`vdKl;$(a&z1F&5#)`Th#vz;HKf1Q?jysxv_m~QuZDE!DYlg(cqgRxQytb>)_X( z#@1cJ+6K8R%4=D=ozV7sh>w4-8K0xl#Z}>I)?)=`wJ=-L&QY^+RRxQH%0&nNUPSOT zMTdBy2&~TSkS(xQCN$opsHX_44uMtX>VID&SYP^kMF+|e{L`o64ZmHzF1or=B!pi(*zz)2$RF-pOtkv4d0`dd`on>vg#fcSDmzAYIRC@ab2={14<;g{r(gP$ znOH(B^P{PrLcMD;x~brYlL;0=+4I^coF@?APCOq^3n7FMLI@#*5JCtcgb+dqA%qY@ b2#L!d2uD9k3Jmp=00000NkvXXu0mjfEZf7U literal 0 HcmV?d00001 diff --git a/textures/base/pack/rare_controls.png b/textures/base/pack/rare_controls.png new file mode 100644 index 0000000000000000000000000000000000000000..4829649344979e0589bda829c6292c1da5bbf81e GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDYhhUcNZWH1V5d3*8?fe0*}aI z1_o|n5N2eUHAey{$X?><>&kwgQIM0Lllx867od=2iEBiObAE1aYF-J0b5UwyNotBh zd1gt5g1e`0KzJjcI8f11PZ!6Kid%1Q9pq$C;9+r8{&v6UjUxw#d2~bn!3K|2yTgmB zTiJmM85ky6GpGC6>73#P^RN)_eQUa>OJk7$3C&N7yv2cC&LLph(q8ORlQ!w(vS61| f&^Ud`4J_5PJJy_?=iT!q8$n!8S3j3^P6 Date: Tue, 15 Dec 2015 00:03:18 +0100 Subject: [PATCH 142/531] Add support for limiting rotation of automatic face movement dir entitys --- src/content_cao.cpp | 12 +++++++++++- src/content_sao.cpp | 16 ++++++++++++++-- src/object_properties.cpp | 6 +++++- src/object_properties.h | 2 +- src/script/common/c_content.cpp | 6 ++++++ 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/content_cao.cpp b/src/content_cao.cpp index ed4e3b71..1b8e84c8 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -1260,8 +1260,18 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) if (getParent() == NULL && m_prop.automatic_face_movement_dir && (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) { - m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + float optimal_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset; + float max_rotation_delta = + dtime * m_prop.automatic_face_movement_max_rotation_per_sec; + + if ((m_prop.automatic_face_movement_max_rotation_per_sec > 0) && + (fabs(m_yaw - optimal_yaw) > max_rotation_delta)) { + + m_yaw = optimal_yaw < m_yaw ? m_yaw - max_rotation_delta : m_yaw + max_rotation_delta; + } else { + m_yaw = optimal_yaw; + } updateNodePos(); } } diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 0a1cfe77..4d144aa1 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -283,8 +283,20 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) } if((m_prop.automatic_face_movement_dir) && - (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)){ - m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset; + (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) + { + float optimal_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + + m_prop.automatic_face_movement_dir_offset; + float max_rotation_delta = + dtime * m_prop.automatic_face_movement_max_rotation_per_sec; + + if ((m_prop.automatic_face_movement_max_rotation_per_sec > 0) && + (fabs(m_yaw - optimal_yaw) > max_rotation_delta)) { + + m_yaw = optimal_yaw < m_yaw ? m_yaw - max_rotation_delta : m_yaw + max_rotation_delta; + } else { + m_yaw = optimal_yaw; + } } } diff --git a/src/object_properties.cpp b/src/object_properties.cpp index 3cec5167..abd1bbd0 100644 --- a/src/object_properties.cpp +++ b/src/object_properties.cpp @@ -45,7 +45,8 @@ ObjectProperties::ObjectProperties(): automatic_face_movement_dir_offset(0.0), backface_culling(true), nametag(""), - nametag_color(255, 255, 255, 255) + nametag_color(255, 255, 255, 255), + automatic_face_movement_max_rotation_per_sec(-1) { textures.push_back("unknown_object.png"); colors.push_back(video::SColor(255,255,255,255)); @@ -116,6 +117,8 @@ void ObjectProperties::serialize(std::ostream &os) const writeU8(os, backface_culling); os << serializeString(nametag); writeARGB8(os, nametag_color); + writeF1000(os, automatic_face_movement_max_rotation_per_sec); + // Add stuff only at the bottom. // Never remove anything, because we don't want new versions of this } @@ -155,6 +158,7 @@ void ObjectProperties::deSerialize(std::istream &is) backface_culling = readU8(is); nametag = deSerializeString(is); nametag_color = readARGB8(is); + automatic_face_movement_max_rotation_per_sec = readF1000(is); }catch(SerializationError &e){} } else diff --git a/src/object_properties.h b/src/object_properties.h index 5dd3f57a..47698cff 100644 --- a/src/object_properties.h +++ b/src/object_properties.h @@ -50,7 +50,7 @@ struct ObjectProperties bool backface_culling; std::string nametag; video::SColor nametag_color; - + f32 automatic_face_movement_max_rotation_per_sec; ObjectProperties(); std::string dump(); diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 4d277ec5..f9370c4d 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -201,6 +201,7 @@ void read_object_properties(lua_State *L, int index, } lua_pop(L, 1); getboolfield(L, -1, "backface_culling", prop->backface_culling); + getstringfield(L, -1, "nametag", prop->nametag); lua_getfield(L, -1, "nametag_color"); if (!lua_isnil(L, -1)) { @@ -208,6 +209,11 @@ void read_object_properties(lua_State *L, int index, if (read_color(L, -1, &color)) prop->nametag_color = color; } + + lua_getfield(L, -1, "automatic_face_movement_max_rotation_per_sec"); + if (lua_isnumber(L, -1)) { + prop->automatic_face_movement_max_rotation_per_sec = luaL_checknumber(L, -1); + } lua_pop(L, 1); } From f192a5bc43951f7ea120877335e97efe755ac29c Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 20 Dec 2015 03:36:47 +0100 Subject: [PATCH 143/531] Fix missing pop Previous commit 70ea5d552e283bd5bce3278cbf3819bd87ba2602 "Add support for limiting rotation of automatic face movement dir entitys" by sapier has broken minetest's feature to open worlds. This was due to a missing stack pop operation. Thanks to @oleastre for reporting this bug and suggesting the fix. --- src/script/common/c_content.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index f9370c4d..89f927f1 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -209,6 +209,7 @@ void read_object_properties(lua_State *L, int index, if (read_color(L, -1, &color)) prop->nametag_color = color; } + lua_pop(L, 1); lua_getfield(L, -1, "automatic_face_movement_max_rotation_per_sec"); if (lua_isnumber(L, -1)) { From b4eb614d31a6ed7935bfaa4090fa275a306a3aee Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 18 Dec 2015 23:26:44 -0500 Subject: [PATCH 144/531] Android: Fix extra files being copied to the APK dcb91cf0c0c9a20622feeb4e5e8104ffbc9fa8ec hacked around the biggest issue this caused, but wasted a lot of CPU time and disk space It also still included a lot of other unwanted files. This removes all of `doc/` except the license, and also removes the server list. --- build/android/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index dd6c89ad..42a46254 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -739,9 +739,9 @@ assets : $(ASSETS_TIMESTAMP) cp ${ROOT}/../../minetest.conf.example ${ROOT}/assets/Minetest; \ cp ${ROOT}/../../README.txt ${ROOT}/assets/Minetest; \ cp -r ${ROOT}/../../builtin ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../client ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../doc ${ROOT}/assets/Minetest; \ - rm -rf ${ROOT}/assets/Minetest/doc/html; \ + mkdir ${ROOT}/assets/Minetest/client; \ + cp -r ${ROOT}/../../client/shaders ${ROOT}/assets/Minetest/client; \ + cp ${ROOT}/../../doc/lgpl-2.1.txt ${ROOT}/assets/Minetest/LICENSE.txt; \ mkdir ${ROOT}/assets/Minetest/fonts; \ cp -r ${ROOT}/../../fonts/*.ttf ${ROOT}/assets/Minetest/fonts/; \ mkdir ${ROOT}/assets/Minetest/games; \ From 5755c9a43980930ba97fe7db56d3e0509a3e2d77 Mon Sep 17 00:00:00 2001 From: HybridDog Date: Fri, 18 Dec 2015 17:38:25 +0100 Subject: [PATCH 145/531] Fix missing localization for obj --- builtin/game/item.lua | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index 6c2214ef..d16601d3 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -27,19 +27,11 @@ function core.get_pointed_thing_position(pointed_thing, above) if above then -- The position where a node would be placed return pointed_thing.above - else - -- The position where a node would be dug - return pointed_thing.under end + -- The position where a node would be dug + return pointed_thing.under elseif pointed_thing.type == "object" then - obj = pointed_thing.ref - if obj ~= nil then - return obj:getpos() - else - return nil - end - else - return nil + return pointed_thing.ref and pointed_thing.ref:getpos() end end From 5de8e026a38f4fd080c10e98d4650de6435c2975 Mon Sep 17 00:00:00 2001 From: Sapier Date: Mon, 21 Dec 2015 00:24:37 +0100 Subject: [PATCH 146/531] Fix lua object:get_properties() being broken --- src/script/common/c_content.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 89f927f1..36a5c2dd 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -278,9 +278,10 @@ void push_object_properties(lua_State *L, ObjectProperties *prop) lua_setfield(L, -2, "backface_culling"); lua_pushlstring(L, prop->nametag.c_str(), prop->nametag.size()); lua_setfield(L, -2, "nametag"); - lua_newtable(L); push_ARGB8(L, prop->nametag_color); lua_setfield(L, -2, "nametag_color"); + lua_pushnumber(L, prop->automatic_face_movement_max_rotation_per_sec); + lua_setfield(L, -2, "automatic_face_movement_max_rotation_per_sec"); } /******************************************************************************/ From 80edc7f78a01f59c4649ee2c6d774c4a12f696b1 Mon Sep 17 00:00:00 2001 From: Andrea Di Pietro Ulla Date: Sun, 15 Nov 2015 15:37:50 +0100 Subject: [PATCH 147/531] Translated using Weblate (Italian) Currently translated at 42.0% (331 of 787 strings) --- po/it/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 577f791e..ee532d22 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-14 22:10+0000\n" -"Last-Translator: LelixSuperHD \n" +"PO-Revision-Date: 2015-11-15 15:37+0000\n" +"Last-Translator: Andrea Di Pietro Ulla \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -38,7 +38,7 @@ msgstr "Ok" #: builtin/fstk/ui.lua msgid "Reconnect" -msgstr "Riconnettiti" +msgstr "Riconnettersi" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" From 1ba9ed70085b7a2edd4960d523ba62cdfdfe2982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Thu, 19 Nov 2015 16:52:36 +0100 Subject: [PATCH 148/531] Translated using Weblate (Estonian) Currently translated at 23.7% (187 of 787 strings) --- po/et/minetest.po | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/po/et/minetest.po b/po/et/minetest.po index 249b40e9..ed6e69a4 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-11 12:12+0000\n" +"PO-Revision-Date: 2015-11-19 16:52+0000\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian " "\n" @@ -21,11 +21,11 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Lue skriptis ilmnes viga; nagu näiteks mod:" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "Ilmnes viga:" #: builtin/fstk/ui.lua msgid "Main menu" @@ -41,35 +41,37 @@ msgstr "Taasta ühendus" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Server taotles taasühendumist:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." -msgstr "" +msgstr "Laadimine..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Protokolli versioon ei sobi. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Server jõustab protokolli versiooni $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Server toetab protokolli versioone $1 kuni $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Proovi lubada uuesti avalik serverite loend ja kontrollo oma Interneti " +"ühendust." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Meie toetame ainult protokolli versiooni $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Meie toetame protokolli versioone $1 kuni $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -98,6 +100,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Mod \"$1\" kasutamine nurjus, sest ka sisaldab keelatud sümboleid. Lubatud " +"märgid on ainult [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -105,11 +109,11 @@ msgstr "Peida mäng" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "" +msgstr "Peida mod. pakkide sisu" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" -msgstr "" +msgstr "Mod:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp @@ -134,11 +138,11 @@ msgstr "Loo" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" +msgstr "Laadi alla alammäng, näiteks minetest_game, aadressilt minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "" +msgstr "Laadi minetest.net-st üks mäng alla" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -154,11 +158,11 @@ msgstr "No nimi või no mäng valitud" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" -msgstr "" +msgstr "Seed" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "" +msgstr "Hoiatus: minimaalne arendustest on mõeldud arendajatele." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -166,7 +170,7 @@ msgstr "Maailma nimi" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "" +msgstr "Sa ei ole alammänge paigaldanud." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" From bf889997a8eb97da5bcc3062b553249c4a1ef9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liudas=20Ali=C5=A1auskas?= Date: Thu, 19 Nov 2015 05:07:59 +0100 Subject: [PATCH 149/531] Translated using Weblate (Lithuanian) Currently translated at 30.7% (242 of 787 strings) Squashed two translation commits to one --- po/lt/minetest.po | 336 ++++++++++++++++++++++++---------------------- 1 file changed, 175 insertions(+), 161 deletions(-) diff --git a/po/lt/minetest.po b/po/lt/minetest.po index 362eaf5b..64d2e78c 100644 --- a/po/lt/minetest.po +++ b/po/lt/minetest.po @@ -8,27 +8,27 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2013-12-11 19:23+0200\n" -"Last-Translator: Jonas Kriaučiūnas \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2015-11-19 05:14+0000\n" +"Last-Translator: Liudas Ališauskas \n" +"Language-Team: Lithuanian " +"\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 1.7-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"(n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Klaida įvyko Lua scenarijuje, tokiame kaip papildinys:" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "Įvyko klaida:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Pagrindinis meniu" @@ -37,13 +37,12 @@ msgid "Ok" msgstr "Gerai" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Jungtis" +msgstr "Prisijungti iš naujo" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Serveris paprašė prisijungti iš naujo:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -51,11 +50,11 @@ msgstr "Įkeliama..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Neatitinka protokolo versija. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Serveris reikalauja naudoti versijos $1 protokolą. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " @@ -64,6 +63,8 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Pabandykite dar kart įjungti viešą serverių sąrašą ir patikrinkite savo " +"interneto ryšį." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." @@ -100,6 +101,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Nepavyko įjungti papildinio „$1“, nes jis turi neleistų rašmenų. Tik " +"rašmenys [a-z0-9_] yra leidžiami." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -136,11 +139,11 @@ msgstr "Sukurti" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" +msgstr "Atsisiųskite sub žaidimą, tokį kaip minetest_game, iš minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "" +msgstr "Atsisiųsti vieną iš minetest.net" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -148,20 +151,19 @@ msgstr "Žaidimas" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "" +msgstr "Žemėlapių generavimas" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" -msgstr "" +msgstr "Nepateiktas joks pasaulio pavadinimas, arba nepasirinktas žaidimas" #: builtin/mainmenu/dlg_create_world.lua -#, fuzzy msgid "Seed" msgstr "Sėkla" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "" +msgstr "Dėmesio: Minimalus kūrimo bandymas yra skirtas vystytojams." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -169,25 +171,26 @@ msgstr "Pasaulio pavadinimas" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "" +msgstr "Neturite įdiegę sub žaidimų." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "" +msgstr "Ar tikrai norite ištrinti „$1“?" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "" +msgstr "Papildtvrk: nepavyko ištrinti „$1“" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "" +msgstr "Papildtvrk: netinkamas papildinio kelias „$1“" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "" +msgstr "Ne, tikrai ne!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Taip" @@ -200,7 +203,6 @@ msgid "No" msgstr "Ne" #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp -#, fuzzy msgid "Accept" msgstr "Priimti" @@ -213,6 +215,8 @@ msgid "" "\n" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" +"\n" +"Papildinio diegimas: nepalaikomas failo tipas „$1“, arba sugadintas archyvas" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" @@ -220,23 +224,25 @@ msgstr "Nepavyko įdiegti $1 į $2" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" -msgstr "" +msgstr "Įdiegti papildinį: failas: „$1“" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" -msgstr "" +msgstr "Papildinio diegimas: nepavyksta rasti tikro pavadinimo skirto: $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" +"Papildinio diegimas: nepavyksta rasti tinkamo aplanko pavadinimo papildinio " +"paketui $1" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "" +msgstr "Užverti parduotuvę" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "" +msgstr "Atsiunčiama $1, prašome palaukti..." #: builtin/mainmenu/store.lua msgid "Install" @@ -244,28 +250,27 @@ msgstr "Įdiegti" #: builtin/mainmenu/store.lua msgid "Page $1 of $2" -msgstr "" +msgstr "Puslapis $1 iš $2" #: builtin/mainmenu/store.lua msgid "Rating" -msgstr "" +msgstr "Įvertinimas" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "" +msgstr "Ieškoti" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "Pasaulio pavadinimas" +msgstr "Trumpas pavadinimas:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" -msgstr "" +msgstr "Sėkmingai įdiegta:" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "" +msgstr "Nerikiuota" #: builtin/mainmenu/store.lua msgid "re-Install" @@ -285,12 +290,11 @@ msgstr "Padėkos" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" -msgstr "" +msgstr "Ankstesni bendradarbiai" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "Pagrindiniai kūrėjai" +msgstr "Ankstesni pagrindiniai kūrėjai" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -325,9 +329,8 @@ msgid "Uninstall selected modpack" msgstr "Pašalinti pasirinktą papildinį" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "Adresas/Prievadas" +msgstr "Adresas / Prievadas :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -338,14 +341,12 @@ msgid "Connect" msgstr "Jungtis" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" msgstr "Kūrybinė veiksena" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Damage enabled" -msgstr "įjungtas" +msgstr "Žalojimas įjungtas" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -353,22 +354,20 @@ msgid "Delete" msgstr "Ištrinti" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "Vardas/slaptažodis" +msgstr "Vardas / Slaptažodis :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" msgstr "Viešų serverių sąrašas" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "PvP enabled" -msgstr "įjungtas" +msgstr "PvP įjungtas" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" -msgstr "" +msgstr "Susieti adresą" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" @@ -376,7 +375,6 @@ msgstr "Konfigūruoti" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua -#, fuzzy msgid "Creative Mode" msgstr "Kūrybinė veiksena" @@ -395,11 +393,11 @@ msgstr "Naujas" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "" +msgstr "Nesukurtas ar pasirinktas joks pasaulis!" #: builtin/mainmenu/tab_server.lua msgid "Port" -msgstr "" +msgstr "Prievadas" #: builtin/mainmenu/tab_server.lua msgid "Public" @@ -510,19 +508,16 @@ msgid "The value must be lower than $1." msgstr "" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Config mods" -msgstr "Konfigūruoti" +msgstr "Konfigūruoti papildinius" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" -msgstr "Pagrindinis meniu" +msgstr "Pagrindinis" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Start Singleplayer" -msgstr "Žaisti vienam" +msgstr "Atstatyti vieno žaidėjo pasaulį" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -534,61 +529,60 @@ msgstr "Žaisti vienam" #: builtin/mainmenu/tab_texturepacks.lua msgid "No information available" -msgstr "" +msgstr "Nėra pasiekiamos informacijos" #: builtin/mainmenu/tab_texturepacks.lua +#: builtin/mainmenu/tab_settings.lua msgid "None" -msgstr "" +msgstr "Joks" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" -msgstr "" +msgstr "Pasirinkite tekstūros paketą:" #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" -msgstr "" +msgstr "Tekstūrų paketai" #: src/client.cpp msgid "Connection timed out." -msgstr "" +msgstr "Baigėsi prijungimo laikas." #: src/client.cpp msgid "Done!" -msgstr "" +msgstr "Atlikta!" #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "Inicijuojami mazgai" #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "Inicijuojami mazgai..." #: src/client.cpp msgid "Item textures..." -msgstr "" +msgstr "Elemento tekstūros..." #: src/client.cpp -#, fuzzy msgid "Loading textures..." -msgstr "Įkeliama..." +msgstr "Įkeliamos tekstūros..." #: src/client.cpp -#, fuzzy msgid "Rebuilding shaders..." -msgstr "Ieškoma adreso..." +msgstr "Perstatomi šešėliavimai..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" -msgstr "" +msgstr "Ryšio klaida (baigėsi prijungimo laikas?)" #: src/client/clientlauncher.cpp msgid "Could not find or load game \"" -msgstr "" +msgstr "Nepavyko rasti ar įkelti žaidimo „" #: src/client/clientlauncher.cpp msgid "Invalid gamespec." -msgstr "" +msgstr "Klaidingi žaidimo nustatymai." #: src/client/clientlauncher.cpp msgid "Main Menu" @@ -597,27 +591,29 @@ msgstr "Pagrindinis meniu" #: src/client/clientlauncher.cpp msgid "No world selected and no address provided. Nothing to do." msgstr "" +"Nepasirinktas joks pasaulis ir nepateiktas joks adresas. Nėra ką daryti." #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "" +msgstr "Žaidėjo vardas per ilgas." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " -msgstr "" +msgstr "Pateiktas pasaulio kelias neegzistuoja: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "" +msgstr "reikia_atsarginio_šrifto" #: src/game.cpp msgid "" "\n" "Check debug.txt for details." msgstr "" +"\n" +"Patikrinkite debug.txt dėl papildomos informacijos." #: src/game.cpp -#, fuzzy msgid "Change Keys" msgstr "Nustatyti klavišus" @@ -634,12 +630,10 @@ msgid "Continue" msgstr "Tęsti" #: src/game.cpp -#, fuzzy msgid "Creating client..." msgstr "Kuriamas klientas..." #: src/game.cpp -#, fuzzy msgid "Creating server..." msgstr "Kuriamas serveris...." @@ -657,6 +651,17 @@ msgid "" "- Mouse wheel: select item\n" "- T: chat\n" msgstr "" +"Numatytas valdymas:\n" +"- WASD: judėti\n" +"- Tarpas: šokti/lipti\n" +"- Lyg2: leistis/eiti žemyn\n" +"- Q: išmesti elementą\n" +"- I: inventorius\n" +"- Pelė: sukti/žiūrėti\n" +"- Pelės kairys: kasti/smugiuoti\n" +"- Pelės dešinys: padėti/naudoti\n" +"- Pelės ratukas: pasirinkti elementą\n" +"- T: kalbėtis\n" #: src/game.cpp msgid "" @@ -673,6 +678,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Numatytas valdymas:\n" +"Nematomi meniu:\n" +"- vienas palietimas: mygtukas aktyvuoti\n" +"- dvigubas palietimas: padėti/naudoti\n" +"- slinkti pirštu: žvalgytis aplink\n" +"Meniu/Inventorius matomi:\n" +"- dvigubas palietimas (išorėje):\n" +" -->uždaryti\n" +"- liesti rietuvę, liesti angą:\n" +" --> judinti rietuvę\n" +"- liesti&tempti, liesti antru pirštu\n" +" --> padėti vieną elementą į angą\n" #: src/game.cpp msgid "Exit to Menu" @@ -684,28 +701,27 @@ msgstr "Išeiti iš žaidimo" #: src/game.cpp msgid "Item definitions..." -msgstr "" +msgstr "Elemento apibrėžimai..." #: src/game.cpp msgid "KiB/s" -msgstr "" +msgstr "KiB/s" #: src/game.cpp msgid "Media..." -msgstr "" +msgstr "Medija..." #: src/game.cpp msgid "MiB/s" -msgstr "" +msgstr "MiB/s" #: src/game.cpp msgid "Node definitions..." -msgstr "" +msgstr "Mazgo apibrėžimai..." #: src/game.cpp src/guiFormSpecMenu.cpp -#, fuzzy msgid "Proceed" -msgstr "Tęsti" +msgstr "Vykdyti" #: src/game.cpp msgid "Resolving address..." @@ -717,11 +733,11 @@ msgstr "Prisikelti" #: src/game.cpp msgid "Shutting down..." -msgstr "" +msgstr "Išjungiama..." #: src/game.cpp msgid "Sound Volume" -msgstr "" +msgstr "Garso lygis" #: src/game.cpp msgid "You died." @@ -729,15 +745,15 @@ msgstr "Jūs numirėte." #: src/guiFormSpecMenu.cpp msgid "Enter " -msgstr "" +msgstr "Įvesti" #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "" +msgstr "gerai" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" -msgstr "" +msgstr "„Naudoti“ = kopti žemyn" #: src/guiKeyChangeMenu.cpp msgid "Backward" @@ -753,11 +769,11 @@ msgstr "Komanda" #: src/guiKeyChangeMenu.cpp msgid "Console" -msgstr "" +msgstr "Pultas" #: src/guiKeyChangeMenu.cpp msgid "Double tap \"jump\" to toggle fly" -msgstr "" +msgstr "Du kart paliesti „šokti“, kad įjungti skrydį" #: src/guiKeyChangeMenu.cpp msgid "Drop" @@ -781,7 +797,7 @@ msgstr "Klavišas jau naudojamas" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "" +msgstr "Klavišai. (Jei šis meniu sugenda, pašalinkite įrašus iš minetest.conf)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -789,11 +805,11 @@ msgstr "Kairėn" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp msgid "Print stacks" -msgstr "" +msgstr "Spausdinti rietuves" #: src/guiKeyChangeMenu.cpp msgid "Range select" -msgstr "" +msgstr "Intervalo pasirinkimas" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Right" @@ -801,23 +817,23 @@ msgstr "Dešinėn" #: src/guiKeyChangeMenu.cpp msgid "Sneak" -msgstr "" +msgstr "Sėlinti" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" -msgstr "" +msgstr "Įjungti kinematografinį" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" -msgstr "" +msgstr "Įjungti greitą" #: src/guiKeyChangeMenu.cpp msgid "Toggle fly" -msgstr "" +msgstr "Įjungti skrydį" #: src/guiKeyChangeMenu.cpp msgid "Toggle noclip" -msgstr "" +msgstr "Įjungti noclip" #: src/guiKeyChangeMenu.cpp msgid "Use" @@ -853,11 +869,11 @@ msgstr "Išeiti" #: src/guiVolumeChange.cpp msgid "Sound Volume: " -msgstr "" +msgstr "Garso lygis: " #: src/keycode.cpp msgid "Apps" -msgstr "" +msgstr "Programos" #: src/keycode.cpp msgid "Attn" @@ -865,15 +881,15 @@ msgstr "" #: src/keycode.cpp msgid "Back" -msgstr "" +msgstr "Atgal" #: src/keycode.cpp msgid "Capital" -msgstr "" +msgstr "Sostinė" #: src/keycode.cpp msgid "Clear" -msgstr "" +msgstr "Išvalyti" #: src/keycode.cpp msgid "Comma" @@ -881,11 +897,11 @@ msgstr "Kablelis" #: src/keycode.cpp msgid "Control" -msgstr "" +msgstr "Valdymas" #: src/keycode.cpp msgid "Convert" -msgstr "" +msgstr "Konvertuoti" #: src/keycode.cpp msgid "CrSel" @@ -897,15 +913,15 @@ msgstr "Žemyn" #: src/keycode.cpp msgid "End" -msgstr "" +msgstr "Baigti" #: src/keycode.cpp msgid "Erase OEF" -msgstr "" +msgstr "Ištrinti OEF" #: src/keycode.cpp msgid "Escape" -msgstr "" +msgstr "Atšaukti" #: src/keycode.cpp msgid "ExSel" @@ -917,7 +933,7 @@ msgstr "Vykdyti" #: src/keycode.cpp msgid "Final" -msgstr "" +msgstr "Galutinis" #: src/keycode.cpp msgid "Help" @@ -925,7 +941,7 @@ msgstr "Pagalba" #: src/keycode.cpp msgid "Home" -msgstr "" +msgstr "Pradžia" #: src/keycode.cpp msgid "Insert" @@ -933,15 +949,15 @@ msgstr "Įterpti" #: src/keycode.cpp msgid "Junja" -msgstr "" +msgstr "Junja" #: src/keycode.cpp msgid "Kana" -msgstr "" +msgstr "Kana" #: src/keycode.cpp msgid "Kanji" -msgstr "" +msgstr "Kanji" #: src/keycode.cpp msgid "Left Button" @@ -953,7 +969,7 @@ msgstr "Kairysis Control" #: src/keycode.cpp msgid "Left Menu" -msgstr "" +msgstr "Kairysis meniu" #: src/keycode.cpp msgid "Left Shift" @@ -961,7 +977,7 @@ msgstr "Kairysis Shift" #: src/keycode.cpp msgid "Left Windows" -msgstr "" +msgstr "Kairieji langai" #: src/keycode.cpp msgid "Menu" @@ -973,15 +989,15 @@ msgstr "Vidurinis mygtukas" #: src/keycode.cpp msgid "Minus" -msgstr "" +msgstr "Minus" #: src/keycode.cpp msgid "Mode Change" -msgstr "" +msgstr "Būsenos keitimas" #: src/keycode.cpp msgid "Next" -msgstr "" +msgstr "Kitas" #: src/keycode.cpp msgid "Nonconvert" @@ -989,67 +1005,67 @@ msgstr "" #: src/keycode.cpp msgid "Num Lock" -msgstr "" +msgstr "Num Lock" #: src/keycode.cpp msgid "Numpad *" -msgstr "" +msgstr "SkaitKlav *" #: src/keycode.cpp msgid "Numpad +" -msgstr "" +msgstr "SkaitKlav +" #: src/keycode.cpp msgid "Numpad -" -msgstr "" +msgstr "SkaitKlav -" #: src/keycode.cpp msgid "Numpad /" -msgstr "" +msgstr "SkaitKlav /" #: src/keycode.cpp msgid "Numpad 0" -msgstr "" +msgstr "SkaitKlav 0" #: src/keycode.cpp msgid "Numpad 1" -msgstr "" +msgstr "SkaitKlav 1" #: src/keycode.cpp msgid "Numpad 2" -msgstr "" +msgstr "SkaitKlav 2" #: src/keycode.cpp msgid "Numpad 3" -msgstr "" +msgstr "SkaitKlav 3" #: src/keycode.cpp msgid "Numpad 4" -msgstr "" +msgstr "SkaitKlav 4" #: src/keycode.cpp msgid "Numpad 5" -msgstr "" +msgstr "SkaitKlav 5" #: src/keycode.cpp msgid "Numpad 6" -msgstr "" +msgstr "SkaitKlav 6" #: src/keycode.cpp msgid "Numpad 7" -msgstr "" +msgstr "SkaitKlav 7" #: src/keycode.cpp msgid "Numpad 8" -msgstr "" +msgstr "SkaitKlav 8" #: src/keycode.cpp msgid "Numpad 9" -msgstr "" +msgstr "SkaitKlav 9" #: src/keycode.cpp msgid "OEM Clear" -msgstr "" +msgstr "OEM valymas" #: src/keycode.cpp msgid "PA1" @@ -1057,11 +1073,11 @@ msgstr "" #: src/keycode.cpp msgid "Pause" -msgstr "" +msgstr "Pause" #: src/keycode.cpp msgid "Period" -msgstr "" +msgstr "Periodas" #: src/keycode.cpp msgid "Plus" @@ -1069,15 +1085,15 @@ msgstr "Plius" #: src/keycode.cpp msgid "Print" -msgstr "" +msgstr "Spausdinti" #: src/keycode.cpp msgid "Prior" -msgstr "" +msgstr "Ankstesnis" #: src/keycode.cpp msgid "Return" -msgstr "" +msgstr "Grįžti" #: src/keycode.cpp msgid "Right Button" @@ -1089,7 +1105,7 @@ msgstr "Dešinysis Control" #: src/keycode.cpp msgid "Right Menu" -msgstr "" +msgstr "Dešinysis meniu" #: src/keycode.cpp msgid "Right Shift" @@ -1097,15 +1113,15 @@ msgstr "Dešinysis Shift" #: src/keycode.cpp msgid "Right Windows" -msgstr "" +msgstr "Dešinieji langai" #: src/keycode.cpp msgid "Scroll Lock" -msgstr "" +msgstr "Scroll Lock" #: src/keycode.cpp msgid "Select" -msgstr "" +msgstr "Pasirinkti" #: src/keycode.cpp msgid "Shift" @@ -1113,11 +1129,11 @@ msgstr "Shift (Lyg2)" #: src/keycode.cpp msgid "Sleep" -msgstr "" +msgstr "Užmigdyti" #: src/keycode.cpp msgid "Snapshot" -msgstr "" +msgstr "Užlaikymas" #: src/keycode.cpp msgid "Space" @@ -1125,7 +1141,7 @@ msgstr "Tarpas" #: src/keycode.cpp msgid "Tab" -msgstr "" +msgstr "Tabuliacija" #: src/keycode.cpp msgid "Up" @@ -1133,14 +1149,13 @@ msgstr "Aukštyn" #: src/keycode.cpp msgid "X Button 1" -msgstr "" +msgstr "X mygtukas 1" #: src/keycode.cpp msgid "X Button 2" -msgstr "" +msgstr "X mygtukas 2" #: src/keycode.cpp -#, fuzzy msgid "Zoom" msgstr "Pritraukti" @@ -2978,8 +2993,9 @@ msgid "Overall scale of parallax occlusion effect." msgstr "" #: src/settings_translation_file.cpp +#: builtin/mainmenu/tab_settings.lua msgid "Parallax Occlusion" -msgstr "" +msgstr "Paralaksinė okliuzija" #: src/settings_translation_file.cpp msgid "Parallax occlusion" @@ -3236,9 +3252,9 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy +#: builtin/mainmenu/tab_settings.lua msgid "Shaders" -msgstr "Šešėliai" +msgstr "Šešėliavimai" #: src/settings_translation_file.cpp msgid "" @@ -3646,16 +3662,14 @@ msgstr "" msgid "cURL timeout" msgstr "" -#, fuzzy #~ msgid "Opaque Leaves" -#~ msgstr "Nepermatomas vanduo" +#~ msgstr "Nepermatomi lapai" #~ msgid "Opaque Water" #~ msgstr "Nepermatomas vanduo" -#, fuzzy #~ msgid "Reset singleplayer world" -#~ msgstr "Žaisti vienam" +#~ msgstr "Atstatyti vieno žaidėjo pasaulį" #~ msgid "Add mod:" #~ msgstr "Pridėti papildinį:" From 0ae14a506f31811f80f6d9ac99b9bd6174e27a79 Mon Sep 17 00:00:00 2001 From: senpi Date: Sun, 22 Nov 2015 06:05:30 +0100 Subject: [PATCH 150/531] Translated using Weblate (Lojban) Currently translated at 11.4% (90 of 787 strings) --- po/jbo/minetest.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po index e42b19dd..b851a61f 100644 --- a/po/jbo/minetest.po +++ b/po/jbo/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-08-15 16:30+0200\n" -"Last-Translator: Wuzzy \n" -"Language-Team: Lojban \n" +"PO-Revision-Date: 2015-11-22 06:05+0000\n" +"Last-Translator: senpi \n" +"Language-Team: Lojban " +"\n" "Language: jbo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -43,7 +43,7 @@ msgstr "samjongau" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "le samse'u cu pu cpedu lo nu samjongau" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." From d3b0c6dcd5797443c61a1bf92b0ef85c8f20bb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= Date: Mon, 23 Nov 2015 16:45:21 +0100 Subject: [PATCH 151/531] Translated using Weblate (Czech) Currently translated at 49.0% (386 of 787 strings) Squashed two translation commits to one --- po/cs/minetest.po | 216 ++++++++++++++++++++-------------------------- 1 file changed, 94 insertions(+), 122 deletions(-) diff --git a/po/cs/minetest.po b/po/cs/minetest.po index 78f21b70..8d0677d9 100644 --- a/po/cs/minetest.po +++ b/po/cs/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-10-26 16:53+0200\n" -"Last-Translator: Honza Borovička \n" -"Language-Team: Czech \n" +"PO-Revision-Date: 2015-11-23 17:09+0000\n" +"Last-Translator: Jakub Vaněk \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +53,7 @@ msgstr "Neshoda verze protokolu. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Server vyžaduje protokol verze $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " @@ -418,7 +418,7 @@ msgstr "Spustit hru" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" není platný příznak." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -434,7 +434,7 @@ msgstr "Změnit nastavení kláves" #: builtin/mainmenu/tab_settings.lua msgid "Disabled" -msgstr "Zakázaný" +msgstr "Zakázáno" #: builtin/mainmenu/tab_settings.lua msgid "Edit" @@ -442,11 +442,11 @@ msgstr "Upravit" #: builtin/mainmenu/tab_settings.lua msgid "Enabled" -msgstr "Povolený" +msgstr "Povoleno" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "Formát jsou tři čísla uvnitř závorek oddělená čárkami." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -462,7 +462,7 @@ msgstr "Hry" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "Lakunarita může být specifikována spolu s předcházející čárkou." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." @@ -1162,6 +1162,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = paralaxní okluze s informacemi o sklonu (rychlejší).\n" +"1 = mapování reliéfu (pomalejší, ale přesnější)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1169,7 +1171,7 @@ msgstr "3D mraky" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "Režim 3D" +msgstr "Režim 3D zobrazení" #: src/settings_translation_file.cpp msgid "" @@ -1181,27 +1183,30 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" -"Podpora 3D.\n" +"Podpora 3D zobrazení.\n" "V současné době podporovány:\n" -"-none: žádné 3d výstup.\n" -"-anaglyf: azurová/purpurová barva 3d.\n" -"-prokládaný: lichá/sudá linie založené polarizace displejem.\n" -"-nahoře a dole: rozdělení obrazovky prvních či posledních položek.\n" -"-vedle sebe: rozdělené obrazovce vedle sebe." +"- none: žádný 3D výstup.\n" +"- anaglyph: azurová/purpurová barva 3D.\n" +"- interlaced: pro polarizaci ve stylu lichý/sudý řádek.\n" +"- topbottom: rozdělení obrazovky na horní a dolní část.\n" +"- sidebyside: rozdělené obrazovky na levou a pravou část." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Zvolený seed pro novou mapu, nechte prázdné pro vygenerování náhodného seedu." +"\n" +"Toto bude přepsáno při vytváření nové mapy přes hlavní menu." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "Zpráva, která se zobrazí všem klientům, když server spadne." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" +msgstr "Zpráva, která se zobrazí všem klientům, když se server vypne." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1209,7 +1214,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Zrychlení ve vzduchu" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1240,11 +1245,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Advanced" -msgstr "" +msgstr "Pokročilé" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Vždy mít zapnuté létání a turbo" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" @@ -1279,7 +1284,7 @@ msgstr "Vzad" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Základní" #: src/settings_translation_file.cpp msgid "Bilinear filtering" @@ -1291,7 +1296,7 @@ msgstr "Svázat adresu" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bitová hloubka (bity na pixel) v celoobrazovkovém režimu." #: src/settings_translation_file.cpp msgid "Build inside player" @@ -1339,19 +1344,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Klient a Server" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Rychlost šplhání" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Výška mraků" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Poloměr mraků" #: src/settings_translation_file.cpp msgid "Clouds" @@ -1367,7 +1372,7 @@ msgstr "Mraky v menu" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Barevná mlha" #: src/settings_translation_file.cpp msgid "" @@ -1454,7 +1459,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp msgid "Damage" @@ -1662,7 +1667,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" @@ -1746,7 +1751,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Mlha" #: src/settings_translation_file.cpp msgid "Fog toggle key" @@ -1754,15 +1759,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Cesta k písmu" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Stín písma" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Průhlednost stínu písma" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." @@ -1774,7 +1779,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Velikost písma" #: src/settings_translation_file.cpp msgid "Forward key" @@ -1782,7 +1787,7 @@ msgstr "Vpřed" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Písma Freetype" #: src/settings_translation_file.cpp msgid "" @@ -1802,15 +1807,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Celá obrazovka" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "Bitová hloubka v celoobrazovkovém režimu" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Celoobrazovkový režim." #: src/settings_translation_file.cpp msgid "GUI scaling" @@ -1826,7 +1831,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gamma" #: src/settings_translation_file.cpp msgid "Generate normalmaps" @@ -1847,7 +1852,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravitace" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -1901,15 +1906,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "IPv6 server" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "Podpora IPv6." #: src/settings_translation_file.cpp msgid "" @@ -2272,7 +2277,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Jazyk" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -2547,14 +2552,12 @@ msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Generátor mapy" +msgstr "Jméno generátoru mapy" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Generátor mapy" +msgstr "Mapgen v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2577,9 +2580,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Generátor mapy" +msgstr "Mapgen v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2638,9 +2640,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Generátor mapy" +msgstr "Mapgen v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2802,9 +2803,8 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" -msgstr "Nabídka" +msgstr "Nabídky" #: src/settings_translation_file.cpp msgid "Mesh cache" @@ -2842,9 +2842,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" -msgstr "Mip-Mapování" +msgstr "Mip-mapování" #: src/settings_translation_file.cpp msgid "Mod profiling" @@ -2935,9 +2934,8 @@ msgid "Noclip key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" -msgstr "Zvýraznění bloků" +msgstr "Zvýraznění označených bloků" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -3031,7 +3029,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "Fyzika" #: src/settings_translation_file.cpp msgid "" @@ -3040,9 +3038,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Jméno hráče je příliš dlouhé." +msgstr "Jméno hráče" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -3050,7 +3047,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "Hráč proti hráči (PvP)" #: src/settings_translation_file.cpp msgid "" @@ -3067,9 +3064,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Načítám textury..." +msgstr "Přednačíst inventářové textury" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." @@ -3096,29 +3092,27 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "Náhodný vstup" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Změna dohledu" +msgstr "Klávesa pro označení většího počtu věcí" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "Vzdálená média" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "Vzdálený port" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Pravá klávesa Menu" +msgstr "Klávesa doprava" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3130,7 +3124,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "Kulatá minimapa" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." @@ -3151,24 +3145,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "Výška obrazovky" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "Šířka obrazovky" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Snapshot" +msgstr "Snímek obrazovky" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "Složka se snímky obrazovky" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "Zabezpečení" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" @@ -3192,39 +3185,32 @@ msgid "Server / Singleplayer" msgstr "Start místní hry" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Server" +msgstr "URL serveru" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Port serveru" +msgstr "Adresa serveru" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Port serveru" +msgstr "Popis serveru" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Server" +msgstr "Jméno serveru" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Port serveru" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Seznam veřejných serverů" +msgstr "Adresa seznamu veřejných serverů" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Seznam veřejných serverů" +msgstr "Soubor se seznamem veřejných serverů" #: src/settings_translation_file.cpp msgid "" @@ -3267,7 +3253,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "Zobrazit ladící informace" #: src/settings_translation_file.cpp msgid "Shutdown message" @@ -3280,7 +3266,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" msgstr "Plynulé osvětlení" @@ -3299,13 +3284,12 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Plížit se" +msgstr "Klávesa plížení" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "Zvuk" #: src/settings_translation_file.cpp msgid "" @@ -3422,9 +3406,8 @@ msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" -msgstr "Trilineární filtr" +msgstr "Trilineární filtrování" #: src/settings_translation_file.cpp msgid "" @@ -3466,9 +3449,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "stiskni klávesu" +msgstr "Klávesa použít" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -3479,13 +3461,12 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Bývalí klíčoví vývojáři" +msgstr "Užitečné pro vývojáře modů." #: src/settings_translation_file.cpp msgid "V-Sync" -msgstr "" +msgstr "Vertikální synchronizace" #: src/settings_translation_file.cpp msgid "Vertical initial window size." @@ -3501,7 +3482,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "Ovladač grafiky" #: src/settings_translation_file.cpp msgid "View bobbing" @@ -3524,14 +3505,12 @@ msgid "Viewing range minimum" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Hlasitost" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Vlnění listů" +msgstr "Rychlost chůze" #: src/settings_translation_file.cpp msgid "Wanted FPS" @@ -3546,39 +3525,32 @@ msgid "Water surface level of the world." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "Vlnění listů" +msgstr "Vlnění bloků" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" msgstr "Vlnění listů" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" msgstr "Vlnění rostlin" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "Vlnění vody" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "Vlnění vody" +msgstr "Výška vodních vln" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "Vlnění vody" +msgstr "Délka vodních vln" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Vlnění vody" +msgstr "Rychlost vodních vln" #: src/settings_translation_file.cpp msgid "" @@ -3666,11 +3638,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "cURL limit paralelních stahování" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "cURL timeout" #~ msgid "Are you sure to reset your singleplayer world?" #~ msgstr "Jste si jisti, že chcete resetovat místní svět?" From a8a4a66b83de2492c31061dfa5600d1abf560bc7 Mon Sep 17 00:00:00 2001 From: Rui Date: Mon, 23 Nov 2015 07:16:33 +0100 Subject: [PATCH 152/531] Translated using Weblate (Japanese) Currently translated at 39.8% (314 of 787 strings) --- po/ja/minetest.po | 108 +++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 45 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index fdb72fdf..c98ebec5 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 02:44+0000\n" -"Last-Translator: nobb \n" +"PO-Revision-Date: 2015-11-23 07:16+0000\n" +"Last-Translator: Rui \n" "Language-Team: Japanese " "\n" "Language: ja\n" @@ -36,7 +36,7 @@ msgstr "再接続" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "サーバが再接続を要求しました：" +msgstr "サーバーが再接続を要求しました:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -86,7 +86,7 @@ msgstr "有効化" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" -msgstr "すべて有効化" +msgstr "全て有効化" #: builtin/mainmenu/dlg_config_world.lua msgid "" @@ -123,7 +123,7 @@ msgstr "有効化" #: builtin/mainmenu/dlg_create_world.lua msgid "A world named \"$1\" already exists" -msgstr "ワールド名\"$1\"はすでに使用されています" +msgstr "ワールド名\"$1\"は既に使用されています" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" @@ -131,9 +131,10 @@ msgstr "作成" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "minetest.netからminetest_gameのゲームをダウンロードしてください" +msgstr "minetest.netからminetest_gameなどのサブゲームをダウンロードしてください" #: builtin/mainmenu/dlg_create_world.lua +#, fuzzy msgid "Download one from minetest.net" msgstr "minetest.netから再ダウンロードしてください" @@ -155,7 +156,7 @@ msgstr "Seed値" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "警告: Minimal development testは開発者のためのゲームです。" +msgstr "警告: Minimal development testは開発者用です。" #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -163,7 +164,7 @@ msgstr "ワールド名" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "ゲームがインストールされていません。" +msgstr "サブゲームがインストールされていません。" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -171,11 +172,11 @@ msgstr "本当に\"$1\"を削除してよろしいですか？" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "Modマネージャ: \"$1\"の削除に失敗しました" +msgstr "Modマネージャー: \"$1\"の削除に失敗しました" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "Modマネージャ: Mod\"$1\"の場所が不明です" +msgstr "Modマネージャー: Mod\"$1\"の場所が不明です" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" @@ -199,7 +200,7 @@ msgstr "決定" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "名前を変更:" +msgstr "Modパック名を変更:" #: builtin/mainmenu/modmgr.lua msgid "" @@ -229,7 +230,7 @@ msgstr "" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "閉じる" +msgstr "ストアを閉じる" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." @@ -269,7 +270,7 @@ msgstr "再インストール" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" -msgstr "開発協力者" +msgstr "活動中の開発協力者" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" @@ -357,6 +358,7 @@ msgid "PvP enabled" msgstr "PvP有効" #: builtin/mainmenu/tab_server.lua +#, fuzzy msgid "Bind Address" msgstr "バインドアドレス" @@ -411,6 +413,7 @@ msgid "Start Game" msgstr "ゲームスタート" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "\"$1\" is not a valid flag." msgstr "\"$1\"は有効なフラグではありません。" @@ -439,10 +442,12 @@ msgid "Enabled" msgstr "有効" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "書式は、コンマとかっこで区切られた 3 つの数字です。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "" "Format: , , (, , ), , " ", " @@ -460,6 +465,7 @@ msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "空隙性随意大手カンマを付加することができます。" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Please enter a comma seperated list of flags." msgstr "フラグのリストはカンマで区切って入力してください。" @@ -481,6 +487,7 @@ msgid "Restore Default" msgstr "初期設定に戻す" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Select path" msgstr "ファイルパスを選択" @@ -495,7 +502,7 @@ msgstr "技術名称を表示" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "$1より大きな値でなければいけません。" +msgstr "$1より大きい値でなければいけません。" #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." @@ -547,11 +554,11 @@ msgstr "完了！" #: src/client.cpp msgid "Initializing nodes" -msgstr "ノードを設定中" +msgstr "ノードを初期化中" #: src/client.cpp msgid "Initializing nodes..." -msgstr "ノードの設定中..." +msgstr "ノードを初期化中..." #: src/client.cpp msgid "Item textures..." @@ -559,21 +566,23 @@ msgstr "テクスチャを設定中..." #: src/client.cpp msgid "Loading textures..." -msgstr "テクスチャ読み込み中..." +msgstr "テクスチャを読み込み中..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "シェーダー構築中..." +msgstr "シェーダーを再構築中..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" -msgstr "接続失敗（またはタイムアウト）" +msgstr "接続エラー (タイムアウト？)" #: src/client/clientlauncher.cpp +#, fuzzy msgid "Could not find or load game \"" -msgstr "ゲーム\"の読み込みができません" +msgstr "以下のゲームの読み込みができません\"" #: src/client/clientlauncher.cpp +#, fuzzy msgid "Invalid gamespec." msgstr "無効なgamespecです。" @@ -582,14 +591,16 @@ msgid "Main Menu" msgstr "メインメニュー" #: src/client/clientlauncher.cpp +#, fuzzy msgid "No world selected and no address provided. Nothing to do." msgstr "ワールドが選択されていないアドレスです。続行できません。" #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "名前が長過ぎます。" +msgstr "プレイヤー名が長過ぎます。" #: src/client/clientlauncher.cpp +#, fuzzy msgid "Provided world path doesn't exist: " msgstr "ワールドが存在しません: " @@ -603,7 +614,7 @@ msgid "" "Check debug.txt for details." msgstr "" "\n" -"詳細はdebug.txtをご覧ください。" +"詳細はdebug.txtを確認してください。" #: src/game.cpp msgid "Change Keys" @@ -615,7 +626,7 @@ msgstr "パスワード変更" #: src/game.cpp msgid "Connecting to server..." -msgstr "サーバー接続中..." +msgstr "サーバーに接続中..." #: src/game.cpp msgid "Continue" @@ -623,11 +634,11 @@ msgstr "再開" #: src/game.cpp msgid "Creating client..." -msgstr "クライアント起動中..." +msgstr "クライアントを起動中..." #: src/game.cpp msgid "Creating server..." -msgstr "サーバー起動中..." +msgstr "サーバーを起動中..." #: src/game.cpp msgid "" @@ -643,19 +654,20 @@ msgid "" "- Mouse wheel: select item\n" "- T: chat\n" msgstr "" -"基本操作:\n" +"デフォルトの操作:\n" "- WASD: 移動\n" -"- スペース: ジャンプ､登る\n" -"- Shift:　スニーク､降りる\n" +"- スペース: ジャンプ/登る\n" +"- Shift: スニーク/降りる\n" "- Q: アイテムを落とす\n" "- I: インベントリ\n" "- マウス: 見回す\n" -"- 左クリック: 破壊、パンチ\n" -"- 右クリック: 設置、使用\n" -"- ホイール: アイテム選択\n" -"- T: チャット画面\n" +"- 左クリック: 破壊/パンチ\n" +"- 右クリック: 設置/使用\n" +"- マウスホイール: アイテム選択\n" +"- T: チャット\n" #: src/game.cpp +#, fuzzy msgid "" "Default Controls:\n" "No menu visible:\n" @@ -670,7 +682,7 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" -"基本操作:\n" +"デフォルトの操作:\n" "タッチ操作:\n" "- シングルタップ: ブロックの破壊\n" "- ダブルタップ: 設置、使用\n" @@ -693,7 +705,7 @@ msgstr "終了" #: src/game.cpp msgid "Item definitions..." -msgstr "アイテム定義中..." +msgstr "アイテムを定義中..." #: src/game.cpp msgid "KiB/s" @@ -709,7 +721,7 @@ msgstr "MB/秒" #: src/game.cpp msgid "Node definitions..." -msgstr "ノード定義中..." +msgstr "ノードを定義中..." #: src/game.cpp src/guiFormSpecMenu.cpp msgid "Proceed" @@ -717,7 +729,7 @@ msgstr "決定" #: src/game.cpp msgid "Resolving address..." -msgstr "アドレス解決中..." +msgstr "アドレスを解決中..." #: src/game.cpp msgid "Respawn" @@ -789,9 +801,7 @@ msgstr "キーが重複しています" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "" -"操作設定です。（変更に失敗した場合、minetest.confから該当する設定を削除してく" -"ださい）" +msgstr "操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してください)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -883,15 +893,15 @@ msgstr "Caps Lock" #: src/keycode.cpp msgid "Clear" -msgstr "消す" +msgstr "クリア" #: src/keycode.cpp msgid "Comma" -msgstr "読点" +msgstr "," #: src/keycode.cpp msgid "Control" -msgstr "コントロール" +msgstr "Ctrl" #: src/keycode.cpp msgid "Convert" @@ -907,7 +917,7 @@ msgstr "下" #: src/keycode.cpp msgid "End" -msgstr "終了" +msgstr "エンド" #: src/keycode.cpp msgid "Erase OEF" @@ -1161,13 +1171,14 @@ msgstr "" #: src/settings_translation_file.cpp msgid "3D clouds" -msgstr "立体雲" +msgstr "立体な雲" #: src/settings_translation_file.cpp msgid "3D mode" msgstr "3Dモード" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1177,6 +1188,13 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"3Dサポート\n" +"現在サポートしている:\n" +"- none: 3D出力なし\n" +"- anaglyph: cyan/magenta color 3d.\n" +"- interlaced: odd/even line based polarisation screen support.\n" +"- topbottom: split screen top/bottom.\n" +"- sidebyside: split screen side by side." #: src/settings_translation_file.cpp msgid "" @@ -3507,7 +3525,7 @@ msgstr "音量" #: src/settings_translation_file.cpp msgid "Walking speed" -msgstr "歩き速度" +msgstr "歩く速度" #: src/settings_translation_file.cpp msgid "Wanted FPS" From f5597c5f9075759354dfdb191d7ddd74603ac480 Mon Sep 17 00:00:00 2001 From: ChaosWormz Date: Wed, 25 Nov 2015 08:42:11 +0100 Subject: [PATCH 153/531] Translated using Weblate (Hebrew) Currently translated at 3.1% (25 of 787 strings) --- po/he/minetest.po | 56 +++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/po/he/minetest.po b/po/he/minetest.po index 7c9e8e95..036978fe 100644 --- a/po/he/minetest.po +++ b/po/he/minetest.po @@ -10,8 +10,8 @@ msgstr "" "POT-Creation-Date: 2015-11-08 21:23+0100\n" "PO-Revision-Date: 2015-10-26 16:22+0200\n" "Last-Translator: ChaosWormz \n" -"Language-Team: Hebrew \n" +"Language-Team: Hebrew " +"\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +78,6 @@ msgid "Cancel" msgstr "ביטול" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Depends:" msgstr "תלוי ב:" @@ -91,7 +90,6 @@ msgid "Enable MP" msgstr "" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable all" msgstr "אפשר בכל" @@ -110,7 +108,6 @@ msgid "Hide mp content" msgstr "" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Mod:" msgstr "מוד:" @@ -124,7 +121,6 @@ msgid "World:" msgstr "עולם:" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "enabled" msgstr "מופעל" @@ -201,7 +197,6 @@ msgid "No" msgstr "לא" #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp -#, fuzzy msgid "Accept" msgstr "קבל" @@ -281,7 +276,7 @@ msgstr "" #: builtin/mainmenu/tab_credits.lua msgid "Credits" -msgstr "" +msgstr "קרדיטים" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" @@ -301,7 +296,7 @@ msgstr "" #: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua msgid "Mods" -msgstr "" +msgstr "מודים" #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" @@ -325,16 +320,15 @@ msgstr "" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" -msgstr "" +msgstr "כתובת / פורט :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp -#, fuzzy msgid "Client" msgstr "קלינט" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" -msgstr "" +msgstr "התחבר" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" @@ -347,19 +341,19 @@ msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Delete" -msgstr "" +msgstr "מחק" #: builtin/mainmenu/tab_multiplayer.lua msgid "Name / Password :" -msgstr "" +msgstr "שם/סיסמה :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" -msgstr "" +msgstr "רשימת שרתים פומבי" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" -msgstr "" +msgstr "PvP אפשר" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" @@ -367,45 +361,45 @@ msgstr "" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" -msgstr "" +msgstr "קביעת תצורה" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Creative Mode" -msgstr "" +msgstr "משחק יצירתי" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Enable Damage" -msgstr "" +msgstr "אפשר נזק" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua msgid "Name/Password" -msgstr "" +msgstr "שם/סיסמה" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "New" -msgstr "" +msgstr "חדש" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "" +msgstr "אין עולם נוצר או נבחר!" #: builtin/mainmenu/tab_server.lua msgid "Port" -msgstr "" +msgstr "פורט" #: builtin/mainmenu/tab_server.lua msgid "Public" -msgstr "" +msgstr "ציבורי" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Select World:" -msgstr "" +msgstr "בחר עולם:" #: builtin/mainmenu/tab_server.lua msgid "Server" -msgstr "" +msgstr "שרת" #: builtin/mainmenu/tab_server.lua msgid "Server Port" @@ -413,7 +407,7 @@ msgstr "" #: builtin/mainmenu/tab_server.lua msgid "Start Game" -msgstr "" +msgstr "התחל משחק" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." @@ -455,7 +449,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Games" -msgstr "" +msgstr "משחקים" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." @@ -515,7 +509,7 @@ msgstr "" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" -msgstr "" +msgstr "שחק" #: builtin/mainmenu/tab_singleplayer.lua msgid "Singleplayer" @@ -535,7 +529,7 @@ msgstr "" #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" -msgstr "" +msgstr "חבילות מרקם" #: src/client.cpp msgid "Connection timed out." @@ -3126,7 +3120,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Server / Singleplayer" -msgstr "" +msgstr "שרת" #: src/settings_translation_file.cpp msgid "Server URL" From c97f7d35e30fcebcef335011f6042393dbf35906 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Thu, 10 Dec 2015 08:13:11 +0100 Subject: [PATCH 154/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 59.7% (470 of 787 strings) --- po/zh_TW/minetest.po | 91 ++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 43ac23f1..ddbc1e3d 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-08 10:49+0000\n" +"PO-Revision-Date: 2015-12-10 08:13+0000\n" "Last-Translator: Jeff Huang \n" -"Language-Team: Chinese (Taiwan) \n" +"Language-Team: Chinese (Taiwan) " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -415,7 +415,7 @@ msgstr "開始遊戲" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "「$1」不是一個有效的旗標。" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -443,7 +443,7 @@ msgstr "已啟用" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "格式為 3 個在括號內的以逗號分離的數字。" #: builtin/mainmenu/tab_settings.lua msgid "" @@ -1432,12 +1432,11 @@ msgstr "" "範例：72 = 20分鐘，360 = 4分鐘，1 = 24小時，0 = 日／夜／一切保持不變。" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"控制在 Mapgen V6 中的沙漠與沙灘大小。\n" +"控制在 Mapgen v6 中的沙漠與沙灘大小。\n" "當 snowbiomes 啟用時「mgv6_freq_desert」會被忽略。" #: src/settings_translation_file.cpp @@ -1593,6 +1592,9 @@ msgid "" "Note that this is not quite optimized and that smooth lighting on the\n" "water surface doesn't work with this." msgstr "" +"啟用略低的的水面，所以它就不會完全「填滿」節點。\n" +"注意，這個功能並未最佳化完成，水面的\n" +"柔和光功能無法與此功能一同運作。" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1724,39 +1726,41 @@ msgstr "後備字型大小" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "快速按鍵" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "快速模式加速" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "快速模式速度" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "快速移動" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"快速移動（透過使用鍵）。\n" +"這需要伺服器上的「快速」特權。" #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "視野" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "以度計算的視野。" #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "" +msgstr "在 客戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。" #: src/settings_translation_file.cpp msgid "" @@ -1765,6 +1769,10 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" +"已過濾的材質會與完全透明的鄰居混合 RGB 值，\n" +"PNG 最佳化器通常會丟棄，有時候會導致透明材質\n" +"會有黑邊或亮邊。套用這個過濾器以在材質載入時\n" +"清理這些東西。" #: src/settings_translation_file.cpp msgid "Filtering" @@ -1772,47 +1780,47 @@ msgstr "過濾器" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "固定的地圖種子" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "" +msgstr "飛行按鍵" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "飛行" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "霧" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "霧切換鍵" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "字型路徑" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "字型陰影" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "字型陰影 alpha 值" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "字型陰影 alpha（不透明度，介於 0 到 255）。" #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" +msgstr "字型陰影偏移，若為 0 則陰影將不會被繪製。" #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "字型大小" #: src/settings_translation_file.cpp msgid "Forward key" @@ -1820,39 +1828,39 @@ msgstr "前進鍵" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Freetype 字型" #: src/settings_translation_file.cpp msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." -msgstr "" +msgstr "要在客戶端上從多遠的區塊開始生成，以地圖區塊計算（16 個節點）。" #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." -msgstr "" +msgstr "要把多遠的區塊送到客戶端，以地圖區塊計算（16 個節點）。" #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." -msgstr "" +msgstr "客戶端上知道多遠的區塊上的物件，以地圖區塊計算（16 個節點）。" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "全螢幕" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "全螢幕 BPP" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "全螢幕模式。" #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "圖形使用者介面縮放比例" #: src/settings_translation_file.cpp msgid "GUI scaling filter" @@ -1860,11 +1868,11 @@ msgstr "圖形使用者介面縮放過濾器" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "圖形使用者介面縮放比例過濾器 txr2img" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gamma" #: src/settings_translation_file.cpp msgid "Generate normalmaps" @@ -1878,6 +1886,10 @@ msgid "" "Flags starting with \"no\" are used to explicitly disable them.\n" "'trees' and 'flat' flags only have effect in mgv6." msgstr "" +"全域地圖產生屬性。\n" +"未在旗標字串中指定的旗標將不會自預設值修改。\n" +"以「no」開頭的旗標字串將會用於明確的停用它們。\n" +"「trees」與「flat」旗標只在 mgv6 有效。" #: src/settings_translation_file.cpp msgid "Graphics" @@ -2503,9 +2515,8 @@ msgid "Mapgen flags" msgstr "地圖產生器旗標" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "地圖產生器旗標" +msgstr "地圖產生器分形" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -2520,14 +2531,12 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal flags" -msgstr "地圖產生器旗標" +msgstr "地圖產生器分形旗標" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal julia iterations" -msgstr "視差遮蔽迭代" +msgstr "地圖產生器分形朱麗亞迭代" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia offset" From 8e36cfaecee75f8a0c4c37219da60cf03994bff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= Date: Thu, 26 Nov 2015 19:08:05 +0100 Subject: [PATCH 155/531] Translated using Weblate (Czech) Currently translated at 56.6% (446 of 787 strings) Squashed two translation commits to one --- po/cs/minetest.po | 157 +++++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 73 deletions(-) diff --git a/po/cs/minetest.po b/po/cs/minetest.po index 8d0677d9..e00ad59a 100644 --- a/po/cs/minetest.po +++ b/po/cs/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-23 17:09+0000\n" +"PO-Revision-Date: 2015-12-10 15:36+0000\n" "Last-Translator: Jakub Vaněk \n" "Language-Team: Czech " "\n" @@ -1202,7 +1202,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "Zpráva, která se zobrazí všem klientům, když server spadne." +msgstr "Zpráva, která se zobrazí všem klientům, když server havaruje." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." @@ -1230,12 +1230,17 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Adresa, kam se připojit.\n" +"Nechte prázdné, pokud chcete spustit místní server.\n" +"Poznámka: pole adresy v hlavním menu přepisuje toto nastavení." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Upraví nastavení DPI pro vaši obrazovku (není pro X11/Android). Pro použití " +"například s 4k obrazovkami." #: src/settings_translation_file.cpp msgid "" @@ -1272,11 +1277,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Zeptat se na znovupřipojení po havárii" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Automaticky hlásit seznamu serverů." #: src/settings_translation_file.cpp msgid "Backward key" @@ -1300,7 +1305,7 @@ msgstr "Bitová hloubka (bity na pixel) v celoobrazovkovém režimu." #: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "" +msgstr "Stavění uvnitř hráče" #: src/settings_translation_file.cpp msgid "Bumpmapping" @@ -1316,7 +1321,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Klávesa pro přepínání aktualizace pohledu" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1340,7 +1345,7 @@ msgstr "Klávesa plynulého pohybu kamery" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Vynulovat průhledné textury" #: src/settings_translation_file.cpp msgid "Client and Server" @@ -1364,7 +1369,7 @@ msgstr "Mraky" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Mraky jsou pouze lokální efekt." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1379,6 +1384,10 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Seznam důvěryhodných modů oddělených čárkami, které mohou používat " +"potenciálně nebezpečné\n" +"funkce ve chvílích, kdy je zapnuto zabezpečení modů (pomocí " +"request_insecure_environment())." #: src/settings_translation_file.cpp msgid "Command key" @@ -1394,7 +1403,7 @@ msgstr "Připojit se k externímu serveru" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Spojí bloky skla, pokud je to jimi podporováno." #: src/settings_translation_file.cpp msgid "Console alpha" @@ -1426,6 +1435,9 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Ovládání délky denního cyklu.\n" +"Příklad: 72 = 20 minut, 360 = 4 minutý, 1 = 24 hodin, 0 = zůstává pouze noc " +"nebo den." #: src/settings_translation_file.cpp msgid "" @@ -1435,7 +1447,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Zpráva o havárii" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1463,15 +1475,15 @@ msgstr "DPI" #: src/settings_translation_file.cpp msgid "Damage" -msgstr "Poškození" +msgstr "Zranění" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Klávesa pro zobrazení ladících informací" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Úroveň minimální důležitosti ladících informací" #: src/settings_translation_file.cpp msgid "Dedicated server step" @@ -1479,7 +1491,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Výchozí zrychlení" #: src/settings_translation_file.cpp msgid "Default game" @@ -1490,6 +1502,8 @@ msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Výchozí hra pro nové světy.\n" +"Při vytváření nového světa přes hlavní menu bude toto nastavení přepsáno." #: src/settings_translation_file.cpp msgid "Default password" @@ -1497,7 +1511,7 @@ msgstr "Výchozí heslo" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Výchozí práva" #: src/settings_translation_file.cpp msgid "" @@ -1513,11 +1527,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." -msgstr "" +msgstr "Definuje maximální posun hráče v blocích (0 = bez limitu)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Prodleva před zobrazením bublinové nápovědy, uvádějte v milisekundách." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" @@ -1525,13 +1539,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Rychlost slézání" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"Popis serveru, který bude zobrazen nově připojeným hráčům a který bude " +"uveden v seznamu serverů." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" @@ -1539,11 +1555,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" +msgstr "Detailní profilovací data modů. Užitečné pro vývojáře modů." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "Detailní profilování modů" #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1551,11 +1567,11 @@ msgstr "Zakázat anticheat" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Zakázat prázdná hesla" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Doménové jméno serveru, které bude zobrazené v seznamu serverů." #: src/settings_translation_file.cpp msgid "Double tap jump for fly" @@ -1567,7 +1583,7 @@ msgstr "Dvojstisk klávesy \"skok\" zapne létání." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Klávesa pro vyhození předmětu" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." @@ -1587,11 +1603,11 @@ msgstr "Povolit zabezpečení módů" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Povolit zranění a úmrtí hráčů." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Povolit náhodný uživatelský vstup (pouze pro testování)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." @@ -1611,6 +1627,10 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Povolte pro zakázání připojení starých klientů.\n" +"Starší klienti jsou kompatibilní v takovém smyslu, že při připojení k novým " +"serverům\n" +"nehavarují, ale nemusí podporovat všechny vlastnosti, které byste očekával/a." #: src/settings_translation_file.cpp msgid "" @@ -1619,6 +1639,9 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Povolit použití vzdáleného media serveru (je-li poskytnut serverem).\n" +"Vzdálené servery nabízejí výrazně rychlejší způsob, jak stáhnout\n" +"média (např. textury) při připojování k serveru." #: src/settings_translation_file.cpp msgid "" @@ -1663,7 +1686,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS v menu pauzy" #: src/settings_translation_file.cpp msgid "FSAA" @@ -1675,41 +1698,43 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fallback font" -msgstr "" +msgstr "Záložní písmo" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Stín záložního písma" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Průhlednost stínu záložního písma" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Velikost záložního písma" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Klávesa pro přepnutí turbo režimu" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Zrychlení v turbo režimu" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Rychlost v turbo režimu" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Turbo režim pohybu" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Turbo režim pohybu (pomocí klávesy použít).\n" +"Vyžaduje na serveru přidělené právo \"fast\"." #: src/settings_translation_file.cpp msgid "Field of view" @@ -1739,7 +1764,7 @@ msgstr "Filtrování" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Fixované seedové čislo" #: src/settings_translation_file.cpp msgid "Fly key" @@ -1747,7 +1772,7 @@ msgstr "Klávesa létání" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Létání" #: src/settings_translation_file.cpp msgid "Fog" @@ -1755,7 +1780,7 @@ msgstr "Mlha" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Klávesa pro přepnutí mlhy" #: src/settings_translation_file.cpp msgid "Font path" @@ -1771,11 +1796,11 @@ msgstr "Průhlednost stínu písma" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Neprůhlednost stínu písma (od 0 do 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" +msgstr "Odsazení stínu písma, pokud je nastaveno na 0, stín nebude vykreslen." #: src/settings_translation_file.cpp msgid "Font size" @@ -1819,7 +1844,7 @@ msgstr "Celoobrazovkový režim." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Měřítko GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter" @@ -1827,7 +1852,7 @@ msgstr "Měřítko GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "Filtr měřítka GUI txr2img" #: src/settings_translation_file.cpp msgid "Gamma" @@ -1848,7 +1873,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Grafika" #: src/settings_translation_file.cpp msgid "Gravity" @@ -1856,7 +1881,7 @@ msgstr "Gravitace" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "Klávesa pro přepnutí HUD (Head-Up Display)" #: src/settings_translation_file.cpp msgid "" @@ -1872,7 +1897,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "Výpočty ve FPU s vysokou přesností" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." @@ -2367,9 +2392,8 @@ msgid "Main menu mod manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Hlavní nabídka" +msgstr "Skript hlavní nabídky" #: src/settings_translation_file.cpp msgid "" @@ -2463,19 +2487,16 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Generátor mapy" +msgstr "Ladění generátoru mapy" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Generátor mapy" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Generátor mapy" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -2490,14 +2511,12 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal flags" -msgstr "Generátor mapy" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal julia iterations" -msgstr "Parallax Occlusion" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia offset" @@ -2986,34 +3005,29 @@ msgid "Parallax Occlusion" msgstr "Parallax Occlusion" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" -msgstr "Parallax Occlusion" +msgstr "Paralaxní okluze" #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion Scale" -msgstr "Parallax Occlusion" +msgstr "Škála paralaxní okluze" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "Parallax Occlusion" +msgstr "Náklon paralaxní okluze" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "Parallax Occlusion" +msgstr "Počet iterací paralaxní okluze" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "Parallax Occlusion" +msgstr "Režim paralaxní okluze" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" -msgstr "Parallax Occlusion" +msgstr "Síla paralaxní okluze" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." @@ -3180,9 +3194,8 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Start místní hry" +msgstr "Server / Místní hra" #: src/settings_translation_file.cpp msgid "Server URL" @@ -3304,9 +3317,8 @@ msgid "Static spawnpoint" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." -msgstr "Generovat normálové mapy" +msgstr "Síla vygenerovaných normálových map." #: src/settings_translation_file.cpp msgid "Strength of parallax." @@ -3321,9 +3333,8 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Balíčky textur" +msgstr "Cesta k texturám" #: src/settings_translation_file.cpp msgid "" From 0f75141d6938427bd36b47de9984efb68b60f9ed Mon Sep 17 00:00:00 2001 From: Luca Argentieri Date: Mon, 14 Dec 2015 23:08:44 +0100 Subject: [PATCH 156/531] Translated using Weblate (Italian) Currently translated at 43.8% (345 of 787 strings) --- po/it/minetest.po | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index ee532d22..83226aa2 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-15 15:37+0000\n" -"Last-Translator: Andrea Di Pietro Ulla \n" +"PO-Revision-Date: 2015-12-14 23:08+0000\n" +"Last-Translator: Luca Argentieri \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -240,7 +240,6 @@ msgstr "" "per il pacchetto moduli $1" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Close store" msgstr "Chiudi deposito" @@ -265,9 +264,8 @@ msgid "Search" msgstr "Cerca" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "Nome del mondo" +msgstr "Nome corto:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" @@ -298,9 +296,8 @@ msgid "Previous Contributors" msgstr "Contributori precedenti" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "Sviluppatori del motore precedenti" +msgstr "Precedente Nucleo sviluppatori" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -454,8 +451,9 @@ msgid "Enabled" msgstr "Attivato" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "Il formato è da 3 numeri separati da virgole e dentro parentesi" #: builtin/mainmenu/tab_settings.lua msgid "" @@ -642,7 +640,6 @@ msgid "Creating client..." msgstr "Creazione del client..." #: src/game.cpp -#, fuzzy msgid "Creating server..." msgstr "Creazione del server..." @@ -673,7 +670,6 @@ msgstr "" "- T: chat\n" #: src/game.cpp -#, fuzzy msgid "" "Default Controls:\n" "No menu visible:\n" @@ -755,7 +751,6 @@ msgid "You died." msgstr "Siete morti." #: src/guiFormSpecMenu.cpp -#, fuzzy msgid "Enter " msgstr "Invio " @@ -1188,7 +1183,6 @@ msgid "3D mode" msgstr "Modalità 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1255,11 +1249,11 @@ msgstr "" "impostazione." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "dpi del tuo schermo (no X11/solo Android) per esempio schermi 4K." +msgstr "" +"Regola i dpi del tuo schermo (no X11/solo Android) per esempio schermi 4K." #: src/settings_translation_file.cpp msgid "" @@ -1268,7 +1262,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Advanced" msgstr "Avanzato" @@ -1277,16 +1270,18 @@ msgid "Always fly and fast" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Ambient occlusion gamma" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Filtro anisotropico" #: src/settings_translation_file.cpp +#, fuzzy msgid "Announce server" -msgstr "" +msgstr "Server annunciato" #: src/settings_translation_file.cpp msgid "" @@ -1309,7 +1304,7 @@ msgstr "Tasto Indietro" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Base" #: src/settings_translation_file.cpp msgid "Bilinear filtering" @@ -1322,7 +1317,7 @@ msgstr "Risoluzione dell'indirizzo..." #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bit per pixel (profondita del colore) in schermo intero." #: src/settings_translation_file.cpp msgid "Build inside player" @@ -1330,7 +1325,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Bumpmapping" -msgstr "" +msgstr "Bumpmapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" @@ -1342,7 +1337,7 @@ msgstr "Ammorbidisci la visuale in modalità cinematica" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Tasto Attiva/Disattiva aggiornamento della camera." #: src/settings_translation_file.cpp msgid "Chat key" @@ -1355,7 +1350,7 @@ msgstr "Tasto mostra/nascondi chat" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "dimensione del blocco" #: src/settings_translation_file.cpp msgid "Cinematic mode" From b675d4984beef28c33b7e0711cbca70936890884 Mon Sep 17 00:00:00 2001 From: Anton Tsyganenko Date: Thu, 17 Dec 2015 23:01:57 +0100 Subject: [PATCH 157/531] Translated using Weblate (Russian) Currently translated at 48.7% (384 of 787 strings) Squashed two translation commits to one --- po/ru/minetest.po | 49 +++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 363e0030..20d605e5 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-08 10:10+0000\n" -"Last-Translator: Vasily Pavlov \n" -"Language-Team: Russian \n" +"PO-Revision-Date: 2015-12-18 09:44+0000\n" +"Last-Translator: Anton Tsyganenko \n" +"Language-Team: Russian " +"\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua @@ -446,7 +446,7 @@ msgstr "Включено" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "Формат -- это 3 числа в скобках, разделенные точками." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -1292,7 +1292,7 @@ msgstr "Назад" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Базовый" #: src/settings_translation_file.cpp #, fuzzy @@ -1305,7 +1305,7 @@ msgstr "Адрес бинда" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Биты на пиксель (глубина цвета) в полноэкранном режиме." #: src/settings_translation_file.cpp msgid "Build inside player" @@ -1325,7 +1325,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Клавиша переключения обновления камеры" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1357,7 +1357,7 @@ msgstr "Клиент и Сервер" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Скорость подъема" #: src/settings_translation_file.cpp msgid "Cloud height" @@ -1373,7 +1373,7 @@ msgstr "Облака" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Облака являются эффектом на стороне клиента." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1403,7 +1403,7 @@ msgstr "Подключение к внешнему серверу..." #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Соединяет стекло, если поддерживается нодой." #: src/settings_translation_file.cpp msgid "Console alpha" @@ -1435,12 +1435,17 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Задает длину цикла дня/ночи.\n" +"Примеры: 72 = 20 минут, 360 = 4 минуты, 1 = 24 часа, 0 = время суток не " +"меняется." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Задает размеры пустыней и пляжей.\n" +"Когда включены снежные биомы, 'mgv6_freq_desert' игнорируется." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1448,23 +1453,24 @@ msgstr "Сообщение при падении" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Прозрачность перекрестия" #: src/settings_translation_file.cpp +#, fuzzy msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Прозрачность перекрестия (от 0 (прозрачно) до 255 (непрозрачно))." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Цвет перекрестия" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Цвет перекрестия (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Скорость спуска" #: src/settings_translation_file.cpp msgid "DPI" @@ -1472,11 +1478,12 @@ msgstr "DPI" #: src/settings_translation_file.cpp msgid "Damage" -msgstr "Увечья" +msgstr "Урон" #: src/settings_translation_file.cpp +#, fuzzy msgid "Debug info toggle key" -msgstr "" +msgstr "Клавиша переключения показа debug-информации" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1488,7 +1495,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Ускорение по умолчанию" #: src/settings_translation_file.cpp msgid "Default game" From e4215c1d177cb6d47bd3d34633ba2d30f5be2c3d Mon Sep 17 00:00:00 2001 From: Rogier Date: Sat, 19 Dec 2015 01:09:48 +0100 Subject: [PATCH 158/531] Translated using Weblate (Dutch) Currently translated at 95.1% (749 of 787 strings) Squashed two translation commits to one --- po/nl/minetest.po | 1203 ++++++++++++++++++++++++++++----------------- 1 file changed, 743 insertions(+), 460 deletions(-) diff --git a/po/nl/minetest.po b/po/nl/minetest.po index 598d641d..44f807c7 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -2,13 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-11 20:55+0000\n" +"PO-Revision-Date: 2015-12-19 02:35+0000\n" "Last-Translator: Rogier \n" "Language-Team: Dutch " "\n" @@ -21,7 +20,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Er is een fout opgetreden in een Lua script, zoals een mod:" +msgstr "Er is een fout opgetreden in een Lua script (bijvoorbeeld van een mod):" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -41,7 +40,7 @@ msgstr "Opnieuw verbinding maken" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "De server heeft verzocht opnieuw verbinding te maken:" +msgstr "De server heeft gevraagd opnieuw verbinding te maken:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -85,15 +84,15 @@ msgstr "Afhankelijkheden:" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" -msgstr "MP uitschakelen" +msgstr "MV uitzetten" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" -msgstr "MP inschakelen" +msgstr "MV aanzetten" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" -msgstr "Alles aan" +msgstr "Alles aanzetten" #: builtin/mainmenu/dlg_config_world.lua msgid "" @@ -105,11 +104,11 @@ msgstr "" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" -msgstr "Geen std" +msgstr "Verberg std. mods" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "Verberg mp mods" +msgstr "Verberg MV mods" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -126,7 +125,7 @@ msgstr "Wereld:" #: builtin/mainmenu/dlg_config_world.lua msgid "enabled" -msgstr "ingeschakeld" +msgstr "aangeschakeld" #: builtin/mainmenu/dlg_create_world.lua msgid "A world named \"$1\" already exists" @@ -138,7 +137,7 @@ msgstr "Maak aan" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "Download een sub-game, zoals minetest_game, van minetest.net" +msgstr "Download een sub-spel, zoals minetest_game, van minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -150,7 +149,7 @@ msgstr "Spel" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Kaartgenerator" +msgstr "Wereldgenerator" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -158,12 +157,13 @@ msgstr "Geen wereldnaam opgegeven of geen spel geselecteerd" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" -msgstr "kiemgetal" +msgstr "Kiemgetal" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." msgstr "" -"Waarschuwing: De minimale ontwikkel test is bedoeld voor ontwikkelaars." +"Waarschuwing: Het minimale ontwikkellaars-test-spel is bedoeld voor " +"ontwikkelaars." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -171,23 +171,23 @@ msgstr "Naam wereld" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "Je heb geen sub-spellen geïnstalleerd." +msgstr "Er zijn geen spellen geïnstalleerd." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "Weet je zeker dat je \"$1\" wilt verwijderen?" +msgstr "Weet je zeker dat je mod \"$1\" wilt verwijderen?" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "Modmgr: kan \"$1\" niet verwijderen" +msgstr "Modmgr: kan mod \"$1\" niet verwijderen" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "Modmgr: onjuist pad \"$1\"" +msgstr "Modbeheer: onjuist pad \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "Natuurlijk niet!" +msgstr "Nee, natuurlijk niet!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua msgid "Yes" @@ -219,7 +219,7 @@ msgstr "" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" -msgstr "Installeren van $1 in $2 is mislukt" +msgstr "Installeren van mod $1 in $2 is mislukt" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" @@ -227,11 +227,12 @@ msgstr "Mod installeren: bestand: \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" -msgstr "Mod installeren: kan geen echte modnaam vinden voor: $1" +msgstr "Mod installeren: kan de echte modnaam niet vinden voor: $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" -msgstr "Mod installeren: kan geen geschikte map vinden voor modverzameling $1" +msgstr "" +"Mod installeren: kan geen geschikte map-naam vinden voor modverzameling $1" #: builtin/mainmenu/store.lua msgid "Close store" @@ -239,7 +240,7 @@ msgstr "Winkel sluiten" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "$1 aan het downloaden, even wachten..." +msgstr "$1 wordt gedownload, een ogenblik geduld..." #: builtin/mainmenu/store.lua msgid "Install" @@ -251,7 +252,7 @@ msgstr "Pagina $1 van $2" #: builtin/mainmenu/store.lua msgid "Rating" -msgstr "Rang" +msgstr "Waardering" #: builtin/mainmenu/store.lua msgid "Search" @@ -271,11 +272,11 @@ msgstr "Ongesorteerd" #: builtin/mainmenu/store.lua msgid "re-Install" -msgstr "opnieuw installeren" +msgstr "Opnieuw installeren" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" -msgstr "Actieve bijdragers" +msgstr "Andere actieve ontwikkelaars" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" @@ -287,11 +288,11 @@ msgstr "Credits" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" -msgstr "Vroegere bijdragers" +msgstr "Vroegere ontwikkelaars" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "Eerdere hoofdontwikkelaars" +msgstr "Vroegere hoofdontwikkelaars" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -299,7 +300,7 @@ msgstr "Geïnstalleerde Mods:" #: builtin/mainmenu/tab_mods.lua msgid "Mod information:" -msgstr "Mod beschrijving:" +msgstr "Mod-beschrijving:" #: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua msgid "Mods" @@ -307,7 +308,7 @@ msgstr "Mods" #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" -msgstr "Geen mod beschrijving aanwezig" +msgstr "Geen mod-beschrijving aanwezig" #: builtin/mainmenu/tab_mods.lua msgid "Rename" @@ -319,19 +320,19 @@ msgstr "Selecteer Modbestand:" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" -msgstr "Geselecteerde mod deinstalleren" +msgstr "Geselecteerde mod deïnstalleren" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" -msgstr "Geselecteerde modpack deinstalleren" +msgstr "Geselecteerde modverzameling deïnstalleren" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" -msgstr "IP-Adres / Poort :" +msgstr "Servernaam of -adres / Poort :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" -msgstr "Client" +msgstr "Cliënt" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" @@ -339,11 +340,11 @@ msgstr "Verbinden" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" -msgstr "Creatieve Modus" +msgstr "Creatieve modus" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Damage enabled" -msgstr "Schade ingeschakeld" +msgstr "Verwondingen aangeschakeld" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -360,11 +361,11 @@ msgstr "Publieke Serverlijst" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" -msgstr "PvP ingeschakeld" +msgstr "Spelergevechten aangeschakeld" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" -msgstr "Adres" +msgstr "Lokaal server-adres" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" @@ -373,16 +374,16 @@ msgstr "Instellingen" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Creative Mode" -msgstr "Creatieve Modus" +msgstr "Creatieve modus" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Enable Damage" -msgstr "Schade inschakelen" +msgstr "Verwondingen inschakelen" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua msgid "Name/Password" -msgstr "Naam/Wachtwoord" +msgstr "Naam / Wachtwoord" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "New" @@ -390,7 +391,7 @@ msgstr "Nieuw" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "Geen wereldnaam opgegeven of geen spel geselecteerd!" +msgstr "Geen wereldnaam opgegeven of geen wereld aangemaakt!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -414,7 +415,7 @@ msgstr "Serverpoort" #: builtin/mainmenu/tab_server.lua msgid "Start Game" -msgstr "Start Server" +msgstr "Start spel" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." @@ -422,7 +423,7 @@ msgstr "\"$1\" is geen geldige vlag." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "(Geen beschrijving beschikbaar)" +msgstr "(Er is geen beschrijving van deze instelling beschikbaar)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" @@ -430,42 +431,43 @@ msgstr "Bladeren" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" -msgstr "Toetsen" +msgstr "Toetsen aanpassen" #: builtin/mainmenu/tab_settings.lua msgid "Disabled" -msgstr "uitgeschakeld" +msgstr "Uitgeschakeld" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "Bewerken" +msgstr "Aanpassen" #: builtin/mainmenu/tab_settings.lua msgid "Enabled" -msgstr "ingeschakeld" +msgstr "Aangeschakeld" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" -"Formaat is 3 getallen, gescheiden door komma's en tussen vierkante haken " -"(bijvoorbeeld: [4,-34,138])." +"Formaat moet zijn: 3 getallen, gescheiden door komma's en tussen vierkante " +"haken (bijvoorbeeld: [4,-34,138])." #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Formaat: , , (, , " +"), " #: builtin/mainmenu/tab_settings.lua msgid "Games" msgstr "Spellen" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" -"Optioneel: de lacunaritie (uit de fractal-meetkunde: een maat voor " -"hoeveelheid en grootte van 'gaten') kan aan het einde toegevoegd worden, " +"Optioneel: de lacunaritie (uit de fractal-meetkunde: een maat voor\n" +"hoeveelheid en grootte van 'gaten') kan aan het einde toegevoegd worden,\n" "voorafgegaan door een komma." #: builtin/mainmenu/tab_settings.lua @@ -513,7 +515,6 @@ msgid "Config mods" msgstr "Mods configureren" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" msgstr "Hoofdmenu" @@ -523,7 +524,7 @@ msgstr "Start Singleplayer" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" -msgstr "Speel" +msgstr "Spelen" #: builtin/mainmenu/tab_singleplayer.lua msgid "Singleplayer" @@ -542,7 +543,6 @@ msgid "Select texture pack:" msgstr "Selecteer textuurverzameling:" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Texturepacks" msgstr "Texturen" @@ -564,13 +564,14 @@ msgstr "Nodes initialiseren..." #: src/client.cpp msgid "Item textures..." -msgstr "Voorwerp texturen..." +msgstr "Voorwerp-texturen..." #: src/client.cpp msgid "Loading textures..." msgstr "Bezig met laden van texturen..." #: src/client.cpp +#, fuzzy msgid "Rebuilding shaders..." msgstr "Herbouwen van shaders..." @@ -580,11 +581,11 @@ msgstr "Fout bij verbinden (time out?)" #: src/client/clientlauncher.cpp msgid "Could not find or load game \"" -msgstr "Kan niet de game laden of vinden \"" +msgstr "Kan het spel niet laden of niet vinden \"" #: src/client/clientlauncher.cpp msgid "Invalid gamespec." -msgstr "Onjuiste gamespec." +msgstr "Onjuiste spel-spec." #: src/client/clientlauncher.cpp msgid "Main Menu" @@ -592,11 +593,11 @@ msgstr "Hoofdmenu" #: src/client/clientlauncher.cpp msgid "No world selected and no address provided. Nothing to do." -msgstr "Geen wereld en adres geselecteerd. Niks te doen." +msgstr "Geen wereld geselecteerd en adres opgegeven. Niets te doen." #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "Spelernaam te lang." +msgstr "Spelernaam is te lang." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " @@ -612,7 +613,7 @@ msgid "" "Check debug.txt for details." msgstr "" "\n" -"Lees debug.txt voor details." +"Kijk in debug.txt voor details." #: src/game.cpp msgid "Change Keys" @@ -632,11 +633,11 @@ msgstr "Verder spelen" #: src/game.cpp msgid "Creating client..." -msgstr "Bezig client te maken..." +msgstr "Bezig cliënt te maken..." #: src/game.cpp msgid "Creating server..." -msgstr "Aanmaken van server..." +msgstr "Bezig server te maken..." #: src/game.cpp msgid "" @@ -659,10 +660,10 @@ msgstr "" "- Q: weggooien\n" "- I: rugzak\n" "- Muis: draaien/kijken\n" -"- L.muisknop: graaf/sla\n" -"- R.muisknop: plaats/gebruik\n" -"- Muiswiel: selecteer\n" -"- T: chat\n" +"- L-muisknop: graaf/sla\n" +"- R-muisknop: plaats/gebruik\n" +"- Muiswiel: selecteer vak\n" +"- T: chatten\n" #: src/game.cpp msgid "" @@ -687,10 +688,10 @@ msgstr "" "Menu of inventaris getoond:\n" "- dubbele tik buiten menu:\n" " --> sluiten\n" -"- aanraken stapel of slot:\n" +"- aanraken stapel of vak:\n" " --> stapel verplaatsen\n" "- aanraken & slepen, tik met tweede vinger\n" -" --> plaats enkel object in slot\n" +" --> plaats enkel object in vak\n" #: src/game.cpp msgid "Exit to Menu" @@ -726,11 +727,11 @@ msgstr "Doorgaan" #: src/game.cpp msgid "Resolving address..." -msgstr "IP-adres opzoeken..." +msgstr "Server-adres opzoeken..." #: src/game.cpp msgid "Respawn" -msgstr "Herspawnen" +msgstr "Wedergeboorte" #: src/game.cpp msgid "Shutting down..." @@ -738,15 +739,16 @@ msgstr "Uitschakelen..." #: src/game.cpp msgid "Sound Volume" -msgstr "Volume" +msgstr "Geluidsvolume" #: src/game.cpp msgid "You died." msgstr "Je bent gestorven." #: src/guiFormSpecMenu.cpp +#, fuzzy msgid "Enter " -msgstr "" +msgstr "Invoeren " #: src/guiFormSpecMenu.cpp msgid "ok" @@ -774,7 +776,7 @@ msgstr "Console" #: src/guiKeyChangeMenu.cpp msgid "Double tap \"jump\" to toggle fly" -msgstr "2x \"springen\" om te vliegen" +msgstr "2x \"springen\" schakelt vliegen aan/uit" #: src/guiKeyChangeMenu.cpp msgid "Drop" @@ -812,7 +814,7 @@ msgstr "Print debug-stacks" #: src/guiKeyChangeMenu.cpp msgid "Range select" -msgstr "Range instellen" +msgstr "Zichtbereik" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Right" @@ -823,9 +825,8 @@ msgid "Sneak" msgstr "Kruipen" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Snel bewegen aan/uit" +msgstr "Cinematic modus aan/uit" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -845,7 +846,7 @@ msgstr "Gebruiken" #: src/guiKeyChangeMenu.cpp msgid "press key" -msgstr "druk op" +msgstr "druk op toets" #: src/guiPasswordChange.cpp msgid "Change" @@ -865,7 +866,7 @@ msgstr "Huidig wachtwoord" #: src/guiPasswordChange.cpp msgid "Passwords do not match!" -msgstr "Wachtwoorden zijn niet gelijk!" +msgstr "De wachtwoorden zijn niet gelijk!" #: src/guiVolumeChange.cpp msgid "Exit" @@ -873,7 +874,7 @@ msgstr "Terug" #: src/guiVolumeChange.cpp msgid "Sound Volume: " -msgstr "Volume: " +msgstr "Geluidsvolume: " #: src/keycode.cpp msgid "Apps" @@ -889,7 +890,7 @@ msgstr "Terug" #: src/keycode.cpp msgid "Capital" -msgstr "Kapitaal" +msgstr "Hoofdletter" #: src/keycode.cpp msgid "Clear" @@ -997,7 +998,7 @@ msgstr "Min" #: src/keycode.cpp msgid "Mode Change" -msgstr "Modus veranderen" +msgstr "Modus verandering" #: src/keycode.cpp msgid "Next" @@ -1097,7 +1098,7 @@ msgstr "Eerste" #: src/keycode.cpp msgid "Return" -msgstr "Terug" +msgstr "Enter" #: src/keycode.cpp msgid "Right Button" @@ -1161,16 +1162,15 @@ msgstr "X knop 2" #: src/keycode.cpp msgid "Zoom" -msgstr "Zoom" +msgstr "Zoomen" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" "0 = parallax occlusie met helling-informatie (sneller).\n" -"1 = 'relief mapping' (lanzamer, nauwkeuriger)." +"1 = 'reliëf mapping' (lanzamer, nauwkeuriger)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1191,7 +1191,7 @@ msgid "" "- sidebyside: split screen side by side." msgstr "" "3D ondersteuning.\n" -"Op dit moment beschikbaar:\n" +"Op dit moment ondersteund:\n" "- none: geen 3D.\n" "- anaglyph: 3D met de kleuren cyaan en magenta.\n" "- interlaced: 3D voor polariserend scherm (even/oneven beeldlijnen).\n" @@ -1203,10 +1203,10 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Vooringestelde zaadwaarde voor de wereld. Indien leeg, wordt een " -"willekeurige waarde gekozen.\n" -"Wanneer in het hoofdmenu een nieuwe wereld gecreëerd wordt, kan een andere " -"waarde gekozen worden." +"Vooringesteld kiemgetal voor de wereld. Indien leeg, wordt een willekeurige " +"waarde gekozen.\n" +"Wanneer vanuit het hoofdmenu een nieuwe wereld gecreëerd wordt, kan een " +"ander kiemgetal gekozen worden." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." @@ -1255,7 +1255,6 @@ msgstr "" "schermen (niet voor X11 of Android)." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." @@ -1270,16 +1269,15 @@ msgstr "Geavanceerd" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "Zet 'snel' altijd aan bij vliegen" +msgstr "Zet 'snel' altijd aan bij 'vliegen'" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" -msgstr "Anisotrope Filtering" +msgstr "Anisotropische filtering" #: src/settings_translation_file.cpp msgid "Announce server" @@ -1291,9 +1289,9 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" -"URL van de serverlijst.\n" -"Voor het aanmelden van een ipv6 adres bij de minetest serverlijst, " -"configureer 'serverlist_url = v6.servers.minetest.net'." +"URL van de serverlijst om aan te melden.\n" +"Voor het aanmelden van een ipv6 adres bij de minetest serverlijst, gebruik " +"'v6.servers.minetest.net'." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1312,16 +1310,14 @@ msgid "Basic" msgstr "Basis" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" -msgstr "Bi-Lineaire Filtering" +msgstr "Bi-Lineaire filtering" #: src/settings_translation_file.cpp msgid "Bind address" -msgstr "Adres te gebruiken door lokale server" +msgstr "Lokaal server-adres" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bits per pixel (aka color depth) in fullscreen mode." msgstr "Aantal bits per pixel (oftewel: kleurdiepte) in full-screen modus." @@ -1366,12 +1362,13 @@ msgid "Cinematic mode key" msgstr "Cinematic modus aan/uit toets" #: src/settings_translation_file.cpp +#, fuzzy msgid "Clean transparent textures" -msgstr "" +msgstr "Doorzichtige texturen schonen" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Cliënt en server" #: src/settings_translation_file.cpp msgid "Climbing speed" @@ -1391,7 +1388,7 @@ msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Wolken bestaan enkel aan de kant van de cliënt." +msgstr "Wolken bestaan enkel op de cliënt." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1406,18 +1403,17 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" -"Lijst (met komma's gescheiden) van vertrouwde mods die onveilige functies " +"Lijst, door komma's gescheiden, van vertrouwde mods die onveilige functies " "mogen gebruiken,\n" -"zelfs als mod-beveiliging aan staat (via request_insecure_environment())." +"zelfs wanneer mod-beveiliging aan staat (via request_insecure_environment())." #: src/settings_translation_file.cpp msgid "Command key" msgstr "Opdracht-toets" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Verbonden glas" +msgstr "Verbind glas" #: src/settings_translation_file.cpp msgid "Connect to external media server" @@ -1429,7 +1425,7 @@ msgstr "Verbind glas-nodes met elkaar (indien ondersteund door het type node)." #: src/settings_translation_file.cpp msgid "Console alpha" -msgstr "Console-alpha" +msgstr "Console-alphawaarde" #: src/settings_translation_file.cpp msgid "Console color" @@ -1445,7 +1441,7 @@ msgstr "Continu vooruit lopen" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "Speler loopt continu vooruit (enkel gebruikt voor testen)." +msgstr "Speler loopt continu vooruit (wordt enkel gebruikt voor testen)." #: src/settings_translation_file.cpp msgid "Controls" @@ -1476,7 +1472,7 @@ msgstr "Crash boodschap" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "Draadkruis-alpha" +msgstr "Draadkruis-alphawaarde" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." @@ -1499,7 +1495,6 @@ msgid "DPI" msgstr "Scherm DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" msgstr "Verwondingen" @@ -1512,7 +1507,6 @@ msgid "Debug log level" msgstr "Debug logniveau" #: src/settings_translation_file.cpp -#, fuzzy msgid "Dedicated server step" msgstr "Tijdsstaplengte van de server" @@ -1522,15 +1516,15 @@ msgstr "Standaardversnelling" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "Standaardwereld" +msgstr "Standaardspel" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" -"Standaardnaam voor een nieuwe wereld.\n" -"In het hoofdmenu kan een andere naam opgegeven worden." +"Standaardspel bij het maken een nieuwe wereld.\n" +"In het hoofdmenu kan een ander spel geselecteerd worden." #: src/settings_translation_file.cpp msgid "Default password" @@ -1538,7 +1532,7 @@ msgstr "Standaardwachtwoord" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "Standaardrechten" +msgstr "Standaardvoorrechten" #: src/settings_translation_file.cpp msgid "" @@ -1566,7 +1560,7 @@ msgstr "Vertraging bij het tonen van tooltips, in milliseconden." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "Actie bij gebruik van verouderde Lua API functies" +msgstr "Gedrag bij gebruik van verouderde Lua API functies" #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1581,7 +1575,6 @@ msgstr "" "spelers inloggen." #: src/settings_translation_file.cpp -#, fuzzy msgid "Desynchronize block animation" msgstr "Textuur-animaties niet synchroniseren" @@ -1590,7 +1583,6 @@ msgid "Detailed mod profile data. Useful for mod developers." msgstr "Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars." #: src/settings_translation_file.cpp -#, fuzzy msgid "Detailed mod profiling" msgstr "Gedetailleerde profiling van mods" @@ -1604,17 +1596,15 @@ msgstr "Lege wachtwoorden niet toestaan" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "Domeinnaam van de server, wordt getoond in de serverlijst." +msgstr "Domeinnaam van de server; wordt getoond in de serverlijst." #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" msgstr "2x \"springen\" om te vliegen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "2x \"springen\" om te vliegen" +msgstr "2x \"springen\" schakelt vlieg-modus aan/uit." #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1622,10 +1612,9 @@ msgstr "Weggooi-toets" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Print wereldgenerator debug informatie." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Enable a bit lower water surface, so it doesn't \"fill\" the node " "completely.\n" @@ -1634,24 +1623,23 @@ msgid "" msgstr "" "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n" "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n" -"wateroppervlakte werkt niet als dit is ingeschakeld." +"wateroppervlakte werkt niet als dit is aangeschakeld." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" msgstr "Veilige modus voor mods aanzetten" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Schakel verwondingen en sterven van spelers aan." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Schakel willkeurige invoer aan (enkel voor testen)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" +msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)." #: src/settings_translation_file.cpp msgid "" @@ -1667,6 +1655,11 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Zet dit aan om verbindingen van oudere cliënten te weigeren.\n" +"Oudere cliënten zijn compatibel, in de zin dat ze niet crashen als ze " +"verbinding \n" +"maken met nieuwere servers, maar ze ondersteunen wellicht niet alle nieuwere " +"mogelijkheden." #: src/settings_translation_file.cpp msgid "" @@ -1675,6 +1668,11 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Sta het gebruik van een externe media-server toe (indien opgegeven door de " +"server).\n" +"Het gebruik van externe media-servers versnelt het downloaden van media (" +"bijv. texturen) aanzienlijk\n" +"bij het maken van een verbinding met een server." #: src/settings_translation_file.cpp msgid "" @@ -1682,6 +1680,9 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Schakel IPv6 in voor de server. Afhankelijk van de systeemconfiguratie\n" +"kan dit tot gevolg hebben dat enkel IPv6 cliënten verbinding kunnen maken\n" +"Deze instelling wordt genegeerd als een lokaal server-adres ingesteld is." #: src/settings_translation_file.cpp msgid "" @@ -1696,9 +1697,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Schade inschakelen" +msgstr "Schakelt de mini-kaart in." #: src/settings_translation_file.cpp msgid "" @@ -1717,10 +1717,12 @@ msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Experimentele optie. Kan bij een waarde groter dan 0 zichtbare\n" +"ruimtes tussen blokken tot gevolg hebben." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS in het pauze-menu" #: src/settings_translation_file.cpp msgid "FSAA" @@ -1728,60 +1730,63 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "Loopbeweging bij vallen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "needs_fallback_font" +msgstr "Terugval-font" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Terugval-font schaduw" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Terugval-font schaduw alphawaarde" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Terugval-fontgrootte" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Snel toets" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Versnelling in snelle modus" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Snelheid in snelle modus" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Snelle modus" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Snelle beweging toestaan (met de \"gebruiken\" toets).\n" +"Het \"fast\" voorrecht is vereist op de server." #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Zichthoek" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Zichthoek in graden." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"Bestand in de map 'client/serverlist/' met favoriete servers die getoond " +"worden in de multiplayer tab." #: src/settings_translation_file.cpp msgid "" @@ -1792,73 +1797,75 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Geen filter" +msgstr "Filters" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Vast kiemgetal" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "" +msgstr "Vliegen toets" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Vliegen" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Mist" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Mist aan/uitschakelen toets" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Font pad" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Fontschaduw" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Fontschaduw alphawaarde" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Fontschaduw alphawaarde (ondoorzichtigheid, tussen 0 en 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" +msgstr "Fontschaduw afstand. Indien 0, dan wordt geen schaduw getekend." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Fontgrootte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Vooruit" +msgstr "Vooruit toets" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Freetype fonts" #: src/settings_translation_file.cpp msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"Tot welke afstand blokken gegenereerd worden voor cliënten. In mapblokken (" +"16 nodes)." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"Tot welke afstand blokken naar cliënten gestuurd worden. In mapblokken (16 " +"nodes)." #: src/settings_translation_file.cpp msgid "" @@ -1867,32 +1874,31 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Volledig scherm" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "BPP bij volledig scherm" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Volledig scherm modus." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "GUI schaalfactor" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "GUI schaal-factor" +msgstr "GUI schalingsfilter" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "GUI schalingsfilter: txr2img" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gamma" #: src/settings_translation_file.cpp msgid "Generate normalmaps" @@ -1906,18 +1912,23 @@ msgid "" "Flags starting with \"no\" are used to explicitly disable them.\n" "'trees' and 'flat' flags only have effect in mgv6." msgstr "" +"Algemene wereldgenerator instellingen.\n" +"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" +"waarde.\n" +"Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n" +"'trees' en 'flat' zijn enkel van toepassing in mgv6." #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Grafisch" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Zwaartekracht" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "HUD aan/uitschakelen toets" #: src/settings_translation_file.cpp msgid "" @@ -1926,22 +1937,29 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +"Behandeling van verouderde lua api aanroepen:\n" +"- legacy: (probeer) het oude gedrag na te bootsen (standaard voor een " +"'release' versie).\n" +"- log: boots het oude gedrag na, en log een backtrace van de aanroep (" +"standaard voor een 'debug' versie).\n" +"- error: stop de server bij gebruik van een verouderde aanroep (" +"aanbevolen voor mod ontwikkelaars)." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "Hoogte waarop wolken voorbijdrijven." #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "Hoge-nauwkeurigheid FPU" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "Home-pagina van de server. Wordt getoond in de serverlijst." #: src/settings_translation_file.cpp msgid "Horizontal initial window size." -msgstr "" +msgstr "Horizontale aanvangsgroote van het window." #: src/settings_translation_file.cpp msgid "" @@ -1949,45 +1967,58 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" +"Tot op welke afstand van actieve spelers blokken 'actief' zijn. In blokken (" +"van 16 nodes).\n" +"In actieve blokken worden objecten geladen (bijv. dieren die rondlopen) en " +"ABMs uitgevoerd (bijv. groeien van planten)." #: src/settings_translation_file.cpp msgid "" "How many blocks are flying in the wire simultaneously for the whole server." msgstr "" +"Het aantal blokken dat totaal tegelijk onderweg kan zijn, voor de hele " +"server." #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." -msgstr "" +msgstr "Het aantal blokken dat per cliënt tegelijk onderweg kan zijn." #: src/settings_translation_file.cpp msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" +"De tijd die de server wacht voordat een ongebruikt mapblok vergeten wordt.\n" +"Een hogere waarde zorgt voor een vloeiender spelervaring, maar kost meer " +"geheugen." #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "IPv6 server" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "IPv6 ondersteuning." #: src/settings_translation_file.cpp msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"Beperk de FPS tot maximaal deze waarde, zodat geen processor-\n" +"kracht verspild wordt zonder dat het toegevoegde waarde heeft." #: src/settings_translation_file.cpp msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" +"Indien uitgeschakeld, dan wordt met de \"gebruiken\" toets snel gevlogen " +"wanneer de \"vliegen\" en de \"snel\" modus aanstaan." #: src/settings_translation_file.cpp msgid "" @@ -1995,12 +2026,17 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" +"Indien deze optie aanstaat, in combinatie met \"vliegen\" modus, dan kan de " +"speler door vaste objecten heenvliegen.\n" +"Dit vereist het \"noclip\" voorrecht op de server." #: src/settings_translation_file.cpp msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" +"Indien aangeschakeld, dan wordt de \"gebruiken\" toets gebruikt voor " +"omlaagklimmen en dalen i.p.v. de \"kruipen\" toets." #: src/settings_translation_file.cpp msgid "" @@ -2013,7 +2049,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "Valsspeelbescherming uitschakelen multiplayer modus." +msgstr "Valsspeelbescherming uitschakelen in multiplayer modus." #: src/settings_translation_file.cpp msgid "" @@ -2021,12 +2057,12 @@ msgid "" "Only enable this if you know what you are doing." msgstr "" "Zorg dat de server niet stopt in geval van ongeldige wereld-data.\n" -"Alleen aan te schakelen door mensen die weten wat de consequenties zijn." +"Alleen aan te schakelen indien bekend is wat de consequenties zijn." #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." msgstr "" -"Spelers kunnen zich niet aanmelden zonder wachtwoord indien ingeschakeld." +"Spelers kunnen zich niet aanmelden zonder wachtwoord indien aangeschakeld." #: src/settings_translation_file.cpp msgid "" @@ -2034,110 +2070,126 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" -"Indien ingeschakeld, kan een speler blokken plaatsen op de eigen positie (" -"niveau van de voeten en van de ogen).\n" +"Indien aangeschakeld, kan een speler blokken plaatsen op de eigen positie (" +"het niveau van de voeten en van de ogen).\n" "Dit vergemakkelijkt het werken in nauwe ruimtes." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." -msgstr "Indien ingeschakeld, dan spawnen spelers altijd op deze coördinaten." +msgstr "" +"Indien aangeschakeld, dan worden spelers altijd op deze locatie geboren." #: src/settings_translation_file.cpp msgid "Ignore world errors" msgstr "Wereldfouten negeren" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" msgstr "Spel" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." msgstr "" +"Chat console achtergrond alphawaarde (ondoorzichtigheid, tussen 0 en 255)." #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Chat console achtergrondkleur (R,G,B)." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." msgstr "" +"Interval voor het opslaan van belangrijke veranderingen in de wereld. In " +"seconden." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "" +msgstr "Interval voor het sturen van de kloktijd naar cliënten." #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Rugzak" +msgstr "Rugzak toets" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Muibeweging omkeren" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Vertikale muisbeweging omkeren." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "Bestaansduur van objecten" #: src/settings_translation_file.cpp msgid "" "Julia set: (X,Y,Z) offsets from world centre.\n" "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." msgstr "" +"Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n" +"Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand in " +"nodes." #: src/settings_translation_file.cpp msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "" +msgstr "Juliaverzameling: (X,Y,Z) schaal, in nodes (bij benadering)." #: src/settings_translation_file.cpp msgid "" "Julia set: Iterations of the recursive function.\n" "Controls scale of finest detail." msgstr "" +"Juliaverzameling: Aantal iteraties van de recursieve functie.\n" +"Bepaalt de schaal van de kleinste details." #: src/settings_translation_file.cpp msgid "" "Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Juliaverzameling: W-coördinaat van de 3D doorsnede van de 4D vorm.\n" +"Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp msgid "" "Julia set: W value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Juliaverzameling: W-waarde van de 4D vorm.\n" +"Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp msgid "" "Julia set: X value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Juliaverzameling: X-waarde van de 4D vorm.\n" +"Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp msgid "" "Julia set: Y value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Juliaverzameling: Y-waarde van de 4D vorm.\n" +"Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp msgid "" "Julia set: Z value determining the 4D shape.\n" "Range roughly -2 to 2." msgstr "" +"Juliaverzameling: Z-waarde van de 4D-vorm.\n" +"Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Springen" +msgstr "Springen toets" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "Sprinsnelheid" #: src/settings_translation_file.cpp msgid "" @@ -2145,6 +2197,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale " +"zichtafstand.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2152,6 +2208,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets voor het weggooien van het geselecteerde object.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2159,6 +2218,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets voor het vergroten van de zichtafstand. Dit verandert de minimale " +"zichtafstand.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2166,6 +2229,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets voor springen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2173,6 +2239,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om snel te bewegen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2180,6 +2249,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om de speler achteruit te bewegen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2187,6 +2259,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om de speler vooruit te bewegen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2194,6 +2269,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om de speler naar links te bewegen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2201,6 +2279,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om de speler naar rechts te bewegen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2208,6 +2289,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om de chat-console te openen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2215,6 +2299,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om het chat-window te openen om commando's te typen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2222,6 +2309,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om het chat-window te openen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2229,6 +2319,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om het rugzak-window te openen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2236,6 +2329,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om debug-stapels te printen. Gebruikt voor ontwikkeling.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2245,6 +2341,11 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om te kruipen.\n" +"Wordt ook gebruikt om naar beneden te klimmen en te dalen indien " +"aux1_descends uitstaat.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2252,6 +2353,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om tussen 1e-persoon camera en 3e-persoon camera te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2259,6 +2363,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om screenshot te maken.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2266,6 +2373,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om cinematic modus aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2273,6 +2383,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om de mini-kaart aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2280,6 +2393,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om snelle modus aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2287,6 +2403,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om vliegen aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2294,6 +2413,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om 'noclip' modus aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2301,6 +2423,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om camera-verversing aan/uit te schakelen. Enkel gebruikt voor " +"ontwikkeling.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2308,6 +2434,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om debug informatie aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2315,6 +2444,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om de HUD aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2322,6 +2454,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om het tonen van chatberichten aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2329,6 +2464,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om mist aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2336,6 +2474,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om het tonen van de code-profiler aan/uit te schakelen. Gebruikt voor " +"ontwikkeling.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2343,18 +2485,21 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Toets om oneindige zichtastand aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" +"e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "Gebruik de 'gebruiken'-toets voor klimmen en dalen" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Taal" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Type van bladeren" #: src/settings_translation_file.cpp msgid "" @@ -2363,17 +2508,23 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Type bladeren:\n" +"- Fancy: alle zijden zichtbaar\n" +"- Simple: enkel buitenzijden zichtbaar; special_tiles worden gebruikt " +"indien gedefiniëerd\n" +"- Opaque: geen doorzichtige bladeren" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Linker Menu" +msgstr "Toets voor links" #: src/settings_translation_file.cpp msgid "" "Length of a server tick and the interval at which objects are generally " "updated over network." msgstr "" +"Lengte van server stap, en interval waarin objecten via het netwerk ververst " +"worden." #: src/settings_translation_file.cpp msgid "" @@ -2386,14 +2537,20 @@ msgid "" "- info\n" "- verbose" msgstr "" +"Hoeveelheid logging die geschreven wordt naar debug.txt:\n" +"- (geen logging)\n" +"- none (enkel berichten zonder gedefiniëerd niveau)\n" +"- error (alles van minstens fout-niveau)- warning (alles van minstens " +"waarschuwings-niveau)- action (alles van minstens actie-niveau)- info (" +"alles van minstens informatie-niveau)- verbose (alles)" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "" +msgstr "Emerge-wachtrij voor lezen" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "" +msgstr "Emerge-wachtrij voor genereren" #: src/settings_translation_file.cpp msgid "" @@ -2403,10 +2560,15 @@ msgid "" "- Downloads performed by main menu (e.g. mod manager).\n" "Only has an effect if compiled with cURL." msgstr "" +"Beperking van aantal parallele HTTP verzoeken. Van toepassing op:\n" +"- Laden van media indien een externe media-server gebruikt wordt.\n" +"- Laden van de serverlijst en server-aankondigingen.\n" +"- Downloads vanuit het hoofdmens (bijv. mods).\n" +"(Alleen van toepassing indien cURL meegecompileerd is)." #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "Vloeibaarheid van vloeistoffen" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" @@ -2414,62 +2576,68 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "" +msgstr "Vloeistof-verspreiding per stap" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" -msgstr "" +msgstr "Inkortingstijd vloeistof-wachtrij" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "Zinksnelheid in vloeistof" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "Vloeistof verspreidingssnelheid in seconden." #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "" +msgstr "Vloeistof verspreidingssnelheid" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "Hoofdmenu spelbeheer" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Hoofdmenu" +msgstr "Hoofdmenu modbeheer" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Hoofdmenu" +msgstr "Hoofdmenu script" #: src/settings_translation_file.cpp msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" +"Mist en hemelkleur afhankelijk van tijd van de dag (zonsopkomst/ondergang) " +"en kijkrichting." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +"Maakt dat DirectX werkt met LuaJIT. Schakel dit uit als het problemen geeft." #: src/settings_translation_file.cpp msgid "" "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." msgstr "" +"Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n" +" Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand in " +"nodes." #: src/settings_translation_file.cpp msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" +msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)." #: src/settings_translation_file.cpp msgid "" "Mandelbrot set: Iterations of the recursive function.\n" "Controls scale of finest detail." msgstr "" +"Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n" +"Bepaalt de schaal van de kleinste details." #: src/settings_translation_file.cpp msgid "" @@ -2479,7 +2647,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Wereld map" #: src/settings_translation_file.cpp msgid "" @@ -2489,6 +2657,12 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Wereldgeneratie instellingen voor de fractal generator.\n" +"'julia' selecterd een julia-verzameling in plaats van een mandebrot-" +"verzameling.\n" +"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" +"waarde.\n" +"Zet \"no\" voor een vlag om hem expliciet uit te zetten." #: src/settings_translation_file.cpp msgid "" @@ -2499,6 +2673,12 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Wereldgenerator instellingen specified voor generator v6.\n" +"Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt " +"de \"jungles\" vlag genegeerd.\n" +"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" +"waarde.\n" +"Zet \"no\" voor een vlag om hem expliciet uit te zetten." #: src/settings_translation_file.cpp msgid "" @@ -2508,295 +2688,297 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Wereldgenerator instellingen specified voor generator v7.\n" +"\"ridges\" zijn rivieren.\n" +"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" +"waarde.\n" +"Zet \"no\" voor een vlag om hem expliciet uit te zetten." #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "Wereld-grens" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "Interval voor opslaan wereld" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "Max aantal wereldblokken" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "" +msgstr "Wereldblok vergeet-tijd" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "" +msgstr "Wereldgenerator landschapstemperatuur ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "" +msgstr "Wereldgenerator landschapsvochtigheidsovergangen ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "" +msgstr "Wereldgenerator landschapsvochtigheid ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Kaartgenerator" +msgstr "Wereldgenerator debug" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Kaartgenerator" +msgstr "Wereldgenerator vlaggen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Kaartgenerator" +msgstr "Fractal wereldgenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" -msgstr "" +msgstr "Fractal wereldgenerator grotten (1) ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave2 noise parameters" -msgstr "" +msgstr "Fractal wereldgenerator grotten (2) ruisparameters" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen fractal filler depth noise parameters" -msgstr "" +msgstr "Fractal wereldgenerator vuldiepte ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal flags" -msgstr "Kaartgenerator" +msgstr "Fractal wereldgenerator vlaggen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal julia iterations" -msgstr "Parallax occlusie" +msgstr "Fractal wereldgenerator julia iteraties" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia offset" -msgstr "" +msgstr "Fractal wereldgenerator julia centrum-afstand" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia scale" -msgstr "" +msgstr "Fractal wereldgenerator julia schaal" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia slice w" -msgstr "" +msgstr "Fractal wereldgenerator julia w-doorsnede" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "Fractal wereldgenerator julia w" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "Fractal wereldgenerator julia x" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "Fractal wereldgenerator julia y" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "Fractal wereldgenerator julia z" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +msgstr "Fractal wereldgenerator mandelbrot iteraties" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot offset" -msgstr "" +msgstr "Fractal wereldgenerator mandelbrot centrum-afstand" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot scale" -msgstr "" +msgstr "Fractal wereldgenerator mandelbrot schaal" #: src/settings_translation_file.cpp msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +msgstr "Fractal wereldgenerator mandelbrot w-doorsnede" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" -msgstr "" +msgstr "Fractal wereldgenerator zeebodem parameters" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "" +msgstr "Wereldgenerator landschapstemperatuurovergangen ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Kaartgenerator" +msgstr "Wereldgenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Kaartgenerator" +msgstr "Wereldgenerator v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "" +msgstr "Wereldgenerator v5 grot 1 ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "" +msgstr "Wereldgenerator v5 grot 2 ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "" +msgstr "Wereldgenerator v5 ruisparameters factor" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v5 filler depth noise parameters" -msgstr "" +msgstr "Wereldgenerator v5 vuldiepte ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "" +msgstr "Wereldgenerator v5 hoogte ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Kaartgenerator" +msgstr "Wereldgenerator v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 appelbomen ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "" +msgstr "Wereldgenerator v6 strand frequentie" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 strand ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 landschap ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 grotten ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "Wereldgenerator v6 woestijn ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "" +msgstr "Wereldgenerator v6 vlaggen" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 hoogte-selectie ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 vochtigheid ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 modder ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 steilheid ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 terrein-hoogte ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 basisterrein ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "" +msgstr "Wereldgenerator v6 bomen ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Kaartgenerator" +msgstr "Wereldgenerator v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 grotten (1) ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 grotten (2) ruisparameters" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 filler depth noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 vuldiepte ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "" +msgstr "Wereldgenerator v7 vlaggen" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 hoogte-selectie ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 heuvel-hoogte ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 bergen ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 richel ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "" +msgstr "Wereldgenerator richel-water ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 terrein-hoogte ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 terrein basis ruisparameters" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "" +msgstr "Wereldgenerator v7 terrein-'persist' ruisparameters" #: src/settings_translation_file.cpp msgid "Max block generate distance" -msgstr "" +msgstr "Maximale afstand van te genereren blokken" #: src/settings_translation_file.cpp msgid "Max block send distance" -msgstr "" +msgstr "Maximale afstand voor te versturen blokken" #: src/settings_translation_file.cpp msgid "Max liquids processed per step." msgstr "" +"Maximaal aantal vloeistof-nodes te verwerken (dwz verspreiden) per server-" +"stap." #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" -msgstr "" +msgstr "Maximaal extra aantal blokken voor clearobjects" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" -msgstr "" +msgstr "Maximaal aantal pakketten per iteratie" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "Maximum FPS" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "Maximum FPS als het spel gepauzeerd is." #: src/settings_translation_file.cpp msgid "" @@ -2805,40 +2987,52 @@ msgid "" "Smaller values may result in a suitable spawn point not being found,\n" "resulting in a spawn at (0, 0, 0) possibly buried underground." msgstr "" +"Maximum hoogte boven waterniveau waar een speler geboren wordt.\n" +"Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n" +"Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden wordt,\n" +"in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de grond." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "" +msgstr "Maximaal aantal geforceerd geladen blokken" #: src/settings_translation_file.cpp +#, fuzzy msgid "Maximum hotbar width" -msgstr "" +msgstr "Maximale breedte van de 'hotbar'" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." -msgstr "" +msgstr "Maximaal aantal blokken in de wachtrij voor laden/genereren." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Maximaal aantal blokken in de wachtrij om gegenereerd te worden.\n" +"Laat leeg om een geschikt aantal automatisch te laten berekenen." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Maximaal aantal blokken in de wachtrij om van disk geladen te worden.\n" +"Laat leeg om een geschikt aantal automatisch te laten berekenen." #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "" +msgstr "Maximaal aantal geforceerd geladen blokken." #: src/settings_translation_file.cpp msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" +"Maximaal aantal wereldblokken dat door de cliënt in het geheugen gehouden " +"wordt.\n" +"Gebruik -1 voor een onbeperkt aantal." #: src/settings_translation_file.cpp msgid "" @@ -2846,40 +3040,50 @@ msgid "" "try reducing it, but don't reduce it to a number below double of targeted\n" "client number." msgstr "" +"Maximaal aantal pakketen dat per server-stap verzonden wordt. Verminder dit " +"aantal\n" +"bij een langzame verbinding, maar niet lager dan het gewenste aantal " +"cliënten\n" +"dat gelijk verbonden kan zijn." #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "" +msgstr "Maximaal aantal spelers dat tegelijk verbonden kan zijn." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "" +msgstr "Maximaal aantal objecten per block." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Maximum proportion of current window to be used for hotbar.\n" "Useful if there's something to be displayed right or left of hotbar." msgstr "" +"Maximaal gedeelte van het window dat gebruikt mag worden voor de hotbar.\n" +"Dit is nuttig als er iets links of rechts ervan getoond moet worden." #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "" +msgstr "Maximaal aantal tegelijk te verzenden blokken per cliënt" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "" +msgstr "Maximaal aantal tegelijk te verzenden blokken (totaal)" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" +"Maximale duur voor een download van een bestand (bijv. een mod). In " +"milliseconden." #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "Maximaal aantal gebruikers" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "" +msgstr "Maximaal aantal objecten per blok" #: src/settings_translation_file.cpp #, fuzzy @@ -2892,27 +3096,27 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "Bericht van de dag" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." -msgstr "" +msgstr "Toon bericht aan spelers die verbinding maken." #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Mini-kaart" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Mini-kaart toets" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "Mini-kaart scan-hoogte" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" -msgstr "" +msgstr "Minimale textuur-grootte voor filters" #: src/settings_translation_file.cpp msgid "" @@ -2920,6 +3124,9 @@ msgid "" "The amount of rendered stuff is dynamically set according to this. and " "viewing range min and max." msgstr "" +"Minimaal gewenste FPS.\n" +"De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze " +"waarde, en van de min en max zichtafstanden." #: src/settings_translation_file.cpp #, fuzzy @@ -2932,49 +3139,58 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Modstore details URL" -msgstr "" +msgstr "Mod-winkel details URL" #: src/settings_translation_file.cpp msgid "Modstore download URL" -msgstr "" +msgstr "Mod-winkel download URL" #: src/settings_translation_file.cpp msgid "Modstore mods list URL" -msgstr "" +msgstr "Mod-winkel mod-lijst URL" #: src/settings_translation_file.cpp msgid "Monospace font path" -msgstr "" +msgstr "Vaste-breedte font pad" #: src/settings_translation_file.cpp msgid "Monospace font size" -msgstr "" +msgstr "Vaste-breedte font grootte" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "Muis-gevoeligheid" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "Muis-gevoeligheidsfactor." #: src/settings_translation_file.cpp msgid "" "Multiplier for fall bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Vermenigvuldigingsfactor van loopbeweging bij vallen.\n" +"Bijvoorbeeld: 0 voor geen loopbeweging; 1.0 voor normale loopbeweging; 2.0 " +"voor twee keer grotere loopbeweging." #: src/settings_translation_file.cpp msgid "" "Multiplier for view bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Vermenigvuldigingsfactor van loopbeweging.\n" +"Bijvoorbeeld: 0 voor geen loopbeweging; 1.0 voor normale loopbeweging; 2.0 " +"voor twee keer grotere loopbeweging." #: src/settings_translation_file.cpp msgid "" "Name of map generator to be used when creating a new world.\n" "Creating a world in the main menu will override this." msgstr "" +"Wereldgenerator te gebruiken wanneer een nieuwe wereld gecreëerd wordt.\n" +"Bij het maken van een nieuwe wereld vanuit het hoofdmenu kan een andere " +"generator gekozen worden." #: src/settings_translation_file.cpp msgid "" @@ -2982,33 +3198,41 @@ msgid "" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"Naam van de speler.\n" +"Voor servers: spelers met deze naam krijgen beheerdersrechten.\n" +"Voor cliënten: standaardspelernaam voor verbindingen met een server\n" +"(in het hoofdmenu kan een andere naam gekozen worden)." #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." msgstr "" +"Naam van de server. Wordt getoond in de serverlijst, en wanneer spelers " +"inloggen." #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "Netwerk" #: src/settings_translation_file.cpp msgid "" "Network port to listen (UDP).\n" "This value will be overridden when starting from the main menu." msgstr "" +"Netwerkpoort van de server (UDP).\n" +"Bij starten vanuit het hoofdmenu kan een andere poort opgegeven worden." #: src/settings_translation_file.cpp msgid "New style water" -msgstr "" +msgstr "Nieuw water" #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "Nieuwe spelers dienen dit wachtwoord op te geven." #: src/settings_translation_file.cpp msgid "Noclip" -msgstr "" +msgstr "Noclip" #: src/settings_translation_file.cpp #, fuzzy @@ -3016,13 +3240,13 @@ msgid "Noclip key" msgstr "Noclip-toets" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" -msgstr "Node markering" +msgstr "Oplichtende node" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +"Ruisparameters voor landschapstemperaturen, -vochtigheid en -overgangen." #: src/settings_translation_file.cpp msgid "Normalmaps sampling" @@ -3044,10 +3268,11 @@ msgid "" "speed greatly\n" "at the cost of slightly buggy caves." msgstr "" -"Aantal 'emerge' threads. Standaardwaarde hangt af van het aantal processoren." -"\n" -"Op multiprocessor systemen kan dit de generatie van de wereld versnellen.\n" -"Het kan echter vreemde grotten veroorzaken." +"Aantal 'emerge' threads. Laat dit leeg, of verhoog dit aantal om meerdere " +"threads te\n" +"gebruiken. Dit versnelt de wereldgeneratie op meer-processorsystemen " +"aanzienlijk\n" +"maar het kan de vorm van sommige grotten enigszins verstoren." #: src/settings_translation_file.cpp msgid "" @@ -3064,7 +3289,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." -msgstr "" +msgstr "Aantal parallax occlusie iteraties." #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." @@ -3079,14 +3304,12 @@ msgid "Parallax Occlusion" msgstr "Parallax occlusie" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" msgstr "Parallax occlusie" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" -msgstr "Parallax occlusie" +msgstr "Parallax occlusie schaal" #: src/settings_translation_file.cpp #, fuzzy @@ -3094,14 +3317,12 @@ msgid "Parallax occlusion bias" msgstr "Parallax occlusie" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "Parallax occlusie" +msgstr "Parallax occlusie iteraties" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "Parallax occlusie" +msgstr "Parallax occlusie modus" #: src/settings_translation_file.cpp #, fuzzy @@ -3110,44 +3331,48 @@ msgstr "Parallax occlusie" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." -msgstr "" +msgstr "Pad van TrueType font of bitmap." #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "Pad waar screenshots bewaard worden." #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." msgstr "" +"Pad van de texturen-map. Naar texturen wordt gezocht beginnend bij deze map." #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "Fysica" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the \"fly\" privilege on the server." msgstr "" +"Speler kan vliegen, zonder invloed van de zwaartekracht.\n" +"De speler moet wel in het bezit zijn van het \"vliegen\" voorrecht." #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Spelernaam te lang." +msgstr "Spelernaam" #: src/settings_translation_file.cpp msgid "Player transfer distance" -msgstr "" +msgstr "Speler verplaatsingsafstand" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "Speler-gevechten" #: src/settings_translation_file.cpp msgid "" "Port to connect to (UDP).\n" "Note that the port field in the main menu overrides this setting." msgstr "" +"Netwerk-poort (UDP) waarmee verbinding gemaakt moet worden.In het hoofdmenu " +"kan een andere waarde opgegeven worden." #: src/settings_translation_file.cpp msgid "" @@ -3156,27 +3381,33 @@ msgid "" "The generated textures can easily exceed your VRAM, causing artifacts in the " "inventory." msgstr "" +"Genereer beelden van objecten in de rugzak vooraf.\n" +"De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n" +"Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen heeft " +"kan dit resulteren in vreemde effecten." #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Bezig met laden van texturen..." +msgstr "Laad rugzak-texturen vooraf" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +"Voorkom dat mods onveilige commando's uitvoeren, zoals shell commando's." #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" +"Interval waarmee profiler-gegevens geprint worden. 0 = uitzetten. Dit is " +"nuttig voor ontwikkelaars." #: src/settings_translation_file.cpp msgid "Profiler toggle key" -msgstr "" +msgstr "Profiler aan/uit toets" #: src/settings_translation_file.cpp msgid "Profiling print interval" -msgstr "" +msgstr "Profilergegevens print interval" #: src/settings_translation_file.cpp msgid "" @@ -3184,52 +3415,52 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" +"Straal van wolken, in 64-node eenheden.\n" +"Waarden groter dan 26 hebben scherpe wolkenranden tot gevolg." #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "Willekeurige invoer" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Range instellen" +msgstr "Zichtafstand toets" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "Externe media" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "Poort van externe server" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." -msgstr "" +msgstr "Vervangt het standaard hoofdmenu door een ander." #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Rechter Menu" +msgstr "Toets voor rechts" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "Rechts-klik herhalingsinterval" #: src/settings_translation_file.cpp msgid "Rollback recording" -msgstr "" +msgstr "Opnemen terugrolgegevens" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "Ronde mini-kaart" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "" +msgstr "Bewaar de ontvangen wereld lokaal (op de cliënt)." #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "" +msgstr "Lokaal bewaren van de server-wereld" #: src/settings_translation_file.cpp msgid "" @@ -3239,107 +3470,110 @@ msgid "" "pixels when scaling down, at the cost of blurring some\n" "edge pixels when images are scaled by non-integer sizes." msgstr "" +"Schaal de GUI met een bepaalde factor.\n" +"Er wordt een dichtste-buur-anti-alias filter gebruikt om de GUI te schalen.\n" +"Bij verkleinen worden sommige randen minder duidelijk, en worden\n" +"pixels samengevoegd. Pixels bij randen kunnen vager worden als\n" +"een niet-gehele schaalfactor gebruikt wordt." #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "Schermhoogte" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "Schermbreedte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" msgstr "Screenshot" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "Map voor screenshots" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "Veiligheid" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" +msgstr "Zie http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp msgid "Selection box border color (R,G,B)." -msgstr "" +msgstr "Kleur van selectie-randen (R,G,B)." #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "Kleur van selectie-randen" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "Breedte van selectie-randen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Start Singleplayer" +msgstr "Server / Singleplayer" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Server" +msgstr "Server URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Serverpoort" +msgstr "Adres van de server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Serverpoort" +msgstr "Omschrijving van de server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Server" +msgstr "Naam van de server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" -msgstr "Serverpoort" +msgstr "Netwerkpoort van de server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Publieke Serverlijst" +msgstr "URL van de publieke serverlijst" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Publieke Serverlijst" +msgstr "Bestand met publieke serverlijst" #: src/settings_translation_file.cpp msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" +"Stel de taal in. De systeem-taal wordt gebruikt indien leeg.\n" +"Een herstart is noodzakelijk om de nieuwe taal te activeren." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"Bewegende bladeren staan aan indien 'true'.Dit vereist dat 'shaders' ook " +"aanstaan." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" +"Bewegende planten staan aan indien 'true'Dit vereist dat 'shaders' ook " +"aanstaan." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" +"Golvend water staat aan indien 'true'Dit vereist dat 'shaders' ook aanstaan." #: src/settings_translation_file.cpp msgid "Shaders" @@ -3351,52 +3585,58 @@ msgid "" "video cards.\n" "Thy only work with the OpenGL video backend." msgstr "" +"Shaders maken bijzondere visuele effecten mogelijk, en kunnen op sommige " +"videokaarten ook de snelheid verhogen.\n" +"Alleen mogelijk met OpenGL." #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" +msgstr "Vorm van de mini-kaart. Aan = rond, uit = vierkant." #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "Toon debug informatie" #: src/settings_translation_file.cpp msgid "Shutdown message" -msgstr "" +msgstr "Afsluitbericht van server" #: src/settings_translation_file.cpp msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" +"Grootte van chunks die per keer gegenereerd worden door de wereldgenerator " +"in mapblokken (16 nodes)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "Mooie verlichting" +msgstr "Vloeiende verlichting" #: src/settings_translation_file.cpp msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" +"Maakt camerabewegingen vloeiender bij het rondkijken.\n" +"Nuttig bij het opnemen van videos." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." msgstr "" +"Maakt camera-rotatie vloeiender in cintematic modus. 0 om uit te zetten." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "Maakt camera-rotatie vloeiender. O om uit te zetten." #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Kruipen" +msgstr "Kruipen toets" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "Geluid" #: src/settings_translation_file.cpp msgid "" @@ -3405,10 +3645,15 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" +"URL waar de cliënt media kan ophalen, in plaats van deze over UDP\n" +"van de server te ontvangen.\n" +"$filenaam moet via cURL beschikbaar zijn met adres $remote_media$filename\n" +"(remote_media moet dus eindigen in een slash ('/')).\n" +"Bestanden die niet gevonden worden, worden op de normale manier opgehaald." #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "" +msgstr "Vast geboortepunt" #: src/settings_translation_file.cpp msgid "Strength of generated normalmaps." @@ -3420,16 +3665,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Strict protocol checking" -msgstr "" +msgstr "Stricte protocolcontrole" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" -msgstr "" +msgstr "Sqlite synchrone modus" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Texturen" +msgstr "Pad van texturen" #: src/settings_translation_file.cpp msgid "" @@ -3440,17 +3684,20 @@ msgstr "" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." -msgstr "" +msgstr "Het netwerk-adres waar de server op verbindingen wacht." #: src/settings_translation_file.cpp msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" +"De voorrechten standaard gegund aan nieuwe spelers.\n" +"Gebruik het server-commando '/privs' in het spel voor een volledige lijst\n" +"van beschikbare voorrechten op de server." #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." -msgstr "" +msgstr "Het Irrlicht backend voor renderen." #: src/settings_translation_file.cpp msgid "" @@ -3466,34 +3713,44 @@ msgid "" "capacity until an attempt is made to decrease its size by dumping old queue\n" "items. A value of 0 disables the functionality." msgstr "" +"Het aantal seconden dat de vloeistof-verspreidingswachtrij mag groeien\n" +"terwijl die al te lang is. Bij overschrijding van deze tijd worden oude " +"items\n" +"uit de rij verwijderd. Gebruik 0 om dit uit te zetten." #: src/settings_translation_file.cpp msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" +"De tijd in seconden tussen herhaalde rechts-klikken als de rechter muisknop " +"ingedrukt gehouden wordt." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "" +msgstr "Dit font wordt gebruikt voor bepaalde talen." #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"De tijd in seconden dat weggegooide of gevallen objecten bestaan.\n" +"Gebruik -1 voor een onbeperkte bestaansduur." #: src/settings_translation_file.cpp msgid "Time send interval" -msgstr "" +msgstr "Kloktijd verstuur-interval" #: src/settings_translation_file.cpp msgid "Time speed" -msgstr "" +msgstr "Tijdsnelheid" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." msgstr "" +"Tijdsduur waarna de cliënt ongebruikte wereldgegevens uit het geheugen " +"verwijdert." #: src/settings_translation_file.cpp msgid "" @@ -3502,17 +3759,20 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" +"Om vertraging te verminderen worden blokken minder snel verstuurd als een " +"speler aan het bouwen is.\n" +"Deze instelling bepaalt hoelang ze achtergehouden worden nadat een speler " +"een node geplaatst of verwijderd heeft." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "Camera-modus veranderen toets" #: src/settings_translation_file.cpp msgid "Tooltip delay" -msgstr "" +msgstr "Tooltip tijdsduur" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "Tri-Lineare Filtering" @@ -3522,153 +3782,147 @@ msgid "" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"Aan = 256\n" +"Uit = 128\n" +"Gebruik dit om de mini-kaart sneller te maken op langzamere machines." #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "" +msgstr "Vertrouwde mods" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" +msgstr "URL voor de serverlijst in de multiplayer tab." #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" -msgstr "" +msgstr "Onbeperkte speler zichtbaarheidsafstand" #: src/settings_translation_file.cpp msgid "Unload unused server data" -msgstr "" +msgstr "Vergeet ongebruikte server gegevens" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "Toon 3D wolken in plaats van platte wolken." #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." -msgstr "" +msgstr "Toon wolken in de achtergrond van het hoofdmenu." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" +msgstr "Gebruik anisotropische filtering voor texturen getoond onder een hoek." #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." -msgstr "" +msgstr "Gebruik bi-lineaire filtering bij het schalen van texturen." #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "druk op" +msgstr "Gebruiken toets" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." msgstr "" +"Gebruik mip-mapping om texturen te schalen. Kan een snelheidsverbetering " +"geven." #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." -msgstr "" +msgstr "Gebruik tri-lineaire filtering om texturen te schalen." #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Eerdere hoofdontwikkelaars" +msgstr "Nuttig voor mod-ontwikkelaars." #: src/settings_translation_file.cpp msgid "V-Sync" -msgstr "" +msgstr "V-Sync" #: src/settings_translation_file.cpp msgid "Vertical initial window size." -msgstr "" +msgstr "Aanvangshoogte van het window." #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "" +msgstr "Vertikale scherm-synchronisatie." #: src/settings_translation_file.cpp msgid "Vertical spawn range" -msgstr "" +msgstr "Vertikaal geboortegebied" #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "Video driver" #: src/settings_translation_file.cpp msgid "View bobbing" -msgstr "" +msgstr "Loopbeweging" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "" +msgstr "Toets voor verkleinen zichtafstand" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "" +msgstr "Toets voor vergroten zichtafstand" #: src/settings_translation_file.cpp msgid "Viewing range maximum" -msgstr "" +msgstr "Maximale zichtafstand" #: src/settings_translation_file.cpp msgid "Viewing range minimum" -msgstr "" +msgstr "Minimale zichtafstand" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" -msgstr "Volume" +msgstr "Geluidsniveau" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Bewegende bladeren" +msgstr "Loopsnelheid" #: src/settings_translation_file.cpp msgid "Wanted FPS" -msgstr "" +msgstr "Gewenste FPS" #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "Waterniveau" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "Waterniveau van de wereld." #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "Bewegende bladeren" +msgstr "Bewegende nodes" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" msgstr "Bewegende bladeren" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" msgstr "Bewegende planten" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "Golvend water" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "Golvend water" +msgstr "Golfhoogte van water" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "Golvend water" +msgstr "Golflengte van water" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Golvend water" +msgstr "Golfsnelheid van water" #: src/settings_translation_file.cpp msgid "" @@ -3676,6 +3930,10 @@ msgid "" "filtered in software, but some images are generated directly\n" "to hardware (e.g. render-to-texture for nodes in inventory)." msgstr "" +"Als gui_scaling_filter aan staat worden alle GUI-plaatjes\n" +"softwarematig gefilterd. Sommige plaatjes worden wel direct\n" +"in hardware gegenereerd (bijv. render-to-texture voor nodes\n" +"in de rugzak)." #: src/settings_translation_file.cpp msgid "" @@ -3695,6 +3953,16 @@ msgid "" "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" "enabled." msgstr "" +"Als bi-lineaire, tri-lineaire of anisotropische filters gebruikt worden, " +"dan\n" +"kunnen lage-resolutie texturen vaag worden. Verhoog hun resolutie dmv\n" +"naaste-buur-interpolatie zodat de scherpte behouden blijft. Deze optie\n" +"bepaalt de minimale textuurgroote na het verhogen van de resolutie. Hogere\n" +"waarden geven een scherper beeld, maar kosten meer geheugen. Het is " +"aanbevolen\n" +"machten van 2 te gebruiken. Een waarde groter dan 1 heeft wellicht geen " +"zichtbaar\n" +"effect indien bi-lineaire, tri-lineaire of anisotropische niet aan staan." #: src/settings_translation_file.cpp msgid "" @@ -3705,62 +3973,77 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"Grenzen van de wereldgenerator.\n" +"- Maximale waarde: 31000 (hogere waarden worden niet gehonoreerd).\n" +"- De wereld wordt gegenereerd per gebied van 80x80x80 nodes (5x5x5 " +"mapblokken).\n" +"- Het centrum-gebied begint op coördinaten (-32, -32, -32).\n" +"- Enkel groepen die vallen binnen map_generation_limit worden gegenereerd" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "" +msgstr "Gebruik freetype fonts. Dit vereist dat freetype ingecompileerd is." #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "" +msgstr "Node-animaties in wereldblokken niet synchroniseren." #: src/settings_translation_file.cpp msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" +"Geef de locatie van spelers door aan cliënten ongeacht de afstand.\n" +"Verouderd. Gebruik 'player_transfer_distance'." #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "" +msgstr "Maak het mogelijk dat spelers elkaar kunnen verwonden en doden." #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"Verzoek de cliënten om na een servercrash automatisch opnieuw te verbinden.\n" +"Zet dit aan als de server na een crash automatisch herstart." #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "Maak het einde van het zichtbereik mistig, zodat het einde niet opvalt." #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +"Laat debug informatie zien in de cliënt (heeft hetzelfde effect als de F5 " +"toets)." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "Breedte van de lijnen om een geselecteerde node." #: src/settings_translation_file.cpp msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" +"Wereld-map (alle informatie over de wereld staat in deze map).\n" +"Deze instelling is niet nodig als de server vanuit het hoofdmenu wordt " +"gestart." #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "timeout voor cURL download" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "Maximaal parallellisme in cURL" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "cURL timeout" #~ msgid "Are you sure to reset your singleplayer world?" #~ msgstr "Weet je zeker dat je je wereld wilt resetten?" From d1c0aa1ce7586329f5a5c6a9d30712a7025e71ae Mon Sep 17 00:00:00 2001 From: Rui Date: Sat, 19 Dec 2015 11:07:16 +0100 Subject: [PATCH 159/531] Translated using Weblate (Japanese) Currently translated at 40.0% (315 of 787 strings) --- po/ja/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index c98ebec5..fcd189d9 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-23 07:16+0000\n" +"PO-Revision-Date: 2015-12-19 11:07+0000\n" "Last-Translator: Rui \n" "Language-Team: Japanese " "\n" @@ -136,7 +136,7 @@ msgstr "minetest.netからminetest_gameなどのサブゲームをダウンロ #: builtin/mainmenu/dlg_create_world.lua #, fuzzy msgid "Download one from minetest.net" -msgstr "minetest.netから再ダウンロードしてください" +msgstr "minetest.netからダウンロードしてください" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -3661,7 +3661,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "cURLタイムアウト" #~ msgid "2x" #~ msgstr "2倍" From 7eb3ed8b2a93bb28ebd2e581bf37e6487912d242 Mon Sep 17 00:00:00 2001 From: Gianluca Luparini Date: Mon, 21 Dec 2015 22:09:55 +0100 Subject: [PATCH 160/531] Translated using Weblate (Italian) Currently translated at 43.8% (345 of 787 strings) --- po/it/minetest.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 83226aa2..b6acf55e 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-12-14 23:08+0000\n" -"Last-Translator: Luca Argentieri \n" +"PO-Revision-Date: 2015-12-21 22:09+0000\n" +"Last-Translator: Gianluca Luparini \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -451,9 +451,8 @@ msgid "Enabled" msgstr "Attivato" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Il formato è da 3 numeri separati da virgole e dentro parentesi" +msgstr "Il formato è da 3 numeri separati da virgole e dentro parentesi." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -885,6 +884,7 @@ msgid "Apps" msgstr "Applicazioni" #: src/keycode.cpp +#, fuzzy msgid "Attn" msgstr "Attn" From 98d16e0d9a945f5f48462c05f26ae4bde2db5731 Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 23 Dec 2015 04:51:09 +0100 Subject: [PATCH 161/531] Android: Tell make about sub-makes to speed up build Before, sub-makes called by make were called without make knowing they were sub-makes. This however led make's jobserver not do its tasks, and the build process ended up with inefficient parralelisation. This commit fixes this by applying the two ways the make manual tells about: putting + to the start of the line (used when ndk-build is invoked), and exchanging "make" with "$(MAKE)". Before, make complained with messages like: make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. This complaint can now only been seen for openssl. openssl has issues if make gets exchanged with $(MAKE): if exchanged, above error message is multiplied for various subdirs of the openssl source tree. On a 4 core box, "make -j 4" build time from "make clean_all" cleaned source tree could be improved from 15:34 minutes to 10:45 minutes. This means a speedup of 45%. --- build/android/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index 42a46254..50164d95 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -229,7 +229,7 @@ openal_download : openal : $(OPENAL_LIB) $(OPENAL_LIB): $(OPENAL_TIMESTAMP) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${OPENAL_TIMESTAMP_INT} ] ; then \ REFRESH=1; \ fi; \ @@ -274,7 +274,7 @@ ogg_download : ogg : $(OGG_LIB) $(OGG_LIB): $(OGG_TIMESTAMP) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${OGG_TIMESTAMP_INT} ] ; then \ echo "${OGG_TIMESTAMP_INT} doesn't exist"; \ REFRESH=1; \ @@ -419,7 +419,7 @@ freetype_download : freetype : $(FREETYPE_LIB) $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${FREETYPE_TIMESTAMP_INT} ] ; then \ REFRESH=1; \ fi; \ @@ -535,7 +535,7 @@ $(IRRLICHT_TIMESTAMP) : irrlicht_download irrlicht : $(IRRLICHT_LIB) $(IRRLICHT_LIB): $(IRRLICHT_TIMESTAMP) $(FREETYPE_LIB) - @REFRESH=0; \ + + @REFRESH=0; \ if [ ! -e ${IRRLICHT_TIMESTAMP_INT} ] ; then \ REFRESH=1; \ fi; \ From 9c9b02ca8ad2753ad9c2e10e5b40e23029739634 Mon Sep 17 00:00:00 2001 From: Sapier Date: Fri, 18 Dec 2015 20:05:13 +0100 Subject: [PATCH 162/531] Android: shorten initial progress bar text way more simple --- build/android/res/layout/assetcopy.xml | 4 +- .../minetest/minetest/MinetestAssetCopy.java | 44 +------------------ 2 files changed, 5 insertions(+), 43 deletions(-) diff --git a/build/android/res/layout/assetcopy.xml b/build/android/res/layout/assetcopy.xml index ade4b0c9..8ec14bdc 100644 --- a/build/android/res/layout/assetcopy.xml +++ b/build/android/res/layout/assetcopy.xml @@ -13,8 +13,10 @@ diff --git a/build/android/src/net/minetest/minetest/MinetestAssetCopy.java b/build/android/src/net/minetest/minetest/MinetestAssetCopy.java index 5776e77b..eb92acb6 100644 --- a/build/android/src/net/minetest/minetest/MinetestAssetCopy.java +++ b/build/android/src/net/minetest/minetest/MinetestAssetCopy.java @@ -254,54 +254,14 @@ public class MinetestAssetCopy extends Activity boolean shortened = false; String todisplay = m_tocopy.get(progress[0]); m_ProgressBar.setProgress(progress[0]); - - // make sure our text doesn't exceed our layout width - Rect bounds = new Rect(); - Paint textPaint = m_Filename.getPaint(); - textPaint.getTextBounds(todisplay, 0, todisplay.length(), bounds); - - while (bounds.width() > getResources().getDisplayMetrics().widthPixels * 0.7) { - if (todisplay.length() < 2) { - break; - } - todisplay = todisplay.substring(1); - textPaint.getTextBounds(todisplay, 0, todisplay.length(), bounds); - shortened = true; - } - - if (! shortened) { - m_Filename.setText(todisplay); - } - else { - m_Filename.setText(".." + todisplay); - } + m_Filename.setText(todisplay); } else { boolean shortened = false; String todisplay = m_Foldername; String full_text = "scanning " + todisplay + " ..."; - // make sure our text doesn't exceed our layout width - Rect bounds = new Rect(); - Paint textPaint = m_Filename.getPaint(); - textPaint.getTextBounds(full_text, 0, full_text.length(), bounds); - - while (bounds.width() > getResources().getDisplayMetrics().widthPixels * 0.7) { - if (todisplay.length() < 2) { - break; - } - todisplay = todisplay.substring(1); - full_text = "scanning " + todisplay + " ..."; - textPaint.getTextBounds(full_text, 0, full_text.length(), bounds); - shortened = true; - } - - if (! shortened) { - m_Filename.setText(full_text); - } - else { - m_Filename.setText("scanning .." + todisplay + " ..."); - } + m_Filename.setText(full_text); } } From cdbb9ef228f40863761fb73ff7575a0b0fb1fea9 Mon Sep 17 00:00:00 2001 From: Sapier Date: Fri, 25 Dec 2015 14:11:39 +0100 Subject: [PATCH 163/531] Add missing documentation of automatic_face_movement_max_rotation_per_sec entity parameter --- doc/lua_api.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 45a47c9a..b713b68b 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3233,6 +3233,8 @@ Definition tables stepheight = 0, automatic_face_movement_dir = 0.0, -- ^ automatically set yaw to movement direction; offset in degrees; false to disable + automatic_face_movement_max_rotation_per_sec = -1, + -- ^ limit automatic rotation to this value in degrees per second. values < 0 no limit backface_culling = true, -- false to disable backface_culling for model nametag = "", -- by default empty, for players their name is shown if empty nametag_color = , -- sets color of nametag as ColorSpec From e834e83ed8c1208dcfe945abf5900e278fa3f518 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 23 Dec 2015 23:51:06 +0100 Subject: [PATCH 164/531] Update URLs for buildbot & travis The freehoster these files were hosted on is shutting down soon-ish, they're now hosted on my VPS. --- util/buildbot/buildwin32.sh | 26 +++++++++++++------------- util/buildbot/buildwin64.sh | 22 +++++++++++----------- util/travis/before_install.sh | 6 +++--- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index a9126b9f..78d189b8 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -30,31 +30,31 @@ mkdir -p $libdir cd $builddir # Get stuff -[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://sfan5.pf-control.de/irrlicht-$irrlicht_version-win32.zip \ +[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win32.zip \ -c -O $packagedir/irrlicht-$irrlicht_version.zip -[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://sfan5.pf-control.de/zlib-$zlib_version-win32.zip \ +[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \ -c -O $packagedir/zlib-$zlib_version.zip -[ -e $packagedir/libogg-$ogg_version-dev.7z ] || wget http://sfan5.pf-control.de/libogg-$ogg_version-dev.7z \ +[ -e $packagedir/libogg-$ogg_version-dev.7z ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-dev.7z \ -c -O $packagedir/libogg-$ogg_version-dev.7z -[ -e $packagedir/libogg-$ogg_version-dll.7z ] || wget http://sfan5.pf-control.de/libogg-$ogg_version-dll.7z \ +[ -e $packagedir/libogg-$ogg_version-dll.7z ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-dll.7z \ -c -O $packagedir/libogg-$ogg_version-dll.7z -[ -e $packagedir/libvorbis-$vorbis_version-dev.7z ] || wget http://sfan5.pf-control.de/libvorbis-$vorbis_version-dev.7z \ +[ -e $packagedir/libvorbis-$vorbis_version-dev.7z ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-dev.7z \ -c -O $packagedir/libvorbis-$vorbis_version-dev.7z -[ -e $packagedir/libvorbis-$vorbis_version-dll.7z ] || wget http://sfan5.pf-control.de/libvorbis-$vorbis_version-dll.7z \ +[ -e $packagedir/libvorbis-$vorbis_version-dll.7z ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-dll.7z \ -c -O $packagedir/libvorbis-$vorbis_version-dll.7z -[ -e $packagedir/libcurl-$curl_version.zip ] || wget http://sfan5.pf-control.de/libcurl-$curl_version-win32.zip \ +[ -e $packagedir/libcurl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/libcurl-$curl_version-win32.zip \ -c -O $packagedir/libcurl-$curl_version.zip -[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://sfan5.pf-control.de/gettext-$gettext_version.zip \ +[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version.zip \ -c -O $packagedir/gettext-$gettext_version.zip -[ -e $packagedir/libfreetype-$freetype_version.zip ] || wget http://sfan5.pf-control.de/libfreetype-$freetype_version-win32.zip \ +[ -e $packagedir/libfreetype-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/libfreetype-$freetype_version-win32.zip \ -c -O $packagedir/libfreetype-$freetype_version.zip -[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://sfan5.pf-control.de/sqlite3-$sqlite3_version-win32.zip \ +[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \ -c -O $packagedir/sqlite3-$sqlite3_version.zip -[ -e $packagedir/luajit-$luajit_version-static-win32.zip ] || wget http://sfan5.pf-control.de/luajit-$luajit_version-static-win32.zip \ +[ -e $packagedir/luajit-$luajit_version-static-win32.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-static-win32.zip \ -c -O $packagedir/luajit-$luajit_version-static-win32.zip -[ -e $packagedir/libleveldb-$leveldb_version-win32.zip ] || wget http://sfan5.pf-control.de/libleveldb-$leveldb_version-win32.zip \ +[ -e $packagedir/libleveldb-$leveldb_version-win32.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \ -c -O $packagedir/libleveldb-$leveldb_version-win32.zip -[ -e $packagedir/openal_stripped.zip ] || wget http://sfan5.pf-control.de/openal_stripped.zip \ +[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \ -c -O $packagedir/openal_stripped.zip # Extract stuff diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index 6ab56e72..e13cbd02 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -30,27 +30,27 @@ mkdir -p $libdir cd $builddir # Get stuff -[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://sfan5.pf-control.de/irrlicht-$irrlicht_version-win64.zip \ +[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win64.zip \ -c -O $packagedir/irrlicht-$irrlicht_version.zip -[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://sfan5.pf-control.de/zlib-$zlib_version-win64.zip \ +[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \ -c -O $packagedir/zlib-$zlib_version.zip -[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://sfan5.pf-control.de/libogg-$ogg_version-win64.zip \ +[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip \ -c -O $packagedir/libogg-$ogg_version.zip -[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://sfan5.pf-control.de/libvorbis-$vorbis_version-win64.zip \ +[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \ -c -O $packagedir/libvorbis-$vorbis_version.zip -[ -e $packagedir/libcurl-$curl_version.zip ] || wget http://sfan5.pf-control.de/libcurl-$curl_version-win64.zip \ +[ -e $packagedir/libcurl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/libcurl-$curl_version-win64.zip \ -c -O $packagedir/libcurl-$curl_version.zip -[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://sfan5.pf-control.de/gettext-$gettext_version-win64.zip \ +[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \ -c -O $packagedir/gettext-$gettext_version.zip -[ -e $packagedir/freetype-$freetype_version.zip ] || wget http://sfan5.pf-control.de/libfreetype-$freetype_version-win64.zip \ +[ -e $packagedir/freetype-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/libfreetype-$freetype_version-win64.zip \ -c -O $packagedir/freetype-$freetype_version.zip -[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://sfan5.pf-control.de/sqlite3-$sqlite3_version-win64.zip \ +[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \ -c -O $packagedir/sqlite3-$sqlite3_version.zip -[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://sfan5.pf-control.de/luajit-$luajit_version-static-win64.zip \ +[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-static-win64.zip \ -c -O $packagedir/luajit-$luajit_version.zip -[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://sfan5.pf-control.de/libleveldb-$leveldb_version-win64.zip \ +[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \ -c -O $packagedir/libleveldb-$leveldb_version.zip -[ -e $packagedir/openal_stripped.zip ] || wget http://sfan5.pf-control.de/openal_stripped64.zip \ +[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped64.zip \ -c -O $packagedir/openal_stripped.zip diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index 20f6674a..e3276e0d 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -15,16 +15,16 @@ if [[ $PLATFORM == "Linux" ]]; then libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \ libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext # Linking to LevelDB is broken, use a custom build - wget http://sfan5.pf-control.de/libleveldb-1.18-ubuntu12.04.7z + wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z elif [[ $PLATFORM == "Win32" ]]; then - wget http://sfan5.pf-control.de/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z + wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z sed -e "s|%PREFIX%|i686-w64-mingw32|" \ -e "s|%ROOTPATH%|/usr/i686-w64-mingw32|" \ < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw.cmake sudo 7z x -y -o/usr mingw.7z elif [[ $PLATFORM == "Win64" ]]; then - wget http://sfan5.pf-control.de/mingw_w64_x86_64_ubuntu12.04_4.9.1.7z -O mingw.7z + wget http://minetest.kitsunemimi.pw/mingw_w64_x86_64_ubuntu12.04_4.9.1.7z -O mingw.7z sed -e "s|%PREFIX%|x86_64-w64-mingw32|" \ -e "s|%ROOTPATH%|/usr/x86_64-w64-mingw32|" \ < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake From 382ab969d4de29cd5f74db2de433a37254d40d2a Mon Sep 17 00:00:00 2001 From: "jeanpatrick.guerrero@gmail.com" Date: Fri, 25 Dec 2015 22:10:29 +0100 Subject: [PATCH 165/531] Alphabetical sorting of texture packs in menu (fixes #3487) --- builtin/mainmenu/tab_texturepacks.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/mainmenu/tab_texturepacks.lua b/builtin/mainmenu/tab_texturepacks.lua index 5514d31f..d8b9ba35 100644 --- a/builtin/mainmenu/tab_texturepacks.lua +++ b/builtin/mainmenu/tab_texturepacks.lua @@ -17,12 +17,16 @@ -------------------------------------------------------------------------------- local function filter_texture_pack_list(list) - local retval = {fgettext("None")} + local retval = {} for _, item in ipairs(list) do if item ~= "base" then table.insert(retval, item) end end + + table.sort(retval) + table.insert(retval, 1, fgettext("None")) + return retval end From 8a46c5df1c1b7d7c2b46b73f973a45388a517e71 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 26 Dec 2015 17:01:41 +0100 Subject: [PATCH 166/531] Database backends: fix bug, and small speedup -> Redis backend: break from switch to fix bug -> Dummy and redis backends: reserve the count so that creating the list is faster --- src/database-dummy.cpp | 1 + src/database-redis.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp index 2e5de5ed..b38db1fb 100644 --- a/src/database-dummy.cpp +++ b/src/database-dummy.cpp @@ -47,6 +47,7 @@ bool Database_Dummy::deleteBlock(const v3s16 &pos) void Database_Dummy::listAllLoadableBlocks(std::vector &dst) { + dst.reserve(m_database.size()); for (std::map::const_iterator x = m_database.begin(); x != m_database.end(); ++x) { dst.push_back(getIntegerAsBlock(x->first)); diff --git a/src/database-redis.cpp b/src/database-redis.cpp index b15f546b..196d72f2 100644 --- a/src/database-redis.cpp +++ b/src/database-redis.cpp @@ -169,10 +169,12 @@ void Database_Redis::listAllLoadableBlocks(std::vector &dst) } switch (reply->type) { case REDIS_REPLY_ARRAY: + dst.reserve(reply->elements); for (size_t i = 0; i < reply->elements; i++) { assert(reply->element[i]->type == REDIS_REPLY_STRING); dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str))); } + break; case REDIS_REPLY_ERROR: throw FileNotGoodException(std::string( "Failed to get keys from database: ") + reply->str); From e2d54c9f9275e4f77ec33be8054621d42945f7a4 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 26 Dec 2015 16:19:09 +0100 Subject: [PATCH 167/531] shutdown when requested from lua in singleplayer too Before, minetest.request_shutdown didn't shut down singleplayer instances or server instances from the server tab. This commit fixes this. Fixes #3489. --- src/game.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game.cpp b/src/game.cpp index 3f025f6d..25424fa2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1816,7 +1816,9 @@ void Game::run() && client->checkPrivilege("fast"); #endif - while (device->run() && !(*kill || g_gamecallback->shutdown_requested)) { + while (device->run() + && !(*kill || g_gamecallback->shutdown_requested + || server->getShutdownRequested())) { /* Must be called immediately after a device->run() call because it * uses device->getTimer()->getTime() From f14e7bac54af65e3d3d99f89f23f114b17058e49 Mon Sep 17 00:00:00 2001 From: Sapier Date: Sat, 19 Dec 2015 13:29:06 +0100 Subject: [PATCH 168/531] Refactoring and code style fixes in preparation of adding mesh typed items --- src/itemdef.cpp | 789 ++++++++++++++++++++++++------------------------ src/itemdef.h | 82 ++++- 2 files changed, 477 insertions(+), 394 deletions(-) diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 60a7dc64..fa277f4f 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -28,15 +28,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock_mesh.h" #include "mesh.h" #include "wieldmesh.h" -#include "client/tile.h" #endif #include "log.h" #include "settings.h" #include "util/serialize.h" -#include "util/container.h" -#include "util/thread.h" -#include -#include #ifdef __ANDROID__ #include @@ -227,429 +222,437 @@ void ItemDefinition::deSerialize(std::istream &is) // SUGG: Support chains of aliases? -class CItemDefManager: public IWritableItemDefManager +#ifndef SERVER +CItemDefManager::ClientCached::ClientCached() : + inventory_texture(NULL), + wield_mesh(NULL) +{} +#endif + +CItemDefManager::CItemDefManager() { #ifndef SERVER - struct ClientCached - { - video::ITexture *inventory_texture; - scene::IMesh *wield_mesh; - - ClientCached(): - inventory_texture(NULL), - wield_mesh(NULL) - {} - }; + m_main_thread = thr_get_current_thread_id(); #endif + clear(); +} -public: - CItemDefManager() - { - +/******************************************************************************/ +CItemDefManager::~CItemDefManager() +{ #ifndef SERVER - m_main_thread = thr_get_current_thread_id(); -#endif - clear(); + const std::vector &values = m_clientcached.getValues(); + for(std::vector::const_iterator + i = values.begin(); i != values.end(); ++i) { + + ClientCached *cc = *i; + if (cc->wield_mesh) + cc->wield_mesh->drop(); + delete cc; } - virtual ~CItemDefManager() - { + +#endif + for (std::map::iterator iter = + m_item_definitions.begin(); iter != m_item_definitions.end(); + ++iter) { + + delete iter->second; + } + m_item_definitions.clear(); +} + +/******************************************************************************/ +const ItemDefinition& CItemDefManager::get(const std::string &name_) const +{ + // Convert name according to possible alias + std::string name = getAlias(name_); + // Get the definition + std::map::const_iterator i; + i = m_item_definitions.find(name); + if(i == m_item_definitions.end()) + i = m_item_definitions.find("unknown"); + assert(i != m_item_definitions.end()); + return *(i->second); +} + +/******************************************************************************/ +std::string CItemDefManager::getAlias(const std::string &name) const +{ + StringMap::const_iterator it = m_aliases.find(name); + if (it != m_aliases.end()) + return it->second; + + return name; +} + +/******************************************************************************/ +std::set CItemDefManager::getAll() const +{ + std::set result; + for(std::map::const_iterator + it = m_item_definitions.begin(); + it != m_item_definitions.end(); ++it) { + + result.insert(it->first); + } + for (StringMap::const_iterator + it = m_aliases.begin(); + it != m_aliases.end(); ++it) { + + result.insert(it->first); + } + return result; +} + +/******************************************************************************/ +bool CItemDefManager::isKnown(const std::string &name_) const +{ + // Convert name according to possible alias + std::string name = getAlias(name_); + // Get the definition + std::map::const_iterator i; + + return m_item_definitions.find(name) != m_item_definitions.end(); +} #ifndef SERVER - const std::vector &values = m_clientcached.getValues(); - for(std::vector::const_iterator - i = values.begin(); i != values.end(); ++i) - { - ClientCached *cc = *i; - if (cc->wield_mesh) - cc->wield_mesh->drop(); - delete cc; - } -#endif - for (std::map::iterator iter = - m_item_definitions.begin(); iter != m_item_definitions.end(); - ++iter) { - delete iter->second; - } - m_item_definitions.clear(); - } - virtual const ItemDefinition& get(const std::string &name_) const - { - // Convert name according to possible alias - std::string name = getAlias(name_); - // Get the definition - std::map::const_iterator i; - i = m_item_definitions.find(name); - if(i == m_item_definitions.end()) - i = m_item_definitions.find("unknown"); - assert(i != m_item_definitions.end()); - return *(i->second); - } - virtual std::string getAlias(const std::string &name) const - { - StringMap::const_iterator it = m_aliases.find(name); - if (it != m_aliases.end()) - return it->second; - return name; - } - virtual std::set getAll() const - { - std::set result; - for(std::map::const_iterator - it = m_item_definitions.begin(); - it != m_item_definitions.end(); ++it) { - result.insert(it->first); - } - for (StringMap::const_iterator - it = m_aliases.begin(); - it != m_aliases.end(); ++it) { - result.insert(it->first); - } - return result; - } - virtual bool isKnown(const std::string &name_) const - { - // Convert name according to possible alias - std::string name = getAlias(name_); - // Get the definition - std::map::const_iterator i; - return m_item_definitions.find(name) != m_item_definitions.end(); - } -#ifndef SERVER -public: - ClientCached* createClientCachedDirect(const std::string &name, - IGameDef *gamedef) const - { - infostream<<"Lazily creating item texture and mesh for \"" - <getTextureSource(); - INodeDefManager *nodedef = gamedef->getNodeDefManager(); - const ItemDefinition &def = get(name); - - // Create new ClientCached - cc = new ClientCached(); - - // Create an inventory texture - cc->inventory_texture = NULL; - if(def.inventory_image != "") - cc->inventory_texture = tsrc->getTexture(def.inventory_image); - - // Additional processing for nodes: - // - Create a wield mesh if WieldMeshSceneNode can't render - // the node on its own. - // - If inventory_texture isn't set yet, create one using - // render-to-texture. - if (def.type == ITEM_NODE) { - // Get node properties - content_t id = nodedef->getId(name); - const ContentFeatures &f = nodedef->get(id); - - bool need_rtt_mesh = cc->inventory_texture == NULL; - - // Keep this in sync with WieldMeshSceneNode::setItem() - bool need_wield_mesh = - !(f.mesh_ptr[0] || - f.drawtype == NDT_NORMAL || - f.drawtype == NDT_ALLFACES || - f.drawtype == NDT_AIRLIKE); - - scene::IMesh *node_mesh = NULL; - - if (need_rtt_mesh || need_wield_mesh) { - u8 param1 = 0; - if (f.param_type == CPT_LIGHT) - param1 = 0xee; - - /* - Make a mesh from the node - */ - MeshMakeData mesh_make_data(gamedef, false); - u8 param2 = 0; - if (f.param_type_2 == CPT2_WALLMOUNTED) - param2 = 1; - MapNode mesh_make_node(id, param1, param2); - mesh_make_data.fillSingleNode(&mesh_make_node); - MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); - node_mesh = mapblock_mesh.getMesh(); - node_mesh->grab(); - video::SColor c(255, 255, 255, 255); - setMeshColor(node_mesh, c); - - // scale and translate the mesh so it's a - // unit cube centered on the origin - scaleMesh(node_mesh, v3f(1.0/BS, 1.0/BS, 1.0/BS)); - translateMesh(node_mesh, v3f(-1.0, -1.0, -1.0)); - } - - /* - Draw node mesh into a render target texture - */ - if (need_rtt_mesh) { - TextureFromMeshParams params; - params.mesh = node_mesh; - params.dim.set(64, 64); - params.rtt_texture_name = "INVENTORY_" - + def.name + "_RTT"; - params.delete_texture_on_shutdown = true; - params.camera_position.set(0, 1.0, -1.5); - params.camera_position.rotateXZBy(45); - params.camera_lookat.set(0, 0, 0); - // Set orthogonal projection - params.camera_projection_matrix.buildProjectionMatrixOrthoLH( - 1.65, 1.65, 0, 100); - params.ambient_light.set(1.0, 0.2, 0.2, 0.2); - params.light_position.set(10, 100, -50); - params.light_color.set(1.0, 0.5, 0.5, 0.5); - params.light_radius = 1000; - -#ifdef __ANDROID__ - params.camera_position.set(0, -1.0, -1.5); - params.camera_position.rotateXZBy(45); - params.light_position.set(10, -100, -50); -#endif - cc->inventory_texture = - tsrc->generateTextureFromMesh(params); - - // render-to-target didn't work - if (cc->inventory_texture == NULL) { - cc->inventory_texture = - tsrc->getTexture(f.tiledef[0].name); - } - } - - /* - Use the node mesh as the wield mesh - */ - if (need_wield_mesh) { - cc->wield_mesh = node_mesh; - cc->wield_mesh->grab(); - - // no way reference count can be smaller than 2 in this place! - assert(cc->wield_mesh->getReferenceCount() >= 2); - } - - if (node_mesh) - node_mesh->drop(); - } - - // Put in cache - m_clientcached.set(name, cc); + // This is not thread-safe + sanity_check(thr_is_current_thread(m_main_thread)); + // Skip if already in cache + ClientCached *cc = NULL; + m_clientcached.get(name, &cc); + if (cc) return cc; + + ITextureSource *tsrc = gamedef->getTextureSource(); + INodeDefManager *nodedef = gamedef->getNodeDefManager(); + const ItemDefinition &def = get(name); + + // Create new ClientCached + cc = new ClientCached(); + + // Create an inventory texture + cc->inventory_texture = NULL; + if (def.inventory_image != "") + cc->inventory_texture = tsrc->getTexture(def.inventory_image); + + // Additional processing for nodes: + // - Create a wield mesh if WieldMeshSceneNode can't render + // the node on its own. + // - If inventory_texture isn't set yet, create one using + // render-to-texture. + if (def.type == ITEM_NODE) { + createNodeItemTexture(name, def, nodedef, cc, gamedef, tsrc); } - ClientCached* getClientCached(const std::string &name, - IGameDef *gamedef) const + + // Put in cache + m_clientcached.set(name, cc); + + return cc; +} + +/******************************************************************************/ +CItemDefManager::ClientCached* CItemDefManager::getClientCached(const std::string &name, + IGameDef *gamedef) const +{ + ClientCached *cc = NULL; + m_clientcached.get(name, &cc); + if (cc) + return cc; + + if (thr_is_current_thread(m_main_thread)) { + + return createClientCachedDirect(name, gamedef); + } + else { - ClientCached *cc = NULL; - m_clientcached.get(name, &cc); - if(cc) - return cc; + // We're gonna ask the result to be put into here + static ResultQueue result_queue; - if(thr_is_current_thread(m_main_thread)) - { - return createClientCachedDirect(name, gamedef); - } - else - { - // We're gonna ask the result to be put into here - static ResultQueue result_queue; + // Throw a request in + m_get_clientcached_queue.add(name, 0, 0, &result_queue); + try{ + while (true) { + // Wait result for a second + GetResult + result = result_queue.pop_front(1000); - // Throw a request in - m_get_clientcached_queue.add(name, 0, 0, &result_queue); - try{ - while(true) { - // Wait result for a second - GetResult - result = result_queue.pop_front(1000); - - if (result.key == name) { - return result.item; - } + if (result.key == name) { + return result.item; } } - catch(ItemNotFoundException &e) - { - errorstream<<"Waiting for clientcached " << name << " timed out."<inventory_texture; - } - // Get item wield mesh - virtual scene::IMesh* getWieldMesh(const std::string &name, - IGameDef *gamedef) const - { - ClientCached *cc = getClientCached(name, gamedef); - if(!cc) - return NULL; - return cc->wield_mesh; - } +} + +/******************************************************************************/ +// Get item inventory texture +video::ITexture* CItemDefManager::getInventoryTexture(const std::string &name, + IGameDef *gamedef) const +{ + ClientCached *cc = getClientCached(name, gamedef); + if (!cc) + return NULL; + + return cc->inventory_texture; +} + +/******************************************************************************/ +// Get item wield mesh +scene::IMesh* CItemDefManager::getWieldMesh(const std::string &name, + IGameDef *gamedef) const +{ + ClientCached *cc = getClientCached(name, gamedef); + if (!cc) + return NULL; + + return cc->wield_mesh; +} #endif - void clear() - { - for(std::map::const_iterator - i = m_item_definitions.begin(); - i != m_item_definitions.end(); ++i) - { - delete i->second; - } - m_item_definitions.clear(); - m_aliases.clear(); - // Add the four builtin items: - // "" is the hand - // "unknown" is returned whenever an undefined item - // is accessed (is also the unknown node) - // "air" is the air node - // "ignore" is the ignore node +/******************************************************************************/ +void CItemDefManager::clear() +{ + for (std::map::const_iterator + i = m_item_definitions.begin(); + i != m_item_definitions.end(); ++i) { - ItemDefinition* hand_def = new ItemDefinition; - hand_def->name = ""; - hand_def->wield_image = "wieldhand.png"; - hand_def->tool_capabilities = new ToolCapabilities; - m_item_definitions.insert(std::make_pair("", hand_def)); - - ItemDefinition* unknown_def = new ItemDefinition; - unknown_def->type = ITEM_NODE; - unknown_def->name = "unknown"; - m_item_definitions.insert(std::make_pair("unknown", unknown_def)); - - ItemDefinition* air_def = new ItemDefinition; - air_def->type = ITEM_NODE; - air_def->name = "air"; - m_item_definitions.insert(std::make_pair("air", air_def)); - - ItemDefinition* ignore_def = new ItemDefinition; - ignore_def->type = ITEM_NODE; - ignore_def->name = "ignore"; - m_item_definitions.insert(std::make_pair("ignore", ignore_def)); + delete i->second; } - virtual void registerItem(const ItemDefinition &def) - { - verbosestream<<"ItemDefManager: registering \""<name = ""; + hand_def->wield_image = "wieldhand.png"; + hand_def->tool_capabilities = new ToolCapabilities; + m_item_definitions.insert(std::make_pair("", hand_def)); + + ItemDefinition* unknown_def = new ItemDefinition; + unknown_def->type = ITEM_NODE; + unknown_def->name = "unknown"; + m_item_definitions.insert(std::make_pair("unknown", unknown_def)); + + ItemDefinition* air_def = new ItemDefinition; + air_def->type = ITEM_NODE; + air_def->name = "air"; + m_item_definitions.insert(std::make_pair("air", air_def)); + + ItemDefinition* ignore_def = new ItemDefinition; + ignore_def->type = ITEM_NODE; + ignore_def->name = "ignore"; + m_item_definitions.insert(std::make_pair("ignore", ignore_def)); +} + +/******************************************************************************/ +void CItemDefManager::registerItem(const ItemDefinition &def) +{ + verbosestream<<"ItemDefManager: registering \""< "< "<::const_iterator - it = m_item_definitions.begin(); - it != m_item_definitions.end(); ++it) { - ItemDefinition *def = it->second; - // Serialize ItemDefinition and write wrapped in a string - std::ostringstream tmp_os(std::ios::binary); - def->serialize(tmp_os, protocol_version); - os << serializeString(tmp_os.str()); - } +/******************************************************************************/ +void CItemDefManager::serialize(std::ostream &os, u16 protocol_version) +{ + writeU8(os, 0); // version + u16 count = m_item_definitions.size(); + writeU16(os, count); - writeU16(os, m_aliases.size()); + for (std::map::const_iterator + it = m_item_definitions.begin(); + it != m_item_definitions.end(); ++it) { + ItemDefinition *def = it->second; + // Serialize ItemDefinition and write wrapped in a string + std::ostringstream tmp_os(std::ios::binary); + def->serialize(tmp_os, protocol_version); + os << serializeString(tmp_os.str()); + } - for (StringMap::const_iterator - it = m_aliases.begin(); - it != m_aliases.end(); ++it) { - os << serializeString(it->first); - os << serializeString(it->second); - } + writeU16(os, m_aliases.size()); + + for (StringMap::const_iterator + it = m_aliases.begin(); + it != m_aliases.end(); ++it) { + os << serializeString(it->first); + os << serializeString(it->second); } - void deSerialize(std::istream &is) - { - // Clear everything - clear(); - // Deserialize - int version = readU8(is); - if(version != 0) - throw SerializationError("unsupported ItemDefManager version"); - u16 count = readU16(is); - for(u16 i=0; i - request = m_get_clientcached_queue.pop(); + //NOTE this is only thread safe for ONE consumer thread! + while (!m_get_clientcached_queue.empty()) { - m_get_clientcached_queue.pushResult(request, - createClientCachedDirect(request.key, gamedef)); - } -#endif + GetRequest + request = m_get_clientcached_queue.pop(); + + m_get_clientcached_queue.pushResult(request, + createClientCachedDirect(request.key, gamedef)); } -private: - // Key is name - std::map m_item_definitions; - // Aliases - StringMap m_aliases; -#ifndef SERVER - // The id of the thread that is allowed to use irrlicht directly - threadid_t m_main_thread; - // A reference to this can be returned when nothing is found, to avoid NULLs - mutable ClientCached m_dummy_clientcached; - // Cached textures and meshes - mutable MutexedMap m_clientcached; - // Queued clientcached fetches (to be processed by the main thread) - mutable RequestQueue m_get_clientcached_queue; #endif -}; +} + +#ifndef SERVER +/******************************************************************************/ +void CItemDefManager::createNodeItemTexture(const std::string& name, + const ItemDefinition& def, INodeDefManager* nodedef, + ClientCached* cc, IGameDef* gamedef, ITextureSource* tsrc) const +{ + // Get node properties + content_t id = nodedef->getId(name); + const ContentFeatures& f = nodedef->get(id); + bool need_rtt_mesh = cc->inventory_texture == NULL; + // Keep this in sync with WieldMeshSceneNode::setItem() + bool need_wield_mesh = !(f.mesh_ptr[0] || f.drawtype == NDT_NORMAL + || f.drawtype == NDT_ALLFACES || f.drawtype == NDT_AIRLIKE); + scene::IMesh* node_mesh = NULL; + + if (need_rtt_mesh || need_wield_mesh) { + + u8 param1 = 0; + if (f.param_type == CPT_LIGHT) + param1 = 0xee; + + /* + Make a mesh from the node + */ + MeshMakeData mesh_make_data(gamedef, false); + u8 param2 = 0; + if (f.param_type_2 == CPT2_WALLMOUNTED) + param2 = 1; + + MapNode mesh_make_node(id, param1, param2); + mesh_make_data.fillSingleNode(&mesh_make_node); + MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); + node_mesh = mapblock_mesh.getMesh(); + node_mesh->grab(); + video::SColor c(255, 255, 255, 255); + setMeshColor(node_mesh, c); + // scale and translate the mesh so it's a + // unit cube centered on the origin + scaleMesh(node_mesh, v3f(1.0 / BS, 1.0 / BS, 1.0 / BS)); + translateMesh(node_mesh, v3f(-1.0, -1.0, -1.0)); + } + /* + Draw node mesh into a render target texture + */ + if (need_rtt_mesh) { + + TextureFromMeshParams params; + params.mesh = node_mesh; + params.dim.set(64, 64); + params.rtt_texture_name = "INVENTORY_" + def.name + "_RTT"; + params.delete_texture_on_shutdown = true; + params.camera_position.set(0, 1.0, -1.5); + params.camera_position.rotateXZBy(45); + params.camera_lookat.set(0, 0, 0); + // Set orthogonal projection + params.camera_projection_matrix.buildProjectionMatrixOrthoLH(1.65, + 1.65, 0, 100); + params.ambient_light.set(1.0, 0.2, 0.2, 0.2); + params.light_position.set(10, 100, -50); + params.light_color.set(1.0, 0.5, 0.5, 0.5); + params.light_radius = 1000; + cc->inventory_texture = tsrc->generateTextureFromMesh(params); + // render-to-target didn't work + if (cc->inventory_texture == NULL) { + + cc->inventory_texture = tsrc->getTexture(f.tiledef[0].name); + } + } + /* + Use the node mesh as the wield mesh + */ + if (need_wield_mesh) { + + cc->wield_mesh = node_mesh; + cc->wield_mesh->grab(); + // no way reference count can be smaller than 2 in this place! + assert(cc->wield_mesh->getReferenceCount() >= 2); + } + if (node_mesh) + node_mesh->drop(); +} +#endif + +/******************************************************************************/ IWritableItemDefManager* createItemDefManager() { diff --git a/src/itemdef.h b/src/itemdef.h index 805b4aa5..fb157705 100644 --- a/src/itemdef.h +++ b/src/itemdef.h @@ -25,9 +25,18 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include #include "itemgroup.h" #include "sound.h" +#include "util/container.h" +#include "util/thread.h" + +#ifndef SERVER +#include "client/tile.h" +#endif + class IGameDef; +class INodeDefManager; struct ToolCapabilities; /* @@ -39,7 +48,7 @@ enum ItemType ITEM_NONE, ITEM_NODE, ITEM_CRAFT, - ITEM_TOOL, + ITEM_TOOL }; struct ItemDefinition @@ -157,6 +166,77 @@ public: virtual void processQueue(IGameDef *gamedef)=0; }; + +class CItemDefManager: public IWritableItemDefManager +{ +public: + CItemDefManager(); + virtual ~CItemDefManager(); + virtual const ItemDefinition& get(const std::string &name_) const; + virtual std::string getAlias(const std::string &name) const; + virtual std::set getAll() const; + virtual bool isKnown(const std::string &name_) const; + +#ifndef SERVER + // Get item inventory texture + virtual video::ITexture* getInventoryTexture(const std::string &name, + IGameDef *gamedef) const; + + // Get item wield mesh + virtual scene::IMesh* getWieldMesh(const std::string &name, + IGameDef *gamedef) const; +#endif + void clear(); + + virtual void registerItem(const ItemDefinition &def); + virtual void registerAlias(const std::string &name, + const std::string &convert_to); + void serialize(std::ostream &os, u16 protocol_version); + void deSerialize(std::istream &is); + + void processQueue(IGameDef *gamedef); + +private: + +#ifndef SERVER + struct ClientCached + { + video::ITexture *inventory_texture; + scene::IMesh *wield_mesh; + + ClientCached(); + }; + + void createNodeItemTexture(const std::string& name, + const ItemDefinition& def, INodeDefManager* nodedef, + ClientCached* cc, IGameDef* gamedef, ITextureSource* tsrc) const; + + ClientCached* createClientCachedDirect(const std::string &name, + IGameDef *gamedef) const; + + ClientCached* getClientCached(const std::string &name, + IGameDef *gamedef) const; + + // The id of the thread that is allowed to use irrlicht directly + threadid_t m_main_thread; + + // A reference to this can be returned when nothing is found, to avoid NULLs + mutable ClientCached m_dummy_clientcached; + + // Cached textures and meshes + mutable MutexedMap m_clientcached; + + // Queued clientcached fetches (to be processed by the main thread) + mutable RequestQueue m_get_clientcached_queue; +#endif + + // Key is name + std::map m_item_definitions; + + // Aliases + std::map m_aliases; +}; + IWritableItemDefManager* createItemDefManager(); #endif From 91bafceee6606fab79db1bde4cba01b84fed65c7 Mon Sep 17 00:00:00 2001 From: Sapier Date: Sat, 19 Dec 2015 04:43:59 +0100 Subject: [PATCH 169/531] Add support for using arbitrary meshes as items --- src/content_cao.cpp | 59 ++++++++++++++--- src/itemdef.cpp | 110 +++++++++++++++++++++++++++++++- src/itemdef.h | 9 +++ src/script/common/c_content.cpp | 2 + src/wieldmesh.cpp | 14 ++++ 5 files changed, 185 insertions(+), 9 deletions(-) diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 1b8e84c8..bde0dd32 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -954,15 +954,43 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, IItemDefManager *idef = m_gamedef->idef(); ItemStack item(m_prop.textures[0], 1, 0, "", idef); - m_wield_meshnode = new WieldMeshSceneNode( - smgr->getRootSceneNode(), smgr, -1); - m_wield_meshnode->setItem(item, m_gamedef); + if (!item.getDefinition(idef).meshname.empty()) + { + scene::IAnimatedMesh *mesh = m_gamedef->getMesh(item.getDefinition(idef).meshname); + if(mesh) + { + m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL); - m_wield_meshnode->setScale(v3f(m_prop.visual_size.X/2, - m_prop.visual_size.Y/2, - m_prop.visual_size.X/2)); - u8 li = m_last_light; - m_wield_meshnode->setColor(video::SColor(255,li,li,li)); + m_animated_meshnode->grab(); + mesh->drop(); // The scene node took hold of it + m_animated_meshnode->animateJoints(); // Needed for some animations + m_animated_meshnode->setScale(v3f(m_prop.visual_size.X, + m_prop.visual_size.Y, + m_prop.visual_size.X)); + u8 li = m_last_light; + setMeshColor(m_animated_meshnode->getMesh(), video::SColor(255,li,li,li)); + + bool backface_culling = m_prop.backface_culling; + if (m_is_player) + backface_culling = false; + + m_animated_meshnode->setMaterialFlag(video::EMF_LIGHTING, false); + m_animated_meshnode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false); + m_animated_meshnode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); + m_animated_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true); + m_animated_meshnode->setMaterialFlag(video::EMF_BACK_FACE_CULLING, backface_culling); + } + } + else { + m_wield_meshnode = new WieldMeshSceneNode( + smgr->getRootSceneNode(), smgr, -1); + m_wield_meshnode->setItem(item, m_gamedef); + m_wield_meshnode->setScale(v3f(m_prop.visual_size.X/2, + m_prop.visual_size.Y/2, + m_prop.visual_size.X/2)); + u8 li = m_last_light; + m_wield_meshnode->setColor(video::SColor(255,li,li,li)); + } } } else { infostream<<"GenericCAO::addToScene(): \""<getMaterial(i).SpecularColor = m_prop.colors[i]; } } + else if (m_prop.visual == "wielditem") { + IItemDefManager *idef = m_gamedef->idef(); + ItemStack item(m_prop.textures[0], 1, 0, "", idef); + + if (!item.getDefinition(idef).meshname.empty()) { + + unsigned int materialcount = m_animated_meshnode->getMaterialCount(); + + for (unsigned int i = 0; i < materialcount; i++) { + m_animated_meshnode->getMaterial(i) + .setTexture(0, tsrc->getTexture(item + .getDefinition(idef).meshtexture)); + } + } + } } if(m_meshnode) { diff --git a/src/itemdef.cpp b/src/itemdef.cpp index fa277f4f..e37f10d6 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -77,6 +77,8 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) sound_place = def.sound_place; sound_place_failed = def.sound_place_failed; range = def.range; + meshname = def.meshname; + meshtexture = def.meshtexture; return *this; } @@ -157,6 +159,10 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const os << serializeString(sound_place_failed.name); writeF1000(os, sound_place_failed.gain); } + + //TODO check for protocol version? + os<inventory_texture = NULL; - if (def.inventory_image != "") + if (!def.inventory_image.empty()) cc->inventory_texture = tsrc->getTexture(def.inventory_image); // Additional processing for nodes: @@ -352,6 +362,10 @@ CItemDefManager::ClientCached* CItemDefManager::createClientCachedDirect(const s if (def.type == ITEM_NODE) { createNodeItemTexture(name, def, nodedef, cc, gamedef, tsrc); } + else if (def.type == ITEM_CRAFT) { + if ( !def.meshname.empty()) + createMeshItemTexture(name, def, nodedef, cc, gamedef, tsrc); + } // Put in cache m_clientcached.set(name, cc); @@ -650,6 +664,100 @@ void CItemDefManager::createNodeItemTexture(const std::string& name, if (node_mesh) node_mesh->drop(); } + +/******************************************************************************/ +void CItemDefManager::renderMeshToTexture(const ItemDefinition& def, scene::IMesh* mesh, + ClientCached* cc, ITextureSource* tsrc) const +{ + video::ITexture *itemimage = cc->inventory_texture; + + /* + Draw node mesh into a render target texture + */ + TextureFromMeshParams params; + params.mesh = mesh; + params.dim.set(64, 64); + params.rtt_texture_name = "INVENTORY_" + def.name + "_RTT"; + params.delete_texture_on_shutdown = true; + params.camera_position.set(0, 1.0, -1.5); + params.camera_position.rotateXZBy(45); + params.camera_lookat.set(0, 0, 0); + // Set orthogonal projection + params.camera_projection_matrix.buildProjectionMatrixOrthoLH(1.65, 1.65, 0, + 100); + params.ambient_light.set(1.0, 0.9, 0.9, 0.9); + params.light_position.set(10, 100, -50); + params.light_color.set(1.0, 0.5, 0.5, 0.5); + params.light_radius = 1000; + cc->inventory_texture = tsrc->generateTextureFromMesh(params); + + // render-to-target didn't work + if (cc->inventory_texture == NULL) { + + cc->inventory_texture = itemimage; + } +} + +/******************************************************************************/ +void CItemDefManager::createMeshItemTexture(const std::string& name, + const ItemDefinition& def, INodeDefManager* nodedef, + ClientCached* cc, IGameDef* gamedef, ITextureSource* tsrc) const +{ + // Get node properties + content_t id = nodedef->getId(name); + const ContentFeatures& f = nodedef->get(id); + + if (def.meshname == "") + return; + + video::ITexture *texture = tsrc->getTexture(def.meshtexture); + + infostream<<"CItemDefManager::createMeshItemTexture(): mesh"<getMesh(def.meshname); + if(mesh) + { + + video::SColor c(255, 255, 255, 255); + setMeshColor(mesh, c); + + rotateMeshXZby(mesh, 180); + + // scale and translate the mesh so it's a + // unit cube centered on the origin + scaleMesh(mesh, v3f(1.0 / BS, 1.0 / BS, 1.0 / BS)); + + // Customize materials + for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) { + + video::SMaterial &material = mesh->getMeshBuffer(i)->getMaterial(); + material.setTexture(0, texture); + material.setFlag(video::EMF_BACK_FACE_CULLING, true); + material.setFlag(video::EMF_BILINEAR_FILTER, false); + material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; + } + + /* + Draw node mesh into a render target texture + */ + renderMeshToTexture(def, mesh, cc, tsrc); + + /* + Use the ingot mesh as the wield mesh + */ + + cc->wield_mesh = mesh; + cc->wield_mesh->grab(); + // no way reference count can be smaller than 2 in this place! + assert(cc->wield_mesh->getReferenceCount() >= 2); + + if (mesh) + mesh->drop(); + + } + else + errorstream<<"CItemDefManager::createMeshItemTexture(): Could not load mesh "<getWieldMesh(def.name, gamedef) != 0) { + irr::scene::IMesh * mesh = idef->getWieldMesh(def.name, gamedef); + m_meshnode->setMesh(mesh); + u32 material_count = m_meshnode->getMaterialCount(); + for (u32 i = 0; i < material_count; ++i) { + video::SMaterial &material = m_meshnode->getMaterial(i); + material.setFlag(video::EMF_BACK_FACE_CULLING, true); + material.setFlag(video::EMF_BILINEAR_FILTER, m_bilinear_filter); + material.setFlag(video::EMF_TRILINEAR_FILTER, m_trilinear_filter); + material.MaterialType = m_material_type; + material.setTexture(0, tsrc->getTexture(def.meshtexture)); + } + return; + } else if (def.inventory_image != "") { setExtruded(def.inventory_image, def.wield_scale, tsrc, 1); return; From 61cb4d52a6873a0af69bb8c9a295586f09b2c27a Mon Sep 17 00:00:00 2001 From: Sapier Date: Fri, 18 Dec 2015 19:20:06 +0100 Subject: [PATCH 170/531] Make collisionMoveSimple time overflow message written to log/show up at max once per step --- src/collision.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/collision.cpp b/src/collision.cpp index 2b64547c..187df0a5 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -199,18 +199,25 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, v3f &accel_f,ActiveObject* self, bool collideWithObjects) { + static bool time_notification_done = false; Map *map = &env->getMap(); //TimeTaker tt("collisionMoveSimple"); - ScopeProfiler sp(g_profiler, "collisionMoveSimple avg", SPT_AVG); + ScopeProfiler sp(g_profiler, "collisionMoveSimple avg", SPT_AVG); collisionMoveResult result; /* Calculate new velocity */ - if( dtime > 0.5 ) { - warningstream<<"collisionMoveSimple: maximum step interval exceeded, lost movement details!"< 0.5) { + if (!time_notification_done) { + time_notification_done = true; + infostream << "collisionMoveSimple: maximum step interval exceeded," + " lost movement details!"< Date: Tue, 29 Dec 2015 19:53:38 +0100 Subject: [PATCH 171/531] Revert "Add support for using arbitrary meshes as items" This reverts commit 91bafceee6606fab79db1bde4cba01b84fed65c7. Reverted due to missinterpretation of agreement, obvious dislike and me not interested in doing fights for feature I don't actually need --- src/content_cao.cpp | 59 +++-------------- src/itemdef.cpp | 110 +------------------------------- src/itemdef.h | 9 --- src/script/common/c_content.cpp | 2 - src/wieldmesh.cpp | 14 ---- 5 files changed, 9 insertions(+), 185 deletions(-) diff --git a/src/content_cao.cpp b/src/content_cao.cpp index bde0dd32..1b8e84c8 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -954,43 +954,15 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, IItemDefManager *idef = m_gamedef->idef(); ItemStack item(m_prop.textures[0], 1, 0, "", idef); - if (!item.getDefinition(idef).meshname.empty()) - { - scene::IAnimatedMesh *mesh = m_gamedef->getMesh(item.getDefinition(idef).meshname); - if(mesh) - { - m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL); + m_wield_meshnode = new WieldMeshSceneNode( + smgr->getRootSceneNode(), smgr, -1); + m_wield_meshnode->setItem(item, m_gamedef); - m_animated_meshnode->grab(); - mesh->drop(); // The scene node took hold of it - m_animated_meshnode->animateJoints(); // Needed for some animations - m_animated_meshnode->setScale(v3f(m_prop.visual_size.X, - m_prop.visual_size.Y, - m_prop.visual_size.X)); - u8 li = m_last_light; - setMeshColor(m_animated_meshnode->getMesh(), video::SColor(255,li,li,li)); - - bool backface_culling = m_prop.backface_culling; - if (m_is_player) - backface_culling = false; - - m_animated_meshnode->setMaterialFlag(video::EMF_LIGHTING, false); - m_animated_meshnode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false); - m_animated_meshnode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); - m_animated_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true); - m_animated_meshnode->setMaterialFlag(video::EMF_BACK_FACE_CULLING, backface_culling); - } - } - else { - m_wield_meshnode = new WieldMeshSceneNode( - smgr->getRootSceneNode(), smgr, -1); - m_wield_meshnode->setItem(item, m_gamedef); - m_wield_meshnode->setScale(v3f(m_prop.visual_size.X/2, - m_prop.visual_size.Y/2, - m_prop.visual_size.X/2)); - u8 li = m_last_light; - m_wield_meshnode->setColor(video::SColor(255,li,li,li)); - } + m_wield_meshnode->setScale(v3f(m_prop.visual_size.X/2, + m_prop.visual_size.Y/2, + m_prop.visual_size.X/2)); + u8 li = m_last_light; + m_wield_meshnode->setColor(video::SColor(255,li,li,li)); } } else { infostream<<"GenericCAO::addToScene(): \""<getMaterial(i).SpecularColor = m_prop.colors[i]; } } - else if (m_prop.visual == "wielditem") { - IItemDefManager *idef = m_gamedef->idef(); - ItemStack item(m_prop.textures[0], 1, 0, "", idef); - - if (!item.getDefinition(idef).meshname.empty()) { - - unsigned int materialcount = m_animated_meshnode->getMaterialCount(); - - for (unsigned int i = 0; i < materialcount; i++) { - m_animated_meshnode->getMaterial(i) - .setTexture(0, tsrc->getTexture(item - .getDefinition(idef).meshtexture)); - } - } - } } if(m_meshnode) { diff --git a/src/itemdef.cpp b/src/itemdef.cpp index e37f10d6..fa277f4f 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -77,8 +77,6 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) sound_place = def.sound_place; sound_place_failed = def.sound_place_failed; range = def.range; - meshname = def.meshname; - meshtexture = def.meshtexture; return *this; } @@ -159,10 +157,6 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const os << serializeString(sound_place_failed.name); writeF1000(os, sound_place_failed.gain); } - - //TODO check for protocol version? - os<inventory_texture = NULL; - if (!def.inventory_image.empty()) + if (def.inventory_image != "") cc->inventory_texture = tsrc->getTexture(def.inventory_image); // Additional processing for nodes: @@ -362,10 +352,6 @@ CItemDefManager::ClientCached* CItemDefManager::createClientCachedDirect(const s if (def.type == ITEM_NODE) { createNodeItemTexture(name, def, nodedef, cc, gamedef, tsrc); } - else if (def.type == ITEM_CRAFT) { - if ( !def.meshname.empty()) - createMeshItemTexture(name, def, nodedef, cc, gamedef, tsrc); - } // Put in cache m_clientcached.set(name, cc); @@ -664,100 +650,6 @@ void CItemDefManager::createNodeItemTexture(const std::string& name, if (node_mesh) node_mesh->drop(); } - -/******************************************************************************/ -void CItemDefManager::renderMeshToTexture(const ItemDefinition& def, scene::IMesh* mesh, - ClientCached* cc, ITextureSource* tsrc) const -{ - video::ITexture *itemimage = cc->inventory_texture; - - /* - Draw node mesh into a render target texture - */ - TextureFromMeshParams params; - params.mesh = mesh; - params.dim.set(64, 64); - params.rtt_texture_name = "INVENTORY_" + def.name + "_RTT"; - params.delete_texture_on_shutdown = true; - params.camera_position.set(0, 1.0, -1.5); - params.camera_position.rotateXZBy(45); - params.camera_lookat.set(0, 0, 0); - // Set orthogonal projection - params.camera_projection_matrix.buildProjectionMatrixOrthoLH(1.65, 1.65, 0, - 100); - params.ambient_light.set(1.0, 0.9, 0.9, 0.9); - params.light_position.set(10, 100, -50); - params.light_color.set(1.0, 0.5, 0.5, 0.5); - params.light_radius = 1000; - cc->inventory_texture = tsrc->generateTextureFromMesh(params); - - // render-to-target didn't work - if (cc->inventory_texture == NULL) { - - cc->inventory_texture = itemimage; - } -} - -/******************************************************************************/ -void CItemDefManager::createMeshItemTexture(const std::string& name, - const ItemDefinition& def, INodeDefManager* nodedef, - ClientCached* cc, IGameDef* gamedef, ITextureSource* tsrc) const -{ - // Get node properties - content_t id = nodedef->getId(name); - const ContentFeatures& f = nodedef->get(id); - - if (def.meshname == "") - return; - - video::ITexture *texture = tsrc->getTexture(def.meshtexture); - - infostream<<"CItemDefManager::createMeshItemTexture(): mesh"<getMesh(def.meshname); - if(mesh) - { - - video::SColor c(255, 255, 255, 255); - setMeshColor(mesh, c); - - rotateMeshXZby(mesh, 180); - - // scale and translate the mesh so it's a - // unit cube centered on the origin - scaleMesh(mesh, v3f(1.0 / BS, 1.0 / BS, 1.0 / BS)); - - // Customize materials - for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) { - - video::SMaterial &material = mesh->getMeshBuffer(i)->getMaterial(); - material.setTexture(0, texture); - material.setFlag(video::EMF_BACK_FACE_CULLING, true); - material.setFlag(video::EMF_BILINEAR_FILTER, false); - material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; - } - - /* - Draw node mesh into a render target texture - */ - renderMeshToTexture(def, mesh, cc, tsrc); - - /* - Use the ingot mesh as the wield mesh - */ - - cc->wield_mesh = mesh; - cc->wield_mesh->grab(); - // no way reference count can be smaller than 2 in this place! - assert(cc->wield_mesh->getReferenceCount() >= 2); - - if (mesh) - mesh->drop(); - - } - else - errorstream<<"CItemDefManager::createMeshItemTexture(): Could not load mesh "<getWieldMesh(def.name, gamedef) != 0) { - irr::scene::IMesh * mesh = idef->getWieldMesh(def.name, gamedef); - m_meshnode->setMesh(mesh); - u32 material_count = m_meshnode->getMaterialCount(); - for (u32 i = 0; i < material_count; ++i) { - video::SMaterial &material = m_meshnode->getMaterial(i); - material.setFlag(video::EMF_BACK_FACE_CULLING, true); - material.setFlag(video::EMF_BILINEAR_FILTER, m_bilinear_filter); - material.setFlag(video::EMF_TRILINEAR_FILTER, m_trilinear_filter); - material.MaterialType = m_material_type; - material.setTexture(0, tsrc->getTexture(def.meshtexture)); - } - return; - } else if (def.inventory_image != "") { setExtruded(def.inventory_image, def.wield_scale, tsrc, 1); return; From 1735c20549d474a45f1f231ea7d25ff8e3157818 Mon Sep 17 00:00:00 2001 From: Sapier Date: Tue, 29 Dec 2015 19:55:50 +0100 Subject: [PATCH 172/531] Revert "Refactoring and code style fixes in preparation of adding mesh typed items" This reverts commit f14e7bac54af65e3d3d99f89f23f114b17058e49. Reverted due to missinterpretation of agreement, obvious dislike and me not interested in doing fights for feature I don't actually need --- src/itemdef.cpp | 805 ++++++++++++++++++++++++------------------------ src/itemdef.h | 82 +---- 2 files changed, 402 insertions(+), 485 deletions(-) diff --git a/src/itemdef.cpp b/src/itemdef.cpp index fa277f4f..60a7dc64 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -28,10 +28,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock_mesh.h" #include "mesh.h" #include "wieldmesh.h" +#include "client/tile.h" #endif #include "log.h" #include "settings.h" #include "util/serialize.h" +#include "util/container.h" +#include "util/thread.h" +#include +#include #ifdef __ANDROID__ #include @@ -222,437 +227,429 @@ void ItemDefinition::deSerialize(std::istream &is) // SUGG: Support chains of aliases? -#ifndef SERVER -CItemDefManager::ClientCached::ClientCached() : - inventory_texture(NULL), - wield_mesh(NULL) -{} -#endif - -CItemDefManager::CItemDefManager() +class CItemDefManager: public IWritableItemDefManager { #ifndef SERVER - m_main_thread = thr_get_current_thread_id(); -#endif - clear(); -} - -/******************************************************************************/ -CItemDefManager::~CItemDefManager() -{ -#ifndef SERVER - const std::vector &values = m_clientcached.getValues(); - for(std::vector::const_iterator - i = values.begin(); i != values.end(); ++i) { - - ClientCached *cc = *i; - if (cc->wield_mesh) - cc->wield_mesh->drop(); - delete cc; - } - -#endif - for (std::map::iterator iter = - m_item_definitions.begin(); iter != m_item_definitions.end(); - ++iter) { - - delete iter->second; - } - m_item_definitions.clear(); -} - -/******************************************************************************/ -const ItemDefinition& CItemDefManager::get(const std::string &name_) const -{ - // Convert name according to possible alias - std::string name = getAlias(name_); - // Get the definition - std::map::const_iterator i; - i = m_item_definitions.find(name); - if(i == m_item_definitions.end()) - i = m_item_definitions.find("unknown"); - assert(i != m_item_definitions.end()); - return *(i->second); -} - -/******************************************************************************/ -std::string CItemDefManager::getAlias(const std::string &name) const -{ - StringMap::const_iterator it = m_aliases.find(name); - if (it != m_aliases.end()) - return it->second; - - return name; -} - -/******************************************************************************/ -std::set CItemDefManager::getAll() const -{ - std::set result; - for(std::map::const_iterator - it = m_item_definitions.begin(); - it != m_item_definitions.end(); ++it) { - - result.insert(it->first); - } - for (StringMap::const_iterator - it = m_aliases.begin(); - it != m_aliases.end(); ++it) { - - result.insert(it->first); - } - return result; -} - -/******************************************************************************/ -bool CItemDefManager::isKnown(const std::string &name_) const -{ - // Convert name according to possible alias - std::string name = getAlias(name_); - // Get the definition - std::map::const_iterator i; - - return m_item_definitions.find(name) != m_item_definitions.end(); -} -#ifndef SERVER - -/******************************************************************************/ -CItemDefManager::ClientCached* CItemDefManager::createClientCachedDirect(const std::string &name, - IGameDef *gamedef) const -{ - infostream<<"Lazily creating item texture and mesh for \"" - <getTextureSource(); - INodeDefManager *nodedef = gamedef->getNodeDefManager(); - const ItemDefinition &def = get(name); - - // Create new ClientCached - cc = new ClientCached(); - - // Create an inventory texture - cc->inventory_texture = NULL; - if (def.inventory_image != "") - cc->inventory_texture = tsrc->getTexture(def.inventory_image); - - // Additional processing for nodes: - // - Create a wield mesh if WieldMeshSceneNode can't render - // the node on its own. - // - If inventory_texture isn't set yet, create one using - // render-to-texture. - if (def.type == ITEM_NODE) { - createNodeItemTexture(name, def, nodedef, cc, gamedef, tsrc); - } - - // Put in cache - m_clientcached.set(name, cc); - - return cc; -} - -/******************************************************************************/ -CItemDefManager::ClientCached* CItemDefManager::getClientCached(const std::string &name, - IGameDef *gamedef) const -{ - ClientCached *cc = NULL; - m_clientcached.get(name, &cc); - if (cc) - return cc; - - if (thr_is_current_thread(m_main_thread)) { - - return createClientCachedDirect(name, gamedef); - } - else + struct ClientCached { - // We're gonna ask the result to be put into here - static ResultQueue result_queue; + video::ITexture *inventory_texture; + scene::IMesh *wield_mesh; - // Throw a request in - m_get_clientcached_queue.add(name, 0, 0, &result_queue); - try{ - while (true) { - // Wait result for a second - GetResult - result = result_queue.pop_front(1000); + ClientCached(): + inventory_texture(NULL), + wield_mesh(NULL) + {} + }; +#endif - if (result.key == name) { - return result.item; +public: + CItemDefManager() + { + +#ifndef SERVER + m_main_thread = thr_get_current_thread_id(); +#endif + clear(); + } + virtual ~CItemDefManager() + { +#ifndef SERVER + const std::vector &values = m_clientcached.getValues(); + for(std::vector::const_iterator + i = values.begin(); i != values.end(); ++i) + { + ClientCached *cc = *i; + if (cc->wield_mesh) + cc->wield_mesh->drop(); + delete cc; + } + +#endif + for (std::map::iterator iter = + m_item_definitions.begin(); iter != m_item_definitions.end(); + ++iter) { + delete iter->second; + } + m_item_definitions.clear(); + } + virtual const ItemDefinition& get(const std::string &name_) const + { + // Convert name according to possible alias + std::string name = getAlias(name_); + // Get the definition + std::map::const_iterator i; + i = m_item_definitions.find(name); + if(i == m_item_definitions.end()) + i = m_item_definitions.find("unknown"); + assert(i != m_item_definitions.end()); + return *(i->second); + } + virtual std::string getAlias(const std::string &name) const + { + StringMap::const_iterator it = m_aliases.find(name); + if (it != m_aliases.end()) + return it->second; + return name; + } + virtual std::set getAll() const + { + std::set result; + for(std::map::const_iterator + it = m_item_definitions.begin(); + it != m_item_definitions.end(); ++it) { + result.insert(it->first); + } + for (StringMap::const_iterator + it = m_aliases.begin(); + it != m_aliases.end(); ++it) { + result.insert(it->first); + } + return result; + } + virtual bool isKnown(const std::string &name_) const + { + // Convert name according to possible alias + std::string name = getAlias(name_); + // Get the definition + std::map::const_iterator i; + return m_item_definitions.find(name) != m_item_definitions.end(); + } +#ifndef SERVER +public: + ClientCached* createClientCachedDirect(const std::string &name, + IGameDef *gamedef) const + { + infostream<<"Lazily creating item texture and mesh for \"" + <getTextureSource(); + INodeDefManager *nodedef = gamedef->getNodeDefManager(); + const ItemDefinition &def = get(name); + + // Create new ClientCached + cc = new ClientCached(); + + // Create an inventory texture + cc->inventory_texture = NULL; + if(def.inventory_image != "") + cc->inventory_texture = tsrc->getTexture(def.inventory_image); + + // Additional processing for nodes: + // - Create a wield mesh if WieldMeshSceneNode can't render + // the node on its own. + // - If inventory_texture isn't set yet, create one using + // render-to-texture. + if (def.type == ITEM_NODE) { + // Get node properties + content_t id = nodedef->getId(name); + const ContentFeatures &f = nodedef->get(id); + + bool need_rtt_mesh = cc->inventory_texture == NULL; + + // Keep this in sync with WieldMeshSceneNode::setItem() + bool need_wield_mesh = + !(f.mesh_ptr[0] || + f.drawtype == NDT_NORMAL || + f.drawtype == NDT_ALLFACES || + f.drawtype == NDT_AIRLIKE); + + scene::IMesh *node_mesh = NULL; + + if (need_rtt_mesh || need_wield_mesh) { + u8 param1 = 0; + if (f.param_type == CPT_LIGHT) + param1 = 0xee; + + /* + Make a mesh from the node + */ + MeshMakeData mesh_make_data(gamedef, false); + u8 param2 = 0; + if (f.param_type_2 == CPT2_WALLMOUNTED) + param2 = 1; + MapNode mesh_make_node(id, param1, param2); + mesh_make_data.fillSingleNode(&mesh_make_node); + MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); + node_mesh = mapblock_mesh.getMesh(); + node_mesh->grab(); + video::SColor c(255, 255, 255, 255); + setMeshColor(node_mesh, c); + + // scale and translate the mesh so it's a + // unit cube centered on the origin + scaleMesh(node_mesh, v3f(1.0/BS, 1.0/BS, 1.0/BS)); + translateMesh(node_mesh, v3f(-1.0, -1.0, -1.0)); + } + + /* + Draw node mesh into a render target texture + */ + if (need_rtt_mesh) { + TextureFromMeshParams params; + params.mesh = node_mesh; + params.dim.set(64, 64); + params.rtt_texture_name = "INVENTORY_" + + def.name + "_RTT"; + params.delete_texture_on_shutdown = true; + params.camera_position.set(0, 1.0, -1.5); + params.camera_position.rotateXZBy(45); + params.camera_lookat.set(0, 0, 0); + // Set orthogonal projection + params.camera_projection_matrix.buildProjectionMatrixOrthoLH( + 1.65, 1.65, 0, 100); + params.ambient_light.set(1.0, 0.2, 0.2, 0.2); + params.light_position.set(10, 100, -50); + params.light_color.set(1.0, 0.5, 0.5, 0.5); + params.light_radius = 1000; + +#ifdef __ANDROID__ + params.camera_position.set(0, -1.0, -1.5); + params.camera_position.rotateXZBy(45); + params.light_position.set(10, -100, -50); +#endif + cc->inventory_texture = + tsrc->generateTextureFromMesh(params); + + // render-to-target didn't work + if (cc->inventory_texture == NULL) { + cc->inventory_texture = + tsrc->getTexture(f.tiledef[0].name); } } + + /* + Use the node mesh as the wield mesh + */ + if (need_wield_mesh) { + cc->wield_mesh = node_mesh; + cc->wield_mesh->grab(); + + // no way reference count can be smaller than 2 in this place! + assert(cc->wield_mesh->getReferenceCount() >= 2); + } + + if (node_mesh) + node_mesh->drop(); } - catch(ItemNotFoundException &e) + + // Put in cache + m_clientcached.set(name, cc); + + return cc; + } + ClientCached* getClientCached(const std::string &name, + IGameDef *gamedef) const + { + ClientCached *cc = NULL; + m_clientcached.get(name, &cc); + if(cc) + return cc; + + if(thr_is_current_thread(m_main_thread)) { - errorstream<<"Waiting for clientcached " << name << " timed out."< result_queue; + + // Throw a request in + m_get_clientcached_queue.add(name, 0, 0, &result_queue); + try{ + while(true) { + // Wait result for a second + GetResult + result = result_queue.pop_front(1000); + + if (result.key == name) { + return result.item; + } + } + } + catch(ItemNotFoundException &e) + { + errorstream<<"Waiting for clientcached " << name << " timed out."<inventory_texture; -} - -/******************************************************************************/ -// Get item wield mesh -scene::IMesh* CItemDefManager::getWieldMesh(const std::string &name, - IGameDef *gamedef) const -{ - ClientCached *cc = getClientCached(name, gamedef); - if (!cc) - return NULL; - - return cc->wield_mesh; -} -#endif - -/******************************************************************************/ -void CItemDefManager::clear() -{ - for (std::map::const_iterator - i = m_item_definitions.begin(); - i != m_item_definitions.end(); ++i) { - - delete i->second; + // Get item inventory texture + virtual video::ITexture* getInventoryTexture(const std::string &name, + IGameDef *gamedef) const + { + ClientCached *cc = getClientCached(name, gamedef); + if(!cc) + return NULL; + return cc->inventory_texture; } - m_item_definitions.clear(); - m_aliases.clear(); - - // Add the four builtin items: - // "" is the hand - // "unknown" is returned whenever an undefined item - // is accessed (is also the unknown node) - // "air" is the air node - // "ignore" is the ignore node - - ItemDefinition* hand_def = new ItemDefinition; - hand_def->name = ""; - hand_def->wield_image = "wieldhand.png"; - hand_def->tool_capabilities = new ToolCapabilities; - m_item_definitions.insert(std::make_pair("", hand_def)); - - ItemDefinition* unknown_def = new ItemDefinition; - unknown_def->type = ITEM_NODE; - unknown_def->name = "unknown"; - m_item_definitions.insert(std::make_pair("unknown", unknown_def)); - - ItemDefinition* air_def = new ItemDefinition; - air_def->type = ITEM_NODE; - air_def->name = "air"; - m_item_definitions.insert(std::make_pair("air", air_def)); - - ItemDefinition* ignore_def = new ItemDefinition; - ignore_def->type = ITEM_NODE; - ignore_def->name = "ignore"; - m_item_definitions.insert(std::make_pair("ignore", ignore_def)); -} - -/******************************************************************************/ -void CItemDefManager::registerItem(const ItemDefinition &def) -{ - verbosestream<<"ItemDefManager: registering \""< "<::const_iterator - it = m_item_definitions.begin(); - it != m_item_definitions.end(); ++it) { - ItemDefinition *def = it->second; - // Serialize ItemDefinition and write wrapped in a string - std::ostringstream tmp_os(std::ios::binary); - def->serialize(tmp_os, protocol_version); - os << serializeString(tmp_os.str()); - } - - writeU16(os, m_aliases.size()); - - for (StringMap::const_iterator - it = m_aliases.begin(); - it != m_aliases.end(); ++it) { - os << serializeString(it->first); - os << serializeString(it->second); - } -} - -/******************************************************************************/ -void CItemDefManager::deSerialize(std::istream &is) -{ - // Clear everything - clear(); - // Deserialize - int version = readU8(is); - if(version != 0) - throw SerializationError("unsupported ItemDefManager version"); - u16 count = readU16(is); - - for (u16 i=0; i - request = m_get_clientcached_queue.pop(); - - m_get_clientcached_queue.pushResult(request, - createClientCachedDirect(request.key, gamedef)); + // Get item wield mesh + virtual scene::IMesh* getWieldMesh(const std::string &name, + IGameDef *gamedef) const + { + ClientCached *cc = getClientCached(name, gamedef); + if(!cc) + return NULL; + return cc->wield_mesh; } #endif -} + void clear() + { + for(std::map::const_iterator + i = m_item_definitions.begin(); + i != m_item_definitions.end(); ++i) + { + delete i->second; + } + m_item_definitions.clear(); + m_aliases.clear(); -#ifndef SERVER -/******************************************************************************/ -void CItemDefManager::createNodeItemTexture(const std::string& name, - const ItemDefinition& def, INodeDefManager* nodedef, - ClientCached* cc, IGameDef* gamedef, ITextureSource* tsrc) const -{ - // Get node properties - content_t id = nodedef->getId(name); - const ContentFeatures& f = nodedef->get(id); - bool need_rtt_mesh = cc->inventory_texture == NULL; - // Keep this in sync with WieldMeshSceneNode::setItem() - bool need_wield_mesh = !(f.mesh_ptr[0] || f.drawtype == NDT_NORMAL - || f.drawtype == NDT_ALLFACES || f.drawtype == NDT_AIRLIKE); - scene::IMesh* node_mesh = NULL; + // Add the four builtin items: + // "" is the hand + // "unknown" is returned whenever an undefined item + // is accessed (is also the unknown node) + // "air" is the air node + // "ignore" is the ignore node - if (need_rtt_mesh || need_wield_mesh) { + ItemDefinition* hand_def = new ItemDefinition; + hand_def->name = ""; + hand_def->wield_image = "wieldhand.png"; + hand_def->tool_capabilities = new ToolCapabilities; + m_item_definitions.insert(std::make_pair("", hand_def)); - u8 param1 = 0; - if (f.param_type == CPT_LIGHT) - param1 = 0xee; + ItemDefinition* unknown_def = new ItemDefinition; + unknown_def->type = ITEM_NODE; + unknown_def->name = "unknown"; + m_item_definitions.insert(std::make_pair("unknown", unknown_def)); - /* - Make a mesh from the node - */ - MeshMakeData mesh_make_data(gamedef, false); - u8 param2 = 0; - if (f.param_type_2 == CPT2_WALLMOUNTED) - param2 = 1; + ItemDefinition* air_def = new ItemDefinition; + air_def->type = ITEM_NODE; + air_def->name = "air"; + m_item_definitions.insert(std::make_pair("air", air_def)); - MapNode mesh_make_node(id, param1, param2); - mesh_make_data.fillSingleNode(&mesh_make_node); - MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); - node_mesh = mapblock_mesh.getMesh(); - node_mesh->grab(); - video::SColor c(255, 255, 255, 255); - setMeshColor(node_mesh, c); - // scale and translate the mesh so it's a - // unit cube centered on the origin - scaleMesh(node_mesh, v3f(1.0 / BS, 1.0 / BS, 1.0 / BS)); - translateMesh(node_mesh, v3f(-1.0, -1.0, -1.0)); + ItemDefinition* ignore_def = new ItemDefinition; + ignore_def->type = ITEM_NODE; + ignore_def->name = "ignore"; + m_item_definitions.insert(std::make_pair("ignore", ignore_def)); } - /* - Draw node mesh into a render target texture - */ - if (need_rtt_mesh) { + virtual void registerItem(const ItemDefinition &def) + { + verbosestream<<"ItemDefManager: registering \""<inventory_texture = tsrc->generateTextureFromMesh(params); - // render-to-target didn't work - if (cc->inventory_texture == NULL) { + if(m_item_definitions.count(def.name) == 0) + m_item_definitions[def.name] = new ItemDefinition(def); + else + *(m_item_definitions[def.name]) = def; - cc->inventory_texture = tsrc->getTexture(f.tiledef[0].name); + // Remove conflicting alias if it exists + bool alias_removed = (m_aliases.erase(def.name) != 0); + if(alias_removed) + infostream<<"ItemDefManager: erased alias "< "<wield_mesh = node_mesh; - cc->wield_mesh->grab(); - // no way reference count can be smaller than 2 in this place! - assert(cc->wield_mesh->getReferenceCount() >= 2); + for (std::map::const_iterator + it = m_item_definitions.begin(); + it != m_item_definitions.end(); ++it) { + ItemDefinition *def = it->second; + // Serialize ItemDefinition and write wrapped in a string + std::ostringstream tmp_os(std::ios::binary); + def->serialize(tmp_os, protocol_version); + os << serializeString(tmp_os.str()); + } + + writeU16(os, m_aliases.size()); + + for (StringMap::const_iterator + it = m_aliases.begin(); + it != m_aliases.end(); ++it) { + os << serializeString(it->first); + os << serializeString(it->second); + } } - if (node_mesh) - node_mesh->drop(); -} -#endif + void deSerialize(std::istream &is) + { + // Clear everything + clear(); + // Deserialize + int version = readU8(is); + if(version != 0) + throw SerializationError("unsupported ItemDefManager version"); + u16 count = readU16(is); + for(u16 i=0; i + request = m_get_clientcached_queue.pop(); -/******************************************************************************/ + m_get_clientcached_queue.pushResult(request, + createClientCachedDirect(request.key, gamedef)); + } +#endif + } +private: + // Key is name + std::map m_item_definitions; + // Aliases + StringMap m_aliases; +#ifndef SERVER + // The id of the thread that is allowed to use irrlicht directly + threadid_t m_main_thread; + // A reference to this can be returned when nothing is found, to avoid NULLs + mutable ClientCached m_dummy_clientcached; + // Cached textures and meshes + mutable MutexedMap m_clientcached; + // Queued clientcached fetches (to be processed by the main thread) + mutable RequestQueue m_get_clientcached_queue; +#endif +}; IWritableItemDefManager* createItemDefManager() { diff --git a/src/itemdef.h b/src/itemdef.h index fb157705..805b4aa5 100644 --- a/src/itemdef.h +++ b/src/itemdef.h @@ -25,18 +25,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include -#include #include "itemgroup.h" #include "sound.h" -#include "util/container.h" -#include "util/thread.h" - -#ifndef SERVER -#include "client/tile.h" -#endif - class IGameDef; -class INodeDefManager; struct ToolCapabilities; /* @@ -48,7 +39,7 @@ enum ItemType ITEM_NONE, ITEM_NODE, ITEM_CRAFT, - ITEM_TOOL + ITEM_TOOL, }; struct ItemDefinition @@ -166,77 +157,6 @@ public: virtual void processQueue(IGameDef *gamedef)=0; }; - -class CItemDefManager: public IWritableItemDefManager -{ -public: - CItemDefManager(); - virtual ~CItemDefManager(); - virtual const ItemDefinition& get(const std::string &name_) const; - virtual std::string getAlias(const std::string &name) const; - virtual std::set getAll() const; - virtual bool isKnown(const std::string &name_) const; - -#ifndef SERVER - // Get item inventory texture - virtual video::ITexture* getInventoryTexture(const std::string &name, - IGameDef *gamedef) const; - - // Get item wield mesh - virtual scene::IMesh* getWieldMesh(const std::string &name, - IGameDef *gamedef) const; -#endif - void clear(); - - virtual void registerItem(const ItemDefinition &def); - virtual void registerAlias(const std::string &name, - const std::string &convert_to); - void serialize(std::ostream &os, u16 protocol_version); - void deSerialize(std::istream &is); - - void processQueue(IGameDef *gamedef); - -private: - -#ifndef SERVER - struct ClientCached - { - video::ITexture *inventory_texture; - scene::IMesh *wield_mesh; - - ClientCached(); - }; - - void createNodeItemTexture(const std::string& name, - const ItemDefinition& def, INodeDefManager* nodedef, - ClientCached* cc, IGameDef* gamedef, ITextureSource* tsrc) const; - - ClientCached* createClientCachedDirect(const std::string &name, - IGameDef *gamedef) const; - - ClientCached* getClientCached(const std::string &name, - IGameDef *gamedef) const; - - // The id of the thread that is allowed to use irrlicht directly - threadid_t m_main_thread; - - // A reference to this can be returned when nothing is found, to avoid NULLs - mutable ClientCached m_dummy_clientcached; - - // Cached textures and meshes - mutable MutexedMap m_clientcached; - - // Queued clientcached fetches (to be processed by the main thread) - mutable RequestQueue m_get_clientcached_queue; -#endif - - // Key is name - std::map m_item_definitions; - - // Aliases - std::map m_aliases; -}; - IWritableItemDefManager* createItemDefManager(); #endif From 848b050a567e360e857577c50dee82494b14973b Mon Sep 17 00:00:00 2001 From: qiukeren Date: Mon, 21 Dec 2015 20:52:40 +0800 Subject: [PATCH 173/531] Add macos/freebsd missing endian.h include and add win endianness info --- src/util/serialize.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/util/serialize.h b/src/util/serialize.h index 58e59df2..36324a67 100644 --- a/src/util/serialize.h +++ b/src/util/serialize.h @@ -26,7 +26,17 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "config.h" #if HAVE_ENDIAN_H - #include + #ifdef _WIN32 + #define __BYTE_ORDER 0 + #define __LITTLE_ENDIAN 0 + #define __BIG_ENDIAN 1 + #elif defined(__MACH__) && defined(__APPLE__) + #include + #elif defined(__FreeBSD__) + #include + #else + #include + #endif #endif #include // for memcpy #include From c6bb6f99d1fc0acd0161307a17dd31eea4a56fff Mon Sep 17 00:00:00 2001 From: Rogier Date: Wed, 23 Dec 2015 11:38:50 +0100 Subject: [PATCH 174/531] Handle SQLITE_BUSY errors gracefully This allows other applications (e.g. minetestmapper) to interrogate the database while minetest is running, without causing an almost certain minetest crash. --- src/database-sqlite3.cpp | 60 ++++++++++++++++++++++++++++++++++++++++ src/database-sqlite3.h | 4 +++ 2 files changed, 64 insertions(+) diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index da3e2c86..d2af042e 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -31,10 +31,19 @@ SQLite format specification: #include "filesys.h" #include "exceptions.h" #include "settings.h" +#include "porting.h" #include "util/string.h" #include +// When to print messages when the database is being held locked by another process +// Note: I've seen occasional delays of over 250ms while running minetestmapper. +#define BUSY_INFO_TRESHOLD 100 // Print first informational message after 100ms. +#define BUSY_WARNING_TRESHOLD 250 // Print warning message after 250ms. Lag is increased. +#define BUSY_ERROR_TRESHOLD 1000 // Print error message after 1000ms. Significant lag. +#define BUSY_FATAL_TRESHOLD 3000 // Allow SQLITE_BUSY to be returned, which will cause a minetest crash. +#define BUSY_ERROR_INTERVAL 10000 // Safety net: report again every 10 seconds + #define SQLRES(s, r) \ if ((s) != (r)) { \ @@ -56,6 +65,51 @@ SQLite format specification: sqlite3_errmsg(m_database)); \ } +int Database_SQLite3::busyHandler(void *data, int count) +{ + s64 &first_time = reinterpret_cast(data)[0]; + s64 &prev_time = reinterpret_cast(data)[1]; + s64 cur_time = getTimeMs(); + + if (count == 0) { + first_time = cur_time; + prev_time = first_time; + } else { + while (cur_time < prev_time) + cur_time += s64(1)<<32; + } + + if (cur_time - first_time < BUSY_INFO_TRESHOLD) { + ; // do nothing + } else if (cur_time - first_time >= BUSY_INFO_TRESHOLD && + prev_time - first_time < BUSY_INFO_TRESHOLD) { + infostream << "SQLite3 database has been locked for " + << cur_time - first_time << " ms." << std::endl; + } else if (cur_time - first_time >= BUSY_WARNING_TRESHOLD && + prev_time - first_time < BUSY_WARNING_TRESHOLD) { + warningstream << "Sqlite3 database has been locked for " + << cur_time - first_time << " ms." << std::endl; + } else if (cur_time - first_time >= BUSY_ERROR_TRESHOLD && + prev_time - first_time < BUSY_ERROR_TRESHOLD) { + errorstream << "SQLite3 database has been locked for " + << cur_time - first_time << " ms; this causes lag." << std::endl; + } else if (cur_time - first_time >= BUSY_FATAL_TRESHOLD && + prev_time - first_time < BUSY_FATAL_TRESHOLD) { + errorstream << "Sqlite3 database has been locked for " + << cur_time - first_time << " ms - giving up!" << std::endl; + } else if ((cur_time - first_time) / BUSY_ERROR_INTERVAL != + (prev_time - first_time) / BUSY_ERROR_INTERVAL) { + // Safety net: keep reporting every BUSY_ERROR_INTERVAL + errorstream << "SQLite3 database has been locked for " + << (cur_time - first_time) / 1000 << " seconds!" << std::endl; + } + + prev_time = cur_time; + + // Make sqlite transaction fail if delay exceeds BUSY_FATAL_TRESHOLD + return cur_time - first_time < BUSY_FATAL_TRESHOLD; +} + Database_SQLite3::Database_SQLite3(const std::string &savedir) : m_initialized(false), @@ -107,6 +161,12 @@ void Database_SQLite3::openDatabase() throw FileNotGoodException("Cannot open database file"); } + if (sqlite3_busy_handler(m_database, sqlite3BusyHandler, busy_handler_data) != SQLITE_OK) { + errorstream << "SQLite3 database failed to set busy handler: " + << sqlite3_errmsg(m_database) << std::endl; + throw FileNotGoodException("Failed to set busy handler for sqlite connection"); + } + if (needs_create) { createDatabase(); } diff --git a/src/database-sqlite3.h b/src/database-sqlite3.h index a775742b..04a1825d 100644 --- a/src/database-sqlite3.h +++ b/src/database-sqlite3.h @@ -63,6 +63,10 @@ private: sqlite3_stmt *m_stmt_delete; sqlite3_stmt *m_stmt_begin; sqlite3_stmt *m_stmt_end; + + s64 m_busy_handler_data[2]; + + static int busyHandler(void *data, int count); }; #endif From cb30facda0351a148005bfe33377c2ecc8f97af8 Mon Sep 17 00:00:00 2001 From: Rogier Date: Mon, 28 Dec 2015 19:34:16 +0100 Subject: [PATCH 175/531] Include custom error message in all SQLite3 exceptions. And replace manual tests for error with SQLOK() where possible. --- src/database-sqlite3.cpp | 65 +++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index d2af042e..56f937bf 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -45,25 +45,19 @@ SQLite format specification: #define BUSY_ERROR_INTERVAL 10000 // Safety net: report again every 10 seconds -#define SQLRES(s, r) \ +#define SQLRES(s, r, m) \ if ((s) != (r)) { \ - throw FileNotGoodException(std::string(\ - "SQLite3 database error (" \ - __FILE__ ":" TOSTRING(__LINE__) \ - "): ") +\ + throw FileNotGoodException(std::string(m) + ": " +\ sqlite3_errmsg(m_database)); \ } -#define SQLOK(s) SQLRES(s, SQLITE_OK) +#define SQLOK(s, m) SQLRES(s, SQLITE_OK, m) #define PREPARE_STATEMENT(name, query) \ - SQLOK(sqlite3_prepare_v2(m_database, query, -1, &m_stmt_##name, NULL)) + SQLOK(sqlite3_prepare_v2(m_database, query, -1, &m_stmt_##name, NULL),\ + "Failed to prepare query '" query "'") #define FINALIZE_STATEMENT(statement) \ - if (sqlite3_finalize(statement) != SQLITE_OK) { \ - throw FileNotGoodException(std::string( \ - "SQLite3: Failed to finalize " #statement ": ") + \ - sqlite3_errmsg(m_database)); \ - } + SQLOK(sqlite3_finalize(statement), "Failed to finalize " #statement) int Database_SQLite3::busyHandler(void *data, int count) { @@ -87,7 +81,7 @@ int Database_SQLite3::busyHandler(void *data, int count) << cur_time - first_time << " ms." << std::endl; } else if (cur_time - first_time >= BUSY_WARNING_TRESHOLD && prev_time - first_time < BUSY_WARNING_TRESHOLD) { - warningstream << "Sqlite3 database has been locked for " + warningstream << "SQLite3 database has been locked for " << cur_time - first_time << " ms." << std::endl; } else if (cur_time - first_time >= BUSY_ERROR_TRESHOLD && prev_time - first_time < BUSY_ERROR_TRESHOLD) { @@ -95,7 +89,7 @@ int Database_SQLite3::busyHandler(void *data, int count) << cur_time - first_time << " ms; this causes lag." << std::endl; } else if (cur_time - first_time >= BUSY_FATAL_TRESHOLD && prev_time - first_time < BUSY_FATAL_TRESHOLD) { - errorstream << "Sqlite3 database has been locked for " + errorstream << "SQLite3 database has been locked for " << cur_time - first_time << " ms - giving up!" << std::endl; } else if ((cur_time - first_time) / BUSY_ERROR_INTERVAL != (prev_time - first_time) / BUSY_ERROR_INTERVAL) { @@ -126,13 +120,15 @@ Database_SQLite3::Database_SQLite3(const std::string &savedir) : void Database_SQLite3::beginSave() { verifyDatabase(); - SQLRES(sqlite3_step(m_stmt_begin), SQLITE_DONE); + SQLRES(sqlite3_step(m_stmt_begin), SQLITE_DONE, + "Failed to start SQLite3 transaction"); sqlite3_reset(m_stmt_begin); } void Database_SQLite3::endSave() { verifyDatabase(); - SQLRES(sqlite3_step(m_stmt_end), SQLITE_DONE); + SQLRES(sqlite3_step(m_stmt_end), SQLITE_DONE, + "Failed to commit SQLite3 transaction"); sqlite3_reset(m_stmt_end); } @@ -153,19 +149,12 @@ void Database_SQLite3::openDatabase() bool needs_create = !fs::PathExists(dbp); - if (sqlite3_open_v2(dbp.c_str(), &m_database, - SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, - NULL) != SQLITE_OK) { - errorstream << "SQLite3 database failed to open: " - << sqlite3_errmsg(m_database) << std::endl; - throw FileNotGoodException("Cannot open database file"); - } + SQLOK(sqlite3_open_v2(dbp.c_str(), &m_database, + SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL), + std::string("Failed to open SQLite3 database file ") + dbp); - if (sqlite3_busy_handler(m_database, sqlite3BusyHandler, busy_handler_data) != SQLITE_OK) { - errorstream << "SQLite3 database failed to set busy handler: " - << sqlite3_errmsg(m_database) << std::endl; - throw FileNotGoodException("Failed to set busy handler for sqlite connection"); - } + SQLOK(sqlite3_busy_handler(m_database, Database_SQLite3::busyHandler, + m_busy_handler_data), "Failed to set SQLite3 busy handler"); if (needs_create) { createDatabase(); @@ -173,7 +162,8 @@ void Database_SQLite3::openDatabase() std::string query_str = std::string("PRAGMA synchronous = ") + itos(g_settings->getU16("sqlite_synchronous")); - SQLOK(sqlite3_exec(m_database, query_str.c_str(), NULL, NULL, NULL)); + SQLOK(sqlite3_exec(m_database, query_str.c_str(), NULL, NULL, NULL), + "Failed to modify sqlite3 synchronous mode"); } void Database_SQLite3::verifyDatabase() @@ -200,7 +190,8 @@ void Database_SQLite3::verifyDatabase() inline void Database_SQLite3::bindPos(sqlite3_stmt *stmt, const v3s16 &pos, int index) { - SQLOK(sqlite3_bind_int64(stmt, index, getBlockAsInteger(pos))); + SQLOK(sqlite3_bind_int64(stmt, index, getBlockAsInteger(pos)), + "Internal error: failed to bind query at " __FILE__ ":" TOSTRING(__LINE__)); } bool Database_SQLite3::deleteBlock(const v3s16 &pos) @@ -237,9 +228,10 @@ bool Database_SQLite3::saveBlock(const v3s16 &pos, const std::string &data) #endif bindPos(m_stmt_write, pos); - SQLOK(sqlite3_bind_blob(m_stmt_write, 2, data.data(), data.size(), NULL)); + SQLOK(sqlite3_bind_blob(m_stmt_write, 2, data.data(), data.size(), NULL), + "Internal error: failed to bind query at " __FILE__ ":" TOSTRING(__LINE__)); - SQLRES(sqlite3_step(m_stmt_write), SQLITE_DONE) + SQLRES(sqlite3_step(m_stmt_write), SQLITE_DONE, "Failed to save block") sqlite3_reset(m_stmt_write); return true; @@ -277,7 +269,8 @@ void Database_SQLite3::createDatabase() " `pos` INT PRIMARY KEY,\n" " `data` BLOB\n" ");\n", - NULL, NULL, NULL)); + NULL, NULL, NULL), + "Failed to create database table"); } void Database_SQLite3::listAllLoadableBlocks(std::vector &dst) @@ -299,10 +292,6 @@ Database_SQLite3::~Database_SQLite3() FINALIZE_STATEMENT(m_stmt_end) FINALIZE_STATEMENT(m_stmt_delete) - if (sqlite3_close(m_database) != SQLITE_OK) { - errorstream << "Database_SQLite3::~Database_SQLite3(): " - << "Failed to close database: " - << sqlite3_errmsg(m_database) << std::endl; - } + SQLOK(sqlite3_close(m_database), "Failed to close database"); } From 9719aded5430dd57591310c9cae06944dc345d42 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 18 Dec 2015 15:42:12 -0500 Subject: [PATCH 176/531] Fix cache path with RUN_IN_PLACE If an `XDG_CACHE_HOME` can't be found or `RUN_IN_PLACE` is enabled, `path_cache` is left at its default of `$PATH_USER/cache` (at a time when `PATH_USER` is `..`), rather than being reset to `$PATH_USER/cache` after `PATH_USER` has been properly set. --- src/porting.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/porting.cpp b/src/porting.cpp index 4a72e90f..22329989 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -527,6 +527,7 @@ void initializePaths() path_share = execpath; path_user = execpath; } + path_cache = path_user + DIR_DELIM + "cache"; #else infostream << "Using system-wide paths (NOT RUN_IN_PLACE)" << std::endl; @@ -536,16 +537,16 @@ void initializePaths() // Initialize path_cache // First try $XDG_CACHE_HOME/PROJECT_NAME const char *cache_dir = getenv("XDG_CACHE_HOME"); + const char *home_dir = getenv("HOME"); if (cache_dir) { path_cache = std::string(cache_dir) + DIR_DELIM + PROJECT_NAME; - } else { + } else if (home_dir) { // Then try $HOME/.cache/PROJECT_NAME - const char *home_dir = getenv("HOME"); - if (home_dir) { - path_cache = std::string(home_dir) + DIR_DELIM + ".cache" - + DIR_DELIM + PROJECT_NAME; - } - // If neither works, leave it at $PATH_USER/cache + path_cache = std::string(home_dir) + DIR_DELIM + ".cache" + + DIR_DELIM + PROJECT_NAME; + } else { + // If neither works, use $PATH_USER/cache + path_cache = path_user + DIR_DELIM + "cache"; } // Migrate cache folder to new location if possible migrateCachePath(); From a142e4f4b2256e7c4a16d14aecde6e04be33457c Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 30 Dec 2015 00:50:50 +0100 Subject: [PATCH 177/531] Fix client crashing when connecting to server My commit e2d54c9f9275e4f77ec33be8054621d42945f7a4 "shutdown when requested from lua in singleplayer too" broke minetest's feature to connect to servers. The client crashed after the connection init was complete. Thanks to @sofar for reporting the bug. Fixes #3498. --- src/game.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game.cpp b/src/game.cpp index 25424fa2..7ada1791 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1818,7 +1818,7 @@ void Game::run() while (device->run() && !(*kill || g_gamecallback->shutdown_requested - || server->getShutdownRequested())) { + || (server && server->getShutdownRequested()))) { /* Must be called immediately after a device->run() call because it * uses device->getTimer()->getTime() From 43c804a00b5f6177d0bb02404804234606197dc5 Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 29 Dec 2015 23:42:34 +0000 Subject: [PATCH 178/531] Minimal: Add mapgen alias for air --- games/minimal/mods/default/mapgen.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua index 65b67dae..e13dcfaf 100644 --- a/games/minimal/mods/default/mapgen.lua +++ b/games/minimal/mods/default/mapgen.lua @@ -3,6 +3,7 @@ -- +minetest.register_alias("mapgen_air", "air") minetest.register_alias("mapgen_stone", "default:stone") minetest.register_alias("mapgen_dirt", "default:dirt") minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") From 64c060e1f2d94d8277246d8cdd8a886010564770 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 1 Jan 2016 18:14:30 +0200 Subject: [PATCH 179/531] filesys: safeWriteToFile(): Remove the target file before rename only on Windows Removing the target file on other platforms was enabled likely unintentionally by commit 5f1f1151d3a9c113902630adc16cc3f4845da7ba. This may be the reason why there has been corruption of files on Linux on hard shutdowns. Previously I described the problem and this fix in issue #3084. --- src/filesys.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/filesys.cpp b/src/filesys.cpp index 5fdc9763..501f9ad6 100644 --- a/src/filesys.cpp +++ b/src/filesys.cpp @@ -693,13 +693,22 @@ bool safeWriteToFile(const std::string &path, const std::string &content) os.flush(); os.close(); if (os.fail()) { + // Remove the temporary file because writing it failed and it's useless. remove(tmp_file.c_str()); return false; } - // Copy file + // Move the finished temporary file over the real file +#ifdef _WIN32 + // On POSIX compliant systems rename() is specified to be able to swap the + // file in place of the destination file, making this a truly error-proof + // transaction. + // However, on Windows, the target file has to be removed first. remove(path.c_str()); +#endif if(rename(tmp_file.c_str(), path.c_str())) { + // Remove the temporary file because moving it over the target file + // failed. remove(tmp_file.c_str()); return false; } else { From a7c50a3080e55a6cf11175a60121696de7393dba Mon Sep 17 00:00:00 2001 From: Robert Zenz Date: Sat, 2 Jan 2016 22:14:09 +0100 Subject: [PATCH 180/531] Made it more clear that "[combine" does accept a list of files. --- doc/lua_api.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index b713b68b..37d0aaab 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -264,15 +264,15 @@ Example: default_cobble.png^[crack:10:1 -#### `[combine:x:,=:,=` +#### `[combine:x:,=:,=:...` * `` = width * `` = height -* ``/`` = x positions -* ``/`` = y positions -* ``/`` = textures to combine +* `` = x position +* `` = y position +* `` = texture to combine -Create a texture of size `` times `` and blit `` to (``,``) -and blit `` to (``,``). +Creates a texture of size `` times `` and blits the listed files to their +specified coordinates. Example: From 87dcee6ac2058bbf5264ea7f82874bba67277252 Mon Sep 17 00:00:00 2001 From: gregorycu Date: Sun, 3 Jan 2016 18:25:09 +1100 Subject: [PATCH 181/531] Prevent technically unsafe access with empty vector --- src/network/networkpacket.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp index b5e451cd..2b308f33 100644 --- a/src/network/networkpacket.cpp +++ b/src/network/networkpacket.cpp @@ -77,6 +77,9 @@ void NetworkPacket::putRawString(const char* src, u32 len) m_data.resize(m_datasize); } + if (m_datasize == 0) + return; + memcpy(&m_data[m_read_offset], src, len); m_read_offset += len; } From 09a6910dc78af7e403e3d68bed61199ecb5e0377 Mon Sep 17 00:00:00 2001 From: gregorycu Date: Sun, 3 Jan 2016 18:30:39 +1100 Subject: [PATCH 182/531] Add MinSizeRel and RelWithDebInfo to MSVCBuildDir check --- src/porting.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/porting.cpp b/src/porting.cpp index 22329989..fd1915b0 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -163,6 +163,8 @@ bool detectMSVCBuildDir(const std::string &path) { const char *ends[] = { "bin\\Release", + "bin\\MinSizeRel", + "bin\\RelWithDebInfo", "bin\\Debug", "bin\\Build", NULL From e7e9171f37730c34dd687aa2b9ca5392aa41e46b Mon Sep 17 00:00:00 2001 From: gregorycu Date: Mon, 4 Jan 2016 16:15:50 +1100 Subject: [PATCH 183/531] Fix for commit 87dcee6 It uses the wrong variable and only covers some use cases. This change covers all use cases. --- src/network/networkpacket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp index 2b308f33..388afc18 100644 --- a/src/network/networkpacket.cpp +++ b/src/network/networkpacket.cpp @@ -77,7 +77,7 @@ void NetworkPacket::putRawString(const char* src, u32 len) m_data.resize(m_datasize); } - if (m_datasize == 0) + if (len == 0) return; memcpy(&m_data[m_read_offset], src, len); From bd40ee2b95138139a8cfbef878b3461176688c15 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 6 Dec 2015 21:34:30 -0500 Subject: [PATCH 184/531] Improve Doxyfile * Add main page. * Organize into sections. * Add threading sources. * Include SpatialAreaStore, LevelDB/Redis, sound, FreeType, and cURL in output. * Add logo. * Fix project name hardcoding. * Remove PAPER_TYPE (only used when GENERATE_LATEX is enabled). * Have dot render graphs as SVG (smaller, and works even if dot's text drawing functionality is broken). * Enable built-in STL support. * Enable search bar. * Switch from header-bar based navigation to treeview based navigation. * Enable dynamic HTML (collapses graphs). * Enable generation timestamp. --- doc/Doxyfile.in | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index d35fbf65..3618b852 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,34 +1,53 @@ -DOXYFILE_ENCODING = UTF-8 - -PROJECT_NAME = "Minetest" +# Project properties +PROJECT_NAME = @PROJECT_NAME_CAPITALIZED@ PROJECT_NUMBER = @VERSION_STRING@ +PROJECT_LOGO = @CMAKE_CURRENT_SOURCE_DIR@/misc/minetest.svg -STRIP_FROM_PATH = @CMAKE_CURRENT_SOURCE_DIR@/src +# Parsing JAVADOC_AUTOBRIEF = YES EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES SORT_MEMBERS_CTORS_1ST = YES WARN_IF_UNDOCUMENTED = NO +BUILTIN_STL_SUPPORT = YES +PREDEFINED = "USE_SPATIAL=1" \ + "USE_LEVELDB=1" \ + "USE_REDIS=1" \ + "USE_SOUND=1" \ + "USE_CURL=1" \ + "USE_FREETYPE=1" \ + "USE_GETTEXT=1" -INPUT = @CMAKE_CURRENT_SOURCE_DIR@/src/ \ +# Input +RECURSIVE = NO +STRIP_FROM_PATH = @CMAKE_CURRENT_SOURCE_DIR@/src +INPUT = @CMAKE_CURRENT_SOURCE_DIR@/doc/main_page.dox \ + @CMAKE_CURRENT_SOURCE_DIR@/src/ \ @CMAKE_CURRENT_SOURCE_DIR@/src/client \ @CMAKE_CURRENT_SOURCE_DIR@/src/network \ @CMAKE_CURRENT_SOURCE_DIR@/src/util \ @CMAKE_CURRENT_SOURCE_DIR@/src/script \ @CMAKE_CURRENT_SOURCE_DIR@/src/script/common \ @CMAKE_CURRENT_SOURCE_DIR@/src/script/cpp_api \ - @CMAKE_CURRENT_SOURCE_DIR@/src/script/lua_api -RECURSIVE = NO - -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -GENERATE_LATEX = NO -PAPER_TYPE = a4wide + @CMAKE_CURRENT_SOURCE_DIR@/src/script/lua_api \ + @CMAKE_CURRENT_SOURCE_DIR@/src/threading +# Dot graphs HAVE_DOT = @DOXYGEN_DOT_FOUND@ CALL_GRAPH = YES CALLER_GRAPH = YES MAX_DOT_GRAPH_DEPTH = 3 DOT_MULTI_TARGETS = YES +DOT_IMAGE_FORMAT = svg + +# Output +GENERATE_LATEX = NO +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +SEARCHENGINE = YES +DISABLE_INDEX = YES +GENERATE_TREEVIEW = YES +HTML_DYNAMIC_SECTIONS = YES +HTML_TIMESTAMP = YES From 0bbbc6e13dc8180cf1d98f9866bc72a510162eb3 Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 30 Dec 2015 04:22:58 +0000 Subject: [PATCH 185/531] Liquids: Flow into and destroy 'floodable' nodes Add new node property 'floodable', default false Define "air" as floodable = true in C++ and lua --- builtin/game/item.lua | 1 + builtin/game/register.lua | 1 + doc/lua_api.txt | 1 + src/map.cpp | 70 ++++++++++++++++++--------------- src/nodedef.cpp | 4 ++ src/nodedef.h | 2 + src/script/common/c_content.cpp | 2 + 7 files changed, 49 insertions(+), 32 deletions(-) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index d16601d3..c168bf09 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -574,6 +574,7 @@ core.nodedef_default = { diggable = true, climbable = false, buildable_to = false, + floodable = false, liquidtype = "none", liquid_alternative_flowing = "", liquid_alternative_source = "", diff --git a/builtin/game/register.lua b/builtin/game/register.lua index 992fdf74..ba5f69d6 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -289,6 +289,7 @@ core.register_node(":air", { pointable = false, diggable = false, buildable_to = true, + floodable = true, air_equivalent = true, drop = "", groups = {not_in_creative_inventory=1}, diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 37d0aaab..ea5029e6 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3396,6 +3396,7 @@ Definition tables diggable = true, -- If false, can never be dug climbable = false, -- If true, can be climbed on (ladder) buildable_to = false, -- If true, placed nodes can replace this node + floodable = false, -- If true, liquids flow into and replace this node liquidtype = "none", -- "none"/"source"/"flowing" liquid_alternative_flowing = "", -- Flowing version of source liquid liquid_alternative_source = "", -- Source version of flowing liquid diff --git a/src/map.cpp b/src/map.cpp index ceebd40a..ac29cfee 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1654,10 +1654,10 @@ void Map::transformLiquids(std::map & modified_blocks) loop_max *= m_transforming_liquid_loop_count_multiplier; #endif - while(m_transforming_liquid.size() != 0) + while (m_transforming_liquid.size() != 0) { // This should be done here so that it is done when continue is used - if(loopcount >= initial_size || loopcount >= loop_max) + if (loopcount >= initial_size || loopcount >= loop_max) break; loopcount++; @@ -1674,21 +1674,24 @@ void Map::transformLiquids(std::map & modified_blocks) */ s8 liquid_level = -1; content_t liquid_kind = CONTENT_IGNORE; - LiquidType liquid_type = nodemgr->get(n0).liquid_type; + content_t floodable_node = CONTENT_AIR; + ContentFeatures cf = nodemgr->get(n0); + LiquidType liquid_type = cf.liquid_type; switch (liquid_type) { case LIQUID_SOURCE: liquid_level = LIQUID_LEVEL_SOURCE; - liquid_kind = nodemgr->getId(nodemgr->get(n0).liquid_alternative_flowing); + liquid_kind = nodemgr->getId(cf.liquid_alternative_flowing); break; case LIQUID_FLOWING: liquid_level = (n0.param2 & LIQUID_LEVEL_MASK); liquid_kind = n0.getContent(); break; case LIQUID_NONE: - // if this is an air node, it *could* be transformed into a liquid. otherwise, - // continue with the next node. - if (n0.getContent() != CONTENT_AIR) + // if this node is 'floodable', it *could* be transformed + // into a liquid, otherwise, continue with the next node. + if (!cf.floodable) continue; + floodable_node = n0.getContent(); liquid_kind = CONTENT_AIR; break; } @@ -1718,9 +1721,10 @@ void Map::transformLiquids(std::map & modified_blocks) } v3s16 npos = p0 + dirs[i]; NodeNeighbor nb(getNodeNoEx(npos), nt, npos); + ContentFeatures cfnb = nodemgr->get(nb.n); switch (nodemgr->get(nb.n.getContent()).liquid_type) { case LIQUID_NONE: - if (nb.n.getContent() == CONTENT_AIR) { + if (cfnb.floodable) { airs[num_airs++] = nb; // if the current node is a water source the neighbor // should be enqueded for transformation regardless of whether the @@ -1738,8 +1742,8 @@ void Map::transformLiquids(std::map & modified_blocks) case LIQUID_SOURCE: // if this node is not (yet) of a liquid type, choose the first liquid type we encounter if (liquid_kind == CONTENT_AIR) - liquid_kind = nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing); - if (nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing) != liquid_kind) { + liquid_kind = nodemgr->getId(cfnb.liquid_alternative_flowing); + if (nodemgr->getId(cfnb.liquid_alternative_flowing) != liquid_kind) { neutrals[num_neutrals++] = nb; } else { // Do not count bottom source, it will screw things up @@ -1750,8 +1754,8 @@ void Map::transformLiquids(std::map & modified_blocks) case LIQUID_FLOWING: // if this node is not (yet) of a liquid type, choose the first liquid type we encounter if (liquid_kind == CONTENT_AIR) - liquid_kind = nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing); - if (nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing) != liquid_kind) { + liquid_kind = nodemgr->getId(cfnb.liquid_alternative_flowing); + if (nodemgr->getId(cfnb.liquid_alternative_flowing) != liquid_kind) { neutrals[num_neutrals++] = nb; } else { flows[num_flows++] = nb; @@ -1770,8 +1774,8 @@ void Map::transformLiquids(std::map & modified_blocks) s8 max_node_level = -1; u8 range = nodemgr->get(liquid_kind).liquid_range; - if (range > LIQUID_LEVEL_MAX+1) - range = LIQUID_LEVEL_MAX+1; + if (range > LIQUID_LEVEL_MAX + 1) + range = LIQUID_LEVEL_MAX + 1; if ((num_sources >= 2 && nodemgr->get(liquid_kind).liquid_renewable) || liquid_type == LIQUID_SOURCE) { // liquid_kind will be set to either the flowing alternative of the node (if it's a liquid) @@ -1780,10 +1784,11 @@ void Map::transformLiquids(std::map & modified_blocks) new_node_content = nodemgr->getId(nodemgr->get(liquid_kind).liquid_alternative_source); } else if (num_sources >= 1 && sources[0].t != NEIGHBOR_LOWER) { // liquid_kind is set properly, see above - new_node_content = liquid_kind; max_node_level = new_node_level = LIQUID_LEVEL_MAX; - if (new_node_level < (LIQUID_LEVEL_MAX+1-range)) - new_node_content = CONTENT_AIR; + if (new_node_level >= (LIQUID_LEVEL_MAX + 1 - range)) + new_node_content = liquid_kind; + else + new_node_content = floodable_node; } else { // no surrounding sources, so get the maximum level that can flow into this node for (u16 i = 0; i < num_flows; i++) { @@ -1794,16 +1799,16 @@ void Map::transformLiquids(std::map & modified_blocks) max_node_level = LIQUID_LEVEL_MAX; if (nb_liquid_level + WATER_DROP_BOOST < LIQUID_LEVEL_MAX) max_node_level = nb_liquid_level + WATER_DROP_BOOST; - } else if (nb_liquid_level > max_node_level) + } else if (nb_liquid_level > max_node_level) { max_node_level = nb_liquid_level; + } break; case NEIGHBOR_LOWER: break; case NEIGHBOR_SAME_LEVEL: if ((flows[i].n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK && - nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level) { + nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level) max_node_level = nb_liquid_level - 1; - } break; } } @@ -1821,23 +1826,25 @@ void Map::transformLiquids(std::map & modified_blocks) new_node_level = liquid_level + 1; if (new_node_level != max_node_level) must_reflow.push_back(p0); - } else + } else { new_node_level = max_node_level; + } - if (max_node_level >= (LIQUID_LEVEL_MAX+1-range)) + if (max_node_level >= (LIQUID_LEVEL_MAX + 1 - range)) new_node_content = liquid_kind; else - new_node_content = CONTENT_AIR; + new_node_content = floodable_node; } /* check if anything has changed. if not, just continue with the next node. */ - if (new_node_content == n0.getContent() && (nodemgr->get(n0.getContent()).liquid_type != LIQUID_FLOWING || - ((n0.param2 & LIQUID_LEVEL_MASK) == (u8)new_node_level && - ((n0.param2 & LIQUID_FLOW_DOWN_MASK) == LIQUID_FLOW_DOWN_MASK) - == flowing_down))) + if (new_node_content == n0.getContent() && + (nodemgr->get(n0.getContent()).liquid_type != LIQUID_FLOWING || + ((n0.param2 & LIQUID_LEVEL_MASK) == (u8)new_node_level && + ((n0.param2 & LIQUID_FLOW_DOWN_MASK) == LIQUID_FLOW_DOWN_MASK) + == flowing_down))) continue; @@ -1857,11 +1864,10 @@ void Map::transformLiquids(std::map & modified_blocks) // Find out whether there is a suspect for this action std::string suspect; - if(m_gamedef->rollback()) { + if (m_gamedef->rollback()) suspect = m_gamedef->rollback()->getSuspect(p0, 83, 1); - } - if(m_gamedef->rollback() && !suspect.empty()){ + if (m_gamedef->rollback() && !suspect.empty()) { // Blame suspect RollbackScopeActor rollback_scope(m_gamedef->rollback(), suspect, true); // Get old node for rollback @@ -1880,10 +1886,10 @@ void Map::transformLiquids(std::map & modified_blocks) v3s16 blockpos = getNodeBlockPos(p0); MapBlock *block = getBlockNoCreateNoEx(blockpos); - if(block != NULL) { + if (block != NULL) { modified_blocks[blockpos] = block; // If new or old node emits light, MapBlock requires lighting update - if(nodemgr->get(n0).light_source != 0 || + if (nodemgr->get(n0).light_source != 0 || nodemgr->get(n00).light_source != 0) lighting_modified_blocks[block->getPos()] = block; } diff --git a/src/nodedef.cpp b/src/nodedef.cpp index b5ccc3b9..2ebe1c13 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -233,6 +233,7 @@ void ContentFeatures::reset() diggable = true; climbable = false; buildable_to = false; + floodable = false; rightclickable = true; leveled = 0; liquid_type = LIQUID_NONE; @@ -318,6 +319,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const // the protocol version os< Date: Fri, 8 Jan 2016 15:37:11 +0100 Subject: [PATCH 186/531] Fix redis error reporting Previously, we assumed that reply->str was NULL terminated. However, this turned out to be not true, as users reported crashes in strlen connected to where reply->str was appended to an std::string. Use the method recomended by the docs, to read the length separately. --- src/database-redis.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/database-redis.cpp b/src/database-redis.cpp index 196d72f2..498e9d39 100644 --- a/src/database-redis.cpp +++ b/src/database-redis.cpp @@ -92,7 +92,7 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data) if (reply->type == REDIS_REPLY_ERROR) { warningstream << "saveBlock: saving block " << PP(pos) - << " failed: " << reply->str << std::endl; + << " failed: " << std::string(reply->str, reply->len) << std::endl; freeReplyObject(reply); return false; } @@ -119,7 +119,7 @@ std::string Database_Redis::loadBlock(const v3s16 &pos) return str; } case REDIS_REPLY_ERROR: { - std::string errstr = reply->str; + std::string errstr(reply->str, reply->len); freeReplyObject(reply); errorstream << "loadBlock: loading block " << PP(pos) << " failed: " << errstr << std::endl; @@ -134,7 +134,7 @@ std::string Database_Redis::loadBlock(const v3s16 &pos) } errorstream << "loadBlock: loading block " << PP(pos) << " returned invalid reply type " << reply->type - << ": " << reply->str << std::endl; + << ": " << std::string(reply->str, reply->len) << std::endl; freeReplyObject(reply); throw FileNotGoodException(std::string( "Redis command 'HGET %s %s' gave invalid reply.")); @@ -151,7 +151,7 @@ bool Database_Redis::deleteBlock(const v3s16 &pos) "Redis command 'HDEL %s %s' failed: ") + ctx->errstr); } else if (reply->type == REDIS_REPLY_ERROR) { warningstream << "deleteBlock: deleting block " << PP(pos) - << " failed: " << reply->str << std::endl; + << " failed: " << std::string(reply->str, reply->len) << std::endl; freeReplyObject(reply); return false; } @@ -177,7 +177,8 @@ void Database_Redis::listAllLoadableBlocks(std::vector &dst) break; case REDIS_REPLY_ERROR: throw FileNotGoodException(std::string( - "Failed to get keys from database: ") + reply->str); + "Failed to get keys from database: ") + + std::string(reply->str, reply->len)); } freeReplyObject(reply); } From 95c1b66722bbad9e82ef14bcc53d31d035b49012 Mon Sep 17 00:00:00 2001 From: slemonide Date: Sat, 2 Jan 2016 03:21:17 -0800 Subject: [PATCH 187/531] Update lua_api.txt set_sky does work with on_joinplayer --- doc/lua_api.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index ea5029e6..2ef25a9b 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2636,8 +2636,6 @@ This is basically a reference to a C++ `ServerActiveObject` * `"regular"`: Uses 0 textures, `bgcolor` ignored * `"skybox"`: Uses 6 textures, `bgcolor` used * `"plain"`: Uses 0 textures, `bgcolor` used - * **Note**: currently does not work directly in `on_joinplayer`; use - `minetest.after(0)` in there. * `get_sky()`: returns bgcolor, type and a table with the textures * `override_day_night_ratio(ratio or nil)` * `0`...`1`: Overrides day-night ratio, controlling sunlight to a specific amount From 386d190e0915a7ed270c313b4e9998f25d219e41 Mon Sep 17 00:00:00 2001 From: Robert Zenz Date: Thu, 7 Jan 2016 23:16:56 +0100 Subject: [PATCH 188/531] Clarified what get_node does. --- doc/lua_api.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 2ef25a9b..9088bd69 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1958,9 +1958,11 @@ and `minetest.auth_reload` call the authetification handler. * `minetest.remove_node(pos)` * Equivalent to `set_node(pos, "air")` * `minetest.get_node(pos)` - * Returns `{name="ignore", ...}` for unloaded area + * Returns the node at the given position as table in the format + `{name="node_name", param1=0, param2=0}`, returns `{name="ignore", param1=0, param2=0}` + for unloaded areas. * `minetest.get_node_or_nil(pos)` - * Returns `nil` for unloaded area + * Same as `get_node` but returns `nil` for unloaded areas. * `minetest.get_node_light(pos, timeofday)` * Gets the light value at the given position. Note that the light value "inside" the node at the given position is returned, so you usually want From 9c77725653061baa9ae169a966205a4eb2f6c3fd Mon Sep 17 00:00:00 2001 From: gregorycu Date: Mon, 4 Jan 2016 18:02:12 +1100 Subject: [PATCH 189/531] Replace instance of readsome with read in decompressZlib Make decompressZlib more robust --- src/serialization.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/serialization.cpp b/src/serialization.cpp index c0fbe10e..79f66fca 100644 --- a/src/serialization.cpp +++ b/src/serialization.cpp @@ -133,7 +133,8 @@ void decompressZlib(std::istream &is, std::ostream &os) if(z.avail_in == 0) { z.next_in = (Bytef*)input_buffer; - input_buffer_len = is.readsome(input_buffer, bufsize); + is.read(input_buffer, bufsize); + input_buffer_len = is.gcount(); z.avail_in = input_buffer_len; //dstream<<"read fail="<http://minetest.net/_media/screen2.png - http://minetest.net/_media/screenshot_4032289578.png + http://www.minetest.net/media/gallery/1.jpg + http://www.minetest.net/media/gallery/3.jpg + http://www.minetest.net/media/gallery/5.jpg http://minetest.net sfan5@live.de From fe3f6be4d262b466cd511595ad3b3c9bd5c89ea1 Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Fri, 13 Mar 2015 13:09:58 +0200 Subject: [PATCH 192/531] Simplify custom games packaging --- CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea41d0d2..f8278522 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,16 +149,9 @@ endif() install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}") -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games") -set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game") -if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE}) - install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/") - install(FILES ${MINETEST_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/minetest_game/") - install(DIRECTORY ${MINETEST_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/minetest_game") - install(DIRECTORY ${MINETEST_GAME_SOURCE}/menu DESTINATION "${SHAREDIR}/games/minetest_game") -endif() +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games" DESTINATION "${SHAREDIR}" PATTERN ".git*" EXCLUDE) + if(BUILD_CLIENT) - #install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base") endif() if(RUN_IN_PLACE) From 9943ae3f1a4fa1b687c780419b7f3a2d8091abe0 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 14 Dec 2015 19:01:32 -0200 Subject: [PATCH 193/531] New 3D Mode: Pageflip The pageflip mode requires a stereo quadbuffer, and a modern graphic card. Patch tested with NVidia 3D Vision. The mini-map is not drawn, but that's what is done for topbottom and sidebyside modes as well. Also most of the time the user would prefer the HUD to be off. That's for the user to decide though, and toggle it manually. Finally, the interocular distance (aka eye separation) is twice as much as the "3d_paralax_strength" settings. I find this a strange design decision. I didn't want to chance this though, since it's how the other 3d modes interpret this settings. --- builtin/settingtypes.txt | 3 +- minetest.conf.example | 3 +- src/client/clientlauncher.cpp | 4 ++ src/drawscene.cpp | 85 +++++++++++++++++++++++++++++++++++ src/game.cpp | 4 ++ 5 files changed, 97 insertions(+), 2 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 62f81706..6412ab4f 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -454,7 +454,8 @@ fall_bobbing_amount (Fall bobbing) float 0.0 # - interlaced: odd/even line based polarisation screen support. # - topbottom: split screen top/bottom. # - sidebyside: split screen side by side. -3d_mode (3D mode) enum none none,anaglyph,interlaced,topbottom,sidebyside +# - pageflip: quadbuffer based 3d. +3d_mode (3D mode) enum none none,anaglyph,interlaced,topbottom,sidebyside,pageflip # In-game chat console background color (R,G,B). console_color (Console color) string (0,0,0) diff --git a/minetest.conf.example b/minetest.conf.example index 40456f95..806ce62c 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -518,7 +518,8 @@ # - interlaced: odd/even line based polarisation screen support. # - topbottom: split screen top/bottom. # - sidebyside: split screen side by side. -# type: enum values: none, anaglyph, interlaced, topbottom, sidebyside +# - pageflip: quadbuffer based 3d. +# type: enum values: none, anaglyph, interlaced, topbottom, sidebyside, pageflip # 3d_mode = none # In-game chat console background color (R,G,B). diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp index dfddef34..be642662 100644 --- a/src/client/clientlauncher.cpp +++ b/src/client/clientlauncher.cpp @@ -512,6 +512,9 @@ bool ClientLauncher::create_engine_device() u16 bits = g_settings->getU16("fullscreen_bpp"); u16 fsaa = g_settings->getU16("fsaa"); + // stereo buffer required for pageflip stereo + bool stereo_buffer = g_settings->get("3d_mode") == "pageflip"; + // Determine driver video::E_DRIVER_TYPE driverType = video::EDT_OPENGL; std::string driverstring = g_settings->get("video_driver"); @@ -537,6 +540,7 @@ bool ClientLauncher::create_engine_device() params.AntiAlias = fsaa; params.Fullscreen = fullscreen; params.Stencilbuffer = false; + params.Stereobuffer = stereo_buffer; params.Vsync = vsync; params.EventReceiver = receiver; params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu"); diff --git a/src/drawscene.cpp b/src/drawscene.cpp index 509f341d..c716ca0d 100644 --- a/src/drawscene.cpp +++ b/src/drawscene.cpp @@ -404,6 +404,84 @@ void draw_top_bottom_3d_mode(Camera& camera, bool show_hud, camera.getCameraNode()->setTarget(oldTarget); } +void draw_pageflip_3d_mode(Camera& camera, bool show_hud, + Hud& hud, std::vector hilightboxes, video::IVideoDriver* driver, + scene::ISceneManager* smgr, const v2u32& screensize, + bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv, + video::SColor skycolor) +{ + /* preserve old setup*/ + irr::core::vector3df oldPosition = camera.getCameraNode()->getPosition(); + irr::core::vector3df oldTarget = camera.getCameraNode()->getTarget(); + + irr::core::matrix4 startMatrix = + camera.getCameraNode()->getAbsoluteTransformation(); + irr::core::vector3df focusPoint = (camera.getCameraNode()->getTarget() + - camera.getCameraNode()->getAbsolutePosition()).setLength(1) + + camera.getCameraNode()->getAbsolutePosition(); + + //Left eye... + driver->setRenderTarget(irr::video::ERT_STEREO_LEFT_BUFFER); + + irr::core::vector3df leftEye; + irr::core::matrix4 leftMove; + leftMove.setTranslation( + irr::core::vector3df(-g_settings->getFloat("3d_paralax_strength"), + 0.0f, 0.0f)); + leftEye = (startMatrix * leftMove).getTranslation(); + + //clear the depth buffer, and color + driver->beginScene(true, true, irr::video::SColor(200, 200, 200, 255)); + camera.getCameraNode()->setPosition(leftEye); + camera.getCameraNode()->setTarget(focusPoint); + smgr->drawAll(); + driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); + + if (show_hud) { + draw_selectionbox(driver, hud, hilightboxes, show_hud); + + if (draw_wield_tool) + camera.drawWieldedTool(&leftMove); + + hud.drawHotbar(client.getPlayerItem()); + hud.drawLuaElements(camera.getOffset()); + } + + guienv->drawAll(); + + //Right eye... + driver->setRenderTarget(irr::video::ERT_STEREO_RIGHT_BUFFER); + + irr::core::vector3df rightEye; + irr::core::matrix4 rightMove; + rightMove.setTranslation( + irr::core::vector3df(g_settings->getFloat("3d_paralax_strength"), + 0.0f, 0.0f)); + rightEye = (startMatrix * rightMove).getTranslation(); + + //clear the depth buffer, and color + driver->beginScene(true, true, irr::video::SColor(200, 200, 200, 255)); + camera.getCameraNode()->setPosition(rightEye); + camera.getCameraNode()->setTarget(focusPoint); + smgr->drawAll(); + driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); + + if (show_hud) { + draw_selectionbox(driver, hud, hilightboxes, show_hud); + + if (draw_wield_tool) + camera.drawWieldedTool(&rightMove); + + hud.drawHotbar(client.getPlayerItem()); + hud.drawLuaElements(camera.getOffset()); + } + + guienv->drawAll(); + + camera.getCameraNode()->setPosition(oldPosition); + camera.getCameraNode()->setTarget(oldTarget); +} + void draw_plain(Camera& camera, bool show_hud, Hud& hud, std::vector hilightboxes, video::IVideoDriver* driver, bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv) @@ -466,6 +544,13 @@ void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr, smgr, screensize, draw_wield_tool, client, guienv, skycolor); show_hud = false; } + else if (draw_mode == "pageflip") + { + draw_pageflip_3d_mode(camera, show_hud, hud, hilightboxes, driver, + smgr, screensize, draw_wield_tool, client, guienv, skycolor); + draw_crosshair = false; + show_hud = false; + } else { draw_plain(camera, show_hud, hud, hilightboxes, driver, draw_wield_tool, client, guienv); diff --git a/src/game.cpp b/src/game.cpp index 7ada1791..92d91993 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1872,6 +1872,10 @@ void Game::run() void Game::shutdown() { + if (g_settings->get("3d_mode") == "pageflip") { + driver->setRenderTarget(irr::video::ERT_STEREO_BOTH_BUFFERS); + } + showOverlayMessage(wgettext("Shutting down..."), 0, 0, false); if (clouds) From 711808343db6d081e0aec550553a018554bed4d6 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 9 Jan 2016 15:11:43 -0500 Subject: [PATCH 194/531] Actually add Doxygen main page I apparently forgot to add this file in my previous commit (bd40ee2b95138139a8cfbef878b3461176688c15). --- doc/main_page.dox | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/main_page.dox diff --git a/doc/main_page.dox b/doc/main_page.dox new file mode 100644 index 00000000..8211d9ca --- /dev/null +++ b/doc/main_page.dox @@ -0,0 +1,8 @@ +/** @mainpage The Minetest engine internal documentation + +Welcome to the Minetest engine Doxygen documentation site!\n +This page documents the internal structure of the Minetest engine's C++ code.\n +Use the tree view at the left to navigate. + +*/ + From 106d4b7d05cfbba901abd540113991042d77bc97 Mon Sep 17 00:00:00 2001 From: ASL97 Date: Mon, 7 Dec 2015 17:39:48 +0800 Subject: [PATCH 195/531] Cache disable_anticheat and check it for "interacted_too_far" --- src/network/serverpackethandler.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index a5aaf1ec..7e348a94 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1358,7 +1358,9 @@ void Server::handleCommand_Interact(NetworkPacket* pkt) Check that target is reasonably close (only when digging or placing things) */ - if (action == 0 || action == 2 || action == 3) { + static const bool enable_anticheat = !g_settings->getBool("disable_anticheat"); + if ((action == 0 || action == 2 || action == 3) && + (enable_anticheat && !isSingleplayer())) { float d = player_pos.getDistanceFrom(pointed_pos_under); float max_d = BS * 14; // Just some large enough value if (d > max_d) { @@ -1495,7 +1497,7 @@ void Server::handleCommand_Interact(NetworkPacket* pkt) /* Cheat prevention */ bool is_valid_dig = true; - if (!isSingleplayer() && !g_settings->getBool("disable_anticheat")) { + if (enable_anticheat && !isSingleplayer()) { v3s16 nocheat_p = playersao->getNoCheatDigPos(); float nocheat_t = playersao->getNoCheatDigTime(); playersao->noCheatDigEnd(); From 58babf8b1945f1a2db0180a4a3ed7b0d52872bef Mon Sep 17 00:00:00 2001 From: Rogier Date: Thu, 7 Jan 2016 12:33:26 +0100 Subject: [PATCH 196/531] Improve parsing of setting types from settingtypes.txt for settings tab - Accept numbers prefixed with '+' - Accept multiple spaces instead of just a single one where spaces are expected - Allow flags to have an empty default value --- builtin/mainmenu/tab_settings.lua | 36 ++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index db8d08d5..f3a09a98 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -20,8 +20,8 @@ local FILENAME = "settingtypes.txt" local CHAR_CLASSES = { SPACE = "[%s]", VARIABLE = "[%w_%-%.]", - INTEGER = "[-]?[%d]", - FLOAT = "[-]?[%d%.]", + INTEGER = "[+-]?[%d]", + FLOAT = "[+-]?[%d%.]", FLAGS = "[%w_%-%.,]", } @@ -65,11 +65,11 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se -- so we can later strip it from the rest of the line .. "(" .. "([" .. CHAR_CLASSES.VARIABLE .. "+)" -- variable name - .. CHAR_CLASSES.SPACE + .. CHAR_CLASSES.SPACE .. "*" .. "%(([^%)]*)%)" -- readable name - .. CHAR_CLASSES.SPACE + .. CHAR_CLASSES.SPACE .. "*" .. "(" .. CHAR_CLASSES.VARIABLE .. "+)" -- type - .. CHAR_CLASSES.SPACE .. "?" + .. CHAR_CLASSES.SPACE .. "*" .. ")") if not first_part then @@ -88,8 +88,8 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se if setting_type == "int" then local default, min, max = remaining_line:match("^" -- first int is required, the last 2 are optional - .. "(" .. CHAR_CLASSES.INTEGER .. "+)" .. CHAR_CLASSES.SPACE .. "?" - .. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. CHAR_CLASSES.SPACE .. "?" + .. "(" .. CHAR_CLASSES.INTEGER .. "+)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. CHAR_CLASSES.SPACE .. "*" .. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. "$") @@ -151,8 +151,8 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se if setting_type == "float" then local default, min, max = remaining_line:match("^" -- first float is required, the last 2 are optional - .. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "?" - .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "?" + .. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "*" .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .."$") @@ -175,7 +175,11 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se end if setting_type == "enum" then - local default, values = remaining_line:match("^(.+)" .. CHAR_CLASSES.SPACE .. "(.+)$") + local default, values = remaining_line:match("^" + -- first value (default) may be empty (i.e. is optional) + .. "(" .. CHAR_CLASSES.VARIABLE .. "*)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.FLAGS .. "+)" + .. "$") if not default or values == "" then return "Invalid enum setting" @@ -211,14 +215,22 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se if setting_type == "flags" then local default, possible = remaining_line:match("^" - .. "(" .. CHAR_CLASSES.FLAGS .. "+)" .. CHAR_CLASSES.SPACE .. "" - .. "(" .. CHAR_CLASSES.FLAGS .. "+)" + -- first value (default) may be empty (i.e. is optional) + -- this is implemented by making the last value optional, and + -- swapping them around if it turns out empty. + .. "(" .. CHAR_CLASSES.FLAGS .. "+)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.FLAGS .. "*)" .. "$") if not default or not possible then return "Invalid flags setting" end + if possible == "" then + possible = default + default = "" + end + table.insert(settings, { name = name, readable_name = readable_name, From 31ac53dfd0eb0ab1e42921e85cf6575a16cbc38e Mon Sep 17 00:00:00 2001 From: Rogier Date: Thu, 7 Jan 2016 20:59:35 +0100 Subject: [PATCH 197/531] Fix the checking of flags values in the settings tab Changes: - Accept setting an empty flags-type value in the settings tab if the variable specification permits it - Don't accept substrings of flag values E.g. with values: 'one,two,three', 'hree', 'w', etc. used to be accepted. Not any more - Don't accept flags with random pattern-matching special characters E.g. with values: 'one,two,three', 'on.', '(o)[n]e*' etc. used to be accepted. Not any more. --- builtin/mainmenu/tab_settings.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index f3a09a98..472becea 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -506,8 +506,8 @@ local function handle_change_setting_buttons(this, fields) local new_value = fields["te_setting_value"] for _,value in ipairs(new_value:split(",", true)) do value = value:trim() - if not value:match(CHAR_CLASSES.FLAGS .. "+") - or not setting.possible:match("[,]?" .. value .. "[,]?") then + local possible = "," .. setting.possible .. "," + if not possible:find("," .. value .. ",", 0, true) then this.data.error_message = fgettext_ne("\"$1\" is not a valid flag.", value) this.data.entered_text = fields["te_setting_value"] core.update_formspec(this:get_formspec()) From 3e0ea3c6eda27a7b6535570c2c208213be046494 Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 10 Jan 2016 03:27:32 +0000 Subject: [PATCH 198/531] Mgflat: Set blank default spflags. Unhide --- builtin/settingtypes.txt | 2 +- minetest.conf.example | 4 ++-- src/emerge.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 6412ab4f..06d47380 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -936,7 +936,7 @@ mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100, # Occasional lakes and hills added to the flat world. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -mgflat_spflags (Mapgen flat flags) flags nolakes,nohills lakes,hills,nolakes,nohills +mgflat_spflags (Mapgen flat flags) flags lakes,hills,,nolakes,nohills # Y of flat ground. mgflat_ground_level (Mapgen flat ground level) int 8 diff --git a/minetest.conf.example b/minetest.conf.example index 806ce62c..bea9b4ac 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1187,8 +1187,8 @@ # Occasional lakes and hills added to the flat world. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. -# type: flags possible values: lakes, hills, nolakes, nohills -# mgflat_spflags = nolakes,nohills +# type: flags possible values: lakes, hills, , nolakes, nohills +# mgflat_spflags = # Y of flat ground. # type: int diff --git a/src/emerge.cpp b/src/emerge.cpp index 6d4d84d7..157be2e6 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -106,7 +106,7 @@ MapgenDesc g_reg_mapgens[] = { {"v5", new MapgenFactoryV5, true}, {"v6", new MapgenFactoryV6, true}, {"v7", new MapgenFactoryV7, true}, - {"flat", new MapgenFactoryFlat, false}, + {"flat", new MapgenFactoryFlat, true}, {"fractal", new MapgenFactoryFractal, true}, {"singlenode", new MapgenFactorySinglenode, false}, }; From 8fc8cb819b60dcaca887056e9fcb9cb7927412f1 Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 11 Jan 2016 00:30:03 +0000 Subject: [PATCH 199/531] Mapgen: Various fixes and improvements Lua_api.txt: Document 'minetest.registered_biomes' Minimal: Remove 'mapgen_air' alias Cavegen: Add fallback node for 'mapgen_ice' Dungeongen: Add fallback node for 'mapgen_river_water_source' Mgv5: Remove unnecessary '#include util/directiontables.h' Add missing 'this->'s in makeChunk() Mgv6: Edit empty line formatting Remove leading spaces in makeChunk() Add missing spaces after 'for' and 'if' Mgv7: Edit empty line formatting --- doc/lua_api.txt | 2 ++ games/minimal/mods/default/mapgen.lua | 1 - src/cavegen.cpp | 3 +++ src/dungeongen.cpp | 2 ++ src/mapgen_v5.cpp | 7 +++---- src/mapgen_v6.cpp | 20 +++++++++++--------- src/mapgen_v7.cpp | 1 + 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 0b3d5daa..a3bb6481 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2461,6 +2461,8 @@ These functions return the leftover itemstack. * Map of Lua entities, indexed by active object id * `minetest.registered_ores` * List of registered ore definitions. +* `minetest.registered_biomes` + * List of registered biome definitions. * `minetest.registered_decorations` * List of registered decoration definitions. diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua index e13dcfaf..65b67dae 100644 --- a/games/minimal/mods/default/mapgen.lua +++ b/games/minimal/mods/default/mapgen.lua @@ -3,7 +3,6 @@ -- -minetest.register_alias("mapgen_air", "air") minetest.register_alias("mapgen_stone", "default:stone") minetest.register_alias("mapgen_dirt", "default:dirt") minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") diff --git a/src/cavegen.cpp b/src/cavegen.cpp index e1516af0..b8abfbca 100644 --- a/src/cavegen.cpp +++ b/src/cavegen.cpp @@ -43,6 +43,9 @@ CaveV5::CaveV5(Mapgen *mg, PseudoRandom *ps) c_ice = ndef->getId("mapgen_ice"); this->np_caveliquids = &nparams_caveliquids; this->ystride = mg->csize.X; + + if (c_ice == CONTENT_IGNORE) + c_ice = CONTENT_AIR; dswitchint = ps->range(1, 14); flooded = ps->range(1, 2) == 2; diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp index cb5ea97b..ce92319e 100644 --- a/src/dungeongen.cpp +++ b/src/dungeongen.cpp @@ -68,6 +68,8 @@ DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams) // For mapgens using river water dp.c_river_water = mg->ndef->getId("mapgen_river_water_source"); + if (dp.c_river_water == CONTENT_IGNORE) + dp.c_river_water = mg->ndef->getId("mapgen_water_source"); } diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 92cf0020..48b71729 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -38,7 +38,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mg_ore.h" #include "mg_decoration.h" #include "mapgen_v5.h" -#include "util/directiontables.h" FlagDesc flagdesc_mapgen_v5[] = { @@ -216,9 +215,9 @@ void MapgenV5::makeChunk(BlockMakeData *data) data->blockpos_requested.Y <= data->blockpos_max.Y && data->blockpos_requested.Z <= data->blockpos_max.Z); - generating = true; - vm = data->vmanip; - ndef = data->nodedef; + this->generating = true; + this->vm = data->vmanip; + this->ndef = data->nodedef; //TimeTaker t("makeChunk"); v3s16 blockpos_min = data->blockpos_min; diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 0a9f80dc..57d0f59b 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + #include "mapgen.h" #include "voxel.h" #include "noise.h" @@ -37,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mg_decoration.h" #include "mapgen_v6.h" + FlagDesc flagdesc_mapgen_v6[] = { {"jungles", MGV6_JUNGLES}, {"biomeblend", MGV6_BIOMEBLEND}, @@ -47,7 +49,8 @@ FlagDesc flagdesc_mapgen_v6[] = { {NULL, 0} }; -/////////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge) @@ -197,7 +200,6 @@ void MapgenV6Params::writeParams(Settings *settings) const //////////////////////// Some helper functions for the map generator - // Returns Y one under area minimum if not found s16 MapgenV6::find_stone_level(v2s16 p2d) { @@ -468,11 +470,11 @@ void MapgenV6::makeChunk(BlockMakeData *data) assert(data->vmanip); assert(data->nodedef); assert(data->blockpos_requested.X >= data->blockpos_min.X && - data->blockpos_requested.Y >= data->blockpos_min.Y && - data->blockpos_requested.Z >= data->blockpos_min.Z); + data->blockpos_requested.Y >= data->blockpos_min.Y && + data->blockpos_requested.Z >= data->blockpos_min.Z); assert(data->blockpos_requested.X <= data->blockpos_max.X && - data->blockpos_requested.Y <= data->blockpos_max.Y && - data->blockpos_requested.Z <= data->blockpos_max.Z); + data->blockpos_requested.Y <= data->blockpos_max.Y && + data->blockpos_requested.Z <= data->blockpos_max.Z); this->generating = true; this->vm = data->vmanip; @@ -808,7 +810,7 @@ void MapgenV6::flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos) continue; // Drop mud on side - for(u32 di = 0; di < 4; di++) { + for (u32 di = 0; di < 4; di++) { v3s16 dirp = dirs4[di]; u32 i2 = i; // Move to side @@ -833,7 +835,7 @@ void MapgenV6::flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos) vm->m_area.add_y(em, i2, -1); n2 = &vm->m_data[i2]; // if out of known area - if(vm->m_area.contains(i2) == false || + if (vm->m_area.contains(i2) == false || n2->getContent() == CONTENT_IGNORE) { dropped_to_unknown = true; break; @@ -848,7 +850,7 @@ void MapgenV6::flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos) if (!dropped_to_unknown) { *n2 = *n; // Set old place to be air (or water) - if(old_is_water) + if (old_is_water) *n = MapNode(c_water_source); else *n = MapNode(CONTENT_AIR); diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 3842b1a9..50559f9a 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -46,6 +46,7 @@ FlagDesc flagdesc_mapgen_v7[] = { {NULL, 0} }; + /////////////////////////////////////////////////////////////////////////////// From b4cbcaea262ba1b75e1b29b06d177e9d8d25b177 Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 11 Jan 2016 05:46:41 +0000 Subject: [PATCH 200/531] Mgv7/flat/fractal: Place biome top node on tunnel entrance floor --- src/mapgen_flat.cpp | 39 +++++++++++++++++++++++++++++---------- src/mapgen_fractal.cpp | 39 +++++++++++++++++++++++++++++---------- src/mapgen_v7.cpp | 41 ++++++++++++++++++++++++++++++----------- 3 files changed, 88 insertions(+), 31 deletions(-) diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index c961d755..b7f01320 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -551,20 +551,39 @@ void MapgenFlat::dustTopNodes() void MapgenFlat::generateCaves(s16 max_stone_y) { if (max_stone_y >= node_min.Y) { - u32 index = 0; + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + u32 index3d; for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - u32 vi = vm->m_area.index(node_min.X, y, z); - for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { - float d1 = contour(noise_cave1->result[index]); - float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.3f) { - content_t c = vm->m_data[vi].getContent(); - if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) - continue; + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool open = false; // Is column open to overground + u32 vi = vm->m_area.index(x, node_max.Y + 1, z); + index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; + y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); + } else if (open && (c == biome->c_filler || c == biome->c_stone)) { + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + open = false; + } else { + open = false; } } } diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 6c03c4ca..5c0d283e 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -674,20 +674,39 @@ void MapgenFractal::dustTopNodes() void MapgenFractal::generateCaves(s16 max_stone_y) { if (max_stone_y >= node_min.Y) { - u32 index = 0; + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + u32 index3d; for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - u32 vi = vm->m_area.index(node_min.X, y, z); - for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { - float d1 = contour(noise_cave1->result[index]); - float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.3f) { - content_t c = vm->m_data[vi].getContent(); - if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) - continue; + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool open = false; // Is column open to overground + u32 vi = vm->m_area.index(x, node_max.Y + 1, z); + index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; + y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); + } else if (open && (c == biome->c_filler || c == biome->c_stone)) { + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + open = false; + } else { + open = false; } } } diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 50559f9a..1e481548 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -863,20 +863,39 @@ void MapgenV7::addTopNodes() void MapgenV7::generateCaves(s16 max_stone_y) { if (max_stone_y >= node_min.Y) { - u32 index = 0; + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + u32 index3d; for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - u32 i = vm->m_area.index(node_min.X, y, z); - for (s16 x = node_min.X; x <= node_max.X; x++, i++, index++) { - float d1 = contour(noise_cave1->result[index]); - float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.3f) { - content_t c = vm->m_data[i].getContent(); - if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) - continue; + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool open = false; // Is column open to overground + u32 vi = vm->m_area.index(x, node_max.Y + 1, z); + index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); - vm->m_data[i] = MapNode(CONTENT_AIR); + for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; + y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate + vm->m_data[vi] = MapNode(CONTENT_AIR); + } else if (open && (c == biome->c_filler || c == biome->c_stone)) { + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + open = false; + } else { + open = false; } } } From 3c6b2ffb10e053ad0b585347275034c4d889530d Mon Sep 17 00:00:00 2001 From: Duane Robertson Date: Wed, 13 Jan 2016 21:57:02 -0600 Subject: [PATCH 201/531] Add Valleys mapgen. --- build/android/jni/Android.mk | 1 + builtin/settingtypes.txt | 78 +++ minetest.conf.example | 41 ++ src/CMakeLists.txt | 1 + src/emerge.cpp | 2 + src/mapgen_valleys.cpp | 983 +++++++++++++++++++++++++++++++++++ src/mapgen_valleys.h | 194 +++++++ 7 files changed, 1300 insertions(+) create mode 100644 src/mapgen_valleys.cpp create mode 100644 src/mapgen_valleys.h diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 435dfa3b..ff9d9ec4 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -179,6 +179,7 @@ LOCAL_SRC_FILES := \ jni/src/mapgen_v5.cpp \ jni/src/mapgen_v6.cpp \ jni/src/mapgen_v7.cpp \ + jni/src/mapgen_valleys.cpp \ jni/src/mapnode.cpp \ jni/src/mapsector.cpp \ jni/src/mesh.cpp \ diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 06d47380..833890a3 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1033,6 +1033,84 @@ mgfractal_np_filler_depth (Mapgen fractal filler depth noise parameters) noise_p mgfractal_np_cave1 (Mapgen fractal cave1 noise parameters) noise_params 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0 mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0 +# Mapgen Valleys parameters +[***Mapgen Valleys] + +# General parameters +[****General] + +# Map generation attributes specific to Mapgen Valleys. +# Flags that are not specified in the flag string are not modified from the default. +# Flags starting with "no" are used to explicitly disable them. +# "altitude_chill" makes higher elevations colder, which may cause biome issues. +# "fast" produces softer terrain, more quickly +# "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes. +# "rugged" and "cliffs" do nothing unless "fast" is enabled +mg_valleys_spflags (Valleys C Flags) flags altitude_chill,cliffs,humid_rivers,nofast,rugged altitude_chill,noaltitude_chill,cliffs,nocliffs,fast,nofast,humid_rivers,nohumid_rivers,rugged,norugged + +# The altitude at which temperature drops by 20C +mg_valleys_altitude_chill (Altitude Chill) int 90 + +# Average humidity +mg_valleys_humidity (Humidity) int 50 + +# The highest humidity around rivers in otherwise dry areas +mg_valleys_humidity_break_point (Humidity Break) int 65 + +# Maximum altitude where lava can emerge +mg_valleys_lava_max_height (Lava Height) int 0 + +# Maximum altitude where water occurs in caves (and tends to fall out) +mg_valleys_cave_water_max_height (Cave Water Height) int 31000 + +# How deep to make rivers +mg_valleys_river_depth (River Depth) int 4 + +# How wide to make rivers +mg_valleys_river_size (River Size) int 5 + +# Average temperature +mg_valleys_temperature (Temperature) int 50 + +# How often water occurs in caves (0-10) +mg_valleys_water_features (Water Features) int 3 + +# Noise parameters +[****Noises] + +# Cliff noise +mg_valleys_np_cliffs (Cliffs) noise_params 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0 + +# Mountain corrugation +mg_valleys_np_corr (Corrugation) noise_params 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0 + +# The depth of dirt or other filler +mg_valleys_np_filler_depth (Filler Depth) noise_params 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 + +# River noise -- rivers occur close to zero +mg_valleys_np_rivers (River Noise) noise_params 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 + +# Caves and tunnels form at the intersection of the two noises +mg_valleys_np_simple_caves_1 (Simple Caves #1) noise_params 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0 + +# Caves and tunnels form at the intersection of the two noises +mg_valleys_np_simple_caves_2 (Simple Caves #2) noise_params 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0 + +# Base terrain height +mg_valleys_np_terrain_height (Terrain Height) noise_params -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 + +# Raises terrain to make valleys around the rivers +mg_valleys_np_valley_depth (Valley Depth) noise_params 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 + +# Slope and fill work together to modify the heights +mg_valleys_np_inter_valley_fill (Valley Fill) noise_params 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 + +# Amplifies the valleys +mg_valleys_np_valley_profile (Valley Profile) noise_params 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 + +# Slope and fill work together to modify the heights +mg_valleys_np_inter_valley_slope (Valley Slope) noise_params 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 + [*Security] # Prevent mods from doing insecure things like running shell commands. diff --git a/minetest.conf.example b/minetest.conf.example index bea9b4ac..b95b32ee 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1313,6 +1313,47 @@ # type: noise_params # mgfractal_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0 +#### Mapgen Valleys + +#mg_valleys_spflags = altitude_chill,cliffs,humid_rivers,nofast,rugged +# "altitude_chill" makes higher elevations colder, which may cause biome issues. +# "fast" produces softer terrain, more quickly +# "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes. +# "rugged" and "cliffs" do nothing unless "fast" is enabled +# +#mg_valleys_altitude_chill = 90 # the altitude at which temperature drops by 20C +#mg_valleys_cave_water_max_height = 31000 # max altitude of water in caves +#mg_valleys_humidity = 50 # the average humidity +#mg_valleys_humidity_break_point = 65 # The highest humidity around rivers in otherwise dry areas +#mg_valleys_lava_max_height = 0 # maximum altitude of lava +#mg_valleys_river_depth = 4 # how deep to make rivers +#mg_valleys_river_size = 5 # how wide to make rivers +#mg_valleys_temperature = 50 # the average temperature +#mg_valleys_water_features = 3 # how often water occurs in caves (0-10) +# +#mg_valleys_np_cliffs = 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0 +#mg_valleys_np_corr = 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0 +#mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 +# +# River noise -- rivers occur close to zero +#mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 +# +#mg_valleys_np_simple_caves_1 = 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0 +#mg_valleys_np_simple_caves_2 = 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0 +# +# Base terrain height +#mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 +# +# Raises terrain to make valleys around the rivers +#mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 +# +# Slope and fill work together to modify the heights +#mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 +#mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 +# +# Amplifies the valleys +#mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 + ## Security # Prevent mods from doing insecure things like running shell commands. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6256a850..0b84ff85 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -388,6 +388,7 @@ set(common_SRCS mapgen_v5.cpp mapgen_v6.cpp mapgen_v7.cpp + mapgen_valleys.cpp mapnode.cpp mapsector.cpp mg_biome.cpp diff --git a/src/emerge.cpp b/src/emerge.cpp index 157be2e6..b188a7f4 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen_v5.h" #include "mapgen_v6.h" #include "mapgen_v7.h" +#include "mapgen_valleys.h" #include "mapgen_singlenode.h" #include "mg_biome.h" #include "mg_ore.h" @@ -108,6 +109,7 @@ MapgenDesc g_reg_mapgens[] = { {"v7", new MapgenFactoryV7, true}, {"flat", new MapgenFactoryFlat, true}, {"fractal", new MapgenFactoryFractal, true}, + {"valleys", new MapgenFactoryValleys, true}, {"singlenode", new MapgenFactorySinglenode, false}, }; diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp new file mode 100644 index 00000000..c14ceb51 --- /dev/null +++ b/src/mapgen_valleys.cpp @@ -0,0 +1,983 @@ +/* +Minetest Valleys C +Copyright (C) 2010-2015 kwolekr, Ryan Kwolek +Copyright (C) 2010-2015 paramat, Matt Gregory +Copyright (C) 2016 Duane Robertson + +Based on Valleys Mapgen by Gael de Sailly + (https://forum.minetest.net/viewtopic.php?f=9&t=11430) +and mapgen_v7 by kwolekr and paramat. + +Licensing changed by permission of Gael de Sailly. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + + +#include "mapgen.h" +#include "voxel.h" +#include "noise.h" +#include "mapblock.h" +#include "mapnode.h" +#include "map.h" +#include "content_sao.h" +#include "nodedef.h" +#include "voxelalgorithms.h" +#include "settings.h" // For g_settings +#include "emerge.h" +#include "dungeongen.h" +#include "treegen.h" +#include "mg_biome.h" +#include "mg_ore.h" +#include "mg_decoration.h" +#include "mapgen_valleys.h" + +//#undef NDEBUG +//#include "assert.h" + +//#include "util/timetaker.h" +//#include "profiler.h" + + +//static Profiler mapgen_prof; +//Profiler *mapgen_profiler = &mapgen_prof; + +static FlagDesc flagdesc_mapgen_valleys[] = { + {"altitude_chill", MG_VALLEYS_ALT_CHILL}, + {"cliffs", MG_VALLEYS_CLIFFS}, + {"fast", MG_VALLEYS_FAST}, + {"humid_rivers", MG_VALLEYS_HUMID_RIVERS}, + {"rugged", MG_VALLEYS_RUGGED}, + {NULL, 0} +}; + +/////////////////////////////////////////////////////////////////////////////// + + +MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge) + : Mapgen(mapgenid, params, emerge) +{ + this->m_emerge = emerge; + this->bmgr = emerge->biomemgr; + + //// amount of elements to skip for the next index + //// for noise/height/biome maps (not vmanip) + this->ystride = csize.X; + this->zstride = csize.X * (csize.Y + 2); + + this->biomemap = new u8[csize.X * csize.Z]; + this->heightmap = new s16[csize.X * csize.Z]; + this->heatmap = NULL; + this->humidmap = NULL; + + MapgenValleysParams *sp = (MapgenValleysParams *)params->sparams; + this->spflags = sp->spflags; + + this->cliff_terrain = (spflags & MG_VALLEYS_CLIFFS); + this->fast_terrain = (spflags & MG_VALLEYS_FAST); + this->humid_rivers = (spflags & MG_VALLEYS_HUMID_RIVERS); + this->rugged_terrain = (spflags & MG_VALLEYS_RUGGED); + this->use_altitude_chill = (spflags & MG_VALLEYS_ALT_CHILL); + + this->altitude_chill = sp->altitude_chill; + this->cave_water_max_height = sp->cave_water_max_height; + this->humidity_adjust = sp->humidity - 50.f; + this->humidity_break_point = sp->humidity_break_point; + this->lava_max_height = sp->lava_max_height; + this->river_depth = sp->river_depth + 1.f; + this->river_size = sp->river_size / 100.f; + this->temperature_adjust = sp->temperature - 50.f; + this->water_features = MYMAX(1, MYMIN(11, 11 - sp->water_features)); + + //// 2D Terrain noise + noise_cliffs = new Noise(&sp->np_cliffs, seed, csize.X, csize.Z); + noise_corr = new Noise(&sp->np_corr, seed, csize.X, csize.Z); + noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); + noise_inter_valley_slope = new Noise(&sp->np_inter_valley_slope, seed, csize.X, csize.Z); + noise_rivers = new Noise(&sp->np_rivers, seed, csize.X, csize.Z); + noise_terrain_height = new Noise(&sp->np_terrain_height, seed, csize.X, csize.Z); + noise_valley_depth = new Noise(&sp->np_valley_depth, seed, csize.X, csize.Z); + noise_valley_profile = new Noise(&sp->np_valley_profile, seed, csize.X, csize.Z); + + if (this->fast_terrain) + noise_inter_valley_fill = new Noise(&sp->np_inter_valley_fill, seed, csize.X, csize.Z); + + //// 3D Terrain noise + noise_simple_caves_1 = new Noise(&sp->np_simple_caves_1, seed, csize.X, csize.Y + 2, csize.Z); + noise_simple_caves_2 = new Noise(&sp->np_simple_caves_2, seed, csize.X, csize.Y + 2, csize.Z); + + if (!this->fast_terrain) + noise_inter_valley_fill = new Noise(&sp->np_inter_valley_fill, seed, csize.X, csize.Y + 2, csize.Z); + + //// Biome noise + noise_heat_blend = new Noise(¶ms->np_biome_heat_blend, seed, csize.X, csize.Z); + noise_heat = new Noise(¶ms->np_biome_heat, seed, csize.X, csize.Z); + noise_humidity_blend = new Noise(¶ms->np_biome_humidity_blend, seed, csize.X, csize.Z); + noise_humidity = new Noise(¶ms->np_biome_humidity, seed, csize.X, csize.Z); + + //// Resolve nodes to be used + INodeDefManager *ndef = emerge->ndef; + + c_cobble = ndef->getId("mapgen_cobble"); + c_desert_stone = ndef->getId("mapgen_desert_stone"); + c_dirt = ndef->getId("mapgen_dirt"); + c_lava_source = ndef->getId("mapgen_lava_source"); + c_mossycobble = ndef->getId("mapgen_mossycobble"); + c_river_water_source = ndef->getId("mapgen_river_water_source"); + c_sand = ndef->getId("mapgen_sand"); + c_sandstonebrick = ndef->getId("mapgen_sandstonebrick"); + c_sandstone = ndef->getId("mapgen_sandstone"); + c_stair_cobble = ndef->getId("mapgen_stair_cobble"); + c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick"); + c_stone = ndef->getId("mapgen_stone"); + c_water_source = ndef->getId("mapgen_water_source"); + + if (c_mossycobble == CONTENT_IGNORE) + c_mossycobble = c_cobble; + if (c_river_water_source == CONTENT_IGNORE) + c_river_water_source = c_water_source; + if (c_sand == CONTENT_IGNORE) + c_sand = c_stone; + if (c_sandstonebrick == CONTENT_IGNORE) + c_sandstonebrick = c_sandstone; + if (c_stair_cobble == CONTENT_IGNORE) + c_stair_cobble = c_cobble; + if (c_stair_sandstonebrick == CONTENT_IGNORE) + c_stair_sandstonebrick = c_sandstone; +} + + +MapgenValleys::~MapgenValleys() +{ + delete noise_cliffs; + delete noise_corr; + delete noise_filler_depth; + delete noise_heat; + delete noise_heat_blend; + delete noise_humidity; + delete noise_humidity_blend; + delete noise_inter_valley_fill; + delete noise_inter_valley_slope; + delete noise_rivers; + delete noise_simple_caves_1; + delete noise_simple_caves_2; + delete noise_terrain_height; + delete noise_valley_depth; + delete noise_valley_profile; + + delete[] heightmap; + delete[] biomemap; +} + + +MapgenValleysParams::MapgenValleysParams() +{ + spflags = MG_VALLEYS_CLIFFS | MG_VALLEYS_RUGGED + | MG_VALLEYS_HUMID_RIVERS | MG_VALLEYS_ALT_CHILL; + + altitude_chill = 90; // The altitude at which temperature drops by 20C. + // Water in caves will never be higher than this. + cave_water_max_height = MAX_MAP_GENERATION_LIMIT; + humidity = 50; + // the maximum humidity around rivers in otherwise dry areas + humidity_break_point = 65; + lava_max_height = 0; // Lava will never be higher than this. + river_depth = 4; // How deep to carve river channels. + river_size = 5; // How wide to make rivers. + temperature = 50; + water_features = 3; // How often water will occur in caves. + + np_cliffs = NoiseParams(0.f, 1.f, v3f(750, 750, 750), 8445, 5, 1.f, 2.f); + np_corr = NoiseParams(0.f, 1.f, v3f(40, 40, 40), -3536, 4, 1.f, 2.f); + np_filler_depth = NoiseParams(0.f, 1.2f, v3f(256, 256, 256), 1605, 3, 0.5f, 2.f); + np_inter_valley_fill = NoiseParams(0.f, 1.f, v3f(256, 512, 256), 1993, 6, 0.8f, 2.f); + np_inter_valley_slope = NoiseParams(0.5f, 0.5f, v3f(128, 128, 128), 746, 1, 1.f, 2.f); + np_rivers = NoiseParams(0.f, 1.f, v3f(256, 256, 256), -6050, 5, 0.6f, 2.f); + np_simple_caves_1 = NoiseParams(0.f, 1.f, v3f(64, 64, 64), -8402, 3, 0.5f, 2.f); + np_simple_caves_2 = NoiseParams(0.f, 1.f, v3f(64, 64, 64), 3944, 3, 0.5f, 2.f); + np_terrain_height = NoiseParams(-10.f, 50.f, v3f(1024, 1024, 1024), 5202, 6, 0.4f, 2.f); + np_valley_depth = NoiseParams(5.f, 4.f, v3f(512, 512, 512), -1914, 1, 1.f, 2.f); + np_valley_profile = NoiseParams(0.6f, 0.5f, v3f(512, 512, 512), 777, 1, 1.f, 2.f); + } + + +void MapgenValleysParams::readParams(const Settings *settings) +{ + settings->getFlagStrNoEx("mg_valleys_spflags", spflags, flagdesc_mapgen_valleys); + + settings->getU16NoEx("mg_valleys_altitude_chill", altitude_chill); + settings->getS16NoEx("mg_valleys_cave_water_max_height", cave_water_max_height); + settings->getS16NoEx("mg_valleys_humidity", humidity); + settings->getS16NoEx("mg_valleys_humidity_break_point", humidity_break_point); + settings->getS16NoEx("mg_valleys_lava_max_height", lava_max_height); + settings->getU16NoEx("mg_valleys_river_depth", river_depth); + settings->getU16NoEx("mg_valleys_river_size", river_size); + settings->getS16NoEx("mg_valleys_temperature", temperature); + settings->getU16NoEx("mg_valleys_water_features", water_features); + + settings->getNoiseParams("mg_valleys_np_cliffs", np_cliffs); + settings->getNoiseParams("mg_valleys_np_corr", np_corr); + settings->getNoiseParams("mg_valleys_np_filler_depth", np_filler_depth); + settings->getNoiseParams("mg_valleys_np_inter_valley_fill", np_inter_valley_fill); + settings->getNoiseParams("mg_valleys_np_inter_valley_slope", np_inter_valley_slope); + settings->getNoiseParams("mg_valleys_np_rivers", np_rivers); + settings->getNoiseParams("mg_valleys_np_simple_caves_1", np_simple_caves_1); + settings->getNoiseParams("mg_valleys_np_simple_caves_2", np_simple_caves_2); + settings->getNoiseParams("mg_valleys_np_terrain_height", np_terrain_height); + settings->getNoiseParams("mg_valleys_np_valley_depth", np_valley_depth); + settings->getNoiseParams("mg_valleys_np_valley_profile", np_valley_profile); +} + + +void MapgenValleysParams::writeParams(Settings *settings) const +{ + settings->setFlagStr("mg_valleys_spflags", spflags, flagdesc_mapgen_valleys, U32_MAX); + + settings->setU16("mg_valleys_altitude_chill", altitude_chill); + settings->setS16("mg_valleys_cave_water_max_height", cave_water_max_height); + settings->setS16("mg_valleys_humidity", humidity); + settings->setS16("mg_valleys_humidity_break_point", humidity_break_point); + settings->setS16("mg_valleys_lava_max_height", lava_max_height); + settings->setU16("mg_valleys_river_depth", river_depth); + settings->setU16("mg_valleys_river_size", river_size); + settings->setS16("mg_valleys_temperature", temperature); + settings->setU16("mg_valleys_water_features", water_features); + + settings->setNoiseParams("mg_valleys_np_cliffs", np_cliffs); + settings->setNoiseParams("mg_valleys_np_corr", np_corr); + settings->setNoiseParams("mg_valleys_np_filler_depth", np_filler_depth); + settings->setNoiseParams("mg_valleys_np_inter_valley_fill", np_inter_valley_fill); + settings->setNoiseParams("mg_valleys_np_inter_valley_slope", np_inter_valley_slope); + settings->setNoiseParams("mg_valleys_np_rivers", np_rivers); + settings->setNoiseParams("mg_valleys_np_simple_caves_1", np_simple_caves_1); + settings->setNoiseParams("mg_valleys_np_simple_caves_2", np_simple_caves_2); + settings->setNoiseParams("mg_valleys_np_terrain_height", np_terrain_height); + settings->setNoiseParams("mg_valleys_np_valley_depth", np_valley_depth); + settings->setNoiseParams("mg_valleys_np_valley_profile", np_valley_profile); +} + + +/////////////////////////////////////// + + +void MapgenValleys::makeChunk(BlockMakeData *data) +{ + // Pre-conditions + assert(data->vmanip); + assert(data->nodedef); + assert(data->blockpos_requested.X >= data->blockpos_min.X && + data->blockpos_requested.Y >= data->blockpos_min.Y && + data->blockpos_requested.Z >= data->blockpos_min.Z); + assert(data->blockpos_requested.X <= data->blockpos_max.X && + data->blockpos_requested.Y <= data->blockpos_max.Y && + data->blockpos_requested.Z <= data->blockpos_max.Z); + + this->generating = true; + this->vm = data->vmanip; + this->ndef = data->nodedef; + + //TimeTaker t("makeChunk"); + + v3s16 blockpos_min = data->blockpos_min; + v3s16 blockpos_max = data->blockpos_max; + node_min = blockpos_min * MAP_BLOCKSIZE; + node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1); + full_node_min = (blockpos_min - 1) * MAP_BLOCKSIZE; + full_node_max = (blockpos_max + 2) * MAP_BLOCKSIZE - v3s16(1, 1, 1); + + blockseed = getBlockSeed2(full_node_min, seed); + + // Generate noise maps and base terrain height. + calculateNoise(); + + // Generate base terrain with initial heightmaps + s16 stone_surface_max_y = generateTerrain(); + + // Create biomemap at heightmap surface + bmgr->calcBiomes(csize.X, csize.Z, heatmap, humidmap, heightmap, biomemap); + + // Actually place the biome-specific nodes + MgStoneType stone_type = generateBiomes(heatmap, humidmap); + + // Cave creation. + if (flags & MG_CAVES) + generateSimpleCaves(stone_surface_max_y); + + // Dungeon creation + if ((flags & MG_DUNGEONS) && node_max.Y < 50 && (stone_surface_max_y >= node_min.Y)) { + DungeonParams dp; + + dp.np_rarity = nparams_dungeon_rarity; + dp.np_density = nparams_dungeon_density; + dp.np_wetness = nparams_dungeon_wetness; + dp.c_water = c_water_source; + if (stone_type == STONE) { + dp.c_cobble = c_cobble; + dp.c_moss = c_mossycobble; + dp.c_stair = c_stair_cobble; + + dp.diagonal_dirs = false; + dp.mossratio = 3.f; + dp.holesize = v3s16(1, 2, 1); + dp.roomsize = v3s16(0, 0, 0); + dp.notifytype = GENNOTIFY_DUNGEON; + } else if (stone_type == DESERT_STONE) { + dp.c_cobble = c_desert_stone; + dp.c_moss = c_desert_stone; + dp.c_stair = c_desert_stone; + + dp.diagonal_dirs = true; + dp.mossratio = 0.f; + dp.holesize = v3s16(2, 3, 2); + dp.roomsize = v3s16(2, 5, 2); + dp.notifytype = GENNOTIFY_TEMPLE; + } else if (stone_type == SANDSTONE) { + dp.c_cobble = c_sandstonebrick; + dp.c_moss = c_sandstonebrick; + dp.c_stair = c_sandstonebrick; + + dp.diagonal_dirs = false; + dp.mossratio = 0.f; + dp.holesize = v3s16(2, 2, 2); + dp.roomsize = v3s16(2, 0, 2); + dp.notifytype = GENNOTIFY_DUNGEON; + } + + DungeonGen dgen(this, &dp); + dgen.generate(blockseed, full_node_min, full_node_max); + } + + // Generate the registered decorations + if (flags & MG_DECORATIONS) + m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max); + + // Generate the registered ores + m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max); + + // Sprinkle some dust on top after everything else was generated + dustTopNodes(); + + //TimeTaker tll("liquid_lighting"); + + updateLiquid(&data->transforming_liquid, full_node_min, full_node_max); + + if (flags & MG_LIGHT) + calcLighting( + node_min - v3s16(0, 1, 0), + node_max + v3s16(0, 1, 0), + full_node_min, + full_node_max); + + //mapgen_profiler->avg("liquid_lighting", tll.stop() / 1000.f); + //mapgen_profiler->avg("makeChunk", t.stop() / 1000.f); + + this->generating = false; +} + + +// Populate the noise tables and do most of the +// calculation necessary to determine terrain height. +void MapgenValleys::calculateNoise() +{ + //TimeTaker t("calculateNoise", NULL, PRECISION_MICRO); + + int x = node_min.X; + int y = node_min.Y - 1; + int z = node_min.Z; + + //TimeTaker tcn("actualNoise"); + + noise_filler_depth->perlinMap2D(x, z); + noise_heat_blend->perlinMap2D(x, z); + noise_heat->perlinMap2D(x, z); + noise_humidity_blend->perlinMap2D(x, z); + noise_humidity->perlinMap2D(x, z); + noise_inter_valley_slope->perlinMap2D(x, z); + noise_rivers->perlinMap2D(x, z); + noise_terrain_height->perlinMap2D(x, z); + noise_valley_depth->perlinMap2D(x, z); + noise_valley_profile->perlinMap2D(x, z); + + if (fast_terrain) { + // Make this 2D for speed, if requested. + noise_inter_valley_fill->perlinMap2D(x, z); + + if (cliff_terrain) + noise_cliffs->perlinMap2D(x, z); + if (rugged_terrain) + noise_corr->perlinMap2D(x, z); + } else { + noise_inter_valley_fill->perlinMap3D(x, y, z); + } + + if (flags & MG_CAVES) { + noise_simple_caves_1->perlinMap3D(x, y, z); + noise_simple_caves_2->perlinMap3D(x, y, z); + } + + //mapgen_profiler->avg("noisemaps", tcn.stop() / 1000.f); + + for (s32 index = 0; index < csize.X * csize.Z; index++) { + noise_heat->result[index] += noise_heat_blend->result[index]; + noise_heat->result[index] += temperature_adjust; + noise_humidity->result[index] += noise_humidity_blend->result[index]; + } + + TerrainNoise tn; + + u32 index = 0; + for (tn.z = node_min.Z; tn.z <= node_max.Z; tn.z++) + for (tn.x = node_min.X; tn.x <= node_max.X; tn.x++, index++) { + // The parameters that we actually need to generate terrain + // are passed by address (and the return value). + tn.terrain_height = noise_terrain_height->result[index]; + // River noise is replaced with base terrain, which + // is basically the height of the water table. + tn.rivers = &noise_rivers->result[index]; + // Valley depth noise is replaced with the valley + // number that represents the height of terrain + // over rivers and is used to determine about + // how close a river is for humidity calculation. + tn.valley = &noise_valley_depth->result[index]; + tn.valley_profile = noise_valley_profile->result[index]; + // Slope noise is replaced by the calculated slope + // which is used to get terrain height in the slow + // method, to create sharper mountains. + tn.slope = &noise_inter_valley_slope->result[index]; + tn.inter_valley_fill = noise_inter_valley_fill->result[index]; + tn.cliffs = noise_cliffs->result[index]; + tn.corr = noise_corr->result[index]; + + // This is the actual terrain height. + float mount = terrainLevelFromNoise(&tn); + noise_terrain_height->result[index] = mount; + + if (fast_terrain) { + // Assign humidity adjusted by water proximity. + // I can't think of a reason why a mod would expect base humidity + // from noise or at any altitude other than ground level. + noise_humidity->result[index] = humidityByTerrain( + noise_humidity->result[index], + mount, + noise_rivers->result[index], + noise_valley_depth->result[index]); + + // Assign heat adjusted by altitude. See humidity, above. + if (use_altitude_chill && mount > 0.f) + noise_heat->result[index] *= pow(0.5f, (mount - altitude_chill / 3.f) / altitude_chill); + } + } + + heatmap = noise_heat->result; + humidmap = noise_humidity->result; +} + + +// This keeps us from having to maintain two similar sets of +// complicated code to determine ground level. +float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) +{ + float inter_valley_slope = *tn->slope; + + // The square function changes the behaviour of this noise: + // very often small, and sometimes very high. + float valley_d = pow(*tn->valley, 2); + + // valley_d is here because terrain is generally higher where valleys + // are deep (mountains). base represents the height of the + // rivers, most of the surface is above. + float base = tn->terrain_height + valley_d; + + // "river" represents the distance from the river, in arbitrary units. + float river = fabs(*tn->rivers) - river_size; + + // Use the curve of the function 1−exp(−(x/a)²) to model valleys. + // Making "a" vary (0 < a ≤ 1) changes the shape of the valleys. + // Try it with a geometry software ! + // (here x = "river" and a = valley_profile). + // "valley" represents the height of the terrain, from the rivers. + *tn->valley = valley_d * (1.f - exp(- pow(river / tn->valley_profile, 2))); + + // approximate height of the terrain at this point + float mount = base + *tn->valley; + + *tn->slope *= *tn->valley; + + // Rivers are placed where "river" is negative, so where the original + // noise value is close to zero. + // Base ground is returned as rivers since it's basically the water table. + *tn->rivers = base; + if (river < 0.f) { + // Use the the function −sqrt(1−x²) which models a circle. + float depth = (river_depth * sqrt(1.f - pow((river / river_size + 1), 2))); + + // base - depth : height of the bottom of the river + // water_level - 2 : don't make rivers below 2 nodes under the surface + u16 min_bottom = 2; + if (!fast_terrain) + min_bottom = 6; + mount = fmin(fmax(base - depth, (float) (water_level - min_bottom)), mount); + + // Slope has no influence on rivers. + *tn->slope = 0.f; + } + + if (fast_terrain) { + // The penultimate step builds up the heights, but we reduce it + // occasionally to create cliffs. + float delta = sin(tn->inter_valley_fill) * *tn->slope; + if (cliff_terrain && tn->cliffs >= 0.2f) + mount += delta * 0.66f; + else + mount += delta; + + // Use yet another noise to make the heights look more rugged. + if (rugged_terrain + && mount > water_level + && fabs(inter_valley_slope * tn->inter_valley_fill) < 0.3f) + mount += ((delta < 0.f) ? -1.f : 1.f) * pow(fabs(delta), 0.5f) * fabs(sin(tn->corr)); + } + + return mount; +} + + +// This avoids duplicating the code in terrainLevelFromNoise, adding +// only the final step of terrain generation without a noise map. +float MapgenValleys::adjustedTerrainLevelFromNoise(TerrainNoise *tn) +{ + float mount = terrainLevelFromNoise(tn); + + if (!fast_terrain) { + for (s16 y = round(mount); y <= round(mount) + 1000; y++) { + float fill = NoisePerlin3D(&noise_inter_valley_fill->np, tn->x, y, tn->z, seed); + + if (fill * *tn->slope <= y - mount) { + mount = fmax(y - 1, mount); + break; + } + } + } + + return mount; +} + + +float MapgenValleys::humidityByTerrain( + float humidity_base, + float mount, + float rivers, + float valley) +{ + // Although the original valleys adjusts humidity by distance + // from seawater, this causes problems with the default biomes. + // Adjust only by freshwater proximity. + float humidity = humidity_base + humidity_adjust; + + if (humid_rivers && mount > water_level) { + // Offset to make everything average the same. + humidity -= (humidity_break_point - humidity_adjust) / 3.f; + + // This method is from the original lua. + float water_table = pow(0.5f, fmax(rivers / 3.f, 0.f)); + // This adds humidity next to rivers and lakes. + float river_water = pow(0.5f, fmax(valley / 12.f, 0.f)); + // Combine the two. + float water = water_table + (1.f - water_table) * river_water; + humidity = fmax(humidity, (humidity_break_point * water)); + } + + return humidity; +} + + +inline int MapgenValleys::getGroundLevelAtPoint(v2s16 p) +{ + // Base terrain calculation + return terrainLevelAtPoint(p.X, p.Y); +} + + +float MapgenValleys::terrainLevelAtPoint(s16 x, s16 z) +{ + TerrainNoise tn; + + float rivers = NoisePerlin2D(&noise_rivers->np, x, z, seed); + float valley = NoisePerlin2D(&noise_valley_depth->np, x, z, seed); + float inter_valley_slope = NoisePerlin2D(&noise_inter_valley_slope->np, x, z, seed); + + tn.x = x; + tn.z = z; + tn.terrain_height = NoisePerlin2D(&noise_terrain_height->np, x, z, seed); + tn.rivers = &rivers; + tn.valley = &valley; + tn.valley_profile = NoisePerlin2D(&noise_valley_profile->np, x, z, seed); + tn.slope = &inter_valley_slope; + tn.inter_valley_fill = 0.f; + tn.cliffs = 0.f; + tn.corr = 0.f; + + if (fast_terrain) { + tn.inter_valley_fill = NoisePerlin2D(&noise_inter_valley_fill->np, x, z, seed); + + if (cliff_terrain) + tn.cliffs = NoisePerlin2D(&noise_cliffs->np, x, z, seed); + if (rugged_terrain) + tn.corr = NoisePerlin2D(&noise_corr->np, x, z, seed); + } + + return adjustedTerrainLevelFromNoise(&tn); +} + + +int MapgenValleys::generateTerrain() +{ + MapNode n_air(CONTENT_AIR); + MapNode n_river_water(c_river_water_source); + MapNode n_sand(c_sand); + MapNode n_stone(c_stone); + MapNode n_water(c_water_source); + + v3s16 em = vm->m_area.getExtent(); + s16 surface_max_y = -MAX_MAP_GENERATION_LIMIT; + u32 index_2d = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) { + s16 river_y = round(noise_rivers->result[index_2d]); + s16 surface_y = round(noise_terrain_height->result[index_2d]); + float slope = noise_inter_valley_slope->result[index_2d]; + + heightmap[index_2d] = surface_y; + + if (surface_y > surface_max_y) + surface_max_y = surface_y; + + u32 index_3d = 0; + if (!fast_terrain) + index_3d = (z - node_min.Z) * zstride + (x - node_min.X); + + u32 index_data = vm->m_area.index(x, node_min.Y - 1, z); + + // Mapgens concern themselves with stone and water. + for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { + float fill = 0.f; + if (!fast_terrain) + fill = noise_inter_valley_fill->result[index_3d]; + + if (vm->m_data[index_data].getContent() == CONTENT_IGNORE) { + bool river = (river_y > surface_y); + + if (river && y == surface_y) { + // river bottom + vm->m_data[index_data] = n_sand; + } else if ((fast_terrain || river) && y <= surface_y) { + // ground + vm->m_data[index_data] = n_stone; + } else if (river && y < river_y) { + // river + vm->m_data[index_data] = n_river_water; + } else if ((!fast_terrain) && (!river) && fill * slope > y - surface_y) { + // ground (slow method) + vm->m_data[index_data] = n_stone; + heightmap[index_2d] = surface_max_y = y; + } else if (y <= water_level) { + // sea + vm->m_data[index_data] = n_water; + } else { + vm->m_data[index_data] = n_air; + } + } + + vm->m_area.add_y(em, index_data, 1); + if (!fast_terrain) + index_3d += ystride; + } + + if (!fast_terrain) { + // Assign the humidity adjusted by water proximity. + noise_humidity->result[index_2d] = humidityByTerrain( + noise_humidity->result[index_2d], + surface_max_y, + noise_rivers->result[index_2d], + noise_valley_depth->result[index_2d]); + + // Assign the heat adjusted by altitude. See humidity, above. + if (use_altitude_chill && surface_max_y > 0) + noise_heat->result[index_2d] + *= pow(0.5f, (surface_max_y - altitude_chill / 3.f) / altitude_chill); + } + } + + return surface_max_y; +} + + +MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map) +{ + v3s16 em = vm->m_area.getExtent(); + u32 index = 0; + MgStoneType stone_type = STONE; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index++) { + Biome *biome = NULL; + u16 depth_top = 0; + u16 base_filler = 0; + u16 depth_water_top = 0; + u32 vi = vm->m_area.index(x, node_max.Y, z); + + // Check node at base of mapchunk above, either a node of a previously + // generated mapchunk or if not, a node of overgenerated base terrain. + content_t c_above = vm->m_data[vi + em.X].getContent(); + bool air_above = c_above == CONTENT_AIR; + bool water_above = (c_above == c_water_source); + + // If there is air or water above enable top/filler placement, otherwise force + // nplaced to stone level by setting a number exceeding any possible filler depth. + u16 nplaced = (air_above || water_above) ? 0 : U16_MAX; + + for (s16 y = node_max.Y; y >= node_min.Y; y--) { + content_t c = vm->m_data[vi].getContent(); + + // Biome is recalculated each time an upper surface is detected while + // working down a column. The selected biome then remains in effect for + // all nodes below until the next surface and biome recalculation. + // Biome is recalculated: + // 1. At the surface of stone below air or water. + // 2. At the surface of water below air. + // 3. When stone or water is detected but biome has not yet been calculated. + if ((c == c_stone && (air_above || water_above || !biome)) + || ((c == c_water_source || c == c_river_water_source) + && (air_above || !biome))) { + // Both heat and humidity have already been adjusted for altitude. + biome = bmgr->getBiome(heat_map[index], humidity_map[index], y); + + depth_top = biome->depth_top; + base_filler = MYMAX(depth_top + + biome->depth_filler + + noise_filler_depth->result[index], 0.f); + depth_water_top = biome->depth_water_top; + + // Detect stone type for dungeons during every biome calculation. + // This is more efficient than detecting per-node and will not + // miss any desert stone or sandstone biomes. + if (biome->c_stone == c_desert_stone) + stone_type = DESERT_STONE; + else if (biome->c_stone == c_sandstone) + stone_type = SANDSTONE; + } + + if (c == c_stone) { + content_t c_below = vm->m_data[vi - em.X].getContent(); + + // If the node below isn't solid, make this node stone, so that + // any top/filler nodes above are structurally supported. + // This is done by aborting the cycle of top/filler placement + // immediately by forcing nplaced to stone level. + if (c_below == CONTENT_AIR + || c_below == c_water_source + || c_below == c_river_water_source) + nplaced = U16_MAX; + + if (nplaced < depth_top) { + vm->m_data[vi] = MapNode(biome->c_top); + nplaced++; + } else if (nplaced < base_filler) { + vm->m_data[vi] = MapNode(biome->c_filler); + nplaced++; + } else { + vm->m_data[vi] = MapNode(biome->c_stone); + } + + air_above = false; + water_above = false; + } else if (c == c_water_source) { + vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) + ? biome->c_water_top : biome->c_water); + nplaced = 0; // Enable top/filler placement for next surface + air_above = false; + water_above = true; + } else if (c == c_river_water_source) { + vm->m_data[vi] = MapNode(biome->c_river_water); + nplaced = U16_MAX; // Sand was already placed under rivers. + air_above = false; + water_above = true; + } else if (c == CONTENT_AIR) { + nplaced = 0; // Enable top/filler placement for next surface + air_above = true; + water_above = false; + } else { // Possible various nodes overgenerated from neighbouring mapchunks + nplaced = U16_MAX; // Disable top/filler placement + air_above = false; + water_above = false; + } + + vm->m_area.add_y(em, vi, -1); + } + } + + return stone_type; +} + + +void MapgenValleys::dustTopNodes() +{ + if (node_max.Y < water_level) + return; + + v3s16 em = vm->m_area.getExtent(); + u32 index = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index++) { + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]); + + if (biome->c_dust == CONTENT_IGNORE) + continue; + + u32 vi = vm->m_area.index(x, full_node_max.Y, z); + content_t c_full_max = vm->m_data[vi].getContent(); + s16 y_start; + + if (c_full_max == CONTENT_AIR) { + y_start = full_node_max.Y - 1; + } else if (c_full_max == CONTENT_IGNORE) { + vi = vm->m_area.index(x, node_max.Y + 1, z); + content_t c_max = vm->m_data[vi].getContent(); + + if (c_max == CONTENT_AIR) + y_start = node_max.Y; + else + continue; + } else { + continue; + } + + vi = vm->m_area.index(x, y_start, z); + for (s16 y = y_start; y >= node_min.Y - 1; y--) { + if (vm->m_data[vi].getContent() != CONTENT_AIR) + break; + + vm->m_area.add_y(em, vi, -1); + } + + content_t c = vm->m_data[vi].getContent(); + if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) { + vm->m_area.add_y(em, vi, 1); + vm->m_data[vi] = MapNode(biome->c_dust); + } + } +} + + +void MapgenValleys::generateSimpleCaves(s16 max_stone_y) +{ + PseudoRandom ps(blockseed + 72202); + + MapNode n_air(CONTENT_AIR); + MapNode n_dirt(c_dirt); + MapNode n_lava(c_lava_source); + MapNode n_water(c_river_water_source); + + v3s16 em = vm->m_area.getExtent(); + + s16 base_water_chance = 0; + if (water_features < 11) + base_water_chance = ceil(MAX_MAP_GENERATION_LIMIT / (water_features * 1000)); + + if (max_stone_y >= node_min.Y) { + u32 index_2d = 0; + u32 index_3d = 0; + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) { + bool air_above = false; + //bool underground = false; + u32 index_data = vm->m_area.index(x, node_max.Y + 1, z); + + index_3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); + + // Dig caves on down loop to check for air above. + for (s16 y = node_max.Y + 1; + y >= node_min.Y - 1; + y--, index_3d -= ystride, vm->m_area.add_y(em, index_data, -1)) { + float terrain = noise_terrain_height->result[index_2d]; + + // Saves some time and prevents removing above ground nodes. + if (y > terrain + 1) { + air_above = true; + continue; + } + + content_t c = vm->m_data[index_data].getContent(); + bool n1 = (fabs(noise_simple_caves_1->result[index_3d]) < 0.07f); + bool n2 = (fabs(noise_simple_caves_2->result[index_3d]) < 0.07f); + + // River water is (foolishly) not set as ground content + // in the default game. This can produce strange results + // when a cave undercuts a river. However, that's not for + // the mapgen to correct. Fix it in lua. + + if (c == CONTENT_AIR) { + air_above = true; + } else if (n1 && n2 && ndef->get(c).is_ground_content) { + // When both n's are true, we're in a cave. + vm->m_data[index_data] = n_air; + air_above = true; + } else if (air_above + && (c == c_stone || c == c_sandstone || c == c_desert_stone)) { + // At the cave floor + s16 sr = ps.next() & 1023; + u32 j = index_data; + vm->m_area.add_y(em, j, 1); + + if (sr > (terrain - y) * 25) { + // Put dirt in caves near the surface. + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index_2d]); + vm->m_data[index_data] = MapNode(biome->c_filler); + } else { + s16 lava_chance = 0; + + if (y <= lava_max_height && c == c_stone) { + // Lava spawns increase with depth. + lava_chance = ceil((lava_max_height - y + 1) / 10000); + + if (sr < lava_chance) + vm->m_data[j] = n_lava; + } + + if (base_water_chance > 0 && y <= cave_water_max_height) { + s16 water_chance = base_water_chance + - (abs(y - water_level) / (water_features * 1000)); + + // Waterfalls may get out of control above ground. + sr -= lava_chance; + // If sr < 0 then we should have already placed lava -- + // don't immediately dump water on it. + if (sr >= 0 && sr < water_chance) + vm->m_data[j] = n_water; + } + } + + air_above = false; + } + + // If we're not in a cave, there's no open space. + if (!(n1 && n2)) + air_above = false; + } + } + } +} diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h new file mode 100644 index 00000000..9c08b16d --- /dev/null +++ b/src/mapgen_valleys.h @@ -0,0 +1,194 @@ +/* +Minetest Valleys C +Copyright (C) 2010-2015 kwolekr, Ryan Kwolek +Copyright (C) 2010-2015 paramat, Matt Gregory +Copyright (C) 2016 Duane Robertson + +Based on Valleys Mapgen by Gael de Sailly + (https://forum.minetest.net/viewtopic.php?f=9&t=11430) +and mapgen_v7 by kwolekr and paramat. + +Licensing changed by permission of Gael de Sailly. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef MAPGEN_VALLEYS_HEADER +#define MAPGEN_VALLEYS_HEADER + +#include "mapgen.h" + +/////////////////// Mapgen Valleys flags +#define MG_VALLEYS_ALT_CHILL 0x01 +#define MG_VALLEYS_CLIFFS 0x02 +#define MG_VALLEYS_FAST 0x04 +#define MG_VALLEYS_HUMID_RIVERS 0x08 +#define MG_VALLEYS_RUGGED 0x10 + +class BiomeManager; + +// Global profiler +//class Profiler; +//extern Profiler *mapgen_profiler; + + +struct MapgenValleysParams : public MapgenSpecificParams { + u32 spflags; + + u16 altitude_chill; + s16 cave_water_max_height; + s16 humidity; + s16 humidity_break_point; + s16 lava_max_height; + u16 river_depth; + u16 river_size; + s16 temperature; + u16 water_features; + + NoiseParams np_biome_heat; + NoiseParams np_biome_heat_blend; + NoiseParams np_biome_humidity; + NoiseParams np_biome_humidity_blend; + NoiseParams np_cliffs; + NoiseParams np_corr; + NoiseParams np_filler_depth; + NoiseParams np_inter_valley_fill; + NoiseParams np_inter_valley_slope; + NoiseParams np_rivers; + NoiseParams np_simple_caves_1; + NoiseParams np_simple_caves_2; + NoiseParams np_terrain_height; + NoiseParams np_valley_depth; + NoiseParams np_valley_profile; + + MapgenValleysParams(); + ~MapgenValleysParams() {} + + void readParams(const Settings *settings); + void writeParams(Settings *settings) const; +}; + +struct TerrainNoise { + s16 x; + s16 z; + float terrain_height; + float *rivers; + float *valley; + float valley_profile; + float *slope; + float inter_valley_fill; + float cliffs; + float corr; +}; + +class MapgenValleys : public Mapgen { +public: + + MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge); + ~MapgenValleys(); + + virtual void makeChunk(BlockMakeData *data); + inline int getGroundLevelAtPoint(v2s16 p); + +private: + EmergeManager *m_emerge; + BiomeManager *bmgr; + + int ystride; + int zstride; + + u32 spflags; + bool cliff_terrain; + bool fast_terrain; + bool rugged_terrain; + bool humid_rivers; + bool use_altitude_chill; + + v3s16 node_min; + v3s16 node_max; + v3s16 full_node_min; + v3s16 full_node_max; + + Noise *noise_filler_depth; + + Noise *noise_cliffs; + Noise *noise_corr; + Noise *noise_heat; + Noise *noise_heat_blend; + Noise *noise_humidity; + Noise *noise_humidity_blend; + Noise *noise_inter_valley_fill; + Noise *noise_inter_valley_slope; + Noise *noise_rivers; + Noise *noise_simple_caves_1; + Noise *noise_simple_caves_2; + Noise *noise_terrain_height; + Noise *noise_valley_depth; + Noise *noise_valley_profile; + + float altitude_chill; + float cave_water_max_height; + float humidity_adjust; + float humidity_break_point; + float lava_max_height; + float river_depth; + float river_size; + float temperature_adjust; + s16 water_features; + + content_t c_cobble; + content_t c_desert_stone; + content_t c_dirt; + content_t c_ice; + content_t c_lava_source; + content_t c_mossycobble; + content_t c_river_water_source; + content_t c_sand; + content_t c_sandstone; + content_t c_sandstonebrick; + content_t c_stair_cobble; + content_t c_stair_sandstonebrick; + content_t c_stone; + content_t c_water_source; + + float terrainLevelAtPoint(s16 x, s16 z); + + void calculateNoise(); + + virtual int generateTerrain(); + float terrainLevelFromNoise(TerrainNoise *tn); + float adjustedTerrainLevelFromNoise(TerrainNoise *tn); + + float humidityByTerrain(float humidity_base, float mount, float rivers, float valley); + + MgStoneType generateBiomes(float *heat_map, float *humidity_map); + void dustTopNodes(); + + void generateSimpleCaves(s16 max_stone_y); +}; + +struct MapgenFactoryValleys : public MapgenFactory { + Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) + { + return new MapgenValleys(mgid, params, emerge); + }; + + MapgenSpecificParams *createMapgenParams() + { + return new MapgenValleysParams(); + }; +}; + +#endif From da686160c33069b77a7b4c31fd97da5fa5b59baa Mon Sep 17 00:00:00 2001 From: Kahrl Date: Fri, 15 Jan 2016 02:16:21 +0100 Subject: [PATCH 202/531] Make all mesh manipulators in mesh.cpp work with any vertex type cloneMesh() has to use a switch in order to create a different mesh buffer type depending on vertex type. (Credit: the new cloneMesh was written by RealBadAngel.) To avoid repetitive code, all other methods use getVertexPitchFromType() to automatically adapt the indexing to the vertex type at runtime. --- src/mesh.cpp | 269 +++++++++++++++++++++++++++------------------------ 1 file changed, 145 insertions(+), 124 deletions(-) diff --git a/src/mesh.cpp b/src/mesh.cpp index 329b93dc..a800ddf1 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -206,146 +206,139 @@ void setMeshColorByNormalXYZ(scene::IMesh *mesh, const video::SColor &colorY, const video::SColor &colorZ) { - if(mesh == NULL) + if (mesh == NULL) return; - + u16 mc = mesh->getMeshBufferCount(); - for(u16 j=0; jgetMeshBuffer(j); - video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices(); - u16 vc = buf->getVertexCount(); - for(u16 i=0; i= y && x >= z) - vertices[i].Color = colorX; - else if(y >= z) - vertices[i].Color = colorY; + const u32 stride = getVertexPitchFromType(buf->getVertexType()); + u32 vertex_count = buf->getVertexCount(); + u8 *vertices = (u8 *)buf->getVertices(); + for (u32 i = 0; i < vertex_count; i++) { + video::S3DVertex *vertex = (video::S3DVertex *)(vertices + i * stride); + f32 x = fabs(vertex->Normal.X); + f32 y = fabs(vertex->Normal.Y); + f32 z = fabs(vertex->Normal.Z); + if (x >= y && x >= z) + vertex->Color = colorX; + else if (y >= z) + vertex->Color = colorY; else - vertices[i].Color = colorZ; + vertex->Color = colorZ; } } } -void rotateMeshXYby (scene::IMesh *mesh, f64 degrees) -{ +void rotateMeshXYby(scene::IMesh *mesh, f64 degrees) +{ u16 mc = mesh->getMeshBufferCount(); - for(u16 j = 0; j < mc; j++) - { + for (u16 j = 0; j < mc; j++) { scene::IMeshBuffer *buf = mesh->getMeshBuffer(j); - video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices(); - u16 vc = buf->getVertexCount(); - for(u16 i = 0; i < vc; i++) - { - vertices[i].Pos.rotateXYBy(degrees); - } + const u32 stride = getVertexPitchFromType(buf->getVertexType()); + u32 vertex_count = buf->getVertexCount(); + u8 *vertices = (u8 *)buf->getVertices(); + for (u32 i = 0; i < vertex_count; i++) + ((video::S3DVertex *)(vertices + i * stride))->Pos.rotateXYBy(degrees); } } -void rotateMeshXZby (scene::IMesh *mesh, f64 degrees) -{ +void rotateMeshXZby(scene::IMesh *mesh, f64 degrees) +{ u16 mc = mesh->getMeshBufferCount(); - for(u16 j = 0; j < mc; j++) - { + for (u16 j = 0; j < mc; j++) { scene::IMeshBuffer *buf = mesh->getMeshBuffer(j); - video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices(); - u16 vc = buf->getVertexCount(); - for(u16 i = 0; i < vc; i++) - { - vertices[i].Pos.rotateXZBy(degrees); - } + const u32 stride = getVertexPitchFromType(buf->getVertexType()); + u32 vertex_count = buf->getVertexCount(); + u8 *vertices = (u8 *)buf->getVertices(); + for (u32 i = 0; i < vertex_count; i++) + ((video::S3DVertex *)(vertices + i * stride))->Pos.rotateXZBy(degrees); } } -void rotateMeshYZby (scene::IMesh *mesh, f64 degrees) -{ +void rotateMeshYZby(scene::IMesh *mesh, f64 degrees) +{ u16 mc = mesh->getMeshBufferCount(); - for(u16 j = 0; j < mc; j++) - { + for (u16 j = 0; j < mc; j++) { scene::IMeshBuffer *buf = mesh->getMeshBuffer(j); - video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices(); - u16 vc = buf->getVertexCount(); - for(u16 i = 0; i < vc; i++) - { - vertices[i].Pos.rotateYZBy(degrees); - } + const u32 stride = getVertexPitchFromType(buf->getVertexType()); + u32 vertex_count = buf->getVertexCount(); + u8 *vertices = (u8 *)buf->getVertices(); + for (u32 i = 0; i < vertex_count; i++) + ((video::S3DVertex *)(vertices + i * stride))->Pos.rotateYZBy(degrees); } } void rotateMeshBy6dFacedir(scene::IMesh *mesh, int facedir) -{ - int axisdir = facedir>>2; +{ + int axisdir = facedir >> 2; facedir &= 0x03; u16 mc = mesh->getMeshBufferCount(); - for(u16 j = 0; j < mc; j++) - { + for (u16 j = 0; j < mc; j++) { scene::IMeshBuffer *buf = mesh->getMeshBuffer(j); - video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices(); - u16 vc = buf->getVertexCount(); - for(u16 i=0; igetVertexType()); + u32 vertex_count = buf->getVertexCount(); + u8 *vertices = (u8 *)buf->getVertices(); + for (u32 i = 0; i < vertex_count; i++) { + video::S3DVertex *vertex = (video::S3DVertex *)(vertices + i * stride); + switch (axisdir) { + case 0: + if (facedir == 1) + vertex->Pos.rotateXZBy(-90); + else if (facedir == 2) + vertex->Pos.rotateXZBy(180); + else if (facedir == 3) + vertex->Pos.rotateXZBy(90); + break; + case 1: // z+ + vertex->Pos.rotateYZBy(90); + if (facedir == 1) + vertex->Pos.rotateXYBy(90); + else if (facedir == 2) + vertex->Pos.rotateXYBy(180); + else if (facedir == 3) + vertex->Pos.rotateXYBy(-90); + break; + case 2: //z- + vertex->Pos.rotateYZBy(-90); + if (facedir == 1) + vertex->Pos.rotateXYBy(-90); + else if (facedir == 2) + vertex->Pos.rotateXYBy(180); + else if (facedir == 3) + vertex->Pos.rotateXYBy(90); + break; + case 3: //x+ + vertex->Pos.rotateXYBy(-90); + if (facedir == 1) + vertex->Pos.rotateYZBy(90); + else if (facedir == 2) + vertex->Pos.rotateYZBy(180); + else if (facedir == 3) + vertex->Pos.rotateYZBy(-90); + break; + case 4: //x- + vertex->Pos.rotateXYBy(90); + if (facedir == 1) + vertex->Pos.rotateYZBy(-90); + else if (facedir == 2) + vertex->Pos.rotateYZBy(180); + else if (facedir == 3) + vertex->Pos.rotateYZBy(90); + break; + case 5: + vertex->Pos.rotateXYBy(-180); + if (facedir == 1) + vertex->Pos.rotateXZBy(90); + else if (facedir == 2) + vertex->Pos.rotateXZBy(180); + else if (facedir == 3) + vertex->Pos.rotateXZBy(-90); + break; + default: + break; } } } @@ -355,11 +348,10 @@ void recalculateBoundingBox(scene::IMesh *src_mesh) { core::aabbox3d bbox; bbox.reset(0,0,0); - for(u16 j = 0; j < src_mesh->getMeshBufferCount(); j++) - { + for (u16 j = 0; j < src_mesh->getMeshBufferCount(); j++) { scene::IMeshBuffer *buf = src_mesh->getMeshBuffer(j); buf->recalculateBoundingBox(); - if(j == 0) + if (j == 0) bbox = buf->getBoundingBox(); else bbox.addInternalBox(buf->getBoundingBox()); @@ -370,18 +362,47 @@ void recalculateBoundingBox(scene::IMesh *src_mesh) scene::IMesh* cloneMesh(scene::IMesh *src_mesh) { scene::SMesh* dst_mesh = new scene::SMesh(); - for(u16 j = 0; j < src_mesh->getMeshBufferCount(); j++) - { + for (u16 j = 0; j < src_mesh->getMeshBufferCount(); j++) { scene::IMeshBuffer *buf = src_mesh->getMeshBuffer(j); - video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices(); - u16 *indices = (u16*)buf->getIndices(); - scene::SMeshBuffer *temp_buf = new scene::SMeshBuffer(); - temp_buf->append(vertices, buf->getVertexCount(), - indices, buf->getIndexCount()); - dst_mesh->addMeshBuffer(temp_buf); - temp_buf->drop(); + switch (buf->getVertexType()) { + case video::EVT_STANDARD: { + video::S3DVertex *v = + (video::S3DVertex *) buf->getVertices(); + u16 *indices = (u16*)buf->getIndices(); + scene::SMeshBuffer *temp_buf = new scene::SMeshBuffer(); + temp_buf->append(v, buf->getVertexCount(), + indices, buf->getIndexCount()); + dst_mesh->addMeshBuffer(temp_buf); + temp_buf->drop(); + break; + } + case video::EVT_2TCOORDS: { + video::S3DVertex2TCoords *v = + (video::S3DVertex2TCoords *) buf->getVertices(); + u16 *indices = (u16*)buf->getIndices(); + scene::SMeshBufferTangents *temp_buf = + new scene::SMeshBufferTangents(); + temp_buf->append(v, buf->getVertexCount(), + indices, buf->getIndexCount()); + dst_mesh->addMeshBuffer(temp_buf); + temp_buf->drop(); + break; + } + case video::EVT_TANGENTS: { + video::S3DVertexTangents *v = + (video::S3DVertexTangents *) buf->getVertices(); + u16 *indices = (u16*)buf->getIndices(); + scene::SMeshBufferTangents *temp_buf = + new scene::SMeshBufferTangents(); + temp_buf->append(v, buf->getVertexCount(), + indices, buf->getIndexCount()); + dst_mesh->addMeshBuffer(temp_buf); + temp_buf->drop(); + break; + } + } } - return dst_mesh; + return dst_mesh; } scene::IMesh* convertNodeboxNodeToMesh(ContentFeatures *f) From a58c0f458d336fdab59737c754661e4f16818d99 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 15 Jan 2016 13:40:59 +0100 Subject: [PATCH 203/531] Make ItemStack:set_count(0) clear the item stack fixes minetest/minetest_game#786 --- src/script/lua_api/l_item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp index 842b1570..5381cba7 100644 --- a/src/script/lua_api/l_item.cpp +++ b/src/script/lua_api/l_item.cpp @@ -94,7 +94,7 @@ int LuaItemStack::l_set_count(lua_State *L) bool status; lua_Integer count = luaL_checkinteger(L, 2); - if (count <= 65535) { + if (count > 0 && count <= 65535) { item.count = count; status = true; } else { From 752d8202061b1092daacb1f7056ace4d5aabef01 Mon Sep 17 00:00:00 2001 From: Duane Robertson Date: Sat, 16 Jan 2016 03:53:02 -0600 Subject: [PATCH 204/531] Prevent spawning in rivers with valleys mapgen. Remove unecessary whitespace. --- src/mapgen_valleys.cpp | 88 ++++++++++++++++++++++++------------------ src/mapgen_valleys.h | 20 +++++----- 2 files changed, 61 insertions(+), 47 deletions(-) diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index c14ceb51..93f47cd5 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -185,19 +185,19 @@ MapgenValleys::~MapgenValleys() MapgenValleysParams::MapgenValleysParams() { spflags = MG_VALLEYS_CLIFFS | MG_VALLEYS_RUGGED - | MG_VALLEYS_HUMID_RIVERS | MG_VALLEYS_ALT_CHILL; + | MG_VALLEYS_HUMID_RIVERS | MG_VALLEYS_ALT_CHILL; - altitude_chill = 90; // The altitude at which temperature drops by 20C. + altitude_chill = 90; // The altitude at which temperature drops by 20C. // Water in caves will never be higher than this. - cave_water_max_height = MAX_MAP_GENERATION_LIMIT; - humidity = 50; + cave_water_max_height = MAX_MAP_GENERATION_LIMIT; + humidity = 50; // the maximum humidity around rivers in otherwise dry areas - humidity_break_point = 65; - lava_max_height = 0; // Lava will never be higher than this. - river_depth = 4; // How deep to carve river channels. - river_size = 5; // How wide to make rivers. - temperature = 50; - water_features = 3; // How often water will occur in caves. + humidity_break_point = 65; + lava_max_height = 0; // Lava will never be higher than this. + river_depth = 4; // How deep to carve river channels. + river_size = 5; // How wide to make rivers. + temperature = 50; + water_features = 3; // How often water will occur in caves. np_cliffs = NoiseParams(0.f, 1.f, v3f(750, 750, 750), 8445, 5, 1.f, 2.f); np_corr = NoiseParams(0.f, 1.f, v3f(40, 40, 40), -3536, 4, 1.f, 2.f); @@ -285,7 +285,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data) data->blockpos_requested.Z <= data->blockpos_max.Z); this->generating = true; - this->vm = data->vmanip; + this->vm = data->vmanip; this->ndef = data->nodedef; //TimeTaker t("makeChunk"); @@ -375,9 +375,9 @@ void MapgenValleys::makeChunk(BlockMakeData *data) if (flags & MG_LIGHT) calcLighting( - node_min - v3s16(0, 1, 0), - node_max + v3s16(0, 1, 0), - full_node_min, + node_min - v3s16(0, 1, 0), + node_max + v3s16(0, 1, 0), + full_node_min, full_node_max); //mapgen_profiler->avg("liquid_lighting", tll.stop() / 1000.f); @@ -535,7 +535,7 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) } if (fast_terrain) { - // The penultimate step builds up the heights, but we reduce it + // The penultimate step builds up the heights, but we reduce it // occasionally to create cliffs. float delta = sin(tn->inter_valley_fill) * *tn->slope; if (cliff_terrain && tn->cliffs >= 0.2f) @@ -544,8 +544,8 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) mount += delta; // Use yet another noise to make the heights look more rugged. - if (rugged_terrain - && mount > water_level + if (rugged_terrain + && mount > water_level && fabs(inter_valley_slope * tn->inter_valley_fill) < 0.3f) mount += ((delta < 0.f) ? -1.f : 1.f) * pow(fabs(delta), 0.5f) * fabs(sin(tn->corr)); } @@ -576,9 +576,9 @@ float MapgenValleys::adjustedTerrainLevelFromNoise(TerrainNoise *tn) float MapgenValleys::humidityByTerrain( - float humidity_base, - float mount, - float rivers, + float humidity_base, + float mount, + float rivers, float valley) { // Although the original valleys adjusts humidity by distance @@ -603,9 +603,23 @@ float MapgenValleys::humidityByTerrain( } -inline int MapgenValleys::getGroundLevelAtPoint(v2s16 p) +int MapgenValleys::getGroundLevelAtPoint(v2s16 p) { - // Base terrain calculation + // *********************************************** + // This method (deliberately) does not return correct + // terrain values. This may be a problem in the future. + // *********************************************** + + // Since MT doesn't normally deal with rivers, check + // to make sure this isn't a request for a location + // in a river. + float rivers = NoisePerlin2D(&noise_rivers->np, p.X, p.Y, seed); + + // If it's wet, return an unusable number. + if (fabs(rivers) < river_size) + return MAX_MAP_GENERATION_LIMIT; + + // Otherwise, return the real result. return terrainLevelAtPoint(p.X, p.Y); } @@ -709,14 +723,14 @@ int MapgenValleys::generateTerrain() if (!fast_terrain) { // Assign the humidity adjusted by water proximity. noise_humidity->result[index_2d] = humidityByTerrain( - noise_humidity->result[index_2d], - surface_max_y, - noise_rivers->result[index_2d], + noise_humidity->result[index_2d], + surface_max_y, + noise_rivers->result[index_2d], noise_valley_depth->result[index_2d]); // Assign the heat adjusted by altitude. See humidity, above. if (use_altitude_chill && surface_max_y > 0) - noise_heat->result[index_2d] + noise_heat->result[index_2d] *= pow(0.5f, (surface_max_y - altitude_chill / 3.f) / altitude_chill); } } @@ -759,15 +773,15 @@ MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map) // 1. At the surface of stone below air or water. // 2. At the surface of water below air. // 3. When stone or water is detected but biome has not yet been calculated. - if ((c == c_stone && (air_above || water_above || !biome)) - || ((c == c_water_source || c == c_river_water_source) + if ((c == c_stone && (air_above || water_above || !biome)) + || ((c == c_water_source || c == c_river_water_source) && (air_above || !biome))) { // Both heat and humidity have already been adjusted for altitude. biome = bmgr->getBiome(heat_map[index], humidity_map[index], y); depth_top = biome->depth_top; - base_filler = MYMAX(depth_top - + biome->depth_filler + base_filler = MYMAX(depth_top + + biome->depth_filler + noise_filler_depth->result[index], 0.f); depth_water_top = biome->depth_water_top; @@ -787,8 +801,8 @@ MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map) // any top/filler nodes above are structurally supported. // This is done by aborting the cycle of top/filler placement // immediately by forcing nplaced to stone level. - if (c_below == CONTENT_AIR - || c_below == c_water_source + if (c_below == CONTENT_AIR + || c_below == c_water_source || c_below == c_river_water_source) nplaced = U16_MAX; @@ -805,7 +819,7 @@ MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map) air_above = false; water_above = false; } else if (c == c_water_source) { - vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) + vm->m_data[vi] = MapNode((y > (s32)(water_level - depth_water_top)) ? biome->c_water_top : biome->c_water); nplaced = 0; // Enable top/filler placement for next surface air_above = false; @@ -910,8 +924,8 @@ void MapgenValleys::generateSimpleCaves(s16 max_stone_y) index_3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); // Dig caves on down loop to check for air above. - for (s16 y = node_max.Y + 1; - y >= node_min.Y - 1; + for (s16 y = node_max.Y + 1; + y >= node_min.Y - 1; y--, index_3d -= ystride, vm->m_area.add_y(em, index_data, -1)) { float terrain = noise_terrain_height->result[index_2d]; @@ -936,7 +950,7 @@ void MapgenValleys::generateSimpleCaves(s16 max_stone_y) // When both n's are true, we're in a cave. vm->m_data[index_data] = n_air; air_above = true; - } else if (air_above + } else if (air_above && (c == c_stone || c == c_sandstone || c == c_desert_stone)) { // At the cave floor s16 sr = ps.next() & 1023; @@ -959,7 +973,7 @@ void MapgenValleys::generateSimpleCaves(s16 max_stone_y) } if (base_water_chance > 0 && y <= cave_water_max_height) { - s16 water_chance = base_water_chance + s16 water_chance = base_water_chance - (abs(y - water_level) / (water_features * 1000)); // Waterfalls may get out of control above ground. diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h index 9c08b16d..5fd54909 100644 --- a/src/mapgen_valleys.h +++ b/src/mapgen_valleys.h @@ -81,15 +81,15 @@ struct MapgenValleysParams : public MapgenSpecificParams { }; struct TerrainNoise { - s16 x; - s16 z; - float terrain_height; - float *rivers; - float *valley; - float valley_profile; - float *slope; - float inter_valley_fill; - float cliffs; + s16 x; + s16 z; + float terrain_height; + float *rivers; + float *valley; + float valley_profile; + float *slope; + float inter_valley_fill; + float cliffs; float corr; }; @@ -100,7 +100,7 @@ public: ~MapgenValleys(); virtual void makeChunk(BlockMakeData *data); - inline int getGroundLevelAtPoint(v2s16 p); + int getGroundLevelAtPoint(v2s16 p); private: EmergeManager *m_emerge; From 487ab593d031bf310bd76b3edfe2ad42c1e248b5 Mon Sep 17 00:00:00 2001 From: Rogier Date: Fri, 8 Jan 2016 09:29:39 +0100 Subject: [PATCH 205/531] Fix error message in settings tab overlapping 'save' button The save button is now fully functional again when an error message is shown. After an invalid value is entered in the settings tab dialog, the GUI label for the error message that is shown was partly overlapping the 'save' button, so that the top half of the button could not be clicked on. --- builtin/mainmenu/tab_settings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 472becea..99138a09 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -445,7 +445,7 @@ local function create_change_setting_formspec(dialogdata) if dialogdata.error_message then formspec = formspec .. "tablecolumns[color;text]" .. "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[5,4;5,1;error_message;#FF0000," + "table[5,3.9;5,0.6;error_message;#FF0000," .. core.formspec_escape(dialogdata.error_message) .. ";0]" width = 5 if dialogdata.entered_text then From 22bc66d3a7b96f0742669a988b45d07d58e32928 Mon Sep 17 00:00:00 2001 From: Pinky Snow Date: Sat, 16 Jan 2016 05:23:00 -0500 Subject: [PATCH 206/531] corrected minetest.pos_to_string() corrected this bit reflect the function properly. --- doc/lua_api.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index a3bb6481..0ff8f031 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1715,8 +1715,9 @@ Helper functions * e.g. `string:split("a,b", ",") == {"a","b"}` * `string:trim()` * e.g. `string.trim("\n \t\tfoo bar\t ") == "foo bar"` -* `minetest.pos_to_string({x=X,y=Y,z=Z})`: returns `"(X,Y,Z)"` +* `minetest.pos_to_string({x=X,y=Y,z=Z}, decimal_places))`: returns `"(X,Y,Z)"` * Convert position to a printable string + Optional: 'decimal_places' will round the x, y and z of the pos to the given decimal place. * `minetest.string_to_pos(string)`: returns a position * Same but in reverse. Returns `nil` if the string can't be parsed to a position. * `minetest.string_to_area("(X1, Y1, Z1) (X2, Y2, Z2)")`: returns two positions From 13e7589fecfc8b6c247839ddaac66e9d045e513c Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Mon, 18 Jan 2016 06:08:54 +0100 Subject: [PATCH 207/531] Fix wield item glitch --- src/camera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/camera.cpp b/src/camera.cpp index 0b341359..94bbe988 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -646,7 +646,7 @@ void Camera::drawWieldedTool(irr::core::matrix4* translation) scene::ICameraSceneNode* cam = m_wieldmgr->getActiveCamera(); cam->setAspectRatio(m_cameranode->getAspectRatio()); cam->setFOV(72.0*M_PI/180.0); - cam->setNearValue(0.1); + cam->setNearValue(10); cam->setFarValue(1000); if (translation != NULL) { From eb6e2c11b16c9ef5287bda224fa965a37ef49131 Mon Sep 17 00:00:00 2001 From: Duane Robertson Date: Mon, 18 Jan 2016 01:55:08 -0600 Subject: [PATCH 208/531] Correct overflowing rivers in Valleys mapgen. --- src/mapgen_valleys.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index 93f47cd5..6f4b2ccc 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -670,8 +670,8 @@ int MapgenValleys::generateTerrain() for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) { - s16 river_y = round(noise_rivers->result[index_2d]); - s16 surface_y = round(noise_terrain_height->result[index_2d]); + s16 river_y = floor(noise_rivers->result[index_2d]); + s16 surface_y = floor(noise_terrain_height->result[index_2d]); float slope = noise_inter_valley_slope->result[index_2d]; heightmap[index_2d] = surface_y; @@ -703,7 +703,7 @@ int MapgenValleys::generateTerrain() } else if (river && y < river_y) { // river vm->m_data[index_data] = n_river_water; - } else if ((!fast_terrain) && (!river) && fill * slope > y - surface_y) { + } else if ((!fast_terrain) && (!river) && round(fill * slope) >= y - surface_y) { // ground (slow method) vm->m_data[index_data] = n_stone; heightmap[index_2d] = surface_max_y = y; From 87291ea44a61614d5bd9efc0657926da3f867b5f Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Fri, 8 Jan 2016 15:59:36 +0100 Subject: [PATCH 209/531] Show infotext with description for item entities --- builtin/game/item_entity.lua | 4 ++++ doc/lua_api.txt | 1 + src/content_cao.h | 5 +++++ src/game.cpp | 7 +++++-- src/object_properties.cpp | 2 ++ src/object_properties.h | 1 + src/script/common/c_content.cpp | 3 +++ 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua index be158c11..a66bf33d 100644 --- a/builtin/game/item_entity.lua +++ b/builtin/game/item_entity.lua @@ -31,6 +31,7 @@ core.register_entity(":__builtin:item", { spritediv = {x = 1, y = 1}, initial_sprite_basepos = {x = 0, y = 0}, is_visible = false, + infotext = "", }, itemstring = '', @@ -50,6 +51,7 @@ core.register_entity(":__builtin:item", { local c = s local itemtable = stack:to_table() local itemname = nil + local description = "" if itemtable then itemname = stack:to_table().name end @@ -58,6 +60,7 @@ core.register_entity(":__builtin:item", { if core.registered_items[itemname] then item_texture = core.registered_items[itemname].inventory_image item_type = core.registered_items[itemname].type + description = core.registered_items[itemname].description end local prop = { is_visible = true, @@ -66,6 +69,7 @@ core.register_entity(":__builtin:item", { visual_size = {x = s, y = s}, collisionbox = {-c, -c, -c, c, c, c}, automatic_rotate = math.pi * 0.5, + infotext = description, } self.object:set_properties(prop) end, diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 0ff8f031..c2d5183d 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3241,6 +3241,7 @@ Definition tables backface_culling = true, -- false to disable backface_culling for model nametag = "", -- by default empty, for players their name is shown if empty nametag_color = , -- sets color of nametag as ColorSpec + infotext = "", -- by default empty, text to be shown when pointed at object } ### Entity definition (`register_entity`) diff --git a/src/content_cao.h b/src/content_cao.h index d9145c5f..abb242aa 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -201,6 +201,11 @@ public: float time_from_last_punch=1000000); std::string debugInfoText(); + + std::string infoText() + { + return m_prop.infotext; + } }; diff --git a/src/game.cpp b/src/game.cpp index 92d91993..3902c50b 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -3732,8 +3732,11 @@ void Game::handlePointingAtObject(GameRunData *runData, { infotext = utf8_to_wide(runData->selected_object->infoText()); - if (infotext == L"" && show_debug) { - infotext = utf8_to_wide(runData->selected_object->debugInfoText()); + if (show_debug) { + if (infotext != L"") { + infotext += L"\n"; + } + infotext += utf8_to_wide(runData->selected_object->debugInfoText()); } if (input->getLeftState()) { diff --git a/src/object_properties.cpp b/src/object_properties.cpp index abd1bbd0..89ca2627 100644 --- a/src/object_properties.cpp +++ b/src/object_properties.cpp @@ -118,6 +118,7 @@ void ObjectProperties::serialize(std::ostream &os) const os << serializeString(nametag); writeARGB8(os, nametag_color); writeF1000(os, automatic_face_movement_max_rotation_per_sec); + os << serializeString(infotext); // Add stuff only at the bottom. // Never remove anything, because we don't want new versions of this @@ -159,6 +160,7 @@ void ObjectProperties::deSerialize(std::istream &is) nametag = deSerializeString(is); nametag_color = readARGB8(is); automatic_face_movement_max_rotation_per_sec = readF1000(is); + infotext = deSerializeString(is); }catch(SerializationError &e){} } else diff --git a/src/object_properties.h b/src/object_properties.h index 47698cff..02ec9d1f 100644 --- a/src/object_properties.h +++ b/src/object_properties.h @@ -51,6 +51,7 @@ struct ObjectProperties std::string nametag; video::SColor nametag_color; f32 automatic_face_movement_max_rotation_per_sec; + std::string infotext; ObjectProperties(); std::string dump(); diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 62de2c96..275b22bb 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -216,6 +216,7 @@ void read_object_properties(lua_State *L, int index, prop->automatic_face_movement_max_rotation_per_sec = luaL_checknumber(L, -1); } lua_pop(L, 1); + getstringfield(L, -1, "infotext", prop->infotext); } /******************************************************************************/ @@ -282,6 +283,8 @@ void push_object_properties(lua_State *L, ObjectProperties *prop) lua_setfield(L, -2, "nametag_color"); lua_pushnumber(L, prop->automatic_face_movement_max_rotation_per_sec); lua_setfield(L, -2, "automatic_face_movement_max_rotation_per_sec"); + lua_pushlstring(L, prop->infotext.c_str(), prop->infotext.size()); + lua_setfield(L, -2, "infotext"); } /******************************************************************************/ From b67eab3b0050a1f08d9c56138969d1a659ee7eac Mon Sep 17 00:00:00 2001 From: Kahrl Date: Tue, 19 Jan 2016 10:15:01 +0100 Subject: [PATCH 210/531] Fix Settings::remove() always returning true --- src/settings.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index e1e01e81..8ea687d1 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -880,8 +880,14 @@ bool Settings::remove(const std::string &name) { MutexAutoLock lock(m_mutex); - delete m_settings[name].group; - return m_settings.erase(name); + std::map::iterator it = m_settings.find(name); + if (it != m_settings.end()) { + delete it->second.group; + m_settings.erase(it); + return true; + } else { + return false; + } } From 9f988e3b962389e10a7cf010fd4bf0f81d70e31a Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 14 Nov 2015 03:07:21 -0500 Subject: [PATCH 211/531] EmergeManager: Do not queue duplicate block requests --- src/emerge.cpp | 13 +++++++++---- src/emerge.h | 11 +++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/emerge.cpp b/src/emerge.cpp index b188a7f4..ccb4c170 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -292,14 +292,18 @@ bool EmergeManager::enqueueBlockEmergeEx( void *callback_param) { EmergeThread *thread = NULL; + bool entry_already_exists = false; { MutexAutoLock queuelock(m_queue_mutex); if (!pushBlockEmergeData(blockpos, peer_id, flags, - callback, callback_param)) + callback, callback_param, &entry_already_exists)) return false; + if (entry_already_exists) + return true; + thread = getOptimalThread(); thread->pushBlock(blockpos); } @@ -382,7 +386,8 @@ bool EmergeManager::pushBlockEmergeData( u16 peer_requested, u16 flags, EmergeCompletionCallback callback, - void *callback_param) + void *callback_param, + bool *entry_already_exists) { u16 &count_peer = m_peer_queue_count[peer_requested]; @@ -402,12 +407,12 @@ bool EmergeManager::pushBlockEmergeData( findres = m_blocks_enqueued.insert(std::make_pair(pos, BlockEmergeData())); BlockEmergeData &bedata = findres.first->second; - bool update_existing = !findres.second; + *entry_already_exists = !findres.second; if (callback) bedata.callbacks.push_back(std::make_pair(callback, callback_param)); - if (update_existing) { + if (*entry_already_exists) { bedata.flags |= flags; } else { bedata.flags = flags; diff --git a/src/emerge.h b/src/emerge.h index a143b660..02bdf7e6 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -159,8 +159,15 @@ private: // Requires m_queue_mutex held EmergeThread *getOptimalThread(); - bool pushBlockEmergeData(v3s16 pos, u16 peer_requested, u16 flags, - EmergeCompletionCallback callback, void *callback_param); + + bool pushBlockEmergeData( + v3s16 pos, + u16 peer_requested, + u16 flags, + EmergeCompletionCallback callback, + void *callback_param, + bool *entry_already_exists); + bool popBlockEmergeData(v3s16 pos, BlockEmergeData *bedata); friend class EmergeThread; From 882a89d65aa78b89cfaf2af054d15cc4c94ad022 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 18 Jan 2016 20:44:46 -0800 Subject: [PATCH 212/531] Allow per-tiles culling. Backface culling is enabled by default for all tiles, as this is how the lua parser initializes each tiledef. We revert to always using the value from the tiledef since it is always read and serialized. Mods that wish to enable culling for e.g. mesh nodes, now can specify the following to enable backface culling: tiles = {{ name = "tex.png", backface_culling = true }}, Note the double '{' and use of 'name' key here! In the same fashion, backface_culling can be disabled for any node now. I've tested this against the new door models and this properly allows me to disable culling per node. I've also tested this against my crops mod which uses mesh nodes where culling needs to be disabled, and tested also with plantlike drawtype nodes where we want this to continue to be disabled. No default setting has changed. The defaults are just migrated from nodedef.cpp to c_content.cpp. --- doc/lua_api.txt | 2 +- src/nodedef.cpp | 12 ++---------- src/script/common/c_content.cpp | 23 ++++++++++++++++++++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index c2d5183d..e7c1b7dd 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3358,7 +3358,7 @@ Definition tables * `{name="image.png", animation={Tile Animation definition}}` * `{name="image.png", backface_culling=bool, tileable_vertical=bool, tileable_horizontal=bool}` - * backface culling only supported in special tiles. + * backface culling enabled by default for most nodes * tileable flags are info for shaders, how they should treat texture when displacement mapping is used Directions are from the point of view of the tile texture, diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 2ebe1c13..0bcc00e4 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -843,12 +843,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef, assert(f->liquid_type == LIQUID_SOURCE); if (opaque_water) f->alpha = 255; - if (new_style_water){ - f->solidness = 0; - } else { - f->solidness = 1; - f->backface_culling = false; - } + f->solidness = new_style_water ? 0 : 1; is_liquid = true; break; case NDT_FLOWINGLIQUID: @@ -899,17 +894,14 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef, break; case NDT_PLANTLIKE: f->solidness = 0; - f->backface_culling = false; if (f->waving == 1) material_type = TILE_MATERIAL_WAVING_PLANTS; break; case NDT_FIRELIKE: - f->backface_culling = false; f->solidness = 0; break; case NDT_MESH: f->solidness = 0; - f->backface_culling = false; break; case NDT_TORCHLIKE: case NDT_SIGNLIKE: @@ -941,7 +933,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef, // Tiles (fill in f->tiles[]) for (u16 j = 0; j < 6; j++) { fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j], - use_normal_texture, f->backface_culling, f->alpha, material_type); + use_normal_texture, f->tiledef[j].backface_culling, f->alpha, material_type); } // Special tiles (fill in f->special_tiles[]) diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 275b22bb..96fb78d9 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -294,14 +294,31 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype) index = lua_gettop(L) + 1 + index; TileDef tiledef; - bool default_tiling = (drawtype == NDT_PLANTLIKE || drawtype == NDT_FIRELIKE) - ? false : true; + + bool default_tiling = true; + bool default_culling = true; + switch (drawtype) { + case NDT_PLANTLIKE: + case NDT_FIRELIKE: + default_tiling = false; + // "break" is omitted here intentionaly, as PLANTLIKE + // FIRELIKE drawtype both should default to having + // backface_culling to false. + case NDT_MESH: + case NDT_LIQUID: + default_culling = false; + break; + default: + break; + } + // key at index -2 and value at index if(lua_isstring(L, index)){ // "default_lava.png" tiledef.name = lua_tostring(L, index); tiledef.tileable_vertical = default_tiling; tiledef.tileable_horizontal = default_tiling; + tiledef.backface_culling = default_culling; } else if(lua_istable(L, index)) { @@ -310,7 +327,7 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype) getstringfield(L, index, "name", tiledef.name); getstringfield(L, index, "image", tiledef.name); // MaterialSpec compat. tiledef.backface_culling = getboolfield_default( - L, index, "backface_culling", true); + L, index, "backface_culling", default_culling); tiledef.tileable_horizontal = getboolfield_default( L, index, "tileable_horizontal", default_tiling); tiledef.tileable_vertical = getboolfield_default( From 0459eca8eb2e73e9670e00b838dabc9347acb35f Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 17 Jan 2016 05:11:35 +0000 Subject: [PATCH 213/531] Liquid flow: Prevent water spreading on ignore --- src/map.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index ac29cfee..40950423 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1732,11 +1732,14 @@ void Map::transformLiquids(std::map & modified_blocks) if (nb.t != NEIGHBOR_UPPER && liquid_type != LIQUID_NONE) m_transforming_liquid.push_back(npos); // if the current node happens to be a flowing node, it will start to flow down here. - if (nb.t == NEIGHBOR_LOWER) { + if (nb.t == NEIGHBOR_LOWER) flowing_down = true; - } } else { neutrals[num_neutrals++] = nb; + // If neutral below is ignore prevent water spreading outwards + if (nb.t == NEIGHBOR_LOWER && + nb.n.getContent() == CONTENT_IGNORE) + flowing_down = true; } break; case LIQUID_SOURCE: From e50c784e2ca55735fc360ae51534288c2ea59ca5 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 23 Jan 2016 05:45:00 +0100 Subject: [PATCH 214/531] Fix C++11 compilability Previous commits broke it... :( --- src/script/cpp_api/s_base.cpp | 2 +- src/script/cpp_api/s_base.h | 2 +- src/script/cpp_api/s_internal.h | 2 +- src/threading/event.h | 1 + src/threading/mutex.cpp | 15 +++++++++++++++ src/threading/mutex.h | 14 +++++++++++++- src/threading/mutex_auto_lock.h | 12 +++++++++++- 7 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp index 71369e3d..679a517e 100644 --- a/src/script/cpp_api/s_base.cpp +++ b/src/script/cpp_api/s_base.cpp @@ -68,7 +68,7 @@ public: */ ScriptApiBase::ScriptApiBase() : - m_luastackmutex(true) + m_luastackmutex() { #ifdef SCRIPTAPI_LOCK_DEBUG m_lock_recursion_count = 0; diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h index d30373ce..ead385a4 100644 --- a/src/script/cpp_api/s_base.h +++ b/src/script/cpp_api/s_base.h @@ -108,7 +108,7 @@ protected: void objectrefGetOrCreate(lua_State *L, ServerActiveObject *cobj); void objectrefGet(lua_State *L, u16 id); - Mutex m_luastackmutex; + RecursiveMutex m_luastackmutex; std::string m_last_run_mod; bool m_secure; #ifdef SCRIPTAPI_LOCK_DEBUG diff --git a/src/script/cpp_api/s_internal.h b/src/script/cpp_api/s_internal.h index 651fed95..37473c49 100644 --- a/src/script/cpp_api/s_internal.h +++ b/src/script/cpp_api/s_internal.h @@ -75,7 +75,7 @@ private: #endif #define SCRIPTAPI_PRECHECKHEADER \ - MutexAutoLock scriptlock(this->m_luastackmutex); \ + RecursiveMutexAutoLock scriptlock(this->m_luastackmutex); \ SCRIPTAPI_LOCK_CHECK; \ realityCheck(); \ lua_State *L = getStack(); \ diff --git a/src/threading/event.h b/src/threading/event.h index dba3ddb4..43f2b04b 100644 --- a/src/threading/event.h +++ b/src/threading/event.h @@ -29,6 +29,7 @@ DEALINGS IN THE SOFTWARE. #if __cplusplus >= 201103L #include #include "threading/mutex.h" + #include "threading/mutex_auto_lock.h" #elif defined(_WIN32) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/src/threading/mutex.cpp b/src/threading/mutex.cpp index e12b7918..f2b07bec 100644 --- a/src/threading/mutex.cpp +++ b/src/threading/mutex.cpp @@ -34,7 +34,18 @@ DEALINGS IN THE SOFTWARE. #define UNUSED(expr) do { (void)(expr); } while (0) +Mutex::Mutex() +{ + init_mutex(false); +} + + Mutex::Mutex(bool recursive) +{ + init_mutex(recursive); +} + +void Mutex::init_mutex(bool recursive) { #ifdef _WIN32 // Windows critical sections are recursive by default @@ -89,5 +100,9 @@ void Mutex::unlock() #endif } +RecursiveMutex::RecursiveMutex() + : Mutex(true) +{} + #endif diff --git a/src/threading/mutex.h b/src/threading/mutex.h index 40b10a2e..dadbd050 100644 --- a/src/threading/mutex.h +++ b/src/threading/mutex.h @@ -30,6 +30,7 @@ DEALINGS IN THE SOFTWARE. #if __cplusplus >= 201103L && !defined(_WIN32) #include using Mutex = std::mutex; + using RecursiveMutex = std::recursive_mutex; #else #ifdef _WIN32 @@ -49,11 +50,14 @@ DEALINGS IN THE SOFTWARE. class Mutex { public: - Mutex(bool recursive=false); + Mutex(); ~Mutex(); void lock(); void unlock(); +protected: + Mutex(bool recursive); + void init_mutex(bool recursive); private: #ifdef _WIN32 CRITICAL_SECTION mutex; @@ -64,6 +68,14 @@ private: DISABLE_CLASS_COPY(Mutex); }; +class RecursiveMutex : public Mutex +{ +public: + RecursiveMutex(); + + DISABLE_CLASS_COPY(RecursiveMutex); +}; + #endif // C++11 #endif diff --git a/src/threading/mutex_auto_lock.h b/src/threading/mutex_auto_lock.h index 1c39349e..25caf7e1 100644 --- a/src/threading/mutex_auto_lock.h +++ b/src/threading/mutex_auto_lock.h @@ -28,7 +28,8 @@ DEALINGS IN THE SOFTWARE. #if __cplusplus >= 201103L #include - using MutexAutoLock = std::lock_guard; + using MutexAutoLock = std::unique_lock; + using RecursiveMutexAutoLock = std::unique_lock; #else #include "threading/mutex.h" @@ -44,6 +45,15 @@ private: Mutex &mutex; }; +class RecursiveMutexAutoLock +{ +public: + RecursiveMutexAutoLock(RecursiveMutex &m) : mutex(m) { mutex.lock(); } + ~RecursiveMutexAutoLock() { mutex.unlock(); } + +private: + RecursiveMutex &mutex; +}; #endif #endif From 52eea799285998d9d9595945f89c27a0be64b090 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Thu, 21 Jan 2016 16:04:41 +0100 Subject: [PATCH 215/531] Fix texture tear issue --- src/client/clientlauncher.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp index be642662..357d98b4 100644 --- a/src/client/clientlauncher.cpp +++ b/src/client/clientlauncher.cpp @@ -544,6 +544,7 @@ bool ClientLauncher::create_engine_device() params.Vsync = vsync; params.EventReceiver = receiver; params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu"); + params.ZBufferBits = 24; #ifdef __ANDROID__ params.PrivateData = porting::app_global; params.OGLES2ShaderPath = std::string(porting::path_user + DIR_DELIM + From ef779b0ab6d7460fe074d8b2eda05864c822d905 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 23 Jan 2016 06:26:58 +0100 Subject: [PATCH 216/531] Fix compilation warning if compiling for android with c++11 --- build/android/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index 50164d95..64a50330 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -849,8 +849,8 @@ $(ROOT)/jni/src/android_version.h : prep_srcdir echo "#define VERSION_MAJOR ${VERSION_MAJOR}"; \ echo "#define VERSION_MINOR ${VERSION_MINOR}"; \ echo "#define VERSION_PATCH ${VERSION_PATCH}"; \ - echo "#define VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\ - \".\"STR(VERSION_PATCH)"; \ + echo "#define VERSION_STRING STR(VERSION_MAJOR) \".\" STR(VERSION_MINOR) \ + \".\" STR(VERSION_PATCH)"; \ echo "#endif"; \ } > $${VERSION_FILE_NEW}; \ if ! cmp -s $${VERSION_FILE} $${VERSION_FILE_NEW}; then \ From 735e3b70596e16d04de1edcd878deec3c539c6ed Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 21 Jan 2016 14:40:24 -0800 Subject: [PATCH 217/531] Backface culling: Ignore setting in tiledef from old servers. Outdated servers are always sending tiledefs with culling enabled no matter what, as the value was previously entirely ignored. To compensate, we must (1) detect that we're running against an old server with a new client, and (2) disable culling for mesh, plantlike, firelike and liquid draw types no matter what the server is telling us. In order to achieve this, we need to bump the protocol version since we cannot rely on the tiledef version, and test for it being older. I've bumped the protocol version, although that should have likely happened in the actual change that introduced the new backface_culling PR #3578. Fortunately that's only 2 commits back at this point. We also explicitly test for the drawtype to assure we are not changing the culling value for other nodes, where it should remain enabled. This was tested against various pub servers, including 0.4.13 and 0.4.12. Fixes #3598 --- src/network/networkprotocol.h | 5 ++++- src/nodedef.cpp | 34 ++++++++++++++++++++++++++-------- src/nodedef.h | 2 +- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h index 674c6810..dc15326d 100644 --- a/src/network/networkprotocol.h +++ b/src/network/networkprotocol.h @@ -132,9 +132,12 @@ with this program; if not, write to the Free Software Foundation, Inc., Rename GENERIC_CMD_SET_ATTACHMENT to GENERIC_CMD_ATTACH_TO PROTOCOL_VERSION 26: Add TileDef tileable_horizontal, tileable_vertical flags + PROTOCOL_VERSION 27: + backface_culling: backwards compatibility for playing with + newer client on pre-27 servers. */ -#define LATEST_PROTOCOL_VERSION 26 +#define LATEST_PROTOCOL_VERSION 27 // Server's supported network protocol range #define SERVER_PROTOCOL_VERSION_MIN 13 diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 0bcc00e4..e30cf6f1 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -139,7 +139,7 @@ void TileDef::serialize(std::ostream &os, u16 protocol_version) const } } -void TileDef::deSerialize(std::istream &is) +void TileDef::deSerialize(std::istream &is, bool culling_ignore) { int version = readU8(is); name = deSerializeString(is); @@ -153,6 +153,11 @@ void TileDef::deSerialize(std::istream &is) tileable_horizontal = readU8(is); tileable_vertical = readU8(is); } + // when connecting to old servers - do not use + // provided values here since culling needs to be + // disabled by default for these drawtypes + if (culling_ignore) + backface_culling = false; } @@ -339,15 +344,22 @@ void ContentFeatures::deSerialize(std::istream &is) groups[name] = value; } drawtype = (enum NodeDrawType)readU8(is); + + bool ignore_culling = ((version <= 26) && + ((drawtype == NDT_MESH) || + (drawtype == NDT_PLANTLIKE) || + (drawtype == NDT_FIRELIKE) || + (drawtype == NDT_LIQUID))); + visual_scale = readF1000(is); if(readU8(is) != 6) throw SerializationError("unsupported tile count"); for(u32 i = 0; i < 6; i++) - tiledef[i].deSerialize(is); + tiledef[i].deSerialize(is, ignore_culling); if(readU8(is) != CF_SPECIAL_COUNT) throw SerializationError("unsupported CF_SPECIAL_COUNT"); for(u32 i = 0; i < CF_SPECIAL_COUNT; i++) - tiledef_special[i].deSerialize(is); + tiledef_special[i].deSerialize(is, ignore_culling); alpha = readU8(is); post_effect_color.setAlpha(readU8(is)); post_effect_color.setRed(readU8(is)); @@ -1258,7 +1270,6 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const "Unsupported version requested"); } - void ContentFeatures::deSerializeOld(std::istream &is, int version) { if (version == 5) // In PROTOCOL_VERSION 13 @@ -1272,15 +1283,22 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version) groups[name] = value; } drawtype = (enum NodeDrawType)readU8(is); + + bool ignore_culling = ((version <= 26) && + ((drawtype == NDT_MESH) || + (drawtype == NDT_PLANTLIKE) || + (drawtype == NDT_FIRELIKE) || + (drawtype == NDT_LIQUID))); + visual_scale = readF1000(is); if (readU8(is) != 6) throw SerializationError("unsupported tile count"); for (u32 i = 0; i < 6; i++) - tiledef[i].deSerialize(is); + tiledef[i].deSerialize(is, ignore_culling); if (readU8(is) != CF_SPECIAL_COUNT) throw SerializationError("unsupported CF_SPECIAL_COUNT"); for (u32 i = 0; i < CF_SPECIAL_COUNT; i++) - tiledef_special[i].deSerialize(is); + tiledef_special[i].deSerialize(is, ignore_culling); alpha = readU8(is); post_effect_color.setAlpha(readU8(is)); post_effect_color.setRed(readU8(is)); @@ -1324,12 +1342,12 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version) if (readU8(is) != 6) throw SerializationError("unsupported tile count"); for (u32 i = 0; i < 6; i++) - tiledef[i].deSerialize(is); + tiledef[i].deSerialize(is, drawtype); // CF_SPECIAL_COUNT in version 6 = 2 if (readU8(is) != 2) throw SerializationError("unsupported CF_SPECIAL_COUNT"); for (u32 i = 0; i < 2; i++) - tiledef_special[i].deSerialize(is); + tiledef_special[i].deSerialize(is, drawtype); alpha = readU8(is); post_effect_color.setAlpha(readU8(is)); post_effect_color.setRed(readU8(is)); diff --git a/src/nodedef.h b/src/nodedef.h index 8f4942c0..182bd09b 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -137,7 +137,7 @@ struct TileDef } void serialize(std::ostream &os, u16 protocol_version) const; - void deSerialize(std::istream &is); + void deSerialize(std::istream &is, bool culling_ignore); }; enum NodeDrawType From a594963a7dad2f1ea3d4904610033164983a1389 Mon Sep 17 00:00:00 2001 From: Diego Martinez Date: Mon, 7 Dec 2015 00:49:01 -0300 Subject: [PATCH 218/531] Fix world config menu ignoring `name` in `mod.conf`. --- builtin/mainmenu/modmgr.lua | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua index 89292ed5..41e747b3 100644 --- a/builtin/mainmenu/modmgr.lua +++ b/builtin/mainmenu/modmgr.lua @@ -19,29 +19,29 @@ function get_mods(path,retval,modpack) local mods = core.get_dir_list(path, true) - for i=1, #mods, 1 do - if mods[i]:sub(1,1) ~= "." then + for _, name in ipairs(mods) do + if name:sub(1, 1) ~= "." then + local prefix = path .. DIR_DELIM .. name .. DIR_DELIM local toadd = {} - local modpackfile = nil + table.insert(retval, toadd) - toadd.name = mods[i] - toadd.path = path .. DIR_DELIM .. mods[i] .. DIR_DELIM - if modpack ~= nil and - modpack ~= "" then - toadd.modpack = modpack - else - local filename = path .. DIR_DELIM .. mods[i] .. DIR_DELIM .. "modpack.txt" - local error = nil - modpackfile,error = io.open(filename,"r") + local mod_conf = Settings(prefix .. "mod.conf"):to_table() + if mod_conf.name then + name = mod_conf.name end - if modpackfile ~= nil then - modpackfile:close() - toadd.is_modpack = true - table.insert(retval,toadd) - get_mods(path .. DIR_DELIM .. mods[i],retval,mods[i]) + toadd.name = name + toadd.path = prefix + + if modpack ~= nil and modpack ~= "" then + toadd.modpack = modpack else - table.insert(retval,toadd) + local modpackfile = io.open(prefix .. "modpack.txt") + if modpackfile then + modpackfile:close() + toadd.is_modpack = true + get_mods(prefix, retval, name) + end end end end From 73838a982ffa5882dc993d56df949a74cc0007cd Mon Sep 17 00:00:00 2001 From: Jun Zhang Date: Wed, 30 Dec 2015 16:01:36 +0100 Subject: [PATCH 219/531] Translated using Weblate (Chinese (China)) Currently translated at 34.8% (274 of 787 strings) --- po/zh_CN/minetest.po | 136 ++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 74 deletions(-) diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index c13b3304..52d850a3 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-07 08:04+0000\n" +"PO-Revision-Date: 2015-12-30 16:01+0000\n" "Last-Translator: Jun Zhang \n" -"Language-Team: Chinese (China) \n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,14 +21,13 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Lua 脚本错误:" #: builtin/fstk/ui.lua msgid "An error occured:" msgstr "错误:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "主菜单" @@ -167,7 +166,7 @@ msgstr "世界名称" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "你没有安装任何游戏" +msgstr "你没有安装任何游戏." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -254,9 +253,8 @@ msgid "Search" msgstr "搜索" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "短名称" +msgstr "短名称:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" @@ -287,9 +285,8 @@ msgid "Previous Contributors" msgstr "前贡献者" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "内部开发人员" +msgstr "前核心开发人员" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -324,9 +321,8 @@ msgid "Uninstall selected modpack" msgstr "删除选中的MOD包" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "地址/端口" +msgstr "地址/端口:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -337,14 +333,12 @@ msgid "Connect" msgstr "连接" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" msgstr "创造模式" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Damage enabled" -msgstr "启用" +msgstr "启用伤害" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -352,18 +346,16 @@ msgid "Delete" msgstr "删除" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "名字/密码" +msgstr "用户名/密码:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" msgstr "公共服务器列表" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "PvP enabled" -msgstr "启用" +msgstr "启用 PvP" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" @@ -392,9 +384,8 @@ msgid "New" msgstr "新建" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -#, fuzzy msgid "No world created or selected!" -msgstr "未给定世界名或未选择游戏" +msgstr "未创建或选择世界!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -422,7 +413,7 @@ msgstr "启动游戏" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" 不是合法的 flag." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -437,28 +428,28 @@ msgid "Change keys" msgstr "改变键位设置" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "禁用MOD包" +msgstr "已禁用" #: builtin/mainmenu/tab_settings.lua msgid "Edit" msgstr "设置" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "启用" +msgstr "已启用" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "格式: (X, Y, Z)." #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"格式: , , (, , ), , , " +"" #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -470,28 +461,27 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "请输入 flag, 多个 flag 以半角逗号分隔." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "请输入一个整数类型." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "请输入一个合法的数字." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "可设置的 flag: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "回复初始设置" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "选择" +msgstr "选择路径" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -499,20 +489,19 @@ msgstr "设置" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "显示高级设置" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "这个值必须大于 $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "这个值必须小于 $1." #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Config mods" -msgstr "配置MOD" +msgstr "配置 MOD" #: builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -520,7 +509,6 @@ msgid "Main" msgstr "主菜单" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Start Singleplayer" msgstr "单人游戏" @@ -538,47 +526,43 @@ msgstr "无资料可得" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "无" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "选择材质包：" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Texturepacks" msgstr "材质包" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "连接出错（超时？）" +msgstr "连接超时." #: src/client.cpp msgid "Done!" -msgstr "" +msgstr "完成!" #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "初始化节点中" #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "初始化节点..." #: src/client.cpp msgid "Item textures..." msgstr "物品材质..." #: src/client.cpp -#, fuzzy msgid "Loading textures..." -msgstr "载入中..." +msgstr "载入材质..." #: src/client.cpp -#, fuzzy msgid "Rebuilding shaders..." -msgstr "正在解析地址..." +msgstr "重建渲染器..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -602,11 +586,11 @@ msgstr "没有选择世界或提供地址。未执行操作。" #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "玩家的名字太长了" +msgstr "玩家的名字太长了." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " -msgstr "提供世界地址不存在" +msgstr "提供的世界路径不存在: " #: src/fontengine.cpp msgid "needs_fallback_font" @@ -621,9 +605,8 @@ msgstr "" "查看 debug.txt 以获得详细信息。" #: src/game.cpp -#, fuzzy msgid "Change Keys" -msgstr "改变键位设置" +msgstr "更改键位设置" #: src/game.cpp msgid "Change Password" @@ -642,9 +625,8 @@ msgid "Creating client..." msgstr "正在建立客户端..." #: src/game.cpp -#, fuzzy msgid "Creating server..." -msgstr "正在建立服务器...." +msgstr "建立服务器...." #: src/game.cpp msgid "" @@ -687,6 +669,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"默认按键:\n" +"菜单界面外:\n" +"- 单击: 激活按钮\n" +"- 双击: 放置/使用\n" +"- 滑动手指: 改变视角\n" +"菜单/物品栏:\n" +"- 双击 (界面区域外):\n" +" --> 关闭\n" +"- 点击物品, 然后点击栏位:\n" +" --> 移动一组物品\n" +"- 点击物品并拖动, 然后另一手指点击\n" +" --> 移动一个物品\n" #: src/game.cpp msgid "Exit to Menu" @@ -702,7 +696,7 @@ msgstr "物品定义..." #: src/game.cpp msgid "KiB/s" -msgstr "" +msgstr "KiB/s" #: src/game.cpp msgid "Media..." @@ -710,7 +704,7 @@ msgstr "媒体..." #: src/game.cpp msgid "MiB/s" -msgstr "" +msgstr "MiB/s" #: src/game.cpp msgid "Node definitions..." @@ -729,9 +723,8 @@ msgid "Respawn" msgstr "重生" #: src/game.cpp -#, fuzzy msgid "Shutting down..." -msgstr "关闭中......" +msgstr "关闭..." #: src/game.cpp msgid "Sound Volume" @@ -743,7 +736,7 @@ msgstr "你死了。" #: src/guiFormSpecMenu.cpp msgid "Enter " -msgstr "输入" +msgstr "输入 " #: src/guiFormSpecMenu.cpp msgid "ok" @@ -818,9 +811,8 @@ msgid "Sneak" msgstr "潜行" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "切换快速移动模式" +msgstr "切换电影模式" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1163,16 +1155,16 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = 利用梯度信息进行视差遮蔽 (较快).\n" +"1 = 浮雕映射 (较慢, 但准确)." #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" -msgstr "三维云彩" +msgstr "3D 云彩" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D mode" -msgstr "飞行模式" +msgstr "3D 模式" #: src/settings_translation_file.cpp msgid "" @@ -1247,7 +1239,6 @@ msgid "Ambient occlusion gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" msgstr "各向异性过滤" @@ -1280,7 +1271,6 @@ msgid "Basic" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" msgstr "双线性过滤" @@ -1360,18 +1350,16 @@ msgid "Cloud radius" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "三维云彩" +msgstr "云彩" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "主菜单" +msgstr "主菜单显示云彩" #: src/settings_translation_file.cpp msgid "Colored fog" From 1bd48e429849b43da3e14d199bde5d5f53726473 Mon Sep 17 00:00:00 2001 From: Peter Mikkelsen Date: Wed, 13 Jan 2016 09:23:08 +0100 Subject: [PATCH 220/531] Translated using Weblate (Danish) Currently translated at 30.1% (237 of 787 strings) --- po/da/minetest.po | 247 +++++++++++++++++++++------------------------- 1 file changed, 114 insertions(+), 133 deletions(-) diff --git a/po/da/minetest.po b/po/da/minetest.po index 5065541c..ed3b0d66 100644 --- a/po/da/minetest.po +++ b/po/da/minetest.po @@ -8,69 +8,70 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2013-02-17 00:41+0200\n" -"Last-Translator: Rune Biskopstö Christensen \n" -"Language-Team: \n" +"PO-Revision-Date: 2016-01-13 09:23+0000\n" +"Last-Translator: Peter Mikkelsen \n" +"Language-Team: Danish " +"\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.4-dev\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Der skete en fejt i Lua scriptet, så som et mod:" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "Der skete en fejl:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" msgstr "Hovedmenu" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" -msgstr "" +msgstr "Ok" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Forbind" +msgstr "Forbind igen" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Serveren har anmodet om at forbinde igen:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." -msgstr "" +msgstr "Indlæser..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Protokol versionerne matchede ikke. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Serveren kræver protokol version $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Serveren understøtter protokol versioner mellem $1 og $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Prøv at slå den offentlige serverliste fra og til, og tjek din internet " +"forbindelse." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Vi understøtter kun protokol version $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Vi understøtter protokol versioner mellem $1 og $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -79,22 +80,18 @@ msgid "Cancel" msgstr "Anuller" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Depends:" -msgstr "afhænger af:" +msgstr "Afhænger af:" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Disable MP" -msgstr "Deaktivér alle" +msgstr "Deaktivér MP" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable MP" -msgstr "Aktivér alle" +msgstr "Aktivér MP" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable all" msgstr "Aktivér alle" @@ -103,19 +100,20 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Kunne ikke slå mod \"$1\" til, da den indeholder ugyldige tegn. Kun tegnene " +"[a-z0-9_] er tilladte." #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Hide Game" -msgstr "Spil" +msgstr "Skjul spil" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "" +msgstr "Skjul mp indhold" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" -msgstr "" +msgstr "Mod:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp @@ -123,18 +121,16 @@ msgid "Save" msgstr "Gem" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "World:" -msgstr "Vælg verden:" +msgstr "Verden:" #: builtin/mainmenu/dlg_config_world.lua msgid "enabled" msgstr "aktiveret" #: builtin/mainmenu/dlg_create_world.lua -#, fuzzy msgid "A world named \"$1\" already exists" -msgstr "Kan ikke skabe verden: en verden med dette navn eksisterer allerede" +msgstr "En verden med navnet \"$1\" eksisterer allerede" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" @@ -142,11 +138,11 @@ msgstr "Skab" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" +msgstr "Hent et subgame, så som minetest_game fra minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "" +msgstr "Hent en fra minetest.net" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -154,7 +150,7 @@ msgstr "Spil" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "" +msgstr "Mapgen" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -166,7 +162,7 @@ msgstr "" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "" +msgstr "Advarsel: Den minimale udvikings test er kun lavet for udviklerne." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -174,32 +170,31 @@ msgstr "Verdens navn" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "" +msgstr "Du har ikke installeret nogle subgames." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "" +msgstr "Er du sikker på du vil slette \"$1\"?" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "" +msgstr "Modmgr: Kunne ikke slette \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "" +msgstr "Modmgr: ugyldig mod-sti \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "" +msgstr "Nej selvfølgelig ikke!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua msgid "Yes" msgstr "Ja" #: builtin/mainmenu/dlg_delete_world.lua -#, fuzzy msgid "Delete World \"$1\"?" -msgstr "Slet verden" +msgstr "Slet verden \"$1\"?" #: builtin/mainmenu/dlg_delete_world.lua msgid "No" @@ -211,79 +206,80 @@ msgstr "Accepter" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "" +msgstr "Omdøb Modpack:" #: builtin/mainmenu/modmgr.lua msgid "" "\n" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" +"\n" +"Installer Mod: filtypen \"$1\" er enten ikke understøttet, ellers er arkivet " +"korrupt" #: builtin/mainmenu/modmgr.lua -#, fuzzy msgid "Failed to install $1 to $2" -msgstr "Mislykkedes i at initialisere verden" +msgstr "Kunne ikke installere $1 til $2" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" -msgstr "" +msgstr "Installer Mod: Fil: \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" -msgstr "" +msgstr "Installer Mod: kunne ikke finde det rigtige mod navn for: $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" -msgstr "" +msgstr "Installer Mod: kunne ikke finde passende mappe navn for modpack $1" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "" +msgstr "Luk marked" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "" +msgstr "Henter $1, vent venligst..." #: builtin/mainmenu/store.lua msgid "Install" -msgstr "" +msgstr "Installer" #: builtin/mainmenu/store.lua msgid "Page $1 of $2" -msgstr "" +msgstr "Side $1 af $2" #: builtin/mainmenu/store.lua msgid "Rating" -msgstr "" +msgstr "Bedømmelse" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "" +msgstr "Søg" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "Verdens navn" +msgstr "Kort navn:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" -msgstr "" +msgstr "Succesfuldt installeret:" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "" +msgstr "Usorteret" #: builtin/mainmenu/store.lua msgid "re-Install" -msgstr "" +msgstr "geninstaller" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" -msgstr "" +msgstr "Aktive bidragere" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" -msgstr "" +msgstr "Hoved udviklere" #: builtin/mainmenu/tab_credits.lua msgid "Credits" @@ -291,67 +287,63 @@ msgstr "Skabt af" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" -msgstr "" +msgstr "Tidligere bidragere" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "" +msgstr "Tidligere hoved udviklere" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" -msgstr "" +msgstr "Installerede mods:" #: builtin/mainmenu/tab_mods.lua msgid "Mod information:" -msgstr "" +msgstr "Information om mod:" #: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua msgid "Mods" -msgstr "" +msgstr "Mods" #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" -msgstr "" +msgstr "Der er ikke nogen beskrivelse af tilgængelig af det valgte mod" #: builtin/mainmenu/tab_mods.lua msgid "Rename" -msgstr "" +msgstr "Omdøb" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Select Mod File:" -msgstr "Vælg verden:" +msgstr "Vælg mod fil:" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" -msgstr "" +msgstr "Afinstaller det valgte mod" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" -msgstr "" +msgstr "Afinstaller den valgte modpack" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "Adresse/port" +msgstr "Adresse/port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" -msgstr "" +msgstr "Klient" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" msgstr "Forbind" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" msgstr "Kreativ tilstand" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Damage enabled" -msgstr "aktiveret" +msgstr "Skade aktiveret" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -359,18 +351,16 @@ msgid "Delete" msgstr "Slet" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "Navn/kodeord" +msgstr "Navn/kodeord:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" -msgstr "" +msgstr "Offentlig serverliste" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "PvP enabled" -msgstr "aktiveret" +msgstr "Spiller mod spiller aktiveret" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" @@ -407,9 +397,8 @@ msgid "Port" msgstr "" #: builtin/mainmenu/tab_server.lua -#, fuzzy msgid "Public" -msgstr "Vis offentlig" +msgstr "Offentlig" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Select World:" @@ -417,24 +406,23 @@ msgstr "Vælg verden:" #: builtin/mainmenu/tab_server.lua msgid "Server" -msgstr "" +msgstr "Server" #: builtin/mainmenu/tab_server.lua msgid "Server Port" -msgstr "" +msgstr "Server port" #: builtin/mainmenu/tab_server.lua -#, fuzzy msgid "Start Game" msgstr "Start spil / Forbind" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" er ikke en gyldig indstilling." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Der er ikke nogen beskrivelse af denne indstilling)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" @@ -445,22 +433,20 @@ msgid "Change keys" msgstr "Skift bindinger" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Deaktivér alle" +msgstr "Deaktiveret" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Rediger" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" msgstr "aktiveret" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "Formatet er 3 tal, adskilt af kommaer, og omgivet af parenteser." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -469,7 +455,6 @@ msgid "" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" msgstr "Spil" @@ -479,28 +464,27 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Indtast venligst en liste af indstillinger som er adskilt med kommaer." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Indtast venligst et gyldigt heltal." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Indtast venligt et gyldigt nummer." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Mulige værdier er: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Gendan standard" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Vælg" +msgstr "Vælg sti" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -508,71 +492,70 @@ msgstr "Indstillinger" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Vis tekniske navne" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Værdien skal være større end $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Værdien skal være mindre end $1." #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Config mods" -msgstr "Konfigurér" +msgstr "Konfigurér mods" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" msgstr "Hovedmenu" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Start Singleplayer" -msgstr "Enligspiller" +msgstr "Enlig spiller" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" -msgstr "Afspil" +msgstr "Spil" #: builtin/mainmenu/tab_singleplayer.lua msgid "Singleplayer" -msgstr "Enligspiller" +msgstr "Enlig spiller" #: builtin/mainmenu/tab_texturepacks.lua msgid "No information available" -msgstr "" +msgstr "Der er ikke nogen information tilgængelig" #: builtin/mainmenu/tab_texturepacks.lua +#, fuzzy msgid "None" -msgstr "" +msgstr "Ingen" #: builtin/mainmenu/tab_texturepacks.lua +#, fuzzy msgid "Select texture pack:" msgstr "" #: builtin/mainmenu/tab_texturepacks.lua +#, fuzzy msgid "Texturepacks" msgstr "" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Forbindelses fejl (udløbelse af tidsfrist?)" +msgstr "Forbindelses fejl (tidsfristen udløb)." #: src/client.cpp msgid "Done!" -msgstr "" +msgstr "Færdig!" #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "Initialiserer noder" #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "Initialiserer noder..." #: src/client.cpp msgid "Item textures..." @@ -604,11 +587,11 @@ msgstr "Hovedmenu" #: src/client/clientlauncher.cpp msgid "No world selected and no address provided. Nothing to do." -msgstr "Ingen verden valgt og ingen adresse angivet. Ingen opgave at lave." +msgstr "Ingen verden valgt og ingen adresse angivet. Der er ikke noget at gøre." #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "" +msgstr "Spillerens navn er for langt." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " @@ -627,9 +610,8 @@ msgstr "" "Tjek debug.txt for detaljer." #: src/game.cpp -#, fuzzy msgid "Change Keys" -msgstr "Skift bindinger" +msgstr "Skift tastatur-bindinger" #: src/game.cpp msgid "Change Password" @@ -637,7 +619,7 @@ msgstr "Skift kodeord" #: src/game.cpp msgid "Connecting to server..." -msgstr "" +msgstr "Forbinder til server..." #: src/game.cpp msgid "Continue" @@ -700,7 +682,7 @@ msgstr "" #: src/game.cpp msgid "Media..." -msgstr "" +msgstr "Medier..." #: src/game.cpp msgid "MiB/s" @@ -724,11 +706,11 @@ msgstr "Genopstå" #: src/game.cpp msgid "Shutting down..." -msgstr "" +msgstr "Lukker ned..." #: src/game.cpp msgid "Sound Volume" -msgstr "" +msgstr "Lydniveau" #: src/game.cpp msgid "You died." @@ -740,7 +722,7 @@ msgstr "" #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "" +msgstr "ok" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1358,9 +1340,8 @@ msgid "Cloud radius" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D skyer" +msgstr "Skyer" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." From d486ca064c7a357f273042e27364501a14128115 Mon Sep 17 00:00:00 2001 From: Rui Date: Wed, 13 Jan 2016 08:54:13 +0100 Subject: [PATCH 221/531] Translated using Weblate (Japanese) Currently translated at 42.0% (331 of 787 strings) --- po/ja/minetest.po | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index fcd189d9..c819f72d 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-12-19 11:07+0000\n" +"PO-Revision-Date: 2016-01-13 08:54+0000\n" "Last-Translator: Rui \n" "Language-Team: Japanese " "\n" @@ -134,7 +134,6 @@ msgid "Download a subgame, such as minetest_game, from minetest.net" msgstr "minetest.netからminetest_gameなどのサブゲームをダウンロードしてください" #: builtin/mainmenu/dlg_create_world.lua -#, fuzzy msgid "Download one from minetest.net" msgstr "minetest.netからダウンロードしてください" @@ -358,7 +357,6 @@ msgid "PvP enabled" msgstr "PvP有効" #: builtin/mainmenu/tab_server.lua -#, fuzzy msgid "Bind Address" msgstr "バインドアドレス" @@ -413,7 +411,6 @@ msgid "Start Game" msgstr "ゲームスタート" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "\"$1\" is not a valid flag." msgstr "\"$1\"は有効なフラグではありません。" @@ -442,9 +439,8 @@ msgid "Enabled" msgstr "有効" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "書式は、コンマとかっこで区切られた 3 つの数字です。" +msgstr "括弧内に3つの数字をカンマで区切って入力してください。" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -460,14 +456,12 @@ msgid "Games" msgstr "ゲーム" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "空隙性随意大手カンマを付加することができます。" +msgstr "空隙性の値には、任意でカンマを付けて読みやすくすることができます。" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Please enter a comma seperated list of flags." -msgstr "フラグのリストはカンマで区切って入力してください。" +msgstr "フラグはカンマで区切られた一覧で入力してください。" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." @@ -478,27 +472,24 @@ msgid "Please enter a valid number." msgstr "有効な数字を入力してください。" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Possible values are: " -msgstr "可能な値: " +msgstr "使用可能な値: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" msgstr "初期設定に戻す" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "ファイルパスを選択" +msgstr "ファイルの場所を選択" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "設定" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Show technical names" -msgstr "技術名称を表示" +msgstr "パラメータ名を表示" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." @@ -577,30 +568,26 @@ msgid "Connection error (timed out?)" msgstr "接続エラー (タイムアウト？)" #: src/client/clientlauncher.cpp -#, fuzzy msgid "Could not find or load game \"" -msgstr "以下のゲームの読み込みができません\"" +msgstr "以下のゲームが見つからないか読み込めません \"" #: src/client/clientlauncher.cpp -#, fuzzy msgid "Invalid gamespec." -msgstr "無効なgamespecです。" +msgstr "無効なゲーム情報です。" #: src/client/clientlauncher.cpp msgid "Main Menu" msgstr "メインメニュー" #: src/client/clientlauncher.cpp -#, fuzzy msgid "No world selected and no address provided. Nothing to do." -msgstr "ワールドが選択されていないアドレスです。続行できません。" +msgstr "ワールドが選択されていないか存在しないアドレスです。続行できません。" #: src/client/clientlauncher.cpp msgid "Player name too long." msgstr "プレイヤー名が長過ぎます。" #: src/client/clientlauncher.cpp -#, fuzzy msgid "Provided world path doesn't exist: " msgstr "ワールドが存在しません: " @@ -667,7 +654,6 @@ msgstr "" "- T: チャット\n" #: src/game.cpp -#, fuzzy msgid "" "Default Controls:\n" "No menu visible:\n" @@ -685,9 +671,9 @@ msgstr "" "デフォルトの操作:\n" "タッチ操作:\n" "- シングルタップ: ブロックの破壊\n" -"- ダブルタップ: 設置、使用\n" +"- ダブルタップ: 設置/使用\n" "- スライド: 見回す\n" -"メニュー、インベントリの操作:\n" +"メニュー/インベントリの操作:\n" "- メニューの外をダブルタップ:\n" " --> 閉じる\n" "- アイテムをタッチ:\n" @@ -1168,6 +1154,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = 斜面情報付きの視差遮蔽マッピング(高速)。\n" +"1 = リリーフマッピング(正確だが低速)。" #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1178,7 +1166,6 @@ msgid "3D mode" msgstr "3Dモード" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1189,9 +1176,9 @@ msgid "" "- sidebyside: split screen side by side." msgstr "" "3Dサポート\n" -"現在サポートしている:\n" -"- none: 3D出力なし\n" -"- anaglyph: cyan/magenta color 3d.\n" +"サポートしている出力:\n" +"- none: 3D出力なし。\n" +"- anaglyph: 赤/青の色による3D。\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." From 42dc568f16a7bc93a34f55113df33ba090959817 Mon Sep 17 00:00:00 2001 From: Rui Date: Thu, 14 Jan 2016 08:53:58 +0100 Subject: [PATCH 222/531] Translated using Weblate (Japanese) Currently translated at 43.4% (342 of 787 strings) --- po/ja/minetest.po | 61 ++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index c819f72d..e3d9eab7 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-01-13 08:54+0000\n" +"PO-Revision-Date: 2016-01-14 08:53+0000\n" "Last-Translator: Rui \n" "Language-Team: Japanese " "\n" @@ -1177,17 +1177,20 @@ msgid "" msgstr "" "3Dサポート\n" "サポートしている出力:\n" -"- none: 3D出力なし。\n" -"- anaglyph: 赤/青の色による3D。\n" -"- interlaced: odd/even line based polarisation screen support.\n" -"- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- none: 3D出力を行いません。\n" +"- anaglyph: 赤/青の色による3Dです。\n" +"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応しています。\n" +"- topbottom: 画面を上下で分割します。\n" +"- sidebyside: 画面を左右で分割します。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"新規マップを作成する際の初期シード値です。空にするとランダムに設定されます。\n" +"メインメニューから新規ワールドを作成する際に上書きされることがあります。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." @@ -1198,8 +1201,9 @@ msgid "A message to be displayed to all clients when the server shuts down." msgstr "サーバー終了時に全てのクライアントへ表示するメッセージ。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "エマージキューの絶対的な制限値" #: src/settings_translation_file.cpp #, fuzzy @@ -3535,7 +3539,6 @@ msgid "Waving leaves" msgstr "揺れる葉" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" msgstr "揺れる草花" @@ -3544,19 +3547,16 @@ msgid "Waving water" msgstr "揺れる水" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "揺れる水" +msgstr "水が揺れる高さ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "揺れる水" +msgstr "水が揺れる丈" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "揺れる水" +msgstr "水が揺れる速度" #: src/settings_translation_file.cpp msgid "" @@ -3585,6 +3585,7 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Where the map generator stops.\n" "Please note:\n" @@ -3593,58 +3594,74 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"どこでマップ生成を停止するかの設定です。\n" +"注意:\n" +"- 最大で31000です(これ以上に設定しても効果はありません)。\n" +"- マップ生成は80x80x80ノードのグループで動作します (5x5x5マップブロック)。\n" +"- このグループは原点から-32、-32ノードのオフセットがあります。\n" +"- グループはmap_generation_limit内で生成されたものに限ります。" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "" +msgstr "Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドである必要があります。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "" +msgstr "ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうかの設定です。" #: src/settings_translation_file.cpp msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" +"視界の範囲に関わらずクライアントにプレイヤーを表示するかどうかの設定です。\n" +"非推奨です。player_transfer_distance instead設定を利用してください。" #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "" +msgstr "他のプレイヤーを殺すことができるかどうかの設定です。" #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"(Luaが)クラッシュした際にクライアントに再接続を要求するかどうかの設定です。\n" +"サーバーが自動で再起動されるように設定されているならばtrueに設定してください。" #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "可視領域の端に霧を表示するかどうかの設定です。" #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" +msgstr "クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効果)。" #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "ノードを選択した際に表示される線の幅です。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" +"ワールドを保存するディレクトリです(全てのワールドはここに保存されます)。\n" +"メインメニューから開始する場合必要ありません。" #: src/settings_translation_file.cpp +#, fuzzy msgid "cURL file download timeout" -msgstr "" +msgstr "cURLファイルダウンロードタイムアウト" #: src/settings_translation_file.cpp +#, fuzzy msgid "cURL parallel limit" -msgstr "" +msgstr "cURLパラレル制限" #: src/settings_translation_file.cpp msgid "cURL timeout" From e3e75a43db65e358725f2a9012f0b823050f2d29 Mon Sep 17 00:00:00 2001 From: Ian giestas pauli Date: Thu, 14 Jan 2016 18:20:14 +0100 Subject: [PATCH 223/531] Translated using Weblate (Portuguese) Currently translated at 23.6% (186 of 787 strings) --- po/pt/minetest.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/pt/minetest.po b/po/pt/minetest.po index da85b92d..646821ae 100644 --- a/po/pt/minetest.po +++ b/po/pt/minetest.po @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2014-01-06 01:45+0200\n" -"Last-Translator: João Farias \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2016-01-14 18:20+0000\n" +"Last-Translator: Ian giestas pauli \n" +"Language-Team: Portuguese " +"\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -36,13 +37,12 @@ msgid "Ok" msgstr "Ok" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Ligar" +msgstr "Reconectar" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "O servidor requisitou uma reconexão:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." From e24de58b4d14396eda1755b498f2d997c3e87131 Mon Sep 17 00:00:00 2001 From: Ian giestas pauli Date: Thu, 14 Jan 2016 18:32:23 +0100 Subject: [PATCH 224/531] Translated using Weblate (Portuguese (Brazil)) Currently translated at 26.6% (210 of 787 strings) --- po/pt_BR/minetest.po | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index 7b2029c0..e4b52146 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -8,20 +8,20 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-10-27 16:46+0200\n" -"Last-Translator: PilzAdam \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2016-01-14 18:32+0000\n" +"Last-Translator: Ian giestas pauli \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Ocorreu um erro no script Lua, como um mod:" +msgstr "Ocorreu um erro no script Lua, assim como em um mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -36,13 +36,12 @@ msgid "Ok" msgstr "Ok" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Conectar" +msgstr "Reconectar" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "O servidor requisitou uma reconexão:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -50,27 +49,29 @@ msgstr "Carregando..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Versão do protocolo incompatível. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "O servidor suporta o protocolo versão $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "O servidor suporta entre as versões $1 e $2 do protocolo. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Tente reabilitar a lista de servidores publicos e checar sua conexão de " +"internet." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Nós apenas suportamos a versão $1 do protocolo." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Nós suportamos entre as versões $1 e $2 do protocolo." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -99,6 +100,9 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Falha ao carregar mod \"$1\" devido ao fato de seu nome possuir caracteres " +"inválidos. Apenas caracteres de \"a\" até \"z\" e algarísmos de 0 até 9 são " +"permitidos." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -135,11 +139,11 @@ msgstr "Criar" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" +msgstr "Baixe um subgame, como o minetest_game, do site minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "" +msgstr "Baixe um do site minetest.net" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" From d0d7122c002bddcd782410ea7eee03e02ed00493 Mon Sep 17 00:00:00 2001 From: Ian giestas pauli Date: Thu, 14 Jan 2016 20:25:46 +0100 Subject: [PATCH 225/531] Translated using Weblate (Portuguese (Brazil)) Currently translated at 41.6% (328 of 787 strings) --- po/pt_BR/minetest.po | 312 +++++++++++++++++++++++-------------------- 1 file changed, 170 insertions(+), 142 deletions(-) diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index e4b52146..4728e7ef 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-01-14 18:32+0000\n" +"PO-Revision-Date: 2016-01-14 20:25+0000\n" "Last-Translator: Ian giestas pauli \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -165,6 +165,7 @@ msgstr "Seed" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." msgstr "" +"Aviso: O game \"minimal development test\" apenas serve para desenvolvedores." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -172,7 +173,7 @@ msgstr "Nome do mundo" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "" +msgstr "Você não possui nenhum subgame instalado." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -211,13 +212,13 @@ msgid "Rename Modpack:" msgstr "Renomear pacote de módulos:" #: builtin/mainmenu/modmgr.lua -#, fuzzy msgid "" "\n" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"Instalação de módulo: o tipo de arquivo \"$1\" não é suportado" +"Instalação de módulo: o tipo de arquivo \"$1\" não é suportado ou o arquivo " +"está corrompido" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" @@ -240,11 +241,11 @@ msgstr "" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "" +msgstr "Fechar Mod Store" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "" +msgstr "Baixando $1, por favor aguarde..." #: builtin/mainmenu/store.lua msgid "Install" @@ -260,20 +261,19 @@ msgstr "Classificação" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "" +msgstr "Procurar" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "Nome do mundo" +msgstr "Nome curto:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" -msgstr "" +msgstr "Instalado com sucesso:" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "" +msgstr "Desorganizado" #: builtin/mainmenu/store.lua msgid "re-Install" @@ -296,9 +296,8 @@ msgid "Previous Contributors" msgstr "Colaboradores anteriores" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "Desenvolvedores principais" +msgstr "Desenvolvedores principais anteriores" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -333,9 +332,8 @@ msgid "Uninstall selected modpack" msgstr "Desinstalar o pacote de módulos selecionado" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "Endereço/Porta" +msgstr "Endereço / Porta :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -346,14 +344,12 @@ msgid "Connect" msgstr "Conectar" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" msgstr "Modo criativo" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Damage enabled" -msgstr "habilitado" +msgstr "Habilitar dano" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -361,22 +357,20 @@ msgid "Delete" msgstr "Excluir" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "Nome/Senha" +msgstr "Nome / Senha :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" -msgstr "Servidores públicos" +msgstr "Lista de servidores públicos" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "PvP enabled" -msgstr "habilitado" +msgstr "PvP habilitado" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" -msgstr "" +msgstr "Endereço de Bind" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" @@ -394,21 +388,19 @@ msgstr "Habilitar dano" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua msgid "Name/Password" -msgstr "Nome/Senha" +msgstr "Nome / Senha" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "New" msgstr "Novo" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -#, fuzzy msgid "No world created or selected!" -msgstr "" -"Não foi fornecido nenhum nome para o mundo ou não foi selecionado nenhum jogo" +msgstr "Nenhum mundo criado ou selecionado!" #: builtin/mainmenu/tab_server.lua msgid "Port" -msgstr "" +msgstr "Porta" #: builtin/mainmenu/tab_server.lua msgid "Public" @@ -432,43 +424,43 @@ msgstr "Iniciar o jogo" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" não é uma flag válida." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Nenhuma descrição das configurações foi fornecida)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Navegar" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Mudar teclas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Desabilitar PMs" +msgstr "Desabilitado" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Editar" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "habilitado" +msgstr "Habilitado" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "O formato é de 3 números separados por virgulas e dentro de colchetes." #: builtin/mainmenu/tab_settings.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Formato: , , (, , ), , " +", " #: builtin/mainmenu/tab_settings.lua msgid "Games" @@ -477,31 +469,31 @@ msgstr "Jogos" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" +"Opcionalmente essas lacunas podem ser colocados com a vírgula na frente." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Por favor, digite uma lista de flags separadas por vírgulas." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Por favor entre com um inteiro válido." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Por favor entre com um número válido." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Os possíveis valores são: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Restaurar para o padrão" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Select" +msgstr "Selecionar diretório" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -509,20 +501,19 @@ msgstr "Configurações" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Mostrar nomes técnicos" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "O valor deve ser maior que $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "O valor deve ser menor que $1." #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Config mods" -msgstr "Configurar" +msgstr "Configurar Mods" #: builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -548,7 +539,7 @@ msgstr "Nenhuma informação disponível" #: builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Nenhum" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -560,35 +551,32 @@ msgid "Texturepacks" msgstr "Pacotes de texturas" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Erro de conexão (tempo excedido?)" +msgstr "Erro de conexão (tempo excedido)." #: src/client.cpp msgid "Done!" -msgstr "" +msgstr "Pronto!" #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "Inicializando nodes" #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "Inicializando nodes..." #: src/client.cpp msgid "Item textures..." msgstr "Texturas dos itens..." #: src/client.cpp -#, fuzzy msgid "Loading textures..." -msgstr "Carregando..." +msgstr "Carregando texturas..." #: src/client.cpp -#, fuzzy msgid "Rebuilding shaders..." -msgstr "Resolvendo os endereços..." +msgstr "Recompilando shaders..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -609,20 +597,20 @@ msgstr "Menu principal" #: src/client/clientlauncher.cpp msgid "No world selected and no address provided. Nothing to do." msgstr "" -"Nenhum mundo foi selecionado e nenhum endereço fornecido. Não existe nada a " -"ser feito." +"Nenhum mundo foi selecionado e nenhum endereço fornecido. Nada a ser feito." #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "" +msgstr "Seu nome de jogador é muito longo." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " -msgstr "" +msgstr "O caminho fornecido não existe: " #: src/fontengine.cpp +#, fuzzy msgid "needs_fallback_font" -msgstr "no" +msgstr "needs_fallback_font" #: src/game.cpp msgid "" @@ -699,6 +687,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Controles:\n" +"Se não há nenhum menu visível:\n" +"- Um toque: ativa botão\n" +"- Duplo toque: place/use\n" +"- Deslizar dedo: Olhar ao redor\n" +"Menu/Inventário visível:\n" +"- Duplo toque: (Fora do menu):\n" +" -->Fechar\n" +"- Tocar Item e depois tocar em um slot:\n" +" --> move item\n" +"- Tocar e arrastar, e depois tocar com o 2º dedo\n" +" --> Coloca apenas um item no slot\n" #: src/game.cpp msgid "Exit to Menu" @@ -710,11 +710,11 @@ msgstr "Sair do Minetest" #: src/game.cpp msgid "Item definitions..." -msgstr "Definições dos itens..." +msgstr "Carregando itens..." #: src/game.cpp msgid "KiB/s" -msgstr "" +msgstr "KB/s" #: src/game.cpp msgid "Media..." @@ -722,11 +722,11 @@ msgstr "Mídia..." #: src/game.cpp msgid "MiB/s" -msgstr "" +msgstr "MB/s" #: src/game.cpp msgid "Node definitions..." -msgstr "Definições dos nós..." +msgstr "Carregando blocos..." #: src/game.cpp src/guiFormSpecMenu.cpp msgid "Proceed" @@ -754,12 +754,13 @@ msgid "You died." msgstr "Você morreu." #: src/guiFormSpecMenu.cpp +#, fuzzy msgid "Enter " -msgstr "" +msgstr "Entrar " #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "" +msgstr "Ok" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -832,9 +833,8 @@ msgid "Sneak" msgstr "Esgueirar" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Alternar corrida" +msgstr "Alternar modo de câmera cinemática" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1185,7 +1185,7 @@ msgstr "Nuvens 3D" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "modo 3D" #: src/settings_translation_file.cpp msgid "" @@ -1197,20 +1197,33 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"Suporte 3D.\n" +"Modos atualmente suportados:\n" +"- none: Nenhum efeito 3D.\n" +"- anaglyph: Sistema de cor Ciano/Magenta (Óculos 3D azul vermelho).\n" +"- interlaced: Sistema interlaçado (Óculos com lentes polarizadas).\n" +"- topbottom: Divide a tela em duas: uma em cima e outra em baixo.\n" +"- sidebyside: Divide a tela em duas: lado a lado." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Seed do mundo (deixe em branco para uma seed aleatória).\n" +"Será sobrescrita quando for criada um novo mundo no menu principal." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Uma mensagem para ser mostrada a todos os clientes do seu servidor quando " +"ele travar." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Uma mensagem para ser mostrada a todos os clientes quando o servidor " +"desligar." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1218,11 +1231,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Aceleração no ar" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Limite para blocos ativos" #: src/settings_translation_file.cpp msgid "Active object send range" @@ -1234,12 +1247,17 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Endereço para conexão.\n" +"Deixe em branco para iniciar um servidor local.\n" +"Note que o campo de endereço no menu principal sobrescreve essa configuração." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Ajustar configuração de dpi (profundidade de cor) para sua tela (apenas para " +"quem não usa X11/Android) Ex para telas 4K" #: src/settings_translation_file.cpp msgid "" @@ -1266,7 +1284,7 @@ msgstr "Filtragem anisotrópica" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Anunciar servidor" #: src/settings_translation_file.cpp msgid "" @@ -1290,7 +1308,7 @@ msgstr "Voltar" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Básico" #: src/settings_translation_file.cpp #, fuzzy @@ -1305,11 +1323,12 @@ msgstr "Resolvendo os endereços..." #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." msgstr "" +"Bits por pixel (Também conhecido como profundidade de cor) no modo de tela " +"cheia." #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "Vários jogadores" +msgstr "Construir com o jogador dentro do bloco" #: src/settings_translation_file.cpp #, fuzzy @@ -1318,15 +1337,15 @@ msgstr "Mipmapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Suavização da camera" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Suavização da câmera no modo cinematográfico" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Tecla para alternar atualização da câmera" #: src/settings_translation_file.cpp #, fuzzy @@ -1343,14 +1362,12 @@ msgid "Chunk size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Modo criativo" +msgstr "Modo cinematográfico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Modo criativo" +msgstr "Tecla para modo cinematográfico" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1358,43 +1375,44 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Cliente e servidor" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Velocidade de subida (em escadas e outros)" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Altura das nuvens" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Espessura das nuvens" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "Nuvens 3D" +msgstr "Nuvens" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Conf. das nuvens apenas afetam seu jogo local." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Menu principal" +msgstr "Nuvens no menu" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Névoa colorida" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Lista separada por vírgulas dos mods confiáveis que podem utilizar funções " +"inseguras mesmo quando o a opção de Mod Seguro está ativada (via " +"request_insecure_environment())." #: src/settings_translation_file.cpp #, fuzzy @@ -1402,41 +1420,36 @@ msgid "Command key" msgstr "Comando" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Conectar" +msgstr "Vidro conectado" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Conectando ao servidor..." +msgstr "Conectando ao servidor de mídia externo..." #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Conecta o vidro se isso for suportado pelo bloco." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Console" +msgstr "Console Alpha" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Console" +msgstr "Cor do console" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Console" +msgstr "Tecla do console" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Para frente continuamente" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Movimento contínuo para frente (apenas usado para testes)." #: src/settings_translation_file.cpp #, fuzzy @@ -1449,81 +1462,86 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Controles da duração do dia.\n" +"Exemplos: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = O tempo para e permanece " +"inalterado." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Controla o tamanho dos desertos e das praias no Mapgen v6.\n" +"Quando \"snowbiomes\" (bioma de neve) está habilitado 'mgv6_freq_desert' é " +"ignorado." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Mensagem de travamento" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Alpha do cursor" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Alpha do cursor (o quanto ele é opaco, níveis entre 0 e 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Cor do cursor" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Cor do cursor (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Velocidade para descer" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "dpi" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Habilitar dano" +msgstr "Dano" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Tecla para alternar modo de Debug" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Nível de log do Debug" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Passo do servidor dedicado" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Aceleração padrão" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "editar o jogo" +msgstr "Jogo padrão" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Padrões de jogo para quando criar um novo mundo.\n" +"Isso será sobrescrito quando criar um mundo no menu principal." #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Nova senha" +msgstr "Senha padrão" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Privilégios por padrão" #: src/settings_translation_file.cpp msgid "" @@ -1572,17 +1590,16 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Habilitar partículas" +msgstr "Habilitar Anti-Hack" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Não permitir logar sem senha" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Domínio do servidor, para ser mostrado na lista de servidores." #: src/settings_translation_file.cpp #, fuzzy @@ -1596,11 +1613,11 @@ msgstr "\"Pular\" duas vezes ativa o voo" #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Tecla para largar item" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Mostrar informações de depuração do Mapgen." #: src/settings_translation_file.cpp msgid "" @@ -1609,23 +1626,28 @@ msgid "" "Note that this is not quite optimized and that smooth lighting on the\n" "water surface doesn't work with this." msgstr "" +"Habilita recurso permitindo que o nível da água seja um pouco menor, " +"portando não preenche todo o espaço disponível para bloco.\n" +"Note que isso não está bem otimizado e que suavização da iluminação na " +"superfície da água não funciona bem com esse recurso." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Repositório de módulos online" +msgstr "Habilitar Mod Security (Segurança nos mods)" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Permitir que os jogadores possam sofrer dano e morrer." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Habilitar entrada de comandos aleatórios (apenas usado para testes)." #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." msgstr "" +"Habilitar destaque de bloco selecionado (desabilita o modo de destaque " +"selectionbox [Padrão])." #: src/settings_translation_file.cpp msgid "" @@ -1641,6 +1663,11 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Habilitar recurso de não permitir que jogadores usando versões antigas do " +"cliente possam se conectar.\n" +"Essas versões são compatíveis no sentido de não travar quando conectam a " +"servidores com versões mais atuais, porém eles podem não suportar todos os " +"recursos que você está esperando." #: src/settings_translation_file.cpp msgid "" @@ -1670,9 +1697,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Habilitar dano" +msgstr "Habilitar minimapa." #: src/settings_translation_file.cpp msgid "" @@ -1745,17 +1771,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Campo de visão" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Campo de visão em graus." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"Arquivo na pasta client/serverlist/ que contém seus servidores favoritos, " +"que são mostrados na aba Multiplayer." #: src/settings_translation_file.cpp msgid "" From c07a242d8be1fef1565e7bb8797070f614f56fe2 Mon Sep 17 00:00:00 2001 From: Tobyplowy Date: Sat, 23 Jan 2016 04:35:25 +0100 Subject: [PATCH 226/531] Translated using Weblate (Dutch) Currently translated at 95.5% (752 of 787 strings) --- po/nl/minetest.po | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/po/nl/minetest.po b/po/nl/minetest.po index 44f807c7..8a499085 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-12-19 02:35+0000\n" -"Last-Translator: Rogier \n" +"PO-Revision-Date: 2016-01-23 04:35+0000\n" +"Last-Translator: Tobyplowy \n" "Language-Team: Dutch " "\n" "Language: nl\n" @@ -568,12 +568,12 @@ msgstr "Voorwerp-texturen..." #: src/client.cpp msgid "Loading textures..." -msgstr "Bezig met laden van texturen..." +msgstr "Bezig met texturen te laaden..." #: src/client.cpp #, fuzzy msgid "Rebuilding shaders..." -msgstr "Herbouwen van shaders..." +msgstr "schaduwen herbouwen..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -731,7 +731,7 @@ msgstr "Server-adres opzoeken..." #: src/game.cpp msgid "Respawn" -msgstr "Wedergeboorte" +msgstr "Respawn" #: src/game.cpp msgid "Shutting down..." @@ -743,16 +743,15 @@ msgstr "Geluidsvolume" #: src/game.cpp msgid "You died." -msgstr "Je bent gestorven." +msgstr "Je bent dood." #: src/guiFormSpecMenu.cpp -#, fuzzy msgid "Enter " -msgstr "Invoeren " +msgstr "Enter " #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "ok" +msgstr "oké" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -788,7 +787,7 @@ msgstr "Vooruit" #: src/guiKeyChangeMenu.cpp msgid "Inventory" -msgstr "Rugzak" +msgstr "inventaris" #: src/guiKeyChangeMenu.cpp msgid "Jump" @@ -822,7 +821,7 @@ msgstr "Rechts" #: src/guiKeyChangeMenu.cpp msgid "Sneak" -msgstr "Kruipen" +msgstr "sluipen" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" @@ -1364,7 +1363,7 @@ msgstr "Cinematic modus aan/uit toets" #: src/settings_translation_file.cpp #, fuzzy msgid "Clean transparent textures" -msgstr "Doorzichtige texturen schonen" +msgstr "Transparante texturen" #: src/settings_translation_file.cpp msgid "Client and Server" @@ -1691,6 +1690,10 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"bumpmapping aanzetten voor texturen. Normalmaps moeten al in de texture pack " +"zitten\n" +"of ze moeten automatisch gegenereerd worden.\n" +"Schaduwen moeten aanstaan." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." @@ -1726,7 +1729,7 @@ msgstr "FPS in het pauze-menu" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" From 0097e0308d8a7f5d660533fe7a6d47b2b769636b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kisbenedek=20M=C3=A1rton?= Date: Mon, 25 Jan 2016 00:59:19 +0100 Subject: [PATCH 227/531] Translated using Weblate (Hungarian) Currently translated at 32.4% (255 of 787 strings) --- po/hu/minetest.po | 140 ++++++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 66 deletions(-) diff --git a/po/hu/minetest.po b/po/hu/minetest.po index 38468e17..f34f0fc2 100644 --- a/po/hu/minetest.po +++ b/po/hu/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-09-21 14:55+0200\n" -"Last-Translator: way-hu \n" -"Language-Team: Hungarian \n" +"PO-Revision-Date: 2016-01-25 00:59+0000\n" +"Last-Translator: Kisbenedek Márton \n" +"Language-Team: Hungarian " +"\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.4\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -48,9 +48,8 @@ msgid "Loading..." msgstr "Betöltés..." #: builtin/mainmenu/common.lua -#, fuzzy msgid "Protocol version mismatch. " -msgstr "Protokol verzió eltérés, szerver " +msgstr "Protokoll verzió eltérés. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " @@ -58,7 +57,7 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "A szerver $1 és $2 protokoll verzió közötti verziókat támogat. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -68,11 +67,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Csak $1 protokoll verziót támogatjuk." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "$1 és $2 közötti protokoll verziókat támogatunk." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -82,7 +81,7 @@ msgstr "Mégse" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua msgid "Depends:" -msgstr "Függőségek:" +msgstr "Függ:" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" @@ -94,7 +93,7 @@ msgstr "Csomag engedélyez" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" -msgstr "Összes engedélyezése" +msgstr "Mind engedélyez" #: builtin/mainmenu/dlg_config_world.lua msgid "" @@ -106,11 +105,11 @@ msgstr "" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" -msgstr "Játék elrejtése" +msgstr "Játék elrejtés" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "Modpakk tartalom elrejtése" +msgstr "Modpakk tartalom elrejtés" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -135,7 +134,7 @@ msgstr "\"$1\" nevű világ már létezik" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" -msgstr "Létrehozás" +msgstr "Létrehoz" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" @@ -208,7 +207,7 @@ msgstr "Elfogad" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "Modpakk átnevezése:" +msgstr "Modpakk átnevezés:" #: builtin/mainmenu/modmgr.lua msgid "" @@ -370,7 +369,7 @@ msgstr "Bind Address" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" -msgstr "Beállítás" +msgstr "Beállít" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua @@ -428,20 +427,19 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Keres" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Gombok változtatása" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Csomag letiltás" +msgstr "Letiltva" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Szerkeszt" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -450,7 +448,7 @@ msgstr "Engedélyez" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "A formátum 3 szám vesszőkkel elválasztva zárójelek között." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -459,9 +457,8 @@ msgid "" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" -msgstr "Játék" +msgstr "Játékok" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." @@ -473,24 +470,23 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Írj be egy érvényes egész számot." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Írj be egy érvényes számot." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Lehetséges értékek: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Alapértelmezett visszaállítás" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Kiválaszt" +msgstr "Útvonal kiválasztás" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -498,15 +494,15 @@ msgstr "Beállítások" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Technikai nevek mutatása" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Az értéknek nagyobbnak kell lennie ennél: $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Az értéknek kisebbnek kell lennie ennél: $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -526,7 +522,7 @@ msgstr "Játék" #: builtin/mainmenu/tab_singleplayer.lua msgid "Singleplayer" -msgstr "Egyjátékos mód" +msgstr "Egyjátékos" #: builtin/mainmenu/tab_texturepacks.lua msgid "No information available" @@ -538,7 +534,7 @@ msgstr "Semmi" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" -msgstr "Textúracsomag kiválasztása:" +msgstr "Textúrapakk kiválasztása:" #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" @@ -655,13 +651,13 @@ msgstr "" "Alapértelmezett irányítás:\n" "- WASD: Mozgás\n" "- Space: Ugrás/Mászás\n" -"- Shift: Lopakodás/Lefele menés\n" +"- Shift: Lopakodás/Lefelé\n" "- Q: Tárgyak eldobása\n" -"- I: Invertory\n" +"- I: Eszköztár\n" "- Egér: Forgás/Nézelődés\n" -"- Egér Bal-gomb: Ásás/Ütés\n" -"- Egér jobb-gomb: Helyezés/Használat\n" -"- Egér görgő: Tárgyak kiválasztása\n" +"- Bal-egér: Ásás/Ütés\n" +"- Jobb-egér: Helyez/Használ\n" +"- Egér görgő: Tárgy kiválaszt\n" "- T: Beszélgetés\n" #: src/game.cpp @@ -684,7 +680,7 @@ msgstr "" "- egy érintés: gomb aktiválás\n" "- dupla érintés: helyez/használat\n" "- ujj csúsztatás: körbenéz\n" -"Menü/Inventory látható:\n" +"Menü/Eszköztár látható:\n" "- dupla érintés (külső):\n" " -->bezár\n" "- stack, vagy slot érintése:\n" @@ -698,7 +694,7 @@ msgstr "Kilépés a menübe" #: src/game.cpp msgid "Exit to OS" -msgstr "Kilépés az OP-rendszerbe" +msgstr "Bezárás" #: src/game.cpp msgid "Item definitions..." @@ -785,9 +781,8 @@ msgid "Forward" msgstr "Előre" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Inventory" -msgstr "Inventory" +msgstr "Eszköztár" #: src/guiKeyChangeMenu.cpp msgid "Jump" @@ -800,7 +795,7 @@ msgstr "A gomb már használatban van" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" -"Gombkiosztás. (Ha elfuserálod ezt a menüt, távolíts el néhány cuccot a " +"Gombkiosztás. (Ha elfuserálod ezt a menüt, távolíts el néhány dolgot a " "minetest.conf-ból)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp @@ -809,7 +804,7 @@ msgstr "Bal" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp msgid "Print stacks" -msgstr "Stacks nyomtatása" +msgstr "Halmok nyomtatása" #: src/guiKeyChangeMenu.cpp msgid "Range select" @@ -976,7 +971,7 @@ msgstr "Bal gomb" #: src/keycode.cpp msgid "Left Control" -msgstr "Bal Controll" +msgstr "Bal Control" #: src/keycode.cpp msgid "Left Menu" @@ -1020,59 +1015,59 @@ msgstr "Numlock" #: src/keycode.cpp msgid "Numpad *" -msgstr "Numerikus billentyű *" +msgstr "Numerikus bill. *" #: src/keycode.cpp msgid "Numpad +" -msgstr "Numerikus billentyű +" +msgstr "Numerikus bill. +" #: src/keycode.cpp msgid "Numpad -" -msgstr "Numerikus billentyű -" +msgstr "Numerikus bill. -" #: src/keycode.cpp msgid "Numpad /" -msgstr "Numerikus billentyű /" +msgstr "Numerikus bill. /" #: src/keycode.cpp msgid "Numpad 0" -msgstr "Numerikus billentyű 0" +msgstr "Numerikus bill. 0" #: src/keycode.cpp msgid "Numpad 1" -msgstr "Numerikus billentyű 1" +msgstr "Numerikus bill. 1" #: src/keycode.cpp msgid "Numpad 2" -msgstr "Numerikus billentyű 2" +msgstr "Numerikus bill. 2" #: src/keycode.cpp msgid "Numpad 3" -msgstr "Numerikus billentyű 3" +msgstr "Numerikus bill. 3" #: src/keycode.cpp msgid "Numpad 4" -msgstr "Numerikus billentyű 4" +msgstr "Numerikus bill. 4" #: src/keycode.cpp msgid "Numpad 5" -msgstr "Numerikus billentyű 5" +msgstr "Numerikus bill. 5" #: src/keycode.cpp msgid "Numpad 6" -msgstr "Numerikus billentyű 6" +msgstr "Numerikus bill. 6" #: src/keycode.cpp msgid "Numpad 7" -msgstr "Numerikus billentyű 7" +msgstr "Numerikus bill. 7" #: src/keycode.cpp msgid "Numpad 8" -msgstr "Numerikus billentyű 8" +msgstr "Numerikus bill. 8" #: src/keycode.cpp msgid "Numpad 9" -msgstr "Numerikus billentyű 9" +msgstr "Numerikus bill. 9" #: src/keycode.cpp #, fuzzy @@ -1174,10 +1169,13 @@ msgid "Zoom" msgstr "Nagyítás" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = parallax occlusion with slope information (gyorsabb).\n" +"1 = relief mapping (lassabb, pontosabb)." #: src/settings_translation_file.cpp #, fuzzy @@ -1186,9 +1184,10 @@ msgstr "3D felhők" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "3D mód" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1198,20 +1197,29 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"3D támogatás.\n" +"Jelenleg támogatott:\n" +"- none: nincs 3d kimenet.\n" +"- anaglyph: cián/magenta színű 3d.\n" +"- interlaced: odd/even line based polarisation screen support.\n" +"- topbottom: split screen top/bottom.\n" +"- sidebyside: split screen side by side." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Egy választott map seed az új térképhez, véletlenszerűhöz hagyd üresen.\n" +"Felül lesz írva új világ létrehozásánál a főmenüben." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "Az összes kliensen megjelenített üzenet a szerver összeomlásakor." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" +msgstr "Az összes kliensen megjelenített üzenet a szerver leállításakor." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1219,11 +1227,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Gyorsulás levegőben" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Aktív blokk kiterjedési terület" #: src/settings_translation_file.cpp msgid "Active object send range" From e52ebda8b2273bbd80573838d6dbafb31ee2cd2b Mon Sep 17 00:00:00 2001 From: Paolo DGZ Date: Sun, 24 Jan 2016 15:00:55 +0100 Subject: [PATCH 228/531] Translated using Weblate (Italian) Currently translated at 52.0% (410 of 787 strings) --- po/it/minetest.po | 196 +++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 116 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index b6acf55e..80858d29 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-12-21 22:09+0000\n" -"Last-Translator: Gianluca Luparini \n" +"PO-Revision-Date: 2016-01-24 15:00+0000\n" +"Last-Translator: Paolo DGZ \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -42,7 +42,7 @@ msgstr "Riconnettersi" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "Il server ha richiesto una riconnessione" +msgstr "Il server ha richiesto una riconnessione:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -78,7 +78,7 @@ msgstr "Supportiamo soltanto versioni del protocollo comprese tra $1 e $2." #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Cancel" -msgstr "Annullare" +msgstr "Annulla" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua msgid "Depends:" @@ -86,15 +86,15 @@ msgstr "Dipendenze:" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" -msgstr "Disatt. pacch." +msgstr "Disattiva modpack" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" -msgstr "Att. pacch." +msgstr "Attiva modpack" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" -msgstr "Attivarli tutti" +msgstr "Attivali tutti" #: builtin/mainmenu/dlg_config_world.lua msgid "" @@ -119,7 +119,7 @@ msgstr "Mod.:" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua #: src/guiKeyChangeMenu.cpp msgid "Save" -msgstr "Salvare" +msgstr "Salva" #: builtin/mainmenu/dlg_config_world.lua msgid "World:" @@ -135,7 +135,7 @@ msgstr "Esiste già un mondo chiamato \"$1\"" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" -msgstr "Creare" +msgstr "Crea" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" @@ -325,7 +325,7 @@ msgstr "Selezionare il file modulo:" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" -msgstr "Disinstallare il modulo selezionato" +msgstr "Disinstalla la mod selezionata" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" @@ -341,7 +341,7 @@ msgstr "Client" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" -msgstr "Connettere" +msgstr "Connettiti" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" @@ -354,7 +354,7 @@ msgstr "Danni abilitati" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Delete" -msgstr "Cancellare" +msgstr "Cancella" #: builtin/mainmenu/tab_multiplayer.lua msgid "Name / Password :" @@ -607,7 +607,7 @@ msgstr "Il percorso del mondo fornito non esiste: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "no" +msgstr "richiedi_fallback_font" #: src/game.cpp msgid "" @@ -618,9 +618,8 @@ msgstr "" "Controllare debug.txt per i dettagli." #: src/game.cpp -#, fuzzy msgid "Change Keys" -msgstr "Cambiare i tasti" +msgstr "Cambia i tasti" #: src/game.cpp msgid "Change Password" @@ -703,7 +702,7 @@ msgstr "Tornare al menù" #: src/game.cpp msgid "Exit to OS" -msgstr "Tornare al S.O." +msgstr "Tornare al sistema operativo" #: src/game.cpp msgid "Item definitions..." @@ -910,7 +909,7 @@ msgstr "Control" #: src/keycode.cpp msgid "Convert" -msgstr "Convert" +msgstr "Converti" #: src/keycode.cpp msgid "CrSel" @@ -926,7 +925,7 @@ msgstr "Fine" #: src/keycode.cpp msgid "Erase OEF" -msgstr "Erase OEF" +msgstr "Cancella OEF" #: src/keycode.cpp msgid "Escape" @@ -1074,7 +1073,7 @@ msgstr "Tast. num. 9" #: src/keycode.cpp msgid "OEM Clear" -msgstr "OEM Clear" +msgstr "Ripulisci OEM" #: src/keycode.cpp msgid "PA1" @@ -1221,9 +1220,8 @@ msgstr "" "Un messaggio da mostrare a tutti i giocatori quando il server si spegne." #: src/settings_translation_file.cpp -#, fuzzy msgid "Absolute limit of emerge queues" -msgstr "Limite assoluto delle code di \"emersione\"" +msgstr "Limite assoluto delle code degli emerge" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1267,7 +1265,7 @@ msgstr "Avanzato" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Volo veloce permanentemente abilitato" #: src/settings_translation_file.cpp #, fuzzy @@ -1337,14 +1335,13 @@ msgstr "Ammorbidisci la visuale in modalità cinematica" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "Tasto Attiva/Disattiva aggiornamento della camera." +msgstr "Tasto Attiva/Disattiva aggiornamento della camera" #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Tasto Chat" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" msgstr "Tasto mostra/nascondi chat" @@ -1366,7 +1363,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Client e Server" #: src/settings_translation_file.cpp msgid "Climbing speed" @@ -1403,9 +1400,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Comando" +msgstr "Tasto del comando" #: src/settings_translation_file.cpp #, fuzzy @@ -1413,7 +1409,6 @@ msgid "Connect glass" msgstr "Vetro connesso" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" msgstr "Connettiti al server dati esterno" @@ -1422,27 +1417,24 @@ msgid "Connects glass if supported by node." msgstr "Collega il vetro se supportato dal nodo." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Console" +msgstr "Console primaira" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Console" +msgstr "Colore della console" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Console" +msgstr "Tasto per la console" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Avanti automatico continuo" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Movimento in avanti continuo (usato solo per i test)." #: src/settings_translation_file.cpp msgid "Controls" @@ -1454,12 +1446,17 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Definisce la lunghezza del ciclo giorno/notte.\n" +"Ad esempio: 72 = 20min, 360 = 4min, 1 = 24ore, 0 =giorno e notte rimangono " +"fissi." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Definisce la dimensione di deserti e spiagge nel generatoe delle mappe v6.\n" +"Quando i biomi innevati sono abilitati 'mgv6_freq_desert' viene ignorato." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1483,7 +1480,7 @@ msgstr "Colore del mirino (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Velocita da accovacciato" #: src/settings_translation_file.cpp msgid "DPI" @@ -1495,7 +1492,7 @@ msgstr "Abilitare il danno" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Comando attiva/disattiva informazioni del debug" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1507,12 +1504,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Accelerazione di default" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "modificare il gioco" +msgstr "Gioco di default" #: src/settings_translation_file.cpp msgid "" @@ -1521,9 +1517,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Nuova password" +msgstr "Password di default" #: src/settings_translation_file.cpp msgid "Default privileges" @@ -1576,9 +1571,8 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Abilitare le particelle" +msgstr "Disattiva l'anticheat" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" @@ -1589,14 +1583,13 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "Volare On/Off = due volte \"saltare\"" +msgstr "Schiaccia due volte il tasto \"salto\" per volare" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Volare On/Off = due volte \"saltare\"" +msgstr "" +"Doppio click sul tasto \"salto\" per attivare/disattivare la modalità volo." #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1674,9 +1667,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Abilitare il danno" +msgstr "Abilita la minimap." #: src/settings_translation_file.cpp msgid "" @@ -1706,12 +1698,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "Ondeggiamento visuale quando si cade" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "needs_fallback_font" +msgstr "Fallback font" #: src/settings_translation_file.cpp msgid "Fallback font shadow" @@ -1770,9 +1761,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Nessun Filtro" +msgstr "Filtraggio" #: src/settings_translation_file.cpp msgid "Fixed map seed" @@ -1819,7 +1809,6 @@ msgid "Font size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" msgstr "Avanti" @@ -2015,9 +2004,8 @@ msgid "Ignore world errors" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Gioco" +msgstr "Nel gioco" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -2036,7 +2024,6 @@ msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" msgstr "Inventario" @@ -2099,9 +2086,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Saltare" +msgstr "Salto" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2333,9 +2319,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Menù a sinistra" +msgstr "Sinistra" #: src/settings_translation_file.cpp msgid "" @@ -2378,7 +2363,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "Raffinatezza dello scorrere dei liquidi" #: src/settings_translation_file.cpp msgid "Liquid loop max" @@ -2390,7 +2375,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "Velocità di caduta del liquiddi" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." @@ -2405,14 +2390,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Menù principale" +msgstr "Pannello di controllo mod del menù principale" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Menù principale" +msgstr "Script del menù principale" #: src/settings_translation_file.cpp msgid "" @@ -2506,14 +2489,12 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Generat. mappe" +msgstr "Debug del generatore delle mappe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Generat. mappe" +msgstr "flags del generatore delle mappe" #: src/settings_translation_file.cpp #, fuzzy @@ -2594,14 +2575,12 @@ msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Generat. mappe" +msgstr "Nome del genratore delle mappe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Generat. mappe" +msgstr "Generatore mappe v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2624,9 +2603,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Generat. mappe" +msgstr "Generatore mappe v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2685,9 +2663,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Generat. mappe" +msgstr "Generatore mappe v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2816,7 +2793,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "" +msgstr "Numero di giocatori che si possono connettere simultaneamente." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." @@ -2839,6 +2816,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" +"Tempo massimo per il download di un file, ad esempio una mod, espresso in ms." #: src/settings_translation_file.cpp msgid "Maximum users" @@ -2849,7 +2827,6 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" msgstr "Menù" @@ -2889,7 +2866,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" msgstr "Mip-Mapping" @@ -2982,7 +2958,6 @@ msgid "Noclip key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" msgstr "Evidenziamento Nodi" @@ -3000,7 +2975,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Number of emerge threads" -msgstr "" +msgstr "Numero degli emerge threads" #: src/settings_translation_file.cpp msgid "" @@ -3010,6 +2985,11 @@ msgid "" "speed greatly\n" "at the cost of slightly buggy caves." msgstr "" +"Numero degli emerge threads da usare. Lascia questa voce vuota o aumenta " +"questo numero\n" +"per usare più di un thread. Su sistemi muliprocessore questo migliorerà " +"notevolmente la velocità della generazione delle mappe\n" +"ma potrebbe causare bug." #: src/settings_translation_file.cpp msgid "" @@ -3081,9 +3061,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Nome del giocatore troppo lungo." +msgstr "Nome del giocatore" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -3091,7 +3070,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "PvP" #: src/settings_translation_file.cpp msgid "" @@ -3108,9 +3087,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Caricamento..." +msgstr "Precaricamento delle textures dell'inventario" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." @@ -3157,9 +3135,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Menù a destra" +msgstr "Destra" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3199,9 +3176,8 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Istantanea" +msgstr "Istantanea schermo" #: src/settings_translation_file.cpp msgid "Screenshot folder" @@ -3228,32 +3204,26 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Giocatore singolo" +msgstr "Server / Giocatore singolo" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Server" +msgstr "URL del server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Porta del server" +msgstr "Indirizzo del server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Porta del server" +msgstr "Descrizione del server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Server" +msgstr "Nome del server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Porta del server" @@ -3321,9 +3291,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "Illuminazione armoniosa" +msgstr "Raffinatezza ombreggiature" #: src/settings_translation_file.cpp msgid "" @@ -3340,9 +3309,8 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Strisciare" +msgstr "Abbassati" #: src/settings_translation_file.cpp msgid "Sound" @@ -3530,9 +3498,8 @@ msgid "Use trilinear filtering when scaling textures." msgstr "Usa un filtro trilineare quando si scalano le texture." #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Sviluppatori principali" +msgstr "Utile per gli sviluppatori di mod." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3575,7 +3542,6 @@ msgid "Viewing range minimum" msgstr "Distanza minima di visibilità" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Volume del suono" @@ -3640,7 +3606,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" "can be blurred, so automatically upscale them with nearest-neighbor\n" @@ -3722,7 +3687,6 @@ msgstr "" "premere F5)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Width of the selectionbox's lines around nodes." msgstr "Larghezza dei riquadri attorno ai nodi." From 860d70bd0e228ee542e3e559961bfc7e56888d77 Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 28 Jan 2016 23:53:58 +0100 Subject: [PATCH 229/531] Don't print whole json data buffer to errorstream on error `errorstream` must not be overly verbose as clientside it is directly printed onto the ingame chat window. These days, the serverlist can contain > 200k bytes, so better print it to warningstream if the data buffer is too long. --- src/convert_json.cpp | 8 +++++++- src/script/lua_api/l_util.cpp | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/convert_json.cpp b/src/convert_json.cpp index e03508e2..e548c45f 100644 --- a/src/convert_json.cpp +++ b/src/convert_json.cpp @@ -52,7 +52,13 @@ Json::Value fetchJsonValue(const std::string &url, if (!reader.parse(stream, root)) { errorstream << "URL: " << url << std::endl; errorstream << "Failed to parse json data " << reader.getFormattedErrorMessages(); - errorstream << "data: \"" << fetch_result.data << "\"" << std::endl; + if (fetch_result.data.size() > 100) { + errorstream << "Data (" << fetch_result.data.size() + << " bytes) printed to warningstream." << std::endl; + warningstream << "data: \"" << fetch_result.data << "\"" << std::endl; + } else { + errorstream << "data: \"" << fetch_result.data << "\"" << std::endl; + } return Json::Value(); } diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index 3f7e15ac..39863b98 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -161,8 +161,14 @@ int ModApiUtil::l_parse_json(lua_State *L) if (!reader.parse(stream, root)) { errorstream << "Failed to parse json data " << reader.getFormattedErrorMessages(); - errorstream << "data: \"" << jsonstr << "\"" - << std::endl; + size_t jlen = strlen(jsonstr); + if (jlen > 100) { + errorstream << "Data (" << jlen + << " bytes) printed to warningstream." << std::endl; + warningstream << "data: \"" << jsonstr << "\"" << std::endl; + } else { + errorstream << "data: \"" << jsonstr << "\"" << std::endl; + } lua_pushnil(L); return 1; } From 4ac1e9bccbd0222ab779b3fc4d2144d60e1f2b49 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Sat, 23 Jan 2016 23:06:26 -0800 Subject: [PATCH 230/531] Clocksource: use a better clock if available. clock_gettime() is a far better clock than gettimeofday(). Even better than clock_gettime() is that you can select either CLOCK_MONOTONIC, or even CLOCK_MONOTONIC_RAW. These clocks offer high precision time. And the _RAW variant will never roll back due to NTP drift or daylight savings, or otherwise. I've adjusted this code to select the right clock method auto- matically based on what's available in the OS. This means that if you're running a very old linux version, MacOS or other, you will automatically get the best clocksource available. I've tested all Linux clocksources by selectively compiling and running a 10k+ timer test suite. In all cases I confirmed that the 3 POSIX Linux clocksources worked properly, and were selected properly. I've modified the OS X compile path to use the high-res clock source for all time functions, but I can't confirm it works or that it compiles. As for WIN32, I confirmed that the used clocksource is indeed a Monotonic clocksource, so good news: that code section appears to be exactly what it should be. --- doc/lua_api.txt | 2 +- src/porting.h | 69 +++++++++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 29 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index e7c1b7dd..7255852e 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1727,7 +1727,7 @@ Helper functions * `minetest.is_yes(arg)` * returns whether `arg` can be interpreted as yes * `minetest.get_us_time()` - * returns time with microsecond precision + * returns time with microsecond precision. May not return wall time. * `table.copy(table)`: returns a table * returns a deep copy of `table` diff --git a/src/porting.h b/src/porting.h index 5da32607..5fe81a44 100644 --- a/src/porting.h +++ b/src/porting.h @@ -211,33 +211,11 @@ void initIrrlicht(irr::IrrlichtDevice * ); } #else // Posix - - inline u32 getTimeS() + inline void _os_get_clock(struct timespec *ts) { - struct timeval tv; - gettimeofday(&tv, NULL); - return tv.tv_sec; - } - - inline u32 getTimeMs() - { - struct timeval tv; - gettimeofday(&tv, NULL); - return tv.tv_sec * 1000 + tv.tv_usec / 1000; - } - - inline u32 getTimeUs() - { - struct timeval tv; - gettimeofday(&tv, NULL); - return tv.tv_sec * 1000000 + tv.tv_usec; - } - - inline u32 getTimeNs() - { - struct timespec ts; - // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x -#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time +#if defined(__MACH__) && defined(__APPLE__) + // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x + // OS X does not have clock_gettime, use clock_get_time clock_serv_t cclock; mach_timespec_t mts; host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); @@ -245,9 +223,44 @@ void initIrrlicht(irr::IrrlichtDevice * ); mach_port_deallocate(mach_task_self(), cclock); ts.tv_sec = mts.tv_sec; ts.tv_nsec = mts.tv_nsec; +#elif defined(CLOCK_MONOTONIC_RAW) + clock_gettime(CLOCK_MONOTONIC_RAW, ts); +#elif defined(_POSIX_MONOTONIC_CLOCK) + clock_gettime(CLOCK_MONOTONIC, ts); #else - clock_gettime(CLOCK_REALTIME, &ts); -#endif + struct timeval tv; + gettimeofday(&tv, NULL); + TIMEVAL_TO_TIMESPEC(&tv, ts); +#endif // defined(__MACH__) && defined(__APPLE__) + } + + // Note: these clock functions do not return wall time, but + // generally a clock that starts at 0 when the process starts. + inline u32 getTimeS() + { + struct timespec ts; + _os_get_clock(&ts); + return ts.tv_sec; + } + + inline u32 getTimeMs() + { + struct timespec ts; + _os_get_clock(&ts); + return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; + } + + inline u32 getTimeUs() + { + struct timespec ts; + _os_get_clock(&ts); + return ts.tv_sec * 1000000 + ts.tv_nsec / 1000; + } + + inline u32 getTimeNs() + { + struct timespec ts; + _os_get_clock(&ts); return ts.tv_sec * 1000000000 + ts.tv_nsec; } From ad884f23d4e73d38ce0f529de49591dd66cee44d Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 21 Jan 2016 01:07:38 -0800 Subject: [PATCH 231/531] New timer design. I could honestly not make much sense of the timer implementation that was here. Instead I've implemented the type of timer algorithm that I've used before, and tested it instead. The concept is extremely simple: all timers are put in an ordered list. We check every server tick if any of the timers have elapsed, and execute the function associated with this timer. We know that many timers by themselves cause new timers to be added to this list, so we iterate *backwards* over the timer list. This means that new timers being added while timers are being executed, can never be executed in the same function pass, as they are always appended to the table *after* the end of the table, which we will never reach in the current pass over all the table elements. We switch time keeping to minetest.get_us_time(). dtime is likely unreliable and we have our own high-res timer that we can fix if it is indeed broken. This removes the need to do any sort of time keeping. --- builtin/game/misc.lua | 98 ++++++++++++++++--------------------------- doc/lua_api.txt | 2 +- 2 files changed, 37 insertions(+), 63 deletions(-) diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua index efd0f8dc..bacadf18 100644 --- a/builtin/game/misc.lua +++ b/builtin/game/misc.lua @@ -4,74 +4,48 @@ -- Misc. API functions -- -local timers = {} -local mintime -local function update_timers(delay) - mintime = false - local sub = 0 - for index = 1, #timers do - index = index - sub - local timer = timers[index] - timer.time = timer.time - delay - if timer.time <= 0 then - core.set_last_run_mod(timer.mod_origin) - timer.func(unpack(timer.args or {})) - table.remove(timers, index) - sub = sub + 1 - elseif mintime then - mintime = math.min(mintime, timer.time) - else - mintime = timer.time +local jobs = {} +local time = 0.0 +local last = 0.0 + +core.register_globalstep(function(dtime) + local new = core.get_us_time() / 1000000 + if new > last then + time = time + (new - last) + else + -- Overflow, we may lose a little bit of time here but + -- only 1 tick max, potentially running timers slightly + -- too early. + time = time + new + end + last = new + + if #jobs < 1 then + return + end + + -- Iterate backwards so that we miss any new timers added by + -- a timer callback, and so that we don't skip the next timer + -- in the list if we remove one. + for i = #jobs, 1, -1 do + local job = jobs[i] + if time >= job.expire then + core.set_last_run_mod(job.mod_origin) + job.func(unpack(job.arg)) + table.remove(jobs, i) end end -end - -local timers_to_add -local function add_timers() - for _, timer in ipairs(timers_to_add) do - table.insert(timers, timer) - end - timers_to_add = false -end - -local delay = 0 -core.register_globalstep(function(dtime) - if not mintime then - -- abort if no timers are running - return - end - if timers_to_add then - add_timers() - end - delay = delay + dtime - if delay < mintime then - return - end - update_timers(delay) - delay = 0 end) -function core.after(time, func, ...) +function core.after(after, func, ...) assert(tonumber(time) and type(func) == "function", "Invalid core.after invocation") - if not mintime then - mintime = time - timers_to_add = {{ - time = time+delay, - func = func, - args = {...}, - mod_origin = core.get_last_run_mod(), - }} - return - end - mintime = math.min(mintime, time) - timers_to_add = timers_to_add or {} - timers_to_add[#timers_to_add+1] = { - time = time+delay, - func = func, - args = {...}, - mod_origin = core.get_last_run_mod(), - } + table.insert(jobs, { + func = func, + expire = time + after, + arg = {...}, + mod_origin = core.get_last_run_mod() + }) end function core.check_player_privs(player_or_name, ...) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 7255852e..b6bc957c 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2242,7 +2242,7 @@ These functions return the leftover itemstack. ### Timing * `minetest.after(time, func, ...)` - * Call the function `func` after `time` seconds + * Call the function `func` after `time` seconds, may be fractional * Optional: Variable number of arguments that are passed to `func` ### Server From 4e93ba06a749fa2503786bf8d7dbda3d1e36a65a Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 25 Jan 2016 00:06:01 +0100 Subject: [PATCH 232/531] Don't pass non-const references to collision methods Non const references cause a lot of confusion with behaviour of code, and are disallowed by minetest style guide. --- src/collision.cpp | 154 +++++++++++++++----------------- src/collision.h | 6 +- src/content_cao.cpp | 4 +- src/content_sao.cpp | 2 +- src/localplayer.cpp | 4 +- src/particles.cpp | 4 +- src/unittest/test_collision.cpp | 32 +++---- 7 files changed, 98 insertions(+), 108 deletions(-) diff --git a/src/collision.cpp b/src/collision.cpp index 187df0a5..2ae59b38 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc., // The time after which the collision occurs is stored in dtime. int axisAlignedCollision( const aabb3f &staticbox, const aabb3f &movingbox, - const v3f &speed, f32 d, f32 &dtime) + const v3f &speed, f32 d, f32 *dtime) { //TimeTaker tt("axisAlignedCollision"); @@ -59,13 +59,12 @@ int axisAlignedCollision( if(speed.X > 0) // Check for collision with X- plane { - if(relbox.MaxEdge.X <= d) - { - dtime = - relbox.MaxEdge.X / speed.X; - if((relbox.MinEdge.Y + speed.Y * dtime < ysize) && - (relbox.MaxEdge.Y + speed.Y * dtime > COLL_ZERO) && - (relbox.MinEdge.Z + speed.Z * dtime < zsize) && - (relbox.MaxEdge.Z + speed.Z * dtime > COLL_ZERO)) + if (relbox.MaxEdge.X <= d) { + *dtime = -relbox.MaxEdge.X / speed.X; + if ((relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) && + (relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO) && + (relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) && + (relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO)) return 0; } else if(relbox.MinEdge.X > xsize) @@ -75,13 +74,12 @@ int axisAlignedCollision( } else if(speed.X < 0) // Check for collision with X+ plane { - if(relbox.MinEdge.X >= xsize - d) - { - dtime = (xsize - relbox.MinEdge.X) / speed.X; - if((relbox.MinEdge.Y + speed.Y * dtime < ysize) && - (relbox.MaxEdge.Y + speed.Y * dtime > COLL_ZERO) && - (relbox.MinEdge.Z + speed.Z * dtime < zsize) && - (relbox.MaxEdge.Z + speed.Z * dtime > COLL_ZERO)) + if (relbox.MinEdge.X >= xsize - d) { + *dtime = (xsize - relbox.MinEdge.X) / speed.X; + if ((relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) && + (relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO) && + (relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) && + (relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO)) return 0; } else if(relbox.MaxEdge.X < 0) @@ -94,13 +92,12 @@ int axisAlignedCollision( if(speed.Y > 0) // Check for collision with Y- plane { - if(relbox.MaxEdge.Y <= d) - { - dtime = - relbox.MaxEdge.Y / speed.Y; - if((relbox.MinEdge.X + speed.X * dtime < xsize) && - (relbox.MaxEdge.X + speed.X * dtime > COLL_ZERO) && - (relbox.MinEdge.Z + speed.Z * dtime < zsize) && - (relbox.MaxEdge.Z + speed.Z * dtime > COLL_ZERO)) + if (relbox.MaxEdge.Y <= d) { + *dtime = -relbox.MaxEdge.Y / speed.Y; + if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) && + (relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) && + (relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) && + (relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO)) return 1; } else if(relbox.MinEdge.Y > ysize) @@ -110,13 +107,12 @@ int axisAlignedCollision( } else if(speed.Y < 0) // Check for collision with Y+ plane { - if(relbox.MinEdge.Y >= ysize - d) - { - dtime = (ysize - relbox.MinEdge.Y) / speed.Y; - if((relbox.MinEdge.X + speed.X * dtime < xsize) && - (relbox.MaxEdge.X + speed.X * dtime > COLL_ZERO) && - (relbox.MinEdge.Z + speed.Z * dtime < zsize) && - (relbox.MaxEdge.Z + speed.Z * dtime > COLL_ZERO)) + if (relbox.MinEdge.Y >= ysize - d) { + *dtime = (ysize - relbox.MinEdge.Y) / speed.Y; + if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) && + (relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) && + (relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) && + (relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO)) return 1; } else if(relbox.MaxEdge.Y < 0) @@ -129,13 +125,12 @@ int axisAlignedCollision( if(speed.Z > 0) // Check for collision with Z- plane { - if(relbox.MaxEdge.Z <= d) - { - dtime = - relbox.MaxEdge.Z / speed.Z; - if((relbox.MinEdge.X + speed.X * dtime < xsize) && - (relbox.MaxEdge.X + speed.X * dtime > COLL_ZERO) && - (relbox.MinEdge.Y + speed.Y * dtime < ysize) && - (relbox.MaxEdge.Y + speed.Y * dtime > COLL_ZERO)) + if (relbox.MaxEdge.Z <= d) { + *dtime = -relbox.MaxEdge.Z / speed.Z; + if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) && + (relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) && + (relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) && + (relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO)) return 2; } //else if(relbox.MinEdge.Z > zsize) @@ -145,13 +140,12 @@ int axisAlignedCollision( } else if(speed.Z < 0) // Check for collision with Z+ plane { - if(relbox.MinEdge.Z >= zsize - d) - { - dtime = (zsize - relbox.MinEdge.Z) / speed.Z; - if((relbox.MinEdge.X + speed.X * dtime < xsize) && - (relbox.MaxEdge.X + speed.X * dtime > COLL_ZERO) && - (relbox.MinEdge.Y + speed.Y * dtime < ysize) && - (relbox.MaxEdge.Y + speed.Y * dtime > COLL_ZERO)) + if (relbox.MinEdge.Z >= zsize - d) { + *dtime = (zsize - relbox.MinEdge.Z) / speed.Z; + if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) && + (relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) && + (relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) && + (relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO)) return 2; } //else if(relbox.MaxEdge.Z < 0) @@ -195,8 +189,8 @@ bool wouldCollideWithCeiling( collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, f32 pos_max_d, const aabb3f &box_0, f32 stepheight, f32 dtime, - v3f &pos_f, v3f &speed_f, - v3f &accel_f,ActiveObject* self, + v3f *pos_f, v3f *speed_f, + v3f accel_f, ActiveObject *self, bool collideWithObjects) { static bool time_notification_done = false; @@ -219,16 +213,16 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, } else { time_notification_done = false; } - speed_f += accel_f * dtime; + *speed_f += accel_f * dtime; // If there is no speed, there are no collisions - if(speed_f.getLength() == 0) + if (speed_f->getLength() == 0) return result; // Limit speed for avoiding hangs - speed_f.Y=rangelim(speed_f.Y,-5000,5000); - speed_f.X=rangelim(speed_f.X,-5000,5000); - speed_f.Z=rangelim(speed_f.Z,-5000,5000); + speed_f->Y = rangelim(speed_f->Y, -5000, 5000); + speed_f->X = rangelim(speed_f->X, -5000, 5000); + speed_f->Z = rangelim(speed_f->Z, -5000, 5000); /* Collect node boxes in movement range @@ -243,8 +237,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, //TimeTaker tt2("collisionMoveSimple collect boxes"); ScopeProfiler sp(g_profiler, "collisionMoveSimple collect boxes avg", SPT_AVG); - v3s16 oldpos_i = floatToInt(pos_f, BS); - v3s16 newpos_i = floatToInt(pos_f + speed_f * dtime, BS); + v3s16 oldpos_i = floatToInt(*pos_f, BS); + v3s16 newpos_i = floatToInt(*pos_f + *speed_f * dtime, BS); s16 min_x = MYMIN(oldpos_i.X, newpos_i.X) + (box_0.MinEdge.X / BS) - 1; s16 min_y = MYMIN(oldpos_i.Y, newpos_i.Y) + (box_0.MinEdge.Y / BS) - 1; s16 min_z = MYMIN(oldpos_i.Z, newpos_i.Z) + (box_0.MinEdge.Z / BS) - 1; @@ -318,9 +312,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, #ifndef SERVER ClientEnvironment *c_env = dynamic_cast(env); if (c_env != 0) { - f32 distance = speed_f.getLength(); + f32 distance = speed_f->getLength(); std::vector clientobjects; - c_env->getActiveObjects(pos_f,distance * 1.5,clientobjects); + c_env->getActiveObjects(*pos_f, distance * 1.5, clientobjects); for (size_t i=0; i < clientobjects.size(); i++) { if ((self == 0) || (self != clientobjects[i].obj)) { objects.push_back((ActiveObject*)clientobjects[i].obj); @@ -332,9 +326,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, { ServerEnvironment *s_env = dynamic_cast(env); if (s_env != 0) { - f32 distance = speed_f.getLength(); + f32 distance = speed_f->getLength(); std::vector s_objects; - s_env->getObjectsInsideRadius(s_objects, pos_f, distance * 1.5); + s_env->getObjectsInsideRadius(s_objects, *pos_f, distance * 1.5); for (std::vector::iterator iter = s_objects.begin(); iter != s_objects.end(); ++iter) { ServerActiveObject *current = s_env->getActiveObject(*iter); if ((self == 0) || (self != current)) { @@ -399,8 +393,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, } aabb3f movingbox = box_0; - movingbox.MinEdge += pos_f; - movingbox.MaxEdge += pos_f; + movingbox.MinEdge += *pos_f; + movingbox.MaxEdge += *pos_f; int nearest_collided = -1; f32 nearest_dtime = dtime; @@ -417,7 +411,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, // Find nearest collision of the two boxes (raytracing-like) f32 dtime_tmp; int collided = axisAlignedCollision( - cboxes[boxindex], movingbox, speed_f, d, dtime_tmp); + cboxes[boxindex], movingbox, *speed_f, d, &dtime_tmp); if (collided == -1 || dtime_tmp >= nearest_dtime) continue; @@ -429,7 +423,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, if (nearest_collided == -1) { // No collision with any collision box. - pos_f += speed_f * dtime; + *pos_f += *speed_f * dtime; dtime = 0; // Set to 0 to avoid "infinite" loop due to small FP numbers } else { // Otherwise, a collision occurred. @@ -452,14 +446,14 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, // Handle negative nearest_dtime (can be caused by the d allowance) if (!step_up) { if (nearest_collided == 0) - pos_f.X += speed_f.X * nearest_dtime; + pos_f->X += speed_f->X * nearest_dtime; if (nearest_collided == 1) - pos_f.Y += speed_f.Y * nearest_dtime; + pos_f->Y += speed_f->Y * nearest_dtime; if (nearest_collided == 2) - pos_f.Z += speed_f.Z * nearest_dtime; + pos_f->Z += speed_f->Z * nearest_dtime; } } else { - pos_f += speed_f * nearest_dtime; + *pos_f += *speed_f * nearest_dtime; dtime -= nearest_dtime; } @@ -475,7 +469,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, info.node_p = node_positions[nearest_boxindex]; info.bouncy = bouncy; - info.old_speed = speed_f; + info.old_speed = *speed_f; // Set the speed component that caused the collision to zero if (step_up) { @@ -483,29 +477,29 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, is_step_up[nearest_boxindex] = true; is_collision = false; } else if(nearest_collided == 0) { // X - if (fabs(speed_f.X) > BS * 3) - speed_f.X *= bounce; + if (fabs(speed_f->X) > BS * 3) + speed_f->X *= bounce; else - speed_f.X = 0; + speed_f->X = 0; result.collides = true; result.collides_xz = true; } else if(nearest_collided == 1) { // Y - if(fabs(speed_f.Y) > BS * 3) - speed_f.Y *= bounce; + if (fabs(speed_f->Y) > BS * 3) + speed_f->Y *= bounce; else - speed_f.Y = 0; + speed_f->Y = 0; result.collides = true; } else if(nearest_collided == 2) { // Z - if (fabs(speed_f.Z) > BS * 3) - speed_f.Z *= bounce; + if (fabs(speed_f->Z) > BS * 3) + speed_f->Z *= bounce; else - speed_f.Z = 0; + speed_f->Z = 0; result.collides = true; result.collides_xz = true; } - info.new_speed = speed_f; + info.new_speed = *speed_f; if (info.new_speed.getDistanceFrom(info.old_speed) < 0.1 * BS) is_collision = false; @@ -519,8 +513,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, Final touches: Check if standing on ground, step up stairs. */ aabb3f box = box_0; - box.MinEdge += pos_f; - box.MaxEdge += pos_f; + box.MinEdge += *pos_f; + box.MaxEdge += *pos_f; for (u32 boxindex = 0; boxindex < cboxes.size(); boxindex++) { const aabb3f& cbox = cboxes[boxindex]; @@ -537,10 +531,10 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, cbox.MaxEdge.Z - d > box.MinEdge.Z && cbox.MinEdge.Z + d < box.MaxEdge.Z) { if (is_step_up[boxindex]) { - pos_f.Y += (cbox.MaxEdge.Y - box.MinEdge.Y); + pos_f->Y += (cbox.MaxEdge.Y - box.MinEdge.Y); box = box_0; - box.MinEdge += pos_f; - box.MaxEdge += pos_f; + box.MinEdge += *pos_f; + box.MaxEdge += *pos_f; } if (fabs(cbox.MaxEdge.Y - box.MinEdge.Y) < 0.15 * BS) { result.touching_ground = true; diff --git a/src/collision.h b/src/collision.h index d1234bef..1ceaba81 100644 --- a/src/collision.h +++ b/src/collision.h @@ -73,8 +73,8 @@ struct collisionMoveResult collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef, f32 pos_max_d, const aabb3f &box_0, f32 stepheight, f32 dtime, - v3f &pos_f, v3f &speed_f, - v3f &accel_f,ActiveObject* self=0, + v3f *pos_f, v3f *speed_f, + v3f accel_f, ActiveObject *self=NULL, bool collideWithObjects=true); // Helper function: @@ -83,7 +83,7 @@ collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef, // dtime receives time until first collision, invalid if -1 is returned int axisAlignedCollision( const aabb3f &staticbox, const aabb3f &movingbox, - const v3f &speed, f32 d, f32 &dtime); + const v3f &speed, f32 d, f32 *dtime); // Helper function: // Checks if moving the movingbox up by the given distance would hit a ceiling. diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 1b8e84c8..c3247bd1 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -1192,15 +1192,13 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) f32 pos_max_d = BS*0.125; // Distance per iteration v3f p_pos = m_position; v3f p_velocity = m_velocity; - v3f p_acceleration = m_acceleration; moveresult = collisionMoveSimple(env,env->getGameDef(), pos_max_d, box, m_prop.stepheight, dtime, - p_pos, p_velocity, p_acceleration, + &p_pos, &p_velocity, m_acceleration, this, m_prop.collideWithObjects); // Apply results m_position = p_pos; m_velocity = p_velocity; - m_acceleration = p_acceleration; bool is_end_position = moveresult.collides; pos_translator.update(m_position, is_end_position, dtime); diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 4d144aa1..fa245482 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -269,7 +269,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) v3f p_acceleration = m_acceleration; moveresult = collisionMoveSimple(m_env,m_env->getGameDef(), pos_max_d, box, m_prop.stepheight, dtime, - p_pos, p_velocity, p_acceleration, + &p_pos, &p_velocity, p_acceleration, this, m_prop.collideWithObjects); // Apply results diff --git a/src/localplayer.cpp b/src/localplayer.cpp index fd781f94..60aec95d 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -214,8 +214,8 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, v3f accel_f = v3f(0,0,0); collisionMoveResult result = collisionMoveSimple(env, m_gamedef, - pos_max_d, m_collisionbox, player_stepheight, dtime, - position, m_speed, accel_f); + pos_max_d, m_collisionbox, player_stepheight, dtime, + &position, &m_speed, accel_f); /* If the player's feet touch the topside of any node, this is diff --git a/src/particles.cpp b/src/particles.cpp index ebb54a49..8150e19a 100644 --- a/src/particles.cpp +++ b/src/particles.cpp @@ -131,14 +131,12 @@ void Particle::step(float dtime) core::aabbox3d box = m_collisionbox; v3f p_pos = m_pos*BS; v3f p_velocity = m_velocity*BS; - v3f p_acceleration = m_acceleration*BS; collisionMoveSimple(m_env, m_gamedef, BS*0.5, box, 0, dtime, - p_pos, p_velocity, p_acceleration); + &p_pos, &p_velocity, m_acceleration * BS); m_pos = p_pos/BS; m_velocity = p_velocity/BS; - m_acceleration = p_acceleration/BS; } else { diff --git a/src/unittest/test_collision.cpp b/src/unittest/test_collision.cpp index e505de45..332d3fa1 100644 --- a/src/unittest/test_collision.cpp +++ b/src/unittest/test_collision.cpp @@ -51,7 +51,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1); v3f v(1, 0, 0); f32 dtime = 0; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0); UASSERT(fabs(dtime - 1.000) < 0.001); } { @@ -59,21 +59,21 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1); v3f v(-1, 0, 0); f32 dtime = 0; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx-2, by+1.5, bz, bx-1, by+2.5, bz-1); v3f v(1, 0, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1); v3f v(0.5, 0.1, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0); UASSERT(fabs(dtime - 3.000) < 0.001); } { @@ -81,7 +81,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1); v3f v(0.5, 0.1, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0); UASSERT(fabs(dtime - 3.000) < 0.001); } @@ -91,7 +91,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1); v3f v(-1, 0, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0); UASSERT(fabs(dtime - 1.000) < 0.001); } { @@ -99,21 +99,21 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1); v3f v(1, 0, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx+2, by, bz+1.5, bx+3, by+1, bz+3.5); v3f v(-1, 0, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == -1); } { aabb3f s(bx, by, bz, bx+1, by+1, bz+1); aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1); v3f v(-0.5, 0.2, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1); // Y, not X! + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 1); // Y, not X! UASSERT(fabs(dtime - 2.500) < 0.001); } { @@ -121,7 +121,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1); v3f v(-0.5, 0.3, 0); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0); UASSERT(fabs(dtime - 2.000) < 0.001); } @@ -133,7 +133,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx+2.3, by+2.29, bz+2.29, bx+4.2, by+4.2, bz+4.2); v3f v(-1./3, -1./3, -1./3); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0); UASSERT(fabs(dtime - 0.9) < 0.001); } { @@ -141,7 +141,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx+2.29, by+2.3, bz+2.29, bx+4.2, by+4.2, bz+4.2); v3f v(-1./3, -1./3, -1./3); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 1); UASSERT(fabs(dtime - 0.9) < 0.001); } { @@ -149,7 +149,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx+2.29, by+2.29, bz+2.3, bx+4.2, by+4.2, bz+4.2); v3f v(-1./3, -1./3, -1./3); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 2); UASSERT(fabs(dtime - 0.9) < 0.001); } { @@ -157,7 +157,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.3, by-2.29, bz-2.29); v3f v(1./7, 1./7, 1./7); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 0); UASSERT(fabs(dtime - 16.1) < 0.001); } { @@ -165,7 +165,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.3, bz-2.29); v3f v(1./7, 1./7, 1./7); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 1); UASSERT(fabs(dtime - 16.1) < 0.001); } { @@ -173,7 +173,7 @@ void TestCollision::testAxisAlignedCollision() aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.29, bz-2.3); v3f v(1./7, 1./7, 1./7); f32 dtime; - UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2); + UASSERT(axisAlignedCollision(s, m, v, 0, &dtime) == 2); UASSERT(fabs(dtime - 16.1) < 0.001); } } From 83583aa2d5f795ede066ab7f8e28162633d3786a Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Fri, 29 Jan 2016 16:43:29 +0200 Subject: [PATCH 233/531] Fix OSX building issue caused by ad884f2 --- src/porting.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/porting.h b/src/porting.h index 5fe81a44..4d51c505 100644 --- a/src/porting.h +++ b/src/porting.h @@ -221,8 +221,8 @@ void initIrrlicht(irr::IrrlichtDevice * ); host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); clock_get_time(cclock, &mts); mach_port_deallocate(mach_task_self(), cclock); - ts.tv_sec = mts.tv_sec; - ts.tv_nsec = mts.tv_nsec; + ts->tv_sec = mts.tv_sec; + ts->tv_nsec = mts.tv_nsec; #elif defined(CLOCK_MONOTONIC_RAW) clock_gettime(CLOCK_MONOTONIC_RAW, ts); #elif defined(_POSIX_MONOTONIC_CLOCK) From 80c7612e76ca83fa69a6e709213026478edfe5ab Mon Sep 17 00:00:00 2001 From: Duane Robertson Date: Sun, 31 Jan 2016 02:59:15 -0600 Subject: [PATCH 234/531] Mgvalleys: use standard caves Replace simple caves with V5 caves, adding unpredictable water and lava settings and massive caves based on subterrain. Remove fast terrain mode and accompanying settings. Remove superfluous temperature/humidity settings. Remove lava/water height setting. Fix errors in humidity handling and remove humidity_break_point setting. Move cave noises to generateCaves. Fix minor formatting/naming issues and use MYMAX/MYMIN/myround. --- builtin/settingtypes.txt | 45 ++-- minetest.conf.example | 23 +- src/mapgen_valleys.cpp | 567 ++++++++++++++++++--------------------- src/mapgen_valleys.h | 59 ++-- 4 files changed, 314 insertions(+), 380 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 833890a3..dd852999 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1043,25 +1043,21 @@ mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, ( # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. # "altitude_chill" makes higher elevations colder, which may cause biome issues. -# "fast" produces softer terrain, more quickly # "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes. -# "rugged" and "cliffs" do nothing unless "fast" is enabled -mg_valleys_spflags (Valleys C Flags) flags altitude_chill,cliffs,humid_rivers,nofast,rugged altitude_chill,noaltitude_chill,cliffs,nocliffs,fast,nofast,humid_rivers,nohumid_rivers,rugged,norugged +mg_valleys_spflags (Valleys C Flags) flags altitude_chill,humid_rivers altitude_chill,noaltitude_chill,humid_rivers,nohumid_rivers # The altitude at which temperature drops by 20C mg_valleys_altitude_chill (Altitude Chill) int 90 -# Average humidity -mg_valleys_humidity (Humidity) int 50 +# Depth below which you'll find large caves. +mg_valleys_large_cave_depth (Large cave depth) int -33 -# The highest humidity around rivers in otherwise dry areas -mg_valleys_humidity_break_point (Humidity Break) int 65 +# Creates unpredictable lava features in caves. +# These can make mining difficult. Zero disables them. (0-10) +mg_valleys_lava_features (Lava Features) int 0 -# Maximum altitude where lava can emerge -mg_valleys_lava_max_height (Lava Height) int 0 - -# Maximum altitude where water occurs in caves (and tends to fall out) -mg_valleys_cave_water_max_height (Cave Water Height) int 31000 +# Depth below which you'll find massive caves. +mg_valleys_massive_cave_depth (Massive cave depth) int -256 # How deep to make rivers mg_valleys_river_depth (River Depth) int 4 @@ -1069,33 +1065,28 @@ mg_valleys_river_depth (River Depth) int 4 # How wide to make rivers mg_valleys_river_size (River Size) int 5 -# Average temperature -mg_valleys_temperature (Temperature) int 50 - -# How often water occurs in caves (0-10) -mg_valleys_water_features (Water Features) int 3 +# Creates unpredictable water features in caves. +# These can make mining difficult. Zero disables them. (0-10) +mg_valleys_water_features (Water Features) int 0 # Noise parameters [****Noises] -# Cliff noise -mg_valleys_np_cliffs (Cliffs) noise_params 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0 +# Caves and tunnels form at the intersection of the two noises +mg_valleys_np_cave1 (Cave noise #1) noise_params 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 -# Mountain corrugation -mg_valleys_np_corr (Corrugation) noise_params 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0 +# Caves and tunnels form at the intersection of the two noises +mg_valleys_np_cave2 (Cave noise #2) noise_params 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 # The depth of dirt or other filler mg_valleys_np_filler_depth (Filler Depth) noise_params 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 +# Massive caves form here. +mg_valleys_np_massive_caves (Massive cave noise) noise_params 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0 + # River noise -- rivers occur close to zero mg_valleys_np_rivers (River Noise) noise_params 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 -# Caves and tunnels form at the intersection of the two noises -mg_valleys_np_simple_caves_1 (Simple Caves #1) noise_params 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0 - -# Caves and tunnels form at the intersection of the two noises -mg_valleys_np_simple_caves_2 (Simple Caves #2) noise_params 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0 - # Base terrain height mg_valleys_np_terrain_height (Terrain Height) noise_params -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 diff --git a/minetest.conf.example b/minetest.conf.example index b95b32ee..d8f91e7c 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1315,31 +1315,28 @@ #### Mapgen Valleys -#mg_valleys_spflags = altitude_chill,cliffs,humid_rivers,nofast,rugged +#mg_valleys_spflags = altitude_chill,humid_rivers # "altitude_chill" makes higher elevations colder, which may cause biome issues. -# "fast" produces softer terrain, more quickly # "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes. -# "rugged" and "cliffs" do nothing unless "fast" is enabled # #mg_valleys_altitude_chill = 90 # the altitude at which temperature drops by 20C -#mg_valleys_cave_water_max_height = 31000 # max altitude of water in caves -#mg_valleys_humidity = 50 # the average humidity -#mg_valleys_humidity_break_point = 65 # The highest humidity around rivers in otherwise dry areas -#mg_valleys_lava_max_height = 0 # maximum altitude of lava +#mg_valleys_large_cave_depth = -33 # Depth below which you'll find large caves. +#mg_valleys_lava_features = 0 # Creates unpredictable lava features in caves. These can make mining difficult. Zero disables them. (0-10) +#mg_valleys_massive_cave_depth = -256 # Depth below which you'll find massive caves. #mg_valleys_river_depth = 4 # how deep to make rivers #mg_valleys_river_size = 5 # how wide to make rivers -#mg_valleys_temperature = 50 # the average temperature -#mg_valleys_water_features = 3 # how often water occurs in caves (0-10) +#mg_valleys_water_features = 0 # Creates unpredictable water features in caves. These can make mining difficult. Zero disables them. (0-10) # -#mg_valleys_np_cliffs = 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0 -#mg_valleys_np_corr = 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0 #mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 # # River noise -- rivers occur close to zero #mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 # -#mg_valleys_np_simple_caves_1 = 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0 -#mg_valleys_np_simple_caves_2 = 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0 +# Caves and tunnels form at the intersection of the two noises +#mg_valleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 +#mg_valleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 +# +#mg_valleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2 # Massive caves form here. # # Base terrain height #mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index 6f4b2ccc..f003ae63 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -6,7 +6,7 @@ Copyright (C) 2016 Duane Robertson Based on Valleys Mapgen by Gael de Sailly (https://forum.minetest.net/viewtopic.php?f=9&t=11430) -and mapgen_v7 by kwolekr and paramat. +and mapgen_v7, mapgen_flat by kwolekr and paramat. Licensing changed by permission of Gael de Sailly. @@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #include "mapgen.h" #include "voxel.h" #include "noise.h" @@ -43,6 +42,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mg_ore.h" #include "mg_decoration.h" #include "mapgen_valleys.h" +#include "cavegen.h" + //#undef NDEBUG //#include "assert.h" @@ -55,12 +56,9 @@ with this program; if not, write to the Free Software Foundation, Inc., //Profiler *mapgen_profiler = &mapgen_prof; static FlagDesc flagdesc_mapgen_valleys[] = { - {"altitude_chill", MG_VALLEYS_ALT_CHILL}, - {"cliffs", MG_VALLEYS_CLIFFS}, - {"fast", MG_VALLEYS_FAST}, - {"humid_rivers", MG_VALLEYS_HUMID_RIVERS}, - {"rugged", MG_VALLEYS_RUGGED}, - {NULL, 0} + {"altitude_chill", MG_VALLEYS_ALT_CHILL}, + {"humid_rivers", MG_VALLEYS_HUMID_RIVERS}, + {NULL, 0} }; /////////////////////////////////////////////////////////////////////////////// @@ -82,28 +80,31 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * this->heatmap = NULL; this->humidmap = NULL; + this->map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT, + g_settings->getU16("map_generation_limit")); + MapgenValleysParams *sp = (MapgenValleysParams *)params->sparams; this->spflags = sp->spflags; - this->cliff_terrain = (spflags & MG_VALLEYS_CLIFFS); - this->fast_terrain = (spflags & MG_VALLEYS_FAST); this->humid_rivers = (spflags & MG_VALLEYS_HUMID_RIVERS); - this->rugged_terrain = (spflags & MG_VALLEYS_RUGGED); this->use_altitude_chill = (spflags & MG_VALLEYS_ALT_CHILL); - this->altitude_chill = sp->altitude_chill; - this->cave_water_max_height = sp->cave_water_max_height; - this->humidity_adjust = sp->humidity - 50.f; - this->humidity_break_point = sp->humidity_break_point; - this->lava_max_height = sp->lava_max_height; - this->river_depth = sp->river_depth + 1.f; - this->river_size = sp->river_size / 100.f; - this->temperature_adjust = sp->temperature - 50.f; - this->water_features = MYMAX(1, MYMIN(11, 11 - sp->water_features)); + this->altitude_chill = sp->altitude_chill; + this->humidity_adjust = params->np_biome_humidity.offset - 50.f; + this->large_cave_depth = sp->large_cave_depth; + this->lava_features_lim = rangelim(sp->lava_features, 0, 10); + this->massive_cave_depth = sp->massive_cave_depth; + this->river_depth_bed = sp->river_depth + 1.f; + this->river_size_factor = sp->river_size / 100.f; + this->water_features_lim = rangelim(sp->water_features, 0, 10); + + // a small chance of overflows if the settings are very high + this->cave_water_max_height = water_level + MYMAX(0, water_features_lim - 6) * 50; + this->lava_max_height = water_level + MYMAX(0, lava_features_lim - 6) * 50; + + tcave_cache = new float[csize.Y + 2]; //// 2D Terrain noise - noise_cliffs = new Noise(&sp->np_cliffs, seed, csize.X, csize.Z); - noise_corr = new Noise(&sp->np_corr, seed, csize.X, csize.Z); noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); noise_inter_valley_slope = new Noise(&sp->np_inter_valley_slope, seed, csize.X, csize.Z); noise_rivers = new Noise(&sp->np_rivers, seed, csize.X, csize.Z); @@ -111,15 +112,11 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * noise_valley_depth = new Noise(&sp->np_valley_depth, seed, csize.X, csize.Z); noise_valley_profile = new Noise(&sp->np_valley_profile, seed, csize.X, csize.Z); - if (this->fast_terrain) - noise_inter_valley_fill = new Noise(&sp->np_inter_valley_fill, seed, csize.X, csize.Z); - //// 3D Terrain noise - noise_simple_caves_1 = new Noise(&sp->np_simple_caves_1, seed, csize.X, csize.Y + 2, csize.Z); - noise_simple_caves_2 = new Noise(&sp->np_simple_caves_2, seed, csize.X, csize.Y + 2, csize.Z); - - if (!this->fast_terrain) - noise_inter_valley_fill = new Noise(&sp->np_inter_valley_fill, seed, csize.X, csize.Y + 2, csize.Z); + noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z); + noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z); + noise_inter_valley_fill = new Noise(&sp->np_inter_valley_fill, seed, csize.X, csize.Y + 2, csize.Z); + noise_massive_caves = new Noise(&sp->np_massive_caves, seed, csize.X, csize.Y + 2, csize.Z); //// Biome noise noise_heat_blend = new Noise(¶ms->np_biome_heat_blend, seed, csize.X, csize.Z); @@ -161,8 +158,8 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * MapgenValleys::~MapgenValleys() { - delete noise_cliffs; - delete noise_corr; + delete noise_cave1; + delete noise_cave2; delete noise_filler_depth; delete noise_heat; delete noise_heat_blend; @@ -171,45 +168,39 @@ MapgenValleys::~MapgenValleys() delete noise_inter_valley_fill; delete noise_inter_valley_slope; delete noise_rivers; - delete noise_simple_caves_1; - delete noise_simple_caves_2; + delete noise_massive_caves; delete noise_terrain_height; delete noise_valley_depth; delete noise_valley_profile; - delete[] heightmap; delete[] biomemap; + delete[] heightmap; + delete[] tcave_cache; } MapgenValleysParams::MapgenValleysParams() { - spflags = MG_VALLEYS_CLIFFS | MG_VALLEYS_RUGGED - | MG_VALLEYS_HUMID_RIVERS | MG_VALLEYS_ALT_CHILL; + spflags = MG_VALLEYS_HUMID_RIVERS | MG_VALLEYS_ALT_CHILL; - altitude_chill = 90; // The altitude at which temperature drops by 20C. - // Water in caves will never be higher than this. - cave_water_max_height = MAX_MAP_GENERATION_LIMIT; - humidity = 50; - // the maximum humidity around rivers in otherwise dry areas - humidity_break_point = 65; - lava_max_height = 0; // Lava will never be higher than this. - river_depth = 4; // How deep to carve river channels. - river_size = 5; // How wide to make rivers. - temperature = 50; - water_features = 3; // How often water will occur in caves. + altitude_chill = 90; // The altitude at which temperature drops by 20C. + large_cave_depth = -33; + lava_features = 0; // How often water will occur in caves. + massive_cave_depth = -256; // highest altitude of massive caves + river_depth = 4; // How deep to carve river channels. + river_size = 5; // How wide to make rivers. + water_features = 0; // How often water will occur in caves. - np_cliffs = NoiseParams(0.f, 1.f, v3f(750, 750, 750), 8445, 5, 1.f, 2.f); - np_corr = NoiseParams(0.f, 1.f, v3f(40, 40, 40), -3536, 4, 1.f, 2.f); - np_filler_depth = NoiseParams(0.f, 1.2f, v3f(256, 256, 256), 1605, 3, 0.5f, 2.f); - np_inter_valley_fill = NoiseParams(0.f, 1.f, v3f(256, 512, 256), 1993, 6, 0.8f, 2.f); - np_inter_valley_slope = NoiseParams(0.5f, 0.5f, v3f(128, 128, 128), 746, 1, 1.f, 2.f); - np_rivers = NoiseParams(0.f, 1.f, v3f(256, 256, 256), -6050, 5, 0.6f, 2.f); - np_simple_caves_1 = NoiseParams(0.f, 1.f, v3f(64, 64, 64), -8402, 3, 0.5f, 2.f); - np_simple_caves_2 = NoiseParams(0.f, 1.f, v3f(64, 64, 64), 3944, 3, 0.5f, 2.f); - np_terrain_height = NoiseParams(-10.f, 50.f, v3f(1024, 1024, 1024), 5202, 6, 0.4f, 2.f); - np_valley_depth = NoiseParams(5.f, 4.f, v3f(512, 512, 512), -1914, 1, 1.f, 2.f); - np_valley_profile = NoiseParams(0.6f, 0.5f, v3f(512, 512, 512), 777, 1, 1.f, 2.f); + np_cave1 = NoiseParams(0, 12, v3f(96, 96, 96), 52534, 4, 0.5, 2.0); + np_cave2 = NoiseParams(0, 12, v3f(96, 96, 96), 10325, 4, 0.5, 2.0); + np_filler_depth = NoiseParams(0.f, 1.2f, v3f(256, 256, 256), 1605, 3, 0.5f, 2.f); + np_inter_valley_fill = NoiseParams(0.f, 1.f, v3f(256, 512, 256), 1993, 6, 0.8f, 2.f); + np_inter_valley_slope = NoiseParams(0.5f, 0.5f, v3f(128, 128, 128), 746, 1, 1.f, 2.f); + np_rivers = NoiseParams(0.f, 1.f, v3f(256, 256, 256), -6050, 5, 0.6f, 2.f); + np_massive_caves = NoiseParams(0.f, 1.f, v3f(768, 256, 768), 59033, 6, 0.63f, 2.f); + np_terrain_height = NoiseParams(-10.f, 50.f, v3f(1024, 1024, 1024), 5202, 6, 0.4f, 2.f); + np_valley_depth = NoiseParams(5.f, 4.f, v3f(512, 512, 512), -1914, 1, 1.f, 2.f); + np_valley_profile = NoiseParams(0.6f, 0.5f, v3f(512, 512, 512), 777, 1, 1.f, 2.f); } @@ -217,24 +208,21 @@ void MapgenValleysParams::readParams(const Settings *settings) { settings->getFlagStrNoEx("mg_valleys_spflags", spflags, flagdesc_mapgen_valleys); - settings->getU16NoEx("mg_valleys_altitude_chill", altitude_chill); - settings->getS16NoEx("mg_valleys_cave_water_max_height", cave_water_max_height); - settings->getS16NoEx("mg_valleys_humidity", humidity); - settings->getS16NoEx("mg_valleys_humidity_break_point", humidity_break_point); - settings->getS16NoEx("mg_valleys_lava_max_height", lava_max_height); - settings->getU16NoEx("mg_valleys_river_depth", river_depth); - settings->getU16NoEx("mg_valleys_river_size", river_size); - settings->getS16NoEx("mg_valleys_temperature", temperature); - settings->getU16NoEx("mg_valleys_water_features", water_features); + settings->getU16NoEx("mg_valleys_altitude_chill", altitude_chill); + settings->getS16NoEx("mg_valleys_large_cave_depth", large_cave_depth); + settings->getU16NoEx("mg_valleys_lava_features", lava_features); + settings->getS16NoEx("mg_valleys_massive_cave_depth", massive_cave_depth); + settings->getU16NoEx("mg_valleys_river_depth", river_depth); + settings->getU16NoEx("mg_valleys_river_size", river_size); + settings->getU16NoEx("mg_valleys_water_features", water_features); - settings->getNoiseParams("mg_valleys_np_cliffs", np_cliffs); - settings->getNoiseParams("mg_valleys_np_corr", np_corr); + settings->getNoiseParams("mg_valleys_np_cave1", np_cave1); + settings->getNoiseParams("mg_valleys_np_cave2", np_cave2); settings->getNoiseParams("mg_valleys_np_filler_depth", np_filler_depth); settings->getNoiseParams("mg_valleys_np_inter_valley_fill", np_inter_valley_fill); settings->getNoiseParams("mg_valleys_np_inter_valley_slope", np_inter_valley_slope); settings->getNoiseParams("mg_valleys_np_rivers", np_rivers); - settings->getNoiseParams("mg_valleys_np_simple_caves_1", np_simple_caves_1); - settings->getNoiseParams("mg_valleys_np_simple_caves_2", np_simple_caves_2); + settings->getNoiseParams("mg_valleys_np_massive_caves", np_massive_caves); settings->getNoiseParams("mg_valleys_np_terrain_height", np_terrain_height); settings->getNoiseParams("mg_valleys_np_valley_depth", np_valley_depth); settings->getNoiseParams("mg_valleys_np_valley_profile", np_valley_profile); @@ -245,24 +233,21 @@ void MapgenValleysParams::writeParams(Settings *settings) const { settings->setFlagStr("mg_valleys_spflags", spflags, flagdesc_mapgen_valleys, U32_MAX); - settings->setU16("mg_valleys_altitude_chill", altitude_chill); - settings->setS16("mg_valleys_cave_water_max_height", cave_water_max_height); - settings->setS16("mg_valleys_humidity", humidity); - settings->setS16("mg_valleys_humidity_break_point", humidity_break_point); - settings->setS16("mg_valleys_lava_max_height", lava_max_height); - settings->setU16("mg_valleys_river_depth", river_depth); - settings->setU16("mg_valleys_river_size", river_size); - settings->setS16("mg_valleys_temperature", temperature); - settings->setU16("mg_valleys_water_features", water_features); + settings->setU16("mg_valleys_altitude_chill", altitude_chill); + settings->setS16("mg_valleys_large_cave_depth", large_cave_depth); + settings->setU16("mg_valleys_lava_features", lava_features); + settings->setS16("mg_valleys_massive_cave_depth", massive_cave_depth); + settings->setU16("mg_valleys_river_depth", river_depth); + settings->setU16("mg_valleys_river_size", river_size); + settings->setU16("mg_valleys_water_features", water_features); - settings->setNoiseParams("mg_valleys_np_cliffs", np_cliffs); - settings->setNoiseParams("mg_valleys_np_corr", np_corr); + settings->setNoiseParams("mg_valleys_np_cave1", np_cave1); + settings->setNoiseParams("mg_valleys_np_cave2", np_cave2); settings->setNoiseParams("mg_valleys_np_filler_depth", np_filler_depth); settings->setNoiseParams("mg_valleys_np_inter_valley_fill", np_inter_valley_fill); settings->setNoiseParams("mg_valleys_np_inter_valley_slope", np_inter_valley_slope); settings->setNoiseParams("mg_valleys_np_rivers", np_rivers); - settings->setNoiseParams("mg_valleys_np_simple_caves_1", np_simple_caves_1); - settings->setNoiseParams("mg_valleys_np_simple_caves_2", np_simple_caves_2); + settings->setNoiseParams("mg_valleys_np_massive_caves", np_massive_caves); settings->setNoiseParams("mg_valleys_np_terrain_height", np_terrain_height); settings->setNoiseParams("mg_valleys_np_valley_depth", np_valley_depth); settings->setNoiseParams("mg_valleys_np_valley_profile", np_valley_profile); @@ -313,7 +298,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data) // Cave creation. if (flags & MG_CAVES) - generateSimpleCaves(stone_surface_max_y); + generateCaves(stone_surface_max_y); // Dungeon creation if ((flags & MG_DUNGEONS) && node_max.Y < 50 && (stone_surface_max_y >= node_min.Y)) { @@ -410,28 +395,12 @@ void MapgenValleys::calculateNoise() noise_valley_depth->perlinMap2D(x, z); noise_valley_profile->perlinMap2D(x, z); - if (fast_terrain) { - // Make this 2D for speed, if requested. - noise_inter_valley_fill->perlinMap2D(x, z); - - if (cliff_terrain) - noise_cliffs->perlinMap2D(x, z); - if (rugged_terrain) - noise_corr->perlinMap2D(x, z); - } else { - noise_inter_valley_fill->perlinMap3D(x, y, z); - } - - if (flags & MG_CAVES) { - noise_simple_caves_1->perlinMap3D(x, y, z); - noise_simple_caves_2->perlinMap3D(x, y, z); - } + noise_inter_valley_fill->perlinMap3D(x, y, z); //mapgen_profiler->avg("noisemaps", tcn.stop() / 1000.f); for (s32 index = 0; index < csize.X * csize.Z; index++) { noise_heat->result[index] += noise_heat_blend->result[index]; - noise_heat->result[index] += temperature_adjust; noise_humidity->result[index] += noise_humidity_blend->result[index]; } @@ -442,45 +411,28 @@ void MapgenValleys::calculateNoise() for (tn.x = node_min.X; tn.x <= node_max.X; tn.x++, index++) { // The parameters that we actually need to generate terrain // are passed by address (and the return value). - tn.terrain_height = noise_terrain_height->result[index]; + tn.terrain_height = noise_terrain_height->result[index]; // River noise is replaced with base terrain, which // is basically the height of the water table. - tn.rivers = &noise_rivers->result[index]; + tn.rivers = &noise_rivers->result[index]; // Valley depth noise is replaced with the valley // number that represents the height of terrain // over rivers and is used to determine about // how close a river is for humidity calculation. - tn.valley = &noise_valley_depth->result[index]; - tn.valley_profile = noise_valley_profile->result[index]; + tn.valley = &noise_valley_depth->result[index]; + tn.valley_profile = noise_valley_profile->result[index]; // Slope noise is replaced by the calculated slope // which is used to get terrain height in the slow // method, to create sharper mountains. - tn.slope = &noise_inter_valley_slope->result[index]; + tn.slope = &noise_inter_valley_slope->result[index]; tn.inter_valley_fill = noise_inter_valley_fill->result[index]; - tn.cliffs = noise_cliffs->result[index]; - tn.corr = noise_corr->result[index]; // This is the actual terrain height. float mount = terrainLevelFromNoise(&tn); noise_terrain_height->result[index] = mount; - - if (fast_terrain) { - // Assign humidity adjusted by water proximity. - // I can't think of a reason why a mod would expect base humidity - // from noise or at any altitude other than ground level. - noise_humidity->result[index] = humidityByTerrain( - noise_humidity->result[index], - mount, - noise_rivers->result[index], - noise_valley_depth->result[index]); - - // Assign heat adjusted by altitude. See humidity, above. - if (use_altitude_chill && mount > 0.f) - noise_heat->result[index] *= pow(0.5f, (mount - altitude_chill / 3.f) / altitude_chill); - } } - heatmap = noise_heat->result; + heatmap = noise_heat->result; humidmap = noise_humidity->result; } @@ -489,11 +441,9 @@ void MapgenValleys::calculateNoise() // complicated code to determine ground level. float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) { - float inter_valley_slope = *tn->slope; - // The square function changes the behaviour of this noise: // very often small, and sometimes very high. - float valley_d = pow(*tn->valley, 2); + float valley_d = MYSQUARE(*tn->valley); // valley_d is here because terrain is generally higher where valleys // are deep (mountains). base represents the height of the @@ -501,14 +451,17 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) float base = tn->terrain_height + valley_d; // "river" represents the distance from the river, in arbitrary units. - float river = fabs(*tn->rivers) - river_size; + float river = fabs(*tn->rivers) - river_size_factor; - // Use the curve of the function 1−exp(−(x/a)²) to model valleys. - // Making "a" vary (0 < a ≤ 1) changes the shape of the valleys. + // Use the curve of the function 1-exp(-(x/a)^2) to model valleys. + // Making "a" vary (0 < a <= 1) changes the shape of the valleys. // Try it with a geometry software ! // (here x = "river" and a = valley_profile). // "valley" represents the height of the terrain, from the rivers. - *tn->valley = valley_d * (1.f - exp(- pow(river / tn->valley_profile, 2))); + { + float t = river / tn->valley_profile; + *tn->valley = valley_d * (1.f - exp(- MYSQUARE(t))); + } // approximate height of the terrain at this point float mount = base + *tn->valley; @@ -520,36 +473,21 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) // Base ground is returned as rivers since it's basically the water table. *tn->rivers = base; if (river < 0.f) { - // Use the the function −sqrt(1−x²) which models a circle. - float depth = (river_depth * sqrt(1.f - pow((river / river_size + 1), 2))); + // Use the the function -sqrt(1-x^2) which models a circle. + float depth; + { + float t = river / river_size_factor + 1; + depth = (river_depth_bed * sqrt(MYMAX(0, 1.f - MYSQUARE(t)))); + } // base - depth : height of the bottom of the river - // water_level - 2 : don't make rivers below 2 nodes under the surface - u16 min_bottom = 2; - if (!fast_terrain) - min_bottom = 6; - mount = fmin(fmax(base - depth, (float) (water_level - min_bottom)), mount); + // water_level - 6 : don't make rivers below 6 nodes under the surface + mount = rangelim(base - depth, (float) (water_level - 6), mount); // Slope has no influence on rivers. *tn->slope = 0.f; } - if (fast_terrain) { - // The penultimate step builds up the heights, but we reduce it - // occasionally to create cliffs. - float delta = sin(tn->inter_valley_fill) * *tn->slope; - if (cliff_terrain && tn->cliffs >= 0.2f) - mount += delta * 0.66f; - else - mount += delta; - - // Use yet another noise to make the heights look more rugged. - if (rugged_terrain - && mount > water_level - && fabs(inter_valley_slope * tn->inter_valley_fill) < 0.3f) - mount += ((delta < 0.f) ? -1.f : 1.f) * pow(fabs(delta), 0.5f) * fabs(sin(tn->corr)); - } - return mount; } @@ -559,15 +497,14 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) float MapgenValleys::adjustedTerrainLevelFromNoise(TerrainNoise *tn) { float mount = terrainLevelFromNoise(tn); + s16 y_start = myround(mount); - if (!fast_terrain) { - for (s16 y = round(mount); y <= round(mount) + 1000; y++) { - float fill = NoisePerlin3D(&noise_inter_valley_fill->np, tn->x, y, tn->z, seed); + for (s16 y = y_start; y <= y_start + 1000; y++) { + float fill = NoisePerlin3D(&noise_inter_valley_fill->np, tn->x, y, tn->z, seed); - if (fill * *tn->slope <= y - mount) { - mount = fmax(y - 1, mount); - break; - } + if (fill * *tn->slope <= y - mount) { + mount = MYMAX(y - 1, mount); + break; } } @@ -575,40 +512,12 @@ float MapgenValleys::adjustedTerrainLevelFromNoise(TerrainNoise *tn) } -float MapgenValleys::humidityByTerrain( - float humidity_base, - float mount, - float rivers, - float valley) -{ - // Although the original valleys adjusts humidity by distance - // from seawater, this causes problems with the default biomes. - // Adjust only by freshwater proximity. - float humidity = humidity_base + humidity_adjust; - - if (humid_rivers && mount > water_level) { - // Offset to make everything average the same. - humidity -= (humidity_break_point - humidity_adjust) / 3.f; - - // This method is from the original lua. - float water_table = pow(0.5f, fmax(rivers / 3.f, 0.f)); - // This adds humidity next to rivers and lakes. - float river_water = pow(0.5f, fmax(valley / 12.f, 0.f)); - // Combine the two. - float water = water_table + (1.f - water_table) * river_water; - humidity = fmax(humidity, (humidity_break_point * water)); - } - - return humidity; -} - - int MapgenValleys::getGroundLevelAtPoint(v2s16 p) { - // *********************************************** - // This method (deliberately) does not return correct - // terrain values. This may be a problem in the future. - // *********************************************** + // *********************************** + // This method (deliberately) does not + // return correct terrain values. + // *********************************** // Since MT doesn't normally deal with rivers, check // to make sure this isn't a request for a location @@ -616,7 +525,7 @@ int MapgenValleys::getGroundLevelAtPoint(v2s16 p) float rivers = NoisePerlin2D(&noise_rivers->np, p.X, p.Y, seed); // If it's wet, return an unusable number. - if (fabs(rivers) < river_size) + if (fabs(rivers) < river_size_factor) return MAX_MAP_GENERATION_LIMIT; // Otherwise, return the real result. @@ -632,25 +541,14 @@ float MapgenValleys::terrainLevelAtPoint(s16 x, s16 z) float valley = NoisePerlin2D(&noise_valley_depth->np, x, z, seed); float inter_valley_slope = NoisePerlin2D(&noise_inter_valley_slope->np, x, z, seed); - tn.x = x; - tn.z = z; - tn.terrain_height = NoisePerlin2D(&noise_terrain_height->np, x, z, seed); - tn.rivers = &rivers; - tn.valley = &valley; - tn.valley_profile = NoisePerlin2D(&noise_valley_profile->np, x, z, seed); - tn.slope = &inter_valley_slope; + tn.x = x; + tn.z = z; + tn.terrain_height = NoisePerlin2D(&noise_terrain_height->np, x, z, seed); + tn.rivers = &rivers; + tn.valley = &valley; + tn.valley_profile = NoisePerlin2D(&noise_valley_profile->np, x, z, seed); + tn.slope = &inter_valley_slope; tn.inter_valley_fill = 0.f; - tn.cliffs = 0.f; - tn.corr = 0.f; - - if (fast_terrain) { - tn.inter_valley_fill = NoisePerlin2D(&noise_inter_valley_fill->np, x, z, seed); - - if (cliff_terrain) - tn.cliffs = NoisePerlin2D(&noise_cliffs->np, x, z, seed); - if (rugged_terrain) - tn.corr = NoisePerlin2D(&noise_corr->np, x, z, seed); - } return adjustedTerrainLevelFromNoise(&tn); } @@ -679,17 +577,13 @@ int MapgenValleys::generateTerrain() if (surface_y > surface_max_y) surface_max_y = surface_y; - u32 index_3d = 0; - if (!fast_terrain) - index_3d = (z - node_min.Z) * zstride + (x - node_min.X); - + u32 index_3d = (z - node_min.Z) * zstride + (x - node_min.X); u32 index_data = vm->m_area.index(x, node_min.Y - 1, z); // Mapgens concern themselves with stone and water. for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { float fill = 0.f; - if (!fast_terrain) - fill = noise_inter_valley_fill->result[index_3d]; + fill = noise_inter_valley_fill->result[index_3d]; if (vm->m_data[index_data].getContent() == CONTENT_IGNORE) { bool river = (river_y > surface_y); @@ -697,14 +591,14 @@ int MapgenValleys::generateTerrain() if (river && y == surface_y) { // river bottom vm->m_data[index_data] = n_sand; - } else if ((fast_terrain || river) && y <= surface_y) { + } else if (river && y <= surface_y) { // ground vm->m_data[index_data] = n_stone; } else if (river && y < river_y) { // river vm->m_data[index_data] = n_river_water; - } else if ((!fast_terrain) && (!river) && round(fill * slope) >= y - surface_y) { - // ground (slow method) + } else if ((!river) && myround(fill * slope) >= y - surface_y) { + // ground vm->m_data[index_data] = n_stone; heightmap[index_2d] = surface_max_y = y; } else if (y <= water_level) { @@ -716,23 +610,21 @@ int MapgenValleys::generateTerrain() } vm->m_area.add_y(em, index_data, 1); - if (!fast_terrain) - index_3d += ystride; + index_3d += ystride; } - if (!fast_terrain) { - // Assign the humidity adjusted by water proximity. - noise_humidity->result[index_2d] = humidityByTerrain( - noise_humidity->result[index_2d], - surface_max_y, - noise_rivers->result[index_2d], - noise_valley_depth->result[index_2d]); + // Although the original valleys adjusts humidity by distance + // from seawater, this causes problems with the default biomes. + // Adjust only by freshwater proximity. + const float humidity_offset = 0.8f; // derived by testing + if (humid_rivers) + noise_humidity->result[index_2d] *= (1 + pow(0.5f, MYMAX((surface_max_y + - noise_rivers->result[index_2d]) / 3.f, 0.f))) * humidity_offset; - // Assign the heat adjusted by altitude. See humidity, above. - if (use_altitude_chill && surface_max_y > 0) - noise_heat->result[index_2d] - *= pow(0.5f, (surface_max_y - altitude_chill / 3.f) / altitude_chill); - } + // Assign the heat adjusted by altitude. + if (use_altitude_chill && surface_max_y > 0) + noise_heat->result[index_2d] *= + pow(0.5f, (surface_max_y - altitude_chill / 3.f) / altitude_chill); } return surface_max_y; @@ -897,101 +789,158 @@ void MapgenValleys::dustTopNodes() } -void MapgenValleys::generateSimpleCaves(s16 max_stone_y) +void MapgenValleys::generateCaves(s16 max_stone_y) { + if (max_stone_y < node_min.Y) + return; + + noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + PseudoRandom ps(blockseed + 72202); MapNode n_air(CONTENT_AIR); - MapNode n_dirt(c_dirt); MapNode n_lava(c_lava_source); MapNode n_water(c_river_water_source); v3s16 em = vm->m_area.getExtent(); - s16 base_water_chance = 0; - if (water_features < 11) - base_water_chance = ceil(MAX_MAP_GENERATION_LIMIT / (water_features * 1000)); + // Cave blend distance near YMIN, YMAX + const float massive_cave_blend = 128.f; + // noise threshold for massive caves + const float massive_cave_threshold = 0.6f; + // mct: 1 = small rare caves, 0.5 1/3rd ground volume, 0 = 1/2 ground volume. - if (max_stone_y >= node_min.Y) { - u32 index_2d = 0; - u32 index_3d = 0; - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) { - bool air_above = false; - //bool underground = false; - u32 index_data = vm->m_area.index(x, node_max.Y + 1, z); + float yblmin = -map_gen_limit + massive_cave_blend * 1.5f; + float yblmax = massive_cave_depth - massive_cave_blend * 1.5f; + bool made_a_big_one = false; - index_3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); + // Cache the tcave values as they only vary by altitude. + if (node_max.Y <= massive_cave_depth) { + noise_massive_caves->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - // Dig caves on down loop to check for air above. - for (s16 y = node_max.Y + 1; - y >= node_min.Y - 1; - y--, index_3d -= ystride, vm->m_area.add_y(em, index_data, -1)) { - float terrain = noise_terrain_height->result[index_2d]; + for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { + float tcave = massive_cave_threshold; - // Saves some time and prevents removing above ground nodes. - if (y > terrain + 1) { - air_above = true; - continue; - } + if (y < yblmin) { + float t = (yblmin - y) / massive_cave_blend; + tcave += MYSQUARE(t); + } else if (y > yblmax) { + float t = (y - yblmax) / massive_cave_blend; + tcave += MYSQUARE(t); + } - content_t c = vm->m_data[index_data].getContent(); - bool n1 = (fabs(noise_simple_caves_1->result[index_3d]) < 0.07f); - bool n2 = (fabs(noise_simple_caves_2->result[index_3d]) < 0.07f); + tcave_cache[y - node_min.Y + 1] = tcave; + } + } - // River water is (foolishly) not set as ground content - // in the default game. This can produce strange results - // when a cave undercuts a river. However, that's not for - // the mapgen to correct. Fix it in lua. + // lava_depth varies between one and ten as you approach + // the bottom of the world. + s16 lava_depth = ceil((lava_max_height - node_min.Y + 1) * 10.f / map_gen_limit); + // This allows random lava spawns to be less common at the surface. + s16 lava_chance = MYCUBE(lava_features_lim) * lava_depth; + // water_depth varies between ten and one on the way down. + s16 water_depth = ceil((map_gen_limit - abs(node_min.Y) + 1) * 10.f / map_gen_limit); + // This allows random water spawns to be more common at the surface. + s16 water_chance = MYCUBE(water_features_lim) * water_depth; - if (c == CONTENT_AIR) { - air_above = true; - } else if (n1 && n2 && ndef->get(c).is_ground_content) { - // When both n's are true, we're in a cave. - vm->m_data[index_data] = n_air; - air_above = true; - } else if (air_above - && (c == c_stone || c == c_sandstone || c == c_desert_stone)) { - // At the cave floor - s16 sr = ps.next() & 1023; - u32 j = index_data; - vm->m_area.add_y(em, j, 1); + // Reduce the odds of overflows even further. + if (node_max.Y > water_level) { + lava_chance /= 5; + water_chance /= 5; + } - if (sr > (terrain - y) * 25) { - // Put dirt in caves near the surface. - Biome *biome = (Biome *)bmgr->getRaw(biomemap[index_2d]); + u32 index_2d = 0; + u32 index_3d = 0; + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) { + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index_2d]); + bool air_above = false; + bool underground = false; + u32 index_data = vm->m_area.index(x, node_max.Y + 1, z); + + index_3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); + + // Dig caves on down loop to check for air above. + for (s16 y = node_max.Y + 1; + y >= node_min.Y - 1; + y--, index_3d -= ystride, vm->m_area.add_y(em, index_data, -1)) { + float terrain = noise_terrain_height->result[index_2d]; + + // Saves some time. + if (y > terrain + 10) { + air_above = true; + continue; + } else if (y < terrain - 40) { + underground = true; + } + + // Dig massive caves. + if (node_max.Y <= massive_cave_depth + && noise_massive_caves->result[index_3d] + > tcave_cache[y - node_min.Y + 1]) { + vm->m_data[index_data] = n_air; + made_a_big_one = true; + } + + content_t c = vm->m_data[index_data].getContent(); + float d1 = contour(noise_cave1->result[index_3d]); + float d2 = contour(noise_cave2->result[index_3d]); + + // River water is not set as ground content + // in the default game. This can produce strange results + // when a cave undercuts a river. However, that's not for + // the mapgen to correct. Fix it in lua. + + if (c == CONTENT_AIR) { + air_above = true; + } else if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // in a cave + vm->m_data[index_data] = n_air; + air_above = true; + } else if (air_above && (c == biome->c_filler || c == biome->c_stone)) { + // at the cave floor + s16 sr = ps.range(0,39); + u32 j = index_data; + vm->m_area.add_y(em, j, 1); + + if (sr > terrain - y) { + // Put dirt in caves near the surface. + if (underground) vm->m_data[index_data] = MapNode(biome->c_filler); - } else { - s16 lava_chance = 0; + else + vm->m_data[index_data] = MapNode(biome->c_top); + } else if (sr < 3 && underground) { + sr = abs(ps.next()); + if (lava_features_lim > 0 && y <= lava_max_height + && c == biome->c_stone && sr < lava_chance) + vm->m_data[j] = n_lava; - if (y <= lava_max_height && c == c_stone) { - // Lava spawns increase with depth. - lava_chance = ceil((lava_max_height - y + 1) / 10000); + sr -= lava_chance; - if (sr < lava_chance) - vm->m_data[j] = n_lava; - } - - if (base_water_chance > 0 && y <= cave_water_max_height) { - s16 water_chance = base_water_chance - - (abs(y - water_level) / (water_features * 1000)); - - // Waterfalls may get out of control above ground. - sr -= lava_chance; - // If sr < 0 then we should have already placed lava -- - // don't immediately dump water on it. - if (sr >= 0 && sr < water_chance) - vm->m_data[j] = n_water; - } - } - - air_above = false; + // If sr < 0 then we should have already placed lava -- + // don't immediately dump water on it. + if (water_features_lim > 0 && y <= cave_water_max_height + && sr >= 0 && sr < water_chance) + vm->m_data[j] = n_water; } - // If we're not in a cave, there's no open space. - if (!(n1 && n2)) - air_above = false; + air_above = false; + underground = true; + } else if (c == biome->c_filler || c == biome->c_stone) { + air_above = false; + underground = true; + } else { + air_above = false; } } } + + if (node_max.Y <= large_cave_depth && (!made_a_big_one)) { + u32 bruises_count = ps.range(0, 2); + for (u32 i = 0; i < bruises_count; i++) { + CaveV5 cave(this, &ps); + cave.makeCave(node_min, node_max, max_stone_y); + } + } } diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h index 5fd54909..ee4052d7 100644 --- a/src/mapgen_valleys.h +++ b/src/mapgen_valleys.h @@ -31,11 +31,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen.h" /////////////////// Mapgen Valleys flags -#define MG_VALLEYS_ALT_CHILL 0x01 -#define MG_VALLEYS_CLIFFS 0x02 -#define MG_VALLEYS_FAST 0x04 -#define MG_VALLEYS_HUMID_RIVERS 0x08 -#define MG_VALLEYS_RUGGED 0x10 +#define MG_VALLEYS_ALT_CHILL 0x01 +#define MG_VALLEYS_HUMID_RIVERS 0x02 + +// Feed only one variable into these. +#define MYSQUARE(x) (x) * (x) +#define MYCUBE(x) (x) * (x) * (x) class BiomeManager; @@ -47,28 +48,25 @@ class BiomeManager; struct MapgenValleysParams : public MapgenSpecificParams { u32 spflags; + s16 large_cave_depth; + s16 massive_cave_depth; u16 altitude_chill; - s16 cave_water_max_height; - s16 humidity; - s16 humidity_break_point; - s16 lava_max_height; + u16 lava_features; u16 river_depth; u16 river_size; - s16 temperature; u16 water_features; NoiseParams np_biome_heat; NoiseParams np_biome_heat_blend; NoiseParams np_biome_humidity; NoiseParams np_biome_humidity_blend; - NoiseParams np_cliffs; - NoiseParams np_corr; + NoiseParams np_cave1; + NoiseParams np_cave2; NoiseParams np_filler_depth; NoiseParams np_inter_valley_fill; NoiseParams np_inter_valley_slope; NoiseParams np_rivers; - NoiseParams np_simple_caves_1; - NoiseParams np_simple_caves_2; + NoiseParams np_massive_caves; NoiseParams np_terrain_height; NoiseParams np_valley_depth; NoiseParams np_valley_profile; @@ -89,8 +87,6 @@ struct TerrainNoise { float valley_profile; float *slope; float inter_valley_fill; - float cliffs; - float corr; }; class MapgenValleys : public Mapgen { @@ -102,6 +98,8 @@ public: virtual void makeChunk(BlockMakeData *data); int getGroundLevelAtPoint(v2s16 p); + s16 large_cave_depth; + private: EmergeManager *m_emerge; BiomeManager *bmgr; @@ -109,10 +107,9 @@ private: int ystride; int zstride; + float map_gen_limit; + u32 spflags; - bool cliff_terrain; - bool fast_terrain; - bool rugged_terrain; bool humid_rivers; bool use_altitude_chill; @@ -123,8 +120,8 @@ private: Noise *noise_filler_depth; - Noise *noise_cliffs; - Noise *noise_corr; + Noise *noise_cave1; + Noise *noise_cave2; Noise *noise_heat; Noise *noise_heat_blend; Noise *noise_humidity; @@ -132,21 +129,21 @@ private: Noise *noise_inter_valley_fill; Noise *noise_inter_valley_slope; Noise *noise_rivers; - Noise *noise_simple_caves_1; - Noise *noise_simple_caves_2; + Noise *noise_massive_caves; Noise *noise_terrain_height; Noise *noise_valley_depth; Noise *noise_valley_profile; float altitude_chill; - float cave_water_max_height; + s16 cave_water_max_height; float humidity_adjust; - float humidity_break_point; - float lava_max_height; - float river_depth; - float river_size; - float temperature_adjust; - s16 water_features; + s16 lava_features_lim; + s16 lava_max_height; + s16 massive_cave_depth; + float river_depth_bed; + float river_size_factor; + float *tcave_cache; + s16 water_features_lim; content_t c_cobble; content_t c_desert_stone; @@ -176,7 +173,7 @@ private: MgStoneType generateBiomes(float *heat_map, float *humidity_map); void dustTopNodes(); - void generateSimpleCaves(s16 max_stone_y); + void generateCaves(s16 max_stone_y); }; struct MapgenFactoryValleys : public MapgenFactory { From 0a8af8814787654dcbe0459a28255586fbfa3bd1 Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 31 Jan 2016 04:23:46 +0000 Subject: [PATCH 235/531] Mgv5/v7/flat/fractal: Move tunnel noise calculation into generateCaves Tunnel 3D noises are only calculated when solid terrain is present in mapchunk, avoiding large amounts of unnecessary calculations Change 'int' to 's16' in calculateNoise Change 'i' to 'vi' for voxelmanip indexes for consistency Keep 'u32 index3d' local to a smaller part of tunnel code Mgv7: Don't call CaveV7 if no solid terrain in mapchunk Give 'open' bool a more descriptive name --- src/mapgen_flat.cpp | 84 +++++++++++++++++------------------ src/mapgen_fractal.cpp | 85 ++++++++++++++++++------------------ src/mapgen_v5.cpp | 56 ++++++++++++------------ src/mapgen_v7.cpp | 99 ++++++++++++++++++++++-------------------- 4 files changed, 165 insertions(+), 159 deletions(-) diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index b7f01320..3b7178dd 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -323,20 +323,16 @@ void MapgenFlat::makeChunk(BlockMakeData *data) void MapgenFlat::calculateNoise() { //TimeTaker t("calculateNoise", NULL, PRECISION_MICRO); - int x = node_min.X; - int y = node_min.Y - 1; - int z = node_min.Z; + s16 x = node_min.X; + s16 z = node_min.Z; if ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS)) noise_terrain->perlinMap2D(x, z); + // Cave noises are calculated in generateCaves() + // only if solid terrain is present in mapchunk + noise_filler_depth->perlinMap2D(x, z); - - if (flags & MG_CAVES) { - noise_cave1->perlinMap3D(x, y, z); - noise_cave2->perlinMap3D(x, y, z); - } - noise_heat->perlinMap2D(x, z); noise_humidity->perlinMap2D(x, z); noise_heat_blend->perlinMap2D(x, z); @@ -550,41 +546,45 @@ void MapgenFlat::dustTopNodes() void MapgenFlat::generateCaves(s16 max_stone_y) { - if (max_stone_y >= node_min.Y) { - v3s16 em = vm->m_area.getExtent(); - u32 index2d = 0; - u32 index3d; + if (max_stone_y < node_min.Y) + return; - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { - bool open = false; // Is column open to overground - u32 vi = vm->m_area.index(x, node_max.Y + 1, z); - index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + - (x - node_min.X); - // Biome of column - Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; - y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { - content_t c = vm->m_data[vi].getContent(); - if (c == CONTENT_AIR || c == biome->c_water_top || - c == biome->c_water) { - open = true; - continue; - } - // Ground - float d1 = contour(noise_cave1->result[index3d]); - float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { - // In tunnel and ground content, excavate - vm->m_data[vi] = MapNode(CONTENT_AIR); - } else if (open && (c == biome->c_filler || c == biome->c_stone)) { - // Tunnel entrance floor - vm->m_data[vi] = MapNode(biome->c_top); - open = false; - } else { - open = false; - } + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool column_is_open = false; // Is column open to overground + u32 vi = vm->m_area.index(x, node_max.Y + 1, z); + u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + + for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; + y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + column_is_open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate + vm->m_data[vi] = MapNode(CONTENT_AIR); + } else if (column_is_open && + (c == biome->c_filler || c == biome->c_stone)) { + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + column_is_open = false; + } else { + column_is_open = false; } } } diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 5c0d283e..9cb682a9 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -339,18 +339,15 @@ void MapgenFractal::makeChunk(BlockMakeData *data) void MapgenFractal::calculateNoise() { //TimeTaker t("calculateNoise", NULL, PRECISION_MICRO); - int x = node_min.X; - int y = node_min.Y - 1; - int z = node_min.Z; + s16 x = node_min.X; + s16 z = node_min.Z; noise_seabed->perlinMap2D(x, z); + + // Cave noises are calculated in generateCaves() + // only if solid terrain is present in mapchunk + noise_filler_depth->perlinMap2D(x, z); - - if (flags & MG_CAVES) { - noise_cave1->perlinMap3D(x, y, z); - noise_cave2->perlinMap3D(x, y, z); - } - noise_heat->perlinMap2D(x, z); noise_humidity->perlinMap2D(x, z); noise_heat_blend->perlinMap2D(x, z); @@ -673,41 +670,45 @@ void MapgenFractal::dustTopNodes() void MapgenFractal::generateCaves(s16 max_stone_y) { - if (max_stone_y >= node_min.Y) { - v3s16 em = vm->m_area.getExtent(); - u32 index2d = 0; - u32 index3d; + if (max_stone_y < node_min.Y) + return; - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { - bool open = false; // Is column open to overground - u32 vi = vm->m_area.index(x, node_max.Y + 1, z); - index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + - (x - node_min.X); - // Biome of column - Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; - y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { - content_t c = vm->m_data[vi].getContent(); - if (c == CONTENT_AIR || c == biome->c_water_top || - c == biome->c_water) { - open = true; - continue; - } - // Ground - float d1 = contour(noise_cave1->result[index3d]); - float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { - // In tunnel and ground content, excavate - vm->m_data[vi] = MapNode(CONTENT_AIR); - } else if (open && (c == biome->c_filler || c == biome->c_stone)) { - // Tunnel entrance floor - vm->m_data[vi] = MapNode(biome->c_top); - open = false; - } else { - open = false; - } + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool column_is_open = false; // Is column open to overground + u32 vi = vm->m_area.index(x, node_max.Y + 1, z); + u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + + for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; + y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + column_is_open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate + vm->m_data[vi] = MapNode(CONTENT_AIR); + } else if (column_is_open && + (c == biome->c_filler || c == biome->c_stone)) { + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + column_is_open = false; + } else { + column_is_open = false; } } } diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 48b71729..06e5f1ca 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -322,18 +322,16 @@ void MapgenV5::makeChunk(BlockMakeData *data) void MapgenV5::calculateNoise() { //TimeTaker t("calculateNoise", NULL, PRECISION_MICRO); - int x = node_min.X; - int y = node_min.Y - 1; - int z = node_min.Z; + s16 x = node_min.X; + s16 y = node_min.Y - 1; + s16 z = node_min.Z; noise_factor->perlinMap2D(x, z); noise_height->perlinMap2D(x, z); noise_ground->perlinMap3D(x, y, z); - if (flags & MG_CAVES) { - noise_cave1->perlinMap3D(x, y, z); - noise_cave2->perlinMap3D(x, y, z); - } + // Cave noises are calculated in generateCaves() + // only if solid terrain is present in mapchunk noise_filler_depth->perlinMap2D(x, z); noise_heat->perlinMap2D(x, z); @@ -377,9 +375,9 @@ int MapgenV5::generateBaseTerrain() for (s16 z=node_min.Z; z<=node_max.Z; z++) { for (s16 y=node_min.Y - 1; y<=node_max.Y + 1; y++) { - u32 i = vm->m_area.index(node_min.X, y, z); - for (s16 x=node_min.X; x<=node_max.X; x++, i++, index++, index2d++) { - if (vm->m_data[i].getContent() != CONTENT_IGNORE) + u32 vi = vm->m_area.index(node_min.X, y, z); + for (s16 x=node_min.X; x<=node_max.X; x++, vi++, index++, index2d++) { + if (vm->m_data[vi].getContent() != CONTENT_IGNORE) continue; float f = 0.55 + noise_factor->result[index2d]; @@ -391,11 +389,11 @@ int MapgenV5::generateBaseTerrain() if (noise_ground->result[index] * f < y - h) { if (y <= water_level) - vm->m_data[i] = MapNode(c_water_source); + vm->m_data[vi] = MapNode(c_water_source); else - vm->m_data[i] = MapNode(CONTENT_AIR); + vm->m_data[vi] = MapNode(CONTENT_AIR); } else { - vm->m_data[i] = MapNode(c_stone); + vm->m_data[vi] = MapNode(c_stone); if (y > stone_surface_max_y) stone_surface_max_y = y; } @@ -508,22 +506,26 @@ MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map) void MapgenV5::generateCaves(int max_stone_y) { - if (max_stone_y >= node_min.Y) { - u32 index = 0; + if (max_stone_y < node_min.Y) + return; - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - u32 i = vm->m_area.index(node_min.X, y, z); - for (s16 x = node_min.X; x <= node_max.X; x++, i++, index++) { - float d1 = contour(noise_cave1->result[index]); - float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.125f) { - content_t c = vm->m_data[i].getContent(); - if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) - continue; + noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - vm->m_data[i] = MapNode(CONTENT_AIR); - } + u32 index = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { + u32 vi = vm->m_area.index(node_min.X, y, z); + for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { + float d1 = contour(noise_cave1->result[index]); + float d2 = contour(noise_cave2->result[index]); + if (d1 * d2 > 0.125f) { + content_t c = vm->m_data[vi].getContent(); + if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) + continue; + + vm->m_data[vi] = MapNode(CONTENT_AIR); } } } diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 1e481548..aec00b93 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -345,9 +345,9 @@ void MapgenV7::makeChunk(BlockMakeData *data) void MapgenV7::calculateNoise() { //TimeTaker t("calculateNoise", NULL, PRECISION_MICRO); - int x = node_min.X; - int y = node_min.Y - 1; - int z = node_min.Z; + s16 x = node_min.X; + s16 y = node_min.Y - 1; + s16 z = node_min.Z; noise_terrain_persist->perlinMap2D(x, z); float *persistmap = noise_terrain_persist->result; @@ -356,17 +356,16 @@ void MapgenV7::calculateNoise() noise_terrain_alt->perlinMap2D(x, z, persistmap); noise_height_select->perlinMap2D(x, z); - if (flags & MG_CAVES) { - noise_cave1->perlinMap3D(x, y, z); - noise_cave2->perlinMap3D(x, y, z); - } - if ((spflags & MGV7_RIDGES) && node_max.Y >= water_level) { noise_ridge->perlinMap3D(x, y, z); noise_ridge_uwater->perlinMap2D(x, z); } + // Cave noises are calculated in generateCaves() + // only if solid terrain is present in mapchunk + // Mountain noises are calculated in generateMountainTerrain() + // only if solid terrain surface dips into mapchunk noise_filler_depth->perlinMap2D(x, z); noise_heat->perlinMap2D(x, z); @@ -527,17 +526,17 @@ void MapgenV7::generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_ if (surface_y > surface_max_y) surface_max_y = surface_y; - u32 i = vm->m_area.index(x, node_min.Y - 1, z); + u32 vi = vm->m_area.index(x, node_min.Y - 1, z); for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - if (vm->m_data[i].getContent() == CONTENT_IGNORE) { + if (vm->m_data[vi].getContent() == CONTENT_IGNORE) { if (y <= surface_y) - vm->m_data[i] = n_stone; + vm->m_data[vi] = n_stone; else if (y <= water_level) - vm->m_data[i] = n_water; + vm->m_data[vi] = n_water; else - vm->m_data[i] = n_air; + vm->m_data[vi] = n_air; } - vm->m_area.add_y(em, i, 1); + vm->m_area.add_y(em, vi, 1); } } @@ -585,7 +584,7 @@ void MapgenV7::generateRidgeTerrain() MapNode n_water(c_water_source); MapNode n_air(CONTENT_AIR); u32 index = 0; - float width = 0.2; // TODO: figure out acceptable perlin noise values + float width = 0.2; for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { @@ -862,41 +861,45 @@ void MapgenV7::addTopNodes() void MapgenV7::generateCaves(s16 max_stone_y) { - if (max_stone_y >= node_min.Y) { - v3s16 em = vm->m_area.getExtent(); - u32 index2d = 0; - u32 index3d; + if (max_stone_y < node_min.Y) + return; - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { - bool open = false; // Is column open to overground - u32 vi = vm->m_area.index(x, node_max.Y + 1, z); - index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + - (x - node_min.X); - // Biome of column - Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; - y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { - content_t c = vm->m_data[vi].getContent(); - if (c == CONTENT_AIR || c == biome->c_water_top || - c == biome->c_water) { - open = true; - continue; - } - // Ground - float d1 = contour(noise_cave1->result[index3d]); - float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { - // In tunnel and ground content, excavate - vm->m_data[vi] = MapNode(CONTENT_AIR); - } else if (open && (c == biome->c_filler || c == biome->c_stone)) { - // Tunnel entrance floor - vm->m_data[vi] = MapNode(biome->c_top); - open = false; - } else { - open = false; - } + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool column_is_open = false; // Is column open to overground + u32 vi = vm->m_area.index(x, node_max.Y + 1, z); + u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + + for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; + y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + column_is_open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate + vm->m_data[vi] = MapNode(CONTENT_AIR); + } else if (column_is_open && + (c == biome->c_filler || c == biome->c_stone)) { + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + column_is_open = false; + } else { + column_is_open = false; } } } From 99c905c5633ebb5aef0ed8af13553c38b892c5e2 Mon Sep 17 00:00:00 2001 From: Duane Robertson Date: Mon, 1 Feb 2016 02:09:43 -0600 Subject: [PATCH 236/531] Mgvalleys: fix riverbeds below sea level Stop riverbeds from forming plateaus under sea. Minor corrections to random lava/water placement. --- src/mapgen_valleys.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index f003ae63..ceb2c774 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -99,8 +99,8 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * this->water_features_lim = rangelim(sp->water_features, 0, 10); // a small chance of overflows if the settings are very high - this->cave_water_max_height = water_level + MYMAX(0, water_features_lim - 6) * 50; - this->lava_max_height = water_level + MYMAX(0, lava_features_lim - 6) * 50; + this->cave_water_max_height = water_level + MYMAX(0, water_features_lim - 4) * 50; + this->lava_max_height = water_level + MYMAX(0, lava_features_lim - 4) * 50; tcave_cache = new float[csize.Y + 2]; @@ -482,7 +482,8 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) // base - depth : height of the bottom of the river // water_level - 6 : don't make rivers below 6 nodes under the surface - mount = rangelim(base - depth, (float) (water_level - 6), mount); + // There is no logical equivalent to this using rangelim. + mount = MYMIN(MYMAX(base - depth, (float) (water_level - 6)), mount); // Slope has no influence on rivers. *tn->slope = 0.f; @@ -846,8 +847,8 @@ void MapgenValleys::generateCaves(s16 max_stone_y) // Reduce the odds of overflows even further. if (node_max.Y > water_level) { - lava_chance /= 5; - water_chance /= 5; + lava_chance /= 3; + water_chance /= 3; } u32 index_2d = 0; From c4e0d95c87a3aec22ad52ae427b704a9f3a22d21 Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Fri, 29 Jan 2016 16:15:58 +0200 Subject: [PATCH 237/531] Implement OSX Travis builds --- .travis.yml | 11 +++++++++- util/travis/before_install.sh | 39 +++++++++++++++++++++-------------- util/travis/script.sh | 5 ++++- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7ee2387..9d160081 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,13 @@ language: cpp compiler: - gcc - clang +os: + - osx + - linux env: - PLATFORM=Win32 - PLATFORM=Win64 - - PLATFORM=Linux + - PLATFORM=Unix before_install: ./util/travis/before_install.sh script: ./util/travis/script.sh sudo: required @@ -18,3 +21,9 @@ matrix: compiler: clang - env: PLATFORM=Win64 compiler: clang + - env: PLATFORM=Win32 + os: osx + - env: PLATFORM=Win64 + os: osx + - compiler: gcc + os: osx diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index e3276e0d..58dc42b1 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -1,22 +1,30 @@ #!/bin/bash -e -if [[ $CC == "clang" ]]; then - export PATH="/usr/bin/:$PATH" - sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list' - sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183 +if [[ $TRAVIS_OS_NAME == "linux" ]]; then + if [[ $CC == "clang" ]]; then + export PATH="/usr/bin/:$PATH" + sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list' + sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183 + sudo apt-get update + sudo apt-get install llvm-3.1 + sudo apt-get install clang + fi sudo apt-get update - sudo apt-get install llvm-3.1 - sudo apt-get install clang + sudo apt-get install p7zip-full fi -sudo apt-get update -sudo apt-get install p7zip-full -if [[ $PLATFORM == "Linux" ]]; then - sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \ - libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \ - libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext - # Linking to LevelDB is broken, use a custom build - wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z - sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z + +if [[ $PLATFORM == "Unix" ]]; then + if [[ $TRAVIS_OS_NAME == "linux" ]]; then + sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \ + libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \ + libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext + # Linking to LevelDB is broken, use a custom build + wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z + sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z + else + brew update + brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit + fi elif [[ $PLATFORM == "Win32" ]]; then wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z sed -e "s|%PREFIX%|i686-w64-mingw32|" \ @@ -30,4 +38,3 @@ elif [[ $PLATFORM == "Win64" ]]; then < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake sudo 7z x -y -o/usr mingw.7z fi - diff --git a/util/travis/script.sh b/util/travis/script.sh index 756cc1de..5be747e5 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -if [[ $PLATFORM == "Linux" ]]; then +if [[ $PLATFORM == "Unix" ]]; then mkdir -p travisbuild cd travisbuild CMAKE_FLAGS='-DCMAKE_BUILD_TYPE=Debug \ @@ -10,6 +10,9 @@ if [[ $PLATFORM == "Linux" ]]; then if [[ $CC == "clang" ]]; then CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE' fi + if [[ $TRAVIS_OS_NAME == "osx" ]]; then + CMAKE_FLAGS+=' -DCUSTOM_GETTEXT_PATH=/usr/local/opt/gettext' + fi cmake $CMAKE_FLAGS .. make -j2 echo "Running unit tests." From 0e75eb4324ba71c3d685b2f22a8a36b3aa0c9ef5 Mon Sep 17 00:00:00 2001 From: Splizard Date: Wed, 3 Feb 2016 19:09:13 +1300 Subject: [PATCH 238/531] Add admin command which says who the administator is for the server. --- builtin/game/chatcommands.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 6a35c034..fff893b2 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -84,6 +84,18 @@ core.register_chatcommand("me", { end, }) +core.register_chatcommand("admin", { + description = "Show the name of the server owner", + func = function(name) + local admin = minetest.setting_get("name") + if admin then + return true, "The administrator of this server is "..admin.."." + else + return false, "There's no administrator named in the config file." + end + end, +}) + core.register_chatcommand("help", { privs = {}, params = "[all/privs/]", From bf884e37a06e0a8dd6c31789a69921f07ec5a9a9 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 6 Feb 2016 05:49:12 +0100 Subject: [PATCH 239/531] Use tangent space meshes only when shaders are enabled --- src/mapblock_mesh.cpp | 19 +++++++++++-------- src/mapblock_mesh.h | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 6ae9dec1..9bcc4fa6 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -1167,7 +1167,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): for(u32 j = 0; j < p.vertices.size(); j++) { - video::S3DVertexTangents *vertex = &p.vertices[j]; + video::S3DVertex *vertex = &p.vertices[j]; // Note applyFacesShading second parameter is precalculated sqrt // value for speed improvement // Skip it for lightsources and top faces. @@ -1221,11 +1221,12 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): } // Create meshbuffer - scene::SMeshBufferTangents *buf = new scene::SMeshBufferTangents(); + scene::SMeshBuffer *buf = new scene::SMeshBuffer(); // Set material buf->Material = material; // Add to mesh - m_mesh->addMeshBuffer(buf); + scene::SMesh *mesh = (scene::SMesh *)m_mesh; + mesh->addMeshBuffer(buf); // Mesh grabbed it buf->drop(); buf->append(&p.vertices[0], p.vertices.size(), @@ -1241,7 +1242,9 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): if (m_enable_shaders) { scene::IMeshManipulator* meshmanip = m_gamedef->getSceneManager()->getMeshManipulator(); - meshmanip->recalculateTangents(m_mesh, true, false, false); + scene::IMesh* tangentMesh = meshmanip->createMeshWithTangents(m_mesh); + m_mesh->drop(); + m_mesh = tangentMesh; } if(m_mesh) @@ -1361,7 +1364,7 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat i != m_daynight_diffs.end(); ++i) { scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(i->first); - video::S3DVertexTangents *vertices = (video::S3DVertexTangents *)buf->getVertices(); + video::S3DVertex *vertices = (video::S3DVertex *)buf->getVertices(); for(std::map >::iterator j = i->second.begin(); j != i->second.end(); ++j) @@ -1392,7 +1395,7 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat i != m_highlighted_materials.end(); ++i) { scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(*i); - video::S3DVertexTangents *vertices = (video::S3DVertexTangents*)buf->getVertices(); + video::S3DVertex *vertices = (video::S3DVertex *)buf->getVertices(); for (u32 j = 0; j < buf->getVertexCount() ;j++) vertices[j].Color = hc; } @@ -1448,7 +1451,7 @@ void MeshCollector::append(const TileSpec &tile, } for (u32 i = 0; i < numVertices; i++) { - video::S3DVertexTangents vert(vertices[i].Pos, vertices[i].Normal, + video::S3DVertex vert(vertices[i].Pos, vertices[i].Normal, vertices[i].Color, vertices[i].TCoords); p->vertices.push_back(vert); } @@ -1494,7 +1497,7 @@ void MeshCollector::append(const TileSpec &tile, } for (u32 i = 0; i < numVertices; i++) { - video::S3DVertexTangents vert(vertices[i].Pos + pos, vertices[i].Normal, + video::S3DVertex vert(vertices[i].Pos + pos, vertices[i].Normal, c, vertices[i].TCoords); p->vertices.push_back(vert); } diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h index 8e994ec6..9c4fb655 100644 --- a/src/mapblock_mesh.h +++ b/src/mapblock_mesh.h @@ -104,7 +104,7 @@ public: // Returns true if anything has been changed. bool animate(bool faraway, float time, int crack, u32 daynight_ratio); - scene::SMesh *getMesh() + scene::IMesh *getMesh() { return m_mesh; } @@ -130,7 +130,7 @@ public: void updateCameraOffset(v3s16 camera_offset); private: - scene::SMesh *m_mesh; + scene::IMesh *m_mesh; MinimapMapblock *m_minimap_mapblock; IGameDef *m_gamedef; ITextureSource *m_tsrc; @@ -177,7 +177,7 @@ struct PreMeshBuffer { TileSpec tile; std::vector indices; - std::vector vertices; + std::vector vertices; }; struct MeshCollector From 6cd2b3b445bf558fda1e5a7908adef8e3a45449a Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sun, 24 Jan 2016 14:19:17 +0100 Subject: [PATCH 240/531] Use meshes to display inventory items --- builtin/settingtypes.txt | 3 + minetest.conf.example | 3 + src/defaultsettings.cpp | 1 + src/guiFormSpecMenu.cpp | 79 ++++++++++++++------------ src/guiFormSpecMenu.h | 20 ++++++- src/hud.cpp | 99 ++++++++++++++++++++++++++++----- src/hud.h | 9 ++- src/itemdef.cpp | 101 ++------------------------------- src/wieldmesh.cpp | 117 ++++++++++++++++++++++++++++++++++++++- src/wieldmesh.h | 4 ++ 10 files changed, 281 insertions(+), 155 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index dd852999..1ca5f16d 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -508,6 +508,9 @@ directional_colored_fog (Colored fog) bool true # set to the nearest valid value. ambient_occlusion_gamma (Ambient occlusion gamma) float 2.2 0.25 4.0 +# Enables animation of inventory items. +inventory_items_animations (Inventory items animations) bool false + [**Menus] # Use a cloud animation for the main menu background. diff --git a/minetest.conf.example b/minetest.conf.example index d8f91e7c..198b9323 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -588,6 +588,9 @@ # type: float min: 0.25 max: 4 # ambient_occlusion_gamma = 2.2 +# Enable animation of inventory items. +# inventory_items_animations = false + ### Menus # Use a cloud animation for the main menu background. diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 42eddb8c..669987d0 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -138,6 +138,7 @@ void set_default_settings(Settings *settings) settings->setDefault("console_alpha", "200"); settings->setDefault("selectionbox_color", "(0,0,0)"); settings->setDefault("enable_node_highlighting", "false"); + settings->setDefault("inventory_items_animations", "false"); settings->setDefault("crosshair_color", "(255,255,255)"); settings->setDefault("crosshair_alpha", "255"); settings->setDefault("hud_scaling", "1.0"); diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 3cef5079..4784d731 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -572,7 +572,7 @@ void GUIFormSpecMenu::parseItemImage(parserData* data,std::string element) if(!data->explicit_size) warningstream<<"invalid use of item_image without a size[] element"<idef(); ItemStack item; item.deSerialize(item_name, idef); - video::ITexture *texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef); m_tooltips[name] = TooltipSpec(item.getDefinition(idef).description, @@ -1505,13 +1504,17 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) } e->setUseAlphaChannel(true); - e->setImage(guiScalingImageButton(Environment->getVideoDriver(), texture, geom.X, geom.Y)); - e->setPressedImage(guiScalingImageButton(Environment->getVideoDriver(), texture, geom.X, geom.Y)); + e->setImage(guiScalingImageButton(Environment->getVideoDriver(), NULL, geom.X, geom.Y)); + e->setPressedImage(guiScalingImageButton(Environment->getVideoDriver(), NULL, geom.X, geom.Y)); e->setScaleImage(true); spec.ftype = f_Button; rect+=data->basepos-padding; spec.rect=rect; m_fields.push_back(spec); + pos = padding + AbsoluteRect.UpperLeftCorner; + pos.X += stof(v_pos[0]) * (float) spacing.X; + pos.Y += stof(v_pos[1]) * (float) spacing.Y; + m_itemimages.push_back(ImageDrawSpec("", item_name, pos, geom)); return; } errorstream<< "Invalid ItemImagebutton element(" << parts.size() << "): '" << element << "'" << std::endl; @@ -2151,7 +2154,8 @@ GUIFormSpecMenu::ItemSpec GUIFormSpecMenu::getItemAtPos(v2s32 p) const return ItemSpec(InventoryLocation(), "", -1); } -void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase) +void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, + bool &item_hovered) { video::IVideoDriver* driver = Environment->getVideoDriver(); @@ -2193,12 +2197,13 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase) && m_selected_item->i == item_i; bool hovering = rect.isPointInside(m_pointer); - if(phase == 0) - { - if(hovering) + if (phase == 0) { + if (hovering) { + item_hovered = true; driver->draw2DRectangle(m_slotbg_h, rect, &AbsoluteClippingRect); - else + } else { driver->draw2DRectangle(m_slotbg_n, rect, &AbsoluteClippingRect); + } } //Draw inv slot borders @@ -2232,7 +2237,8 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase) if(!item.empty()) { drawItemStack(driver, m_font, item, - rect, &AbsoluteClippingRect, m_gamedef); + rect, &AbsoluteClippingRect, m_gamedef, + selected, hovering, false); } // Draw tooltip @@ -2273,11 +2279,15 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase) void GUIFormSpecMenu::drawSelectedItem() { - if(!m_selected_item) - return; - video::IVideoDriver* driver = Environment->getVideoDriver(); + if (!m_selected_item) { + drawItemStack(driver, m_font, ItemStack(), + core::rect(v2s32(0, 0), v2s32(0, 0)), + NULL, m_gamedef, false, false, true); + return; + } + Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc); sanity_check(inv); InventoryList *list = inv->getList(m_selected_item->listname); @@ -2287,7 +2297,7 @@ void GUIFormSpecMenu::drawSelectedItem() core::rect imgrect(0,0,imgsize.X,imgsize.Y); core::rect rect = imgrect + (m_pointer - imgrect.getCenter()); - drawItemStack(driver, m_font, stack, rect, NULL, m_gamedef); + drawItemStack(driver, m_font, stack, rect, NULL, m_gamedef, false, false, true); } void GUIFormSpecMenu::drawMenu() @@ -2369,6 +2379,12 @@ void GUIFormSpecMenu::drawMenu() driver->draw2DRectangle(todraw, rect, 0); } + + /* + Call base class + */ + gui::IGUIElement::draw(); + /* Draw images */ @@ -2413,18 +2429,12 @@ void GUIFormSpecMenu::drawMenu() const ImageDrawSpec &spec = m_itemimages[i]; IItemDefManager *idef = m_gamedef->idef(); ItemStack item; - item.deSerialize(spec.name, idef); - video::ITexture *texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef); - // Image size on screen + item.deSerialize(spec.item_name, idef); core::rect imgrect(0, 0, spec.geom.X, spec.geom.Y); - // Image rectangle on screen + // Viewport rectangle on screen core::rect rect = imgrect + spec.pos; - const video::SColor color(255,255,255,255); - const video::SColor colors[] = {color,color,color,color}; - draw2DImageFilterScaled(driver, texture, rect, - core::rect(core::position2d(0,0), - core::dimension2di(texture->getOriginalSize())), - NULL/*&AbsoluteClippingRect*/, colors, true); + drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect, + m_gamedef, false, false, false); } /* @@ -2432,17 +2442,18 @@ void GUIFormSpecMenu::drawMenu() Phase 0: Item slot rectangles Phase 1: Item images; prepare tooltip */ - int start_phase=0; - for(int phase=start_phase; phase<=1; phase++) - for(u32 i=0; i(v2s32(0, 0), v2s32(0, 0)), + NULL, m_gamedef, false, true, false); } - - /* - Call base class - */ - gui::IGUIElement::draw(); /* TODO find way to show tooltips on touchscreen */ #ifndef HAVE_TOUCHSCREENGUI diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 2ba47f7f..9b892f19 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -143,7 +143,17 @@ class GUIFormSpecMenu : public GUIModalMenu { } ImageDrawSpec(const std::string &a_name, - v2s32 a_pos, v2s32 a_geom): + const std::string &a_item_name, + const v2s32 &a_pos, const v2s32 &a_geom): + name(a_name), + item_name (a_item_name), + pos(a_pos), + geom(a_geom) + { + scale = true; + } + ImageDrawSpec(const std::string &a_name, + const v2s32 &a_pos, const v2s32 &a_geom): name(a_name), pos(a_pos), geom(a_geom) @@ -151,13 +161,14 @@ class GUIFormSpecMenu : public GUIModalMenu scale = true; } ImageDrawSpec(const std::string &a_name, - v2s32 a_pos): + const v2s32 &a_pos): name(a_name), pos(a_pos) { scale = false; } std::string name; + std::string item_name; v2s32 pos; v2s32 geom; bool scale; @@ -282,7 +293,7 @@ public: void regenerateGui(v2u32 screensize); ItemSpec getItemAtPos(v2s32 p) const; - void drawList(const ListDrawSpec &s, int phase); + void drawList(const ListDrawSpec &s, int phase, bool &item_hovered); void drawSelectedItem(); void drawMenu(); void updateSelectedItem(); @@ -334,6 +345,8 @@ protected: std::vector > m_scrollbars; ItemSpec *m_selected_item; + f32 m_timer1; + f32 m_timer2; u32 m_selected_amount; bool m_selected_dragging; @@ -373,6 +386,7 @@ private: TextDest *m_text_dst; unsigned int m_formspec_version; std::string m_focused_element; + bool m_selection_active; typedef struct { bool explicit_size; diff --git a/src/hud.cpp b/src/hud.cpp index d1313089..2d22f963 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -82,8 +82,9 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr, use_hotbar_selected_image = false; } -void Hud::drawItem(const ItemStack &item, const core::rect& rect, bool selected) { - +void Hud::drawItem(const ItemStack &item, const core::rect& rect, + bool selected) +{ if (selected) { /* draw hihlighting around selected item */ if (use_hotbar_selected_image) { @@ -154,7 +155,8 @@ void Hud::drawItem(const ItemStack &item, const core::rect& rect, bool sele video::SColor bgcolor2(128, 0, 0, 0); if (!use_hotbar_image) driver->draw2DRectangle(bgcolor2, rect, NULL); - drawItemStack(driver, g_fontengine->getFont(), item, rect, NULL, gamedef); + drawItemStack(driver, g_fontengine->getFont(), item, rect, NULL, + gamedef, selected, false, false); } //NOTE: selectitem = 0 -> no selected; selectitem 1-based @@ -489,23 +491,90 @@ void drawItemStack(video::IVideoDriver *driver, const ItemStack &item, const core::rect &rect, const core::rect *clip, - IGameDef *gamedef) + IGameDef *gamedef, + bool selected, + bool hovered, + bool dragged) { - if(item.empty()) + static s32 hovered_time; + static s32 selected_time; + static s32 dragged_time; + static scene::IMesh *hovered_mesh; + static scene::IMesh *selected_mesh; + static scene::IMesh *dragged_mesh; + bool enable_animations = + g_settings->getBool("inventory_items_animations"); + + if (item.empty()) { + if (selected) { + selected_mesh = NULL; + } else if (hovered) { + hovered_mesh = NULL; + } else if (dragged) { + dragged_mesh = NULL; + } return; + } const ItemDefinition &def = item.getDefinition(gamedef->idef()); - video::ITexture *texture = gamedef->idef()->getInventoryTexture(def.name, gamedef); + scene::IMesh* mesh = gamedef->idef()->getWieldMesh(def.name, gamedef); - // Draw the inventory texture - if(texture != NULL) - { - const video::SColor color(255,255,255,255); - const video::SColor colors[] = {color,color,color,color}; - draw2DImageFilterScaled(driver, texture, rect, - core::rect(core::position2d(0,0), - core::dimension2di(texture->getOriginalSize())), - clip, colors, true); + if (mesh) { + driver->clearZBuffer(); + s32 delta = 0; + if (selected) { + if (mesh != selected_mesh) { + selected_mesh = mesh; + selected_time = getTimeMs(); + } else { + delta = porting::getDeltaMs(selected_time, getTimeMs()) % 100000; + } + } else if (hovered) { + if (mesh != hovered_mesh) { + hovered_mesh = mesh; + hovered_time = getTimeMs(); + } else { + delta = porting::getDeltaMs(hovered_time, getTimeMs()) % 100000; + } + } else if (dragged) { + if (mesh != dragged_mesh) { + dragged_mesh = mesh; + dragged_time = getTimeMs(); + } else { + delta = porting::getDeltaMs(dragged_time, getTimeMs()) % 100000; + } + } + core::rect oldViewPort = driver->getViewPort(); + core::matrix4 oldProjMat = driver->getTransform(video::ETS_PROJECTION); + core::matrix4 oldViewMat = driver->getTransform(video::ETS_VIEW); + core::matrix4 ProjMatrix; + ProjMatrix.buildProjectionMatrixOrthoLH(2, 2, -1, 100); + driver->setTransform(video::ETS_PROJECTION, ProjMatrix); + driver->setTransform(video::ETS_VIEW, ProjMatrix); + core::matrix4 matrix; + matrix.makeIdentity(); + + if (enable_animations) { + float timer_f = (float)delta / 5000.0; + matrix.setRotationDegrees(core::vector3df(0, 360 * timer_f, 0)); + } + + driver->setTransform(video::ETS_WORLD, matrix); + driver->setViewPort(rect); + + u32 mc = mesh->getMeshBufferCount(); + for (u32 j = 0; j < mc; ++j) { + scene::IMeshBuffer *buf = mesh->getMeshBuffer(j); + video::SMaterial &material = buf->getMaterial(); + material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; + material.Lighting = false; + driver->setMaterial(material); + driver->drawMeshBuffer(buf); + } + + driver->setTransform(video::ETS_VIEW, oldViewMat); + driver->setTransform(video::ETS_PROJECTION, oldProjMat); + driver->setViewPort(oldViewPort); } if(def.type == ITEM_TOOL && item.wear != 0) diff --git a/src/hud.h b/src/hud.h index 65453aec..88e7181d 100644 --- a/src/hud.h +++ b/src/hud.h @@ -137,7 +137,8 @@ private: void drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset, InventoryList *mainlist, u16 selectitem, u16 direction); - void drawItem(const ItemStack &item, const core::rect& rect, bool selected); + void drawItem(const ItemStack &item, const core::rect& rect, + bool selected); v2u32 m_screensize; v2s32 m_displaycenter; @@ -151,8 +152,10 @@ void drawItemStack(video::IVideoDriver *driver, const ItemStack &item, const core::rect &rect, const core::rect *clip, - IGameDef *gamedef); - + IGameDef *gamedef, + bool selected, + bool hovered, + bool dragged); #endif diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 60a7dc64..a618ad63 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -332,7 +332,6 @@ public: return cc; ITextureSource *tsrc = gamedef->getTextureSource(); - INodeDefManager *nodedef = gamedef->getNodeDefManager(); const ItemDefinition &def = get(name); // Create new ClientCached @@ -343,103 +342,11 @@ public: if(def.inventory_image != "") cc->inventory_texture = tsrc->getTexture(def.inventory_image); - // Additional processing for nodes: - // - Create a wield mesh if WieldMeshSceneNode can't render - // the node on its own. - // - If inventory_texture isn't set yet, create one using - // render-to-texture. - if (def.type == ITEM_NODE) { - // Get node properties - content_t id = nodedef->getId(name); - const ContentFeatures &f = nodedef->get(id); + ItemStack item = ItemStack(); + item.name = def.name; - bool need_rtt_mesh = cc->inventory_texture == NULL; - - // Keep this in sync with WieldMeshSceneNode::setItem() - bool need_wield_mesh = - !(f.mesh_ptr[0] || - f.drawtype == NDT_NORMAL || - f.drawtype == NDT_ALLFACES || - f.drawtype == NDT_AIRLIKE); - - scene::IMesh *node_mesh = NULL; - - if (need_rtt_mesh || need_wield_mesh) { - u8 param1 = 0; - if (f.param_type == CPT_LIGHT) - param1 = 0xee; - - /* - Make a mesh from the node - */ - MeshMakeData mesh_make_data(gamedef, false); - u8 param2 = 0; - if (f.param_type_2 == CPT2_WALLMOUNTED) - param2 = 1; - MapNode mesh_make_node(id, param1, param2); - mesh_make_data.fillSingleNode(&mesh_make_node); - MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); - node_mesh = mapblock_mesh.getMesh(); - node_mesh->grab(); - video::SColor c(255, 255, 255, 255); - setMeshColor(node_mesh, c); - - // scale and translate the mesh so it's a - // unit cube centered on the origin - scaleMesh(node_mesh, v3f(1.0/BS, 1.0/BS, 1.0/BS)); - translateMesh(node_mesh, v3f(-1.0, -1.0, -1.0)); - } - - /* - Draw node mesh into a render target texture - */ - if (need_rtt_mesh) { - TextureFromMeshParams params; - params.mesh = node_mesh; - params.dim.set(64, 64); - params.rtt_texture_name = "INVENTORY_" - + def.name + "_RTT"; - params.delete_texture_on_shutdown = true; - params.camera_position.set(0, 1.0, -1.5); - params.camera_position.rotateXZBy(45); - params.camera_lookat.set(0, 0, 0); - // Set orthogonal projection - params.camera_projection_matrix.buildProjectionMatrixOrthoLH( - 1.65, 1.65, 0, 100); - params.ambient_light.set(1.0, 0.2, 0.2, 0.2); - params.light_position.set(10, 100, -50); - params.light_color.set(1.0, 0.5, 0.5, 0.5); - params.light_radius = 1000; - -#ifdef __ANDROID__ - params.camera_position.set(0, -1.0, -1.5); - params.camera_position.rotateXZBy(45); - params.light_position.set(10, -100, -50); -#endif - cc->inventory_texture = - tsrc->generateTextureFromMesh(params); - - // render-to-target didn't work - if (cc->inventory_texture == NULL) { - cc->inventory_texture = - tsrc->getTexture(f.tiledef[0].name); - } - } - - /* - Use the node mesh as the wield mesh - */ - if (need_wield_mesh) { - cc->wield_mesh = node_mesh; - cc->wield_mesh->grab(); - - // no way reference count can be smaller than 2 in this place! - assert(cc->wield_mesh->getReferenceCount() >= 2); - } - - if (node_mesh) - node_mesh->drop(); - } + scene::IMesh *mesh = getItemMesh(gamedef, item); + cc->wield_mesh = mesh; // Put in cache m_clientcached.set(name, cc); diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp index a022754a..3e2483b5 100644 --- a/src/wieldmesh.cpp +++ b/src/wieldmesh.cpp @@ -114,9 +114,7 @@ static scene::IMesh *createExtrusionMesh(int resolution_x, int resolution_y) mesh->addMeshBuffer(buf); buf->drop(); scaleMesh(mesh, scale); // also recalculates bounding box - scene::IMesh *newmesh = createForsythOptimizedMesh(mesh); - mesh->drop(); - return newmesh; + return mesh; } /* @@ -436,3 +434,116 @@ void WieldMeshSceneNode::changeToMesh(scene::IMesh *mesh) m_meshnode->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, m_lighting); m_meshnode->setVisible(true); } + +scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item) +{ + ITextureSource *tsrc = gamedef->getTextureSource(); + IItemDefManager *idef = gamedef->getItemDefManager(); + INodeDefManager *ndef = gamedef->getNodeDefManager(); + const ItemDefinition &def = item.getDefinition(idef); + const ContentFeatures &f = ndef->get(def.name); + content_t id = ndef->getId(def.name); + + if (!g_extrusion_mesh_cache) { + g_extrusion_mesh_cache = new ExtrusionMeshCache(); + } else { + g_extrusion_mesh_cache->grab(); + } + + scene::IMesh *mesh; + + // If wield_image is defined, it overrides everything else + if (def.wield_image != "") { + mesh = getExtrudedMesh(tsrc, def.wield_image); + return mesh; + } else if (def.inventory_image != "") { + mesh = getExtrudedMesh(tsrc, def.inventory_image); + return mesh; + } else if (def.type == ITEM_NODE) { + if (f.mesh_ptr[0]) { + mesh = cloneMesh(f.mesh_ptr[0]); + scaleMesh(mesh, v3f(0.12, 0.12, 0.12)); + setMeshColor(mesh, video::SColor (255, 255, 255, 255)); + } else if (f.drawtype == NDT_PLANTLIKE) { + mesh = getExtrudedMesh(tsrc, + tsrc->getTextureName(f.tiles[0].texture_id)); + return mesh; + } else if (f.drawtype == NDT_NORMAL || f.drawtype == NDT_ALLFACES + || f.drawtype == NDT_LIQUID || f.drawtype == NDT_FLOWINGLIQUID) { + mesh = cloneMesh(g_extrusion_mesh_cache->createCube()); + scaleMesh(mesh, v3f(1.2, 1.2, 1.2)); + } else { + MeshMakeData mesh_make_data(gamedef, false); + MapNode mesh_make_node(id, 255, 0); + mesh_make_data.fillSingleNode(&mesh_make_node); + MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0)); + mesh = cloneMesh(mapblock_mesh.getMesh()); + translateMesh(mesh, v3f(-BS, -BS, -BS)); + scaleMesh(mesh, v3f(0.12, 0.12, 0.12)); + rotateMeshXZby(mesh, -45); + rotateMeshYZby(mesh, -30); + + u32 mc = mesh->getMeshBufferCount(); + for (u32 i = 0; i < mc; ++i) { + video::SMaterial &material1 = + mesh->getMeshBuffer(i)->getMaterial(); + video::SMaterial &material2 = + mapblock_mesh.getMesh()->getMeshBuffer(i)->getMaterial(); + material1.setTexture(0, material2.getTexture(0)); + material1.setTexture(1, material2.getTexture(1)); + material1.setTexture(2, material2.getTexture(2)); + material1.setTexture(3, material2.getTexture(3)); + material1.MaterialType = material2.MaterialType; + } + return mesh; + } + + shadeMeshFaces(mesh); + rotateMeshXZby(mesh, -45); + rotateMeshYZby(mesh, -30); + + u32 mc = mesh->getMeshBufferCount(); + for (u32 i = 0; i < mc; ++i) { + video::SMaterial &material = mesh->getMeshBuffer(i)->getMaterial(); + material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; + material.setFlag(video::EMF_BILINEAR_FILTER, false); + material.setFlag(video::EMF_TRILINEAR_FILTER, false); + material.setFlag(video::EMF_BACK_FACE_CULLING, true); + material.setFlag(video::EMF_LIGHTING, false); + if (f.tiles[i].animation_frame_count > 1) { + FrameSpec animation_frame = f.tiles[i].frames[0]; + material.setTexture(0, animation_frame.texture); + } else { + material.setTexture(0, f.tiles[i].texture); + } + } + return mesh; + } + return NULL; +} + +scene::IMesh * getExtrudedMesh(ITextureSource *tsrc, + const std::string &imagename) +{ + video::ITexture *texture = tsrc->getTextureForMesh(imagename); + if (!texture) { + return NULL; + } + + core::dimension2d dim = texture->getSize(); + scene::IMesh *mesh = cloneMesh(g_extrusion_mesh_cache->create(dim)); + + // Customize material + video::SMaterial &material = mesh->getMeshBuffer(0)->getMaterial(); + material.setTexture(0, tsrc->getTexture(imagename)); + material.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE; + material.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE; + material.setFlag(video::EMF_BILINEAR_FILTER, false); + material.setFlag(video::EMF_TRILINEAR_FILTER, false); + material.setFlag(video::EMF_BACK_FACE_CULLING, true); + material.setFlag(video::EMF_LIGHTING, false); + material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; + scaleMesh(mesh, v3f(2.0, 2.0, 2.0)); + + return mesh; +} diff --git a/src/wieldmesh.h b/src/wieldmesh.h index 3f4f4fc0..c29c06f9 100644 --- a/src/wieldmesh.h +++ b/src/wieldmesh.h @@ -77,4 +77,8 @@ private: core::aabbox3d m_bounding_box; }; +scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item); + +scene::IMesh *getExtrudedMesh(ITextureSource *tsrc, + const std::string &imagename); #endif From 16c70087711db38ac40a428c64623355b8e7691b Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 7 Feb 2016 20:27:50 +0100 Subject: [PATCH 241/531] small drawItemStack cleanup -> Replace the three bool params with an enum -> Add struct for the static content, leads to less repetition -> cache enable_animations setting --- src/guiFormSpecMenu.cpp | 12 ++++++---- src/hud.cpp | 53 +++++++++++++---------------------------- src/hud.h | 11 ++++++--- 3 files changed, 32 insertions(+), 44 deletions(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 4784d731..116688e9 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2196,6 +2196,8 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, && m_selected_item->listname == s.listname && m_selected_item->i == item_i; bool hovering = rect.isPointInside(m_pointer); + ItemRotationKind rotation_kind = selected ? IT_ROT_SELECTED : + (hovering ? IT_ROT_HOVERED : IT_ROT_NONE); if (phase == 0) { if (hovering) { @@ -2238,7 +2240,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, { drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect, m_gamedef, - selected, hovering, false); + rotation_kind); } // Draw tooltip @@ -2284,7 +2286,7 @@ void GUIFormSpecMenu::drawSelectedItem() if (!m_selected_item) { drawItemStack(driver, m_font, ItemStack(), core::rect(v2s32(0, 0), v2s32(0, 0)), - NULL, m_gamedef, false, false, true); + NULL, m_gamedef, IT_ROT_DRAGGED); return; } @@ -2297,7 +2299,7 @@ void GUIFormSpecMenu::drawSelectedItem() core::rect imgrect(0,0,imgsize.X,imgsize.Y); core::rect rect = imgrect + (m_pointer - imgrect.getCenter()); - drawItemStack(driver, m_font, stack, rect, NULL, m_gamedef, false, false, true); + drawItemStack(driver, m_font, stack, rect, NULL, m_gamedef, IT_ROT_DRAGGED); } void GUIFormSpecMenu::drawMenu() @@ -2434,7 +2436,7 @@ void GUIFormSpecMenu::drawMenu() // Viewport rectangle on screen core::rect rect = imgrect + spec.pos; drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect, - m_gamedef, false, false, false); + m_gamedef, IT_ROT_NONE); } /* @@ -2452,7 +2454,7 @@ void GUIFormSpecMenu::drawMenu() if (!item_hovered) { drawItemStack(driver, m_font, ItemStack(), core::rect(v2s32(0, 0), v2s32(0, 0)), - NULL, m_gamedef, false, true, false); + NULL, m_gamedef, IT_ROT_HOVERED); } /* TODO find way to show tooltips on touchscreen */ diff --git a/src/hud.cpp b/src/hud.cpp index 2d22f963..1c144b02 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -156,7 +156,7 @@ void Hud::drawItem(const ItemStack &item, const core::rect& rect, if (!use_hotbar_image) driver->draw2DRectangle(bgcolor2, rect, NULL); drawItemStack(driver, g_fontengine->getFont(), item, rect, NULL, - gamedef, selected, false, false); + gamedef, selected ? IT_ROT_SELECTED : IT_ROT_NONE); } //NOTE: selectitem = 0 -> no selected; selectitem 1-based @@ -486,32 +486,26 @@ void Hud::resizeHotbar() { } } +struct MeshTimeInfo { + s32 time; + scene::IMesh *mesh; +}; + void drawItemStack(video::IVideoDriver *driver, gui::IGUIFont *font, const ItemStack &item, const core::rect &rect, const core::rect *clip, IGameDef *gamedef, - bool selected, - bool hovered, - bool dragged) + ItemRotationKind rotation_kind) { - static s32 hovered_time; - static s32 selected_time; - static s32 dragged_time; - static scene::IMesh *hovered_mesh; - static scene::IMesh *selected_mesh; - static scene::IMesh *dragged_mesh; - bool enable_animations = + static MeshTimeInfo rotation_time_infos[IT_ROT_NONE]; + static bool enable_animations = g_settings->getBool("inventory_items_animations"); if (item.empty()) { - if (selected) { - selected_mesh = NULL; - } else if (hovered) { - hovered_mesh = NULL; - } else if (dragged) { - dragged_mesh = NULL; + if (rotation_kind < IT_ROT_NONE) { + rotation_time_infos[rotation_kind].mesh = NULL; } return; } @@ -522,26 +516,13 @@ void drawItemStack(video::IVideoDriver *driver, if (mesh) { driver->clearZBuffer(); s32 delta = 0; - if (selected) { - if (mesh != selected_mesh) { - selected_mesh = mesh; - selected_time = getTimeMs(); + if (rotation_kind < IT_ROT_NONE) { + MeshTimeInfo &ti = rotation_time_infos[rotation_kind]; + if (mesh != ti.mesh) { + ti.mesh = mesh; + ti.time = getTimeMs(); } else { - delta = porting::getDeltaMs(selected_time, getTimeMs()) % 100000; - } - } else if (hovered) { - if (mesh != hovered_mesh) { - hovered_mesh = mesh; - hovered_time = getTimeMs(); - } else { - delta = porting::getDeltaMs(hovered_time, getTimeMs()) % 100000; - } - } else if (dragged) { - if (mesh != dragged_mesh) { - dragged_mesh = mesh; - dragged_time = getTimeMs(); - } else { - delta = porting::getDeltaMs(dragged_time, getTimeMs()) % 100000; + delta = porting::getDeltaMs(ti.time, getTimeMs()) % 100000; } } core::rect oldViewPort = driver->getViewPort(); diff --git a/src/hud.h b/src/hud.h index 88e7181d..f373d4fe 100644 --- a/src/hud.h +++ b/src/hud.h @@ -147,15 +147,20 @@ private: video::SColor hbar_colors[4]; }; +enum ItemRotationKind { + IT_ROT_SELECTED, + IT_ROT_HOVERED, + IT_ROT_DRAGGED, + IT_ROT_NONE, // Must be last, also serves as number +}; + void drawItemStack(video::IVideoDriver *driver, gui::IGUIFont *font, const ItemStack &item, const core::rect &rect, const core::rect *clip, IGameDef *gamedef, - bool selected, - bool hovered, - bool dragged); + ItemRotationKind rotation_kind); #endif From 430195381d8d7254a7b8cdcf6b50769c2c598329 Mon Sep 17 00:00:00 2001 From: Diego Martinez Date: Thu, 4 Feb 2016 09:58:44 -0300 Subject: [PATCH 242/531] builtin: Fix `print` crashing on nil "holes". The engine implementation of `print` packs the varargs into a table and passes the table directly to `table.concat`. If you pass any value not supported by `table.concat` (particularly `nil`), the server crashes. This is unexpected behavior, as `print` is supposed to be able to work with anything. This patch changes the implementation so it first converts all arguments using `tostring`, which fixes the issue and makes the custom `print` function compatible with the stock Lua behavior. --- builtin/init.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/init.lua b/builtin/init.lua index b3004468..6b27cf76 100644 --- a/builtin/init.lua +++ b/builtin/init.lua @@ -12,7 +12,11 @@ if core.print then -- Override native print and use -- terminal if that's turned on function print(...) - core_print(table.concat({...}, "\t")) + local n, t = select("#", ...), { ... } + for i = 1, n do + t[i] = tostring(t[i]) + end + core_print(table.concat(t, "\t")) end core.print = nil -- don't pollute our namespace end From b44da4916aa09b27155ce6675cccbcc128b5a66c Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sun, 7 Feb 2016 04:08:43 +0100 Subject: [PATCH 243/531] Cleanup selection mesh code, add shaders for halo and selection boxes --- builtin/settingtypes.txt | 6 +- .../default_shader/opengl_fragment.glsl | 4 + .../shaders/default_shader/opengl_vertex.glsl | 9 ++ .../selection_shader/opengl_fragment.glsl | 9 ++ .../selection_shader/opengl_vertex.glsl | 9 ++ minetest.conf.example | 6 +- src/client.cpp | 12 -- src/client.h | 5 - src/content_mapblock.cpp | 51 -------- src/defaultsettings.cpp | 6 +- src/drawscene.cpp | 120 +++++++---------- src/drawscene.h | 8 +- src/game.cpp | 123 ++++++++++-------- src/hud.cpp | 118 ++++++++++++++++- src/hud.h | 30 ++++- src/mapblock_mesh.cpp | 62 ++------- src/mapblock_mesh.h | 11 -- src/mesh.cpp | 42 +++--- src/mesh.h | 7 +- src/nodedef.cpp | 2 +- textures/base/pack/halo.png | Bin 83 -> 144 bytes 21 files changed, 336 insertions(+), 304 deletions(-) create mode 100644 client/shaders/default_shader/opengl_fragment.glsl create mode 100644 client/shaders/default_shader/opengl_vertex.glsl create mode 100644 client/shaders/selection_shader/opengl_fragment.glsl create mode 100644 client/shaders/selection_shader/opengl_vertex.glsl diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 1ca5f16d..79a64c2d 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -279,6 +279,9 @@ enable_clouds (Clouds) bool true # Use 3D cloud look instead of flat. enable_3d_clouds (3D clouds) bool true +# Method used to highlight selected object. +node_highlighting (Node highlighting) enum box box,halo + [***Filtering] # Use mip mapping to scale textures. May slightly increase performance. @@ -482,9 +485,6 @@ desynchronize_mapblock_texture_animation (Desynchronize block animation) bool tr # Useful if there's something to be displayed right or left of hotbar. hud_hotbar_max_width (Maximum hotbar width) float 1.0 -# Enable selection highlighting for nodes (disables selectionbox). -enable_node_highlighting (Node highlighting) bool false - # Enables caching of facedir rotated meshes. enable_mesh_cache (Mesh cache) bool false diff --git a/client/shaders/default_shader/opengl_fragment.glsl b/client/shaders/default_shader/opengl_fragment.glsl new file mode 100644 index 00000000..925ab6e1 --- /dev/null +++ b/client/shaders/default_shader/opengl_fragment.glsl @@ -0,0 +1,4 @@ +void main(void) +{ + gl_FragColor = gl_Color; +} diff --git a/client/shaders/default_shader/opengl_vertex.glsl b/client/shaders/default_shader/opengl_vertex.glsl new file mode 100644 index 00000000..0f460917 --- /dev/null +++ b/client/shaders/default_shader/opengl_vertex.glsl @@ -0,0 +1,9 @@ +uniform mat4 mWorldViewProj; + +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_Position = mWorldViewProj * gl_Vertex; + + gl_FrontColor = gl_BackColor = gl_Color; +} diff --git a/client/shaders/selection_shader/opengl_fragment.glsl b/client/shaders/selection_shader/opengl_fragment.glsl new file mode 100644 index 00000000..c679d0e1 --- /dev/null +++ b/client/shaders/selection_shader/opengl_fragment.glsl @@ -0,0 +1,9 @@ +uniform sampler2D baseTexture; + +void main(void) +{ + vec2 uv = gl_TexCoord[0].st; + vec4 color = texture2D(baseTexture, uv); + color.rgb *= gl_Color.rgb; + gl_FragColor = color; +} diff --git a/client/shaders/selection_shader/opengl_vertex.glsl b/client/shaders/selection_shader/opengl_vertex.glsl new file mode 100644 index 00000000..0f460917 --- /dev/null +++ b/client/shaders/selection_shader/opengl_vertex.glsl @@ -0,0 +1,9 @@ +uniform mat4 mWorldViewProj; + +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_Position = mWorldViewProj * gl_Vertex; + + gl_FrontColor = gl_BackColor = gl_Color; +} diff --git a/minetest.conf.example b/minetest.conf.example index 198b9323..1bf56720 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -555,9 +555,9 @@ # type: float # hud_hotbar_max_width = 1.0 -# Enable selection highlighting for nodes (disables selectionbox). -# type: bool -# enable_node_highlighting = false +# Selection highlighting method (box or halo) +# type: string +# node_highlighting = box # Enables caching of facedir rotated meshes. # type: bool diff --git a/src/client.cpp b/src/client.cpp index 8e49ee3b..a845277b 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -235,11 +235,9 @@ Client::Client( m_inventory_updated(false), m_inventory_from_server(NULL), m_inventory_from_server_age(0.0), - m_show_highlighted(false), m_animation_time(0), m_crack_level(-1), m_crack_pos(0,0,0), - m_highlighted_pos(0,0,0), m_map_seed(0), m_password(password), m_chosen_auth_mech(AUTH_MECHANISM_NONE), @@ -1508,15 +1506,6 @@ int Client::getCrackLevel() return m_crack_level; } -void Client::setHighlighted(v3s16 pos, bool show_highlighted) -{ - m_show_highlighted = show_highlighted; - v3s16 old_highlighted_pos = m_highlighted_pos; - m_highlighted_pos = pos; - addUpdateMeshTaskForNode(old_highlighted_pos, false, true); - addUpdateMeshTaskForNode(m_highlighted_pos, false, true); -} - void Client::setCrack(int level, v3s16 pos) { int old_crack_level = m_crack_level; @@ -1601,7 +1590,6 @@ void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent) // Debug: 1-6ms, avg=2ms data->fill(b); data->setCrack(m_crack_level, m_crack_pos); - data->setHighlighted(m_highlighted_pos, m_show_highlighted); data->setSmoothLighting(m_cache_smooth_lighting); } diff --git a/src/client.h b/src/client.h index 07fb79dc..98a8bc12 100644 --- a/src/client.h +++ b/src/client.h @@ -456,9 +456,6 @@ public: int getCrackLevel(); void setCrack(int level, v3s16 pos); - void setHighlighted(v3s16 pos, bool show_higlighted); - v3s16 getHighlighted(){ return m_highlighted_pos; } - u16 getHP(); u16 getBreath(); @@ -609,12 +606,10 @@ private: Inventory *m_inventory_from_server; float m_inventory_from_server_age; PacketCounter m_packetcounter; - bool m_show_highlighted; // Block mesh animation parameters float m_animation_time; int m_crack_level; v3s16 m_crack_pos; - v3s16 m_highlighted_pos; // 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT //s32 m_daynight_i; //u32 m_daynight_ratio; diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index 01a06b6c..ab8091de 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -171,7 +171,6 @@ void mapblock_mesh_generate_special(MeshMakeData *data, MeshCollector &collector) { INodeDefManager *nodedef = data->m_gamedef->ndef(); - ITextureSource *tsrc = data->m_gamedef->tsrc(); scene::ISceneManager* smgr = data->m_gamedef->getSceneManager(); scene::IMeshManipulator* meshmanip = smgr->getMeshManipulator(); @@ -1615,55 +1614,5 @@ void mapblock_mesh_generate_special(MeshMakeData *data, break;} } } - - /* - Caused by incorrect alpha blending, selection mesh needs to be created as - last element to ensure it gets blended correct over nodes with alpha channel - */ - // Create selection mesh - v3s16 p = data->m_highlighted_pos_relative; - if (data->m_show_hud && - (p.X >= 0) && (p.X < MAP_BLOCKSIZE) && - (p.Y >= 0) && (p.Y < MAP_BLOCKSIZE) && - (p.Z >= 0) && (p.Z < MAP_BLOCKSIZE)) { - - MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes + p); - if(n.getContent() != CONTENT_AIR) { - // Get selection mesh light level - static const v3s16 dirs[7] = { - v3s16( 0, 0, 0), - v3s16( 0, 1, 0), - v3s16( 0,-1, 0), - v3s16( 1, 0, 0), - v3s16(-1, 0, 0), - v3s16( 0, 0, 1), - v3s16( 0, 0,-1) - }; - - u16 l = 0; - u16 l1 = 0; - for (u8 i = 0; i < 7; i++) { - MapNode n1 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p + dirs[i]); - l1 = getInteriorLight(n1, -4, nodedef); - if (l1 > l) - l = l1; - } - video::SColor c = MapBlock_LightColor(255, l, 0); - data->m_highlight_mesh_color = c; - std::vector boxes = n.getSelectionBoxes(nodedef); - TileSpec h_tile; - h_tile.material_flags |= MATERIAL_FLAG_HIGHLIGHTED; - h_tile.texture = tsrc->getTextureForMesh("halo.png",&h_tile.texture_id); - v3f pos = intToFloat(p, BS); - f32 d = 0.05 * BS; - for (std::vector::iterator i = boxes.begin(); - i != boxes.end(); ++i) { - aabb3f box = *i; - box.MinEdge += v3f(-d, -d, -d) + pos; - box.MaxEdge += v3f(d, d, d) + pos; - makeCuboid(&collector, box, &h_tile, 1, c, NULL); - } - } - } } diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 669987d0..ddd7b5fe 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -137,8 +137,9 @@ void set_default_settings(Settings *settings) settings->setDefault("console_color", "(0,0,0)"); settings->setDefault("console_alpha", "200"); settings->setDefault("selectionbox_color", "(0,0,0)"); - settings->setDefault("enable_node_highlighting", "false"); + settings->setDefault("selectionbox_width", "2"); settings->setDefault("inventory_items_animations", "false"); + settings->setDefault("node_highlighting", "box"); settings->setDefault("crosshair_color", "(255,255,255)"); settings->setDefault("crosshair_alpha", "255"); settings->setDefault("hud_scaling", "1.0"); @@ -149,8 +150,7 @@ void set_default_settings(Settings *settings) settings->setDefault("enable_sound", "true"); settings->setDefault("sound_volume", "0.8"); settings->setDefault("desynchronize_mapblock_texture_animation", "true"); - settings->setDefault("selectionbox_width","2"); - settings->setDefault("hud_hotbar_max_width","1.0"); + settings->setDefault("hud_hotbar_max_width", "1.0"); settings->setDefault("enable_local_map_saving", "false"); settings->setDefault("mip_map", "false"); diff --git a/src/drawscene.cpp b/src/drawscene.cpp index c716ca0d..32eafeb2 100644 --- a/src/drawscene.cpp +++ b/src/drawscene.cpp @@ -31,27 +31,9 @@ typedef enum { EYECOUNT = 2 } paralax_sign; - -void draw_selectionbox(video::IVideoDriver* driver, Hud& hud, - std::vector& hilightboxes, bool show_hud) -{ - static const s16 selectionbox_width = rangelim(g_settings->getS16("selectionbox_width"), 1, 5); - - if (!show_hud) - return; - - video::SMaterial oldmaterial = driver->getMaterial2D(); - video::SMaterial m; - m.Thickness = selectionbox_width; - m.Lighting = false; - driver->setMaterial(m); - hud.drawSelectionBoxes(hilightboxes); - driver->setMaterial(oldmaterial); -} - void draw_anaglyph_3d_mode(Camera& camera, bool show_hud, Hud& hud, - std::vector hilightboxes, video::IVideoDriver* driver, - scene::ISceneManager* smgr, bool draw_wield_tool, Client& client, + video::IVideoDriver* driver, scene::ISceneManager* smgr, + bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv ) { @@ -85,10 +67,8 @@ void draw_anaglyph_3d_mode(Camera& camera, bool show_hud, Hud& hud, camera.getCameraNode()->setTarget(focusPoint); smgr->drawAll(); driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); - if (show_hud) - { - draw_selectionbox(driver, hud, hilightboxes, show_hud); - + if (show_hud) { + hud.drawSelectionMesh(); if (draw_wield_tool) camera.drawWieldedTool(&leftMove); } @@ -115,10 +95,8 @@ void draw_anaglyph_3d_mode(Camera& camera, bool show_hud, Hud& hud, camera.getCameraNode()->setTarget(focusPoint); smgr->drawAll(); driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); - if (show_hud) - { - draw_selectionbox(driver, hud, hilightboxes, show_hud); - + if (show_hud) { + hud.drawSelectionMesh(); if (draw_wield_tool) camera.drawWieldedTool(&rightMove); } @@ -144,16 +122,15 @@ void init_texture(video::IVideoDriver* driver, const v2u32& screensize, irr::video::ECF_A8R8G8B8); } -video::ITexture* draw_image(const v2u32& screensize, - paralax_sign psign, const irr::core::matrix4& startMatrix, - const irr::core::vector3df& focusPoint, bool show_hud, - video::IVideoDriver* driver, Camera& camera, scene::ISceneManager* smgr, - Hud& hud, std::vector& hilightboxes, - bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv, - video::SColor skycolor ) +video::ITexture* draw_image(const v2u32 &screensize, + paralax_sign psign, const irr::core::matrix4 &startMatrix, + const irr::core::vector3df &focusPoint, bool show_hud, + video::IVideoDriver *driver, Camera &camera, scene::ISceneManager *smgr, + Hud &hud, bool draw_wield_tool, Client &client, + gui::IGUIEnvironment *guienv, const video::SColor &skycolor) { static video::ITexture* images[2] = { NULL, NULL }; - static v2u32 last_screensize = v2u32(0,0); + static v2u32 last_screensize = v2u32(0, 0); video::ITexture* image = NULL; @@ -187,10 +164,8 @@ video::ITexture* draw_image(const v2u32& screensize, driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); - if (show_hud) - { - draw_selectionbox(driver, hud, hilightboxes, show_hud); - + if (show_hud) { + hud.drawSelectionMesh(); if (draw_wield_tool) camera.drawWieldedTool(&movement); } @@ -232,7 +207,7 @@ video::ITexture* draw_hud(video::IVideoDriver* driver, const v2u32& screensize, } void draw_interlaced_3d_mode(Camera& camera, bool show_hud, - Hud& hud, std::vector hilightboxes, video::IVideoDriver* driver, + Hud& hud, video::IVideoDriver* driver, scene::ISceneManager* smgr, const v2u32& screensize, bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv, video::SColor skycolor ) @@ -248,7 +223,7 @@ void draw_interlaced_3d_mode(Camera& camera, bool show_hud, /* create left view */ video::ITexture* left_image = draw_image(screensize, LEFT, startMatrix, - focusPoint, show_hud, driver, camera, smgr, hud, hilightboxes, + focusPoint, show_hud, driver, camera, smgr, hud, draw_wield_tool, client, guienv, skycolor); //Right eye... @@ -267,10 +242,8 @@ void draw_interlaced_3d_mode(Camera& camera, bool show_hud, driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); - if (show_hud) - { - draw_selectionbox(driver, hud, hilightboxes, show_hud); - + if (show_hud) { + hud.drawSelectionMesh(); if(draw_wield_tool) camera.drawWieldedTool(&rightMove); } @@ -293,7 +266,7 @@ void draw_interlaced_3d_mode(Camera& camera, bool show_hud, } void draw_sidebyside_3d_mode(Camera& camera, bool show_hud, - Hud& hud, std::vector hilightboxes, video::IVideoDriver* driver, + Hud& hud, video::IVideoDriver* driver, scene::ISceneManager* smgr, const v2u32& screensize, bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv, video::SColor skycolor ) @@ -309,12 +282,12 @@ void draw_sidebyside_3d_mode(Camera& camera, bool show_hud, /* create left view */ video::ITexture* left_image = draw_image(screensize, LEFT, startMatrix, - focusPoint, show_hud, driver, camera, smgr, hud, hilightboxes, + focusPoint, show_hud, driver, camera, smgr, hud, draw_wield_tool, client, guienv, skycolor); /* create right view */ video::ITexture* right_image = draw_image(screensize, RIGHT, startMatrix, - focusPoint, show_hud, driver, camera, smgr, hud, hilightboxes, + focusPoint, show_hud, driver, camera, smgr, hud, draw_wield_tool, client, guienv, skycolor); /* create hud overlay */ @@ -349,7 +322,7 @@ void draw_sidebyside_3d_mode(Camera& camera, bool show_hud, } void draw_top_bottom_3d_mode(Camera& camera, bool show_hud, - Hud& hud, std::vector hilightboxes, video::IVideoDriver* driver, + Hud& hud, video::IVideoDriver* driver, scene::ISceneManager* smgr, const v2u32& screensize, bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv, video::SColor skycolor ) @@ -365,12 +338,12 @@ void draw_top_bottom_3d_mode(Camera& camera, bool show_hud, /* create left view */ video::ITexture* left_image = draw_image(screensize, LEFT, startMatrix, - focusPoint, show_hud, driver, camera, smgr, hud, hilightboxes, + focusPoint, show_hud, driver, camera, smgr, hud, draw_wield_tool, client, guienv, skycolor); /* create right view */ video::ITexture* right_image = draw_image(screensize, RIGHT, startMatrix, - focusPoint, show_hud, driver, camera, smgr, hud, hilightboxes, + focusPoint, show_hud, driver, camera, smgr, hud, draw_wield_tool, client, guienv, skycolor); /* create hud overlay */ @@ -405,7 +378,7 @@ void draw_top_bottom_3d_mode(Camera& camera, bool show_hud, } void draw_pageflip_3d_mode(Camera& camera, bool show_hud, - Hud& hud, std::vector hilightboxes, video::IVideoDriver* driver, + Hud& hud, video::IVideoDriver* driver, scene::ISceneManager* smgr, const v2u32& screensize, bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv, video::SColor skycolor) @@ -438,11 +411,9 @@ void draw_pageflip_3d_mode(Camera& camera, bool show_hud, driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); if (show_hud) { - draw_selectionbox(driver, hud, hilightboxes, show_hud); - + hud.drawSelectionMesh(); if (draw_wield_tool) camera.drawWieldedTool(&leftMove); - hud.drawHotbar(client.getPlayerItem()); hud.drawLuaElements(camera.getOffset()); } @@ -467,11 +438,9 @@ void draw_pageflip_3d_mode(Camera& camera, bool show_hud, driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); if (show_hud) { - draw_selectionbox(driver, hud, hilightboxes, show_hud); - + hud.drawSelectionMesh(); if (draw_wield_tool) camera.drawWieldedTool(&rightMove); - hud.drawHotbar(client.getPlayerItem()); hud.drawLuaElements(camera.getOffset()); } @@ -482,23 +451,24 @@ void draw_pageflip_3d_mode(Camera& camera, bool show_hud, camera.getCameraNode()->setTarget(oldTarget); } -void draw_plain(Camera& camera, bool show_hud, Hud& hud, - std::vector hilightboxes, video::IVideoDriver* driver, - bool draw_wield_tool, Client& client, gui::IGUIEnvironment* guienv) +void draw_plain(Camera &camera, bool show_hud, Hud &hud, + video::IVideoDriver *driver, bool draw_wield_tool, + Client &client, gui::IGUIEnvironment *guienv) { driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); - - draw_selectionbox(driver, hud, hilightboxes, show_hud); - - if(draw_wield_tool) - camera.drawWieldedTool(); + if (show_hud) { + hud.drawSelectionMesh(); + if (draw_wield_tool) { + camera.drawWieldedTool(); + } + } } void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr, Camera &camera, Client& client, LocalPlayer *player, Hud &hud, Mapper &mapper, gui::IGUIEnvironment *guienv, - std::vector hilightboxes, const v2u32 &screensize, - video::SColor skycolor, bool show_hud, bool show_minimap) + const v2u32 &screensize, const video::SColor &skycolor, + bool show_hud, bool show_minimap) { TimeTaker timer("smgr"); @@ -522,37 +492,37 @@ void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr, if (draw_mode == "anaglyph") { - draw_anaglyph_3d_mode(camera, show_hud, hud, hilightboxes, driver, + draw_anaglyph_3d_mode(camera, show_hud, hud, driver, smgr, draw_wield_tool, client, guienv); draw_crosshair = false; } else if (draw_mode == "interlaced") { - draw_interlaced_3d_mode(camera, show_hud, hud, hilightboxes, driver, + draw_interlaced_3d_mode(camera, show_hud, hud, driver, smgr, screensize, draw_wield_tool, client, guienv, skycolor); draw_crosshair = false; } else if (draw_mode == "sidebyside") { - draw_sidebyside_3d_mode(camera, show_hud, hud, hilightboxes, driver, + draw_sidebyside_3d_mode(camera, show_hud, hud, driver, smgr, screensize, draw_wield_tool, client, guienv, skycolor); show_hud = false; } else if (draw_mode == "topbottom") { - draw_top_bottom_3d_mode(camera, show_hud, hud, hilightboxes, driver, + draw_top_bottom_3d_mode(camera, show_hud, hud, driver, smgr, screensize, draw_wield_tool, client, guienv, skycolor); show_hud = false; } else if (draw_mode == "pageflip") { - draw_pageflip_3d_mode(camera, show_hud, hud, hilightboxes, driver, + draw_pageflip_3d_mode(camera, show_hud, hud, driver, smgr, screensize, draw_wield_tool, client, guienv, skycolor); draw_crosshair = false; show_hud = false; } else { - draw_plain(camera, show_hud, hud, hilightboxes, driver, + draw_plain(camera, show_hud, hud, driver, draw_wield_tool, client, guienv); } diff --git a/src/drawscene.h b/src/drawscene.h index 0630f297..364fcd49 100644 --- a/src/drawscene.h +++ b/src/drawscene.h @@ -31,9 +31,9 @@ void draw_load_screen(const std::wstring &text, IrrlichtDevice *device, bool clouds = true); void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr, - Camera &camera, Client &client, LocalPlayer *player, Hud &hud, - Mapper &mapper, gui::IGUIEnvironment *guienv, - std::vector hilightboxes, const v2u32 &screensize, - video::SColor skycolor, bool show_hud, bool show_minimap); + Camera &camera, Client &client, LocalPlayer *player, + Hud &hud, Mapper &mapper, gui::IGUIEnvironment *guienv, + const v2u32 &screensize, const video::SColor &skycolor, + bool show_hud, bool show_minimap); #endif /* DRAWSCENE_H_ */ diff --git a/src/game.cpp b/src/game.cpp index 3902c50b..cae468d4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -57,6 +57,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/pointedthing.h" #include "version.h" #include "minimap.h" +#include "mapblock_mesh.h" #include "sound.h" @@ -288,14 +289,16 @@ inline bool isPointableNode(const MapNode &n, /* Find what the player is pointing at */ -PointedThing getPointedThing(Client *client, v3f player_position, - v3f camera_direction, v3f camera_position, core::line3d shootline, - f32 d, bool liquids_pointable, bool look_for_object, v3s16 camera_offset, - std::vector &hilightboxes, ClientActiveObject *&selected_object) +PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_position, + const v3f &camera_direction, const v3f &camera_position, + core::line3d shootline, f32 d, bool liquids_pointable, + bool look_for_object, const v3s16 &camera_offset, + ClientActiveObject *&selected_object) { PointedThing result; - hilightboxes.clear(); + std::vector *selectionboxes = hud->getSelectionBoxes(); + selectionboxes->clear(); selected_object = NULL; INodeDefManager *nodedef = client->getNodeDefManager(); @@ -316,9 +319,9 @@ PointedThing getPointedThing(Client *client, v3f player_position, assert(selection_box); v3f pos = selected_object->getPosition(); - hilightboxes.push_back(aabb3f( - selection_box->MinEdge + pos - intToFloat(camera_offset, BS), - selection_box->MaxEdge + pos - intToFloat(camera_offset, BS))); + selectionboxes->push_back(aabb3f( + selection_box->MinEdge, selection_box->MaxEdge)); + hud->setSelectionPos(pos, camera_offset); } mindistance = (selected_object->getPosition() - camera_position).getLength(); @@ -414,22 +417,56 @@ PointedThing getPointedThing(Client *client, v3f player_position, result.node_abovesurface = np_above; mindistance = distance; - hilightboxes.clear(); - - if (!g_settings->getBool("enable_node_highlighting")) { - for (std::vector::const_iterator - i2 = boxes.begin(); - i2 != boxes.end(); ++i2) { - aabb3f box = *i2; - box.MinEdge += npf + v3f(-d, -d, -d) - intToFloat(camera_offset, BS); - box.MaxEdge += npf + v3f(d, d, d) - intToFloat(camera_offset, BS); - hilightboxes.push_back(box); - } + selectionboxes->clear(); + for (std::vector::const_iterator + i2 = boxes.begin(); + i2 != boxes.end(); ++i2) { + aabb3f box = *i2; + box.MinEdge += v3f(-d, -d, -d); + box.MaxEdge += v3f(d, d, d); + selectionboxes->push_back(box); } + hud->setSelectionPos(npf, camera_offset); } } } // for coords + // Update selection mesh light level and vertex colors + if (selectionboxes->size() > 0) { + v3f pf = hud->getSelectionPos(); + v3s16 p = floatToInt(pf, BS); + + // Get selection mesh light level + MapNode n = map.getNodeNoEx(p); + u16 node_light = getInteriorLight(n, -1, nodedef); + u16 light_level = node_light; + + for (u8 i = 0; i < 6; i++) { + n = map.getNodeNoEx(p + g_6dirs[i]); + node_light = getInteriorLight(n, -1, nodedef); + if (node_light > light_level) + light_level = node_light; + } + + video::SColor c = MapBlock_LightColor(255, light_level, 0); + u8 day = c.getRed(); + u8 night = c.getGreen(); + u32 daynight_ratio = client->getEnv().getDayNightRatio(); + finalColorBlend(c, day, night, daynight_ratio); + + // Modify final color a bit with time + u32 timer = porting::getTimeMs() % 5000; + float timerf = (float)(irr::core::PI * ((timer / 2500.0) - 0.5)); + float sin_r = 0.08 * sin(timerf); + float sin_g = 0.08 * sin(timerf + irr::core::PI * 0.5); + float sin_b = 0.08 * sin(timerf + irr::core::PI); + c.setRed(core::clamp(core::round32(c.getRed() * (0.8 + sin_r)), 0, 255)); + c.setGreen(core::clamp(core::round32(c.getGreen() * (0.8 + sin_g)), 0, 255)); + c.setBlue(core::clamp(core::round32(c.getBlue() * (0.8 + sin_b)), 0, 255)); + + // Set mesh final color + hud->setSelectionMeshColor(c); + } return result; } @@ -1522,8 +1559,7 @@ protected: void updateCamera(VolatileRunFlags *flags, u32 busy_time, f32 dtime, float time_from_last_punch); void updateSound(f32 dtime); - void processPlayerInteraction(std::vector &highlight_boxes, - GameRunData *runData, f32 dtime, bool show_hud, + void processPlayerInteraction(GameRunData *runData, f32 dtime, bool show_hud, bool show_debug); void handlePointingAtNothing(GameRunData *runData, const ItemStack &playerItem); void handlePointingAtNode(GameRunData *runData, @@ -1535,8 +1571,7 @@ protected: void handleDigging(GameRunData *runData, const PointedThing &pointed, const v3s16 &nodepos, const ToolCapabilities &playeritem_toolcap, f32 dtime); - void updateFrame(std::vector &highlight_boxes, ProfilerGraph *graph, - RunStats *stats, GameRunData *runData, + void updateFrame(ProfilerGraph *graph, RunStats *stats, GameRunData *runData, f32 dtime, const VolatileRunFlags &flags, const CameraOrientation &cam); void updateGui(float *statustext_time, const RunStats &stats, const GameRunData& runData, f32 dtime, const VolatileRunFlags &flags, @@ -1630,7 +1665,6 @@ private: * a later release. */ bool m_cache_doubletap_jump; - bool m_cache_enable_node_highlighting; bool m_cache_enable_clouds; bool m_cache_enable_particles; bool m_cache_enable_fog; @@ -1668,8 +1702,6 @@ Game::Game() : { g_settings->registerChangedCallback("doubletap_jump", &settingChangedCallback, this); - g_settings->registerChangedCallback("enable_node_highlighting", - &settingChangedCallback, this); g_settings->registerChangedCallback("enable_clouds", &settingChangedCallback, this); g_settings->registerChangedCallback("enable_particles", @@ -1719,8 +1751,6 @@ Game::~Game() g_settings->deregisterChangedCallback("doubletap_jump", &settingChangedCallback, this); - g_settings->deregisterChangedCallback("enable_node_highlighting", - &settingChangedCallback, this); g_settings->deregisterChangedCallback("enable_clouds", &settingChangedCallback, this); g_settings->deregisterChangedCallback("enable_particles", @@ -1807,8 +1837,6 @@ void Game::run() &runData.fog_range, client)); - std::vector highlight_boxes; - set_light_table(g_settings->getFloat("display_gamma")); #ifdef __ANDROID__ @@ -1858,10 +1886,9 @@ void Game::run() updateCamera(&flags, draw_times.busy_time, dtime, runData.time_from_last_punch); updateSound(dtime); - processPlayerInteraction(highlight_boxes, &runData, dtime, - flags.show_hud, flags.show_debug); - updateFrame(highlight_boxes, &graph, &stats, &runData, dtime, - flags, cam_view); + processPlayerInteraction(&runData, dtime, flags.show_hud, + flags.show_debug); + updateFrame(&graph, &stats, &runData, dtime, flags, cam_view); updateProfilerGraphs(&graph); // Update if minimap has been disabled by the server @@ -2888,8 +2915,6 @@ void Game::toggleHud(float *statustext_time, bool *flag) *flag = !*flag; *statustext_time = 0; statustext = msg[*flag]; - if (g_settings->getBool("enable_node_highlighting")) - client->setHighlighted(client->getHighlighted(), *flag); } void Game::toggleMinimap(float *statustext_time, bool *flag, @@ -3475,8 +3500,8 @@ void Game::updateSound(f32 dtime) } -void Game::processPlayerInteraction(std::vector &highlight_boxes, - GameRunData *runData, f32 dtime, bool show_hud, bool show_debug) +void Game::processPlayerInteraction(GameRunData *runData, + f32 dtime, bool show_hud, bool show_debug) { LocalPlayer *player = client->getEnv().getLocalPlayer(); @@ -3534,25 +3559,17 @@ void Game::processPlayerInteraction(std::vector &highlight_boxes, PointedThing pointed = getPointedThing( // input - client, player_position, camera_direction, + client, hud, player_position, camera_direction, camera_position, shootline, d, playeritem_def.liquids_pointable, !runData->ldown_for_dig, camera_offset, // output - highlight_boxes, runData->selected_object); if (pointed != runData->pointed_old) { infostream << "Pointing at " << pointed.dump() << std::endl; - - if (m_cache_enable_node_highlighting) { - if (pointed.type == POINTEDTHING_NODE) { - client->setHighlighted(pointed.node_undersurface, show_hud); - } else { - client->setHighlighted(pointed.node_undersurface, false); - } - } + hud->updateSelectionMesh(camera_offset); } /* @@ -3576,6 +3593,7 @@ void Game::processPlayerInteraction(std::vector &highlight_boxes, infostream << "Pointing away from node" << " (stopped digging)" << std::endl; runData->digging = false; + hud->updateSelectionMesh(camera_offset); } } @@ -3900,9 +3918,9 @@ void Game::handleDigging(GameRunData *runData, } -void Game::updateFrame(std::vector &highlight_boxes, - ProfilerGraph *graph, RunStats *stats, GameRunData *runData, - f32 dtime, const VolatileRunFlags &flags, const CameraOrientation &cam) +void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, + GameRunData *runData, f32 dtime, const VolatileRunFlags &flags, + const CameraOrientation &cam) { LocalPlayer *player = client->getEnv().getLocalPlayer(); @@ -4094,7 +4112,7 @@ void Game::updateFrame(std::vector &highlight_boxes, } draw_scene(driver, smgr, *camera, *client, player, *hud, *mapper, - guienv, highlight_boxes, screensize, skycolor, flags.show_hud, + guienv, screensize, skycolor, flags.show_hud, flags.show_minimap); /* @@ -4374,7 +4392,6 @@ void Game::settingChangedCallback(const std::string &setting_name, void *data) void Game::readSettings() { m_cache_doubletap_jump = g_settings->getBool("doubletap_jump"); - m_cache_enable_node_highlighting = g_settings->getBool("enable_node_highlighting"); m_cache_enable_clouds = g_settings->getBool("enable_clouds"); m_cache_enable_particles = g_settings->getBool("enable_particles"); m_cache_enable_fog = g_settings->getBool("enable_fog"); diff --git a/src/hud.cpp b/src/hud.cpp index 1c144b02..0a77a1a2 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" #include "fontengine.h" #include "guiscalingfilter.h" +#include "mesh.h" #include #ifdef HAVE_TOUCHSCREENGUI @@ -80,6 +81,39 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr, use_hotbar_image = false; hotbar_selected_image = ""; use_hotbar_selected_image = false; + + m_selection_mesh = NULL; + m_selection_boxes.clear(); + m_selection_pos = v3f(0.0, 0.0, 0.0); + std::string mode = g_settings->get("node_highlighting"); + m_selection_material.Lighting = false; + + if (g_settings->getBool("enable_shaders")) { + IShaderSource *shdrsrc = gamedef->getShaderSource(); + u16 shader_id = shdrsrc->getShader( + mode == "halo" ? "selection_shader" : "default_shader", 1, 1); + m_selection_material.MaterialType = shdrsrc->getShaderInfo(shader_id).material; + } else { + m_selection_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; + } + + if (mode == "box") { + m_use_selection_mesh = false; + m_selection_material.Thickness = + rangelim(g_settings->getS16("selectionbox_width"), 1, 5); + } else if (mode == "halo") { + m_use_selection_mesh = true; + m_selection_material.setTexture(0, tsrc->getTextureForMesh("halo.png")); + m_selection_material.setFlag(video::EMF_BACK_FACE_CULLING, true); + } else { + m_selection_material.MaterialType = video::EMT_SOLID; + } +} + +Hud::~Hud() +{ + if (m_selection_mesh) + m_selection_mesh->drop(); } void Hud::drawItem(const ItemStack &item, const core::rect& rect, @@ -239,7 +273,7 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset, } -void Hud::drawLuaElements(v3s16 camera_offset) { +void Hud::drawLuaElements(const v3s16 &camera_offset) { u32 text_height = g_fontengine->getTextHeight(); irr::gui::IGUIFont* font = g_fontengine->getFont(); for (size_t i = 0; i != player->maxHudId(); i++) { @@ -466,15 +500,85 @@ void Hud::drawCrosshair() { } } - -void Hud::drawSelectionBoxes(std::vector &hilightboxes) { - for (std::vector::const_iterator - i = hilightboxes.begin(); - i != hilightboxes.end(); ++i) { - driver->draw3DBox(*i, selectionbox_argb); +void Hud::setSelectionPos(const v3f &pos, const v3s16 &camera_offset) +{ + m_camera_offset = camera_offset; + m_selection_pos = pos; + m_selection_pos_with_offset = pos - intToFloat(camera_offset, BS); +} + +void Hud::drawSelectionMesh() +{ + if (!m_use_selection_mesh) { + // Draw 3D selection boxes + video::SMaterial oldmaterial = driver->getMaterial2D(); + driver->setMaterial(m_selection_material); + for (std::vector::const_iterator + i = m_selection_boxes.begin(); + i != m_selection_boxes.end(); ++i) { + aabb3f box = aabb3f( + i->MinEdge + m_selection_pos_with_offset, + i->MaxEdge + m_selection_pos_with_offset); + + u32 r = (selectionbox_argb.getRed() * + m_selection_mesh_color.getRed() / 255); + u32 g = (selectionbox_argb.getGreen() * + m_selection_mesh_color.getGreen() / 255); + u32 b = (selectionbox_argb.getBlue() * + m_selection_mesh_color.getBlue() / 255); + driver->draw3DBox(box, video::SColor(255, r, g, b)); + } + driver->setMaterial(oldmaterial); + } else if (m_selection_mesh) { + // Draw selection mesh + video::SMaterial oldmaterial = driver->getMaterial2D(); + driver->setMaterial(m_selection_material); + setMeshColor(m_selection_mesh, m_selection_mesh_color); + scene::IMesh* mesh = cloneMesh(m_selection_mesh); + translateMesh(mesh, m_selection_pos_with_offset); + u32 mc = m_selection_mesh->getMeshBufferCount(); + for (u32 i = 0; i < mc; i++) { + scene::IMeshBuffer *buf = mesh->getMeshBuffer(i); + driver->drawMeshBuffer(buf); + } + mesh->drop(); + driver->setMaterial(oldmaterial); } } +void Hud::updateSelectionMesh(const v3s16 &camera_offset) +{ + m_camera_offset = camera_offset; + if (!m_use_selection_mesh) + return; + + if (m_selection_mesh) { + m_selection_mesh->drop(); + m_selection_mesh = NULL; + } + + if (!m_selection_boxes.size()) { + // No pointed object + return; + } + + // New pointed object, create new mesh. + + // Texture UV coordinates for selection boxes + static f32 texture_uv[24] = { + 0,0,1,1, + 0,0,1,1, + 0,0,1,1, + 0,0,1,1, + 0,0,1,1, + 0,0,1,1 + }; + + m_selection_mesh = convertNodeboxesToMesh(m_selection_boxes, texture_uv); + + // scale final halo mesh + scaleMesh(m_selection_mesh, v3f(1.08, 1.08, 1.08)); +} void Hud::resizeHotbar() { if (m_screensize != porting::getWindowSize()) { diff --git a/src/hud.h b/src/hud.h index f373d4fe..d0158b2f 100644 --- a/src/hud.h +++ b/src/hud.h @@ -119,17 +119,31 @@ public: bool use_hotbar_image; std::string hotbar_selected_image; bool use_hotbar_selected_image; - v3s16 camera_offset; Hud(video::IVideoDriver *driver,scene::ISceneManager* smgr, gui::IGUIEnvironment* guienv, IGameDef *gamedef, LocalPlayer *player, Inventory *inventory); + ~Hud(); void drawHotbar(u16 playeritem); void resizeHotbar(); void drawCrosshair(); - void drawSelectionBoxes(std::vector &hilightboxes); - void drawLuaElements(v3s16 camera_offset); + void drawSelectionMesh(); + void updateSelectionMesh(const v3s16 &camera_offset); + + std::vector *getSelectionBoxes() + { return &m_selection_boxes; } + + void setSelectionPos(const v3f &pos, const v3s16 &camera_offset); + + v3f getSelectionPos() const + { return m_selection_pos; } + + void setSelectionMeshColor(const video::SColor &c) + { m_selection_mesh_color = c; } + + void drawLuaElements(const v3s16 &camera_offset); + private: void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s32 count, v2s32 offset, v2s32 size=v2s32()); @@ -140,11 +154,21 @@ private: void drawItem(const ItemStack &item, const core::rect& rect, bool selected); + v3s16 m_camera_offset; v2u32 m_screensize; v2s32 m_displaycenter; s32 m_hotbar_imagesize; s32 m_padding; video::SColor hbar_colors[4]; + + std::vector m_selection_boxes; + v3f m_selection_pos; + v3f m_selection_pos_with_offset; + + scene::IMesh* m_selection_mesh; + video::SColor m_selection_mesh_color; + video::SMaterial m_selection_material; + bool m_use_selection_mesh; }; enum ItemRotationKind { diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 9bcc4fa6..9486220e 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -47,10 +47,8 @@ MeshMakeData::MeshMakeData(IGameDef *gamedef, bool use_shaders): m_vmanip(), m_blockpos(-1337,-1337,-1337), m_crack_pos_relative(-1337, -1337, -1337), - m_highlighted_pos_relative(-1337, -1337, -1337), m_smooth_lighting(false), m_show_hud(false), - m_highlight_mesh_color(255, 255, 255, 255), m_gamedef(gamedef), m_use_shaders(use_shaders) {} @@ -138,12 +136,6 @@ void MeshMakeData::setCrack(int crack_level, v3s16 crack_pos) m_crack_pos_relative = crack_pos - m_blockpos*MAP_BLOCKSIZE; } -void MeshMakeData::setHighlighted(v3s16 highlighted_pos, bool show_hud) -{ - m_show_hud = show_hud; - m_highlighted_pos_relative = highlighted_pos - m_blockpos*MAP_BLOCKSIZE; -} - void MeshMakeData::setSmoothLighting(bool smooth_lighting) { m_smooth_lighting = smooth_lighting; @@ -1036,12 +1028,10 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): m_animation_force_timer(0), // force initial animation m_last_crack(-1), m_crack_materials(), - m_highlighted_materials(), m_last_daynight_ratio((u32) -1), m_daynight_diffs() { m_enable_shaders = data->m_use_shaders; - m_enable_highlighting = g_settings->getBool("enable_node_highlighting"); if (g_settings->getBool("enable_minimap")) { m_minimap_mapblock = new MinimapMapblock; @@ -1116,8 +1106,6 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): mapblock_mesh_generate_special(data, collector); - m_highlight_mesh_color = data->m_highlight_mesh_color; - /* Convert MeshCollector to SMesh */ @@ -1162,9 +1150,6 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): p.tile.texture = animation_frame.texture; } - if(m_enable_highlighting && p.tile.material_flags & MATERIAL_FLAG_HIGHLIGHTED) - m_highlighted_materials.push_back(i); - for(u32 j = 0; j < p.vertices.size(); j++) { video::S3DVertex *vertex = &p.vertices[j]; @@ -1205,19 +1190,15 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): material.setFlag(video::EMF_FOG_ENABLE, true); material.setTexture(0, p.tile.texture); - if (p.tile.material_flags & MATERIAL_FLAG_HIGHLIGHTED) { - material.MaterialType = video::EMT_TRANSPARENT_ADD_COLOR; - } else { - if (m_enable_shaders) { - material.MaterialType = m_shdrsrc->getShaderInfo(p.tile.shader_id).material; - p.tile.applyMaterialOptionsWithShaders(material); - if (p.tile.normal_texture) { - material.setTexture(1, p.tile.normal_texture); - } - material.setTexture(2, p.tile.flags_texture); - } else { - p.tile.applyMaterialOptions(material); + if (m_enable_shaders) { + material.MaterialType = m_shdrsrc->getShaderInfo(p.tile.shader_id).material; + p.tile.applyMaterialOptionsWithShaders(material); + if (p.tile.normal_texture) { + material.setTexture(1, p.tile.normal_texture); } + material.setTexture(2, p.tile.flags_texture); + } else { + p.tile.applyMaterialOptions(material); } // Create meshbuffer @@ -1273,8 +1254,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): m_has_animation = !m_crack_materials.empty() || !m_daynight_diffs.empty() || - !m_animation_tiles.empty() || - !m_highlighted_materials.empty(); + !m_animation_tiles.empty(); } MapBlockMesh::~MapBlockMesh() @@ -1377,30 +1357,6 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat m_last_daynight_ratio = daynight_ratio; } - // Node highlighting - if (m_enable_highlighting) { - u8 day = m_highlight_mesh_color.getRed(); - u8 night = m_highlight_mesh_color.getGreen(); - video::SColor hc; - finalColorBlend(hc, day, night, daynight_ratio); - float sin_r = 0.07 * sin(1.5 * time); - float sin_g = 0.07 * sin(1.5 * time + irr::core::PI * 0.5); - float sin_b = 0.07 * sin(1.5 * time + irr::core::PI); - hc.setRed(core::clamp(core::round32(hc.getRed() * (0.8 + sin_r)), 0, 255)); - hc.setGreen(core::clamp(core::round32(hc.getGreen() * (0.8 + sin_g)), 0, 255)); - hc.setBlue(core::clamp(core::round32(hc.getBlue() * (0.8 + sin_b)), 0, 255)); - - for(std::list::iterator - i = m_highlighted_materials.begin(); - i != m_highlighted_materials.end(); ++i) - { - scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(*i); - video::S3DVertex *vertices = (video::S3DVertex *)buf->getVertices(); - for (u32 j = 0; j < buf->getVertexCount() ;j++) - vertices[j].Color = hc; - } - } - return true; } diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h index 9c4fb655..421e8f2b 100644 --- a/src/mapblock_mesh.h +++ b/src/mapblock_mesh.h @@ -41,10 +41,8 @@ struct MeshMakeData VoxelManipulator m_vmanip; v3s16 m_blockpos; v3s16 m_crack_pos_relative; - v3s16 m_highlighted_pos_relative; bool m_smooth_lighting; bool m_show_hud; - video::SColor m_highlight_mesh_color; IGameDef *m_gamedef; bool m_use_shaders; @@ -67,11 +65,6 @@ struct MeshMakeData */ void setCrack(int crack_level, v3s16 crack_pos); - /* - Set the highlighted node position - */ - - void setHighlighted(v3s16 highlighted_pos, bool show_hud); /* Enable or disable smooth lighting */ @@ -137,10 +130,7 @@ private: IShaderSource *m_shdrsrc; bool m_enable_shaders; - bool m_enable_highlighting; - video::SColor m_highlight_mesh_color; - // Must animate() be called before rendering? bool m_has_animation; int m_animation_force_timer; @@ -150,7 +140,6 @@ private: int m_last_crack; // Maps mesh buffer (i.e. material) indices to base texture names std::map m_crack_materials; - std::list m_highlighted_materials; // Animation info: texture animationi // Maps meshbuffers to TileSpecs diff --git a/src/mesh.cpp b/src/mesh.cpp index a800ddf1..d79f545f 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -405,9 +405,11 @@ scene::IMesh* cloneMesh(scene::IMesh *src_mesh) return dst_mesh; } -scene::IMesh* convertNodeboxNodeToMesh(ContentFeatures *f) +scene::IMesh* convertNodeboxesToMesh(const std::vector &boxes, + const f32 *uv_coords) { scene::SMesh* dst_mesh = new scene::SMesh(); + for (u16 j = 0; j < 6; j++) { scene::IMeshBuffer *buf = new scene::SMeshBuffer(); @@ -416,12 +418,10 @@ scene::IMesh* convertNodeboxNodeToMesh(ContentFeatures *f) dst_mesh->addMeshBuffer(buf); buf->drop(); } - + video::SColor c(255,255,255,255); - std::vector boxes = f->node_box.fixed; - - for(std::vector::iterator + for(std::vector::const_iterator i = boxes.begin(); i != boxes.end(); ++i) { @@ -446,27 +446,33 @@ scene::IMesh* convertNodeboxNodeToMesh(ContentFeatures *f) box.MinEdge.Z=box.MaxEdge.Z; box.MaxEdge.Z=temp; } - // Compute texture coords - f32 tx1 = (box.MinEdge.X/BS)+0.5; - f32 ty1 = (box.MinEdge.Y/BS)+0.5; - f32 tz1 = (box.MinEdge.Z/BS)+0.5; - f32 tx2 = (box.MaxEdge.X/BS)+0.5; - f32 ty2 = (box.MaxEdge.Y/BS)+0.5; - f32 tz2 = (box.MaxEdge.Z/BS)+0.5; - f32 txc[24] = { + + // Compute texture UV coords + f32 tx1 = (box.MinEdge.X / BS) + 0.5; + f32 ty1 = (box.MinEdge.Y / BS) + 0.5; + f32 tz1 = (box.MinEdge.Z / BS) + 0.5; + f32 tx2 = (box.MaxEdge.X / BS) + 0.5; + f32 ty2 = (box.MaxEdge.Y / BS) + 0.5; + f32 tz2 = (box.MaxEdge.Z / BS) + 0.5; + + f32 txc_default[24] = { // up - tx1, 1-tz2, tx2, 1-tz1, + tx1, 1 - tz2, tx2, 1 - tz1, // down tx1, tz1, tx2, tz2, // right - tz1, 1-ty2, tz2, 1-ty1, + tz1, 1 - ty2, tz2, 1 - ty1, // left - 1-tz2, 1-ty2, 1-tz1, 1-ty1, + 1 - tz2, 1 - ty2, 1 - tz1, 1 - ty1, // back - 1-tx2, 1-ty2, 1-tx1, 1-ty1, + 1 - tx2, 1 - ty2, 1 - tx1, 1 - ty1, // front - tx1, 1-ty2, tx2, 1-ty1, + tx1, 1 - ty2, tx2, 1 - ty1, }; + + // use default texture UV mapping if not provided + const f32 *txc = uv_coords ? uv_coords : txc_default; + v3f min = box.MinEdge; v3f max = box.MaxEdge; diff --git a/src/mesh.h b/src/mesh.h index ec109e9e..ad3f8db4 100644 --- a/src/mesh.h +++ b/src/mesh.h @@ -83,9 +83,12 @@ void rotateMeshYZby (scene::IMesh *mesh, f64 degrees); scene::IMesh* cloneMesh(scene::IMesh *src_mesh); /* - Convert nodebox drawtype node to mesh. + Convert nodeboxes to mesh. + boxes - set of nodeboxes to be converted into cuboids + uv_coords[24] - table of texture uv coords for each cuboid face */ -scene::IMesh* convertNodeboxNodeToMesh(ContentFeatures *f); +scene::IMesh* convertNodeboxesToMesh(const std::vector &boxes, + const f32 *uv_coords = NULL); /* Update bounding box for a mesh. diff --git a/src/nodedef.cpp b/src/nodedef.cpp index e30cf6f1..c60958ba 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -972,7 +972,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef, //Convert regular nodebox nodes to meshnodes //Change the drawtype and apply scale f->drawtype = NDT_MESH; - f->mesh_ptr[0] = convertNodeboxNodeToMesh(f); + f->mesh_ptr[0] = convertNodeboxesToMesh(f->node_box.fixed); v3f scale = v3f(1.0, 1.0, 1.0) * f->visual_scale; scaleMesh(f->mesh_ptr[0], scale); recalculateBoundingBox(f->mesh_ptr[0]); diff --git a/textures/base/pack/halo.png b/textures/base/pack/halo.png index e13b544199c8cd299d7b061162b8bc22849b297d..eaea782da6480cd7996367a1a10785db6f5933cb 100644 GIT binary patch delta 126 zcmWHZz&Jsof`g5LfkFQB|3o0gmgMd3!tfsi7wla=87RV8;1OBOz`!jG!i)^F=12eq z*-JcqUD+Qnu`^kTmX({Z1BGNgT^vI!PA7kf`;g1W%-Yb|=wy&}U Date: Mon, 8 Feb 2016 01:40:05 +0100 Subject: [PATCH 244/531] Use inventory_image in the first place for inventory item mesh --- src/wieldmesh.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp index 3e2483b5..9c4d5b64 100644 --- a/src/wieldmesh.cpp +++ b/src/wieldmesh.cpp @@ -452,11 +452,8 @@ scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item) scene::IMesh *mesh; - // If wield_image is defined, it overrides everything else - if (def.wield_image != "") { - mesh = getExtrudedMesh(tsrc, def.wield_image); - return mesh; - } else if (def.inventory_image != "") { + // If inventory_image is defined, it overrides everything else + if (def.inventory_image != "") { mesh = getExtrudedMesh(tsrc, def.inventory_image); return mesh; } else if (def.type == ITEM_NODE) { From 4adbd69a3701608876b50665ed3f7a150750d26e Mon Sep 17 00:00:00 2001 From: paramat Date: Thu, 4 Feb 2016 01:03:31 +0000 Subject: [PATCH 245/531] FindSpawnPos: Let mapgens decide what spawn altitude is suitable To avoid spawn search failing in new specialised mapgens Increase spawn search range to 4000 nodes Add getSpawnLevelAtPoint() functions to EmergeManager, class Mapgen and all mapgens Remove getGroundLevelAtPoint() functions from all mapgens except mgv6 (possibly to be re-added later in the correct form to return actual ground level) Make mgvalleys flag names consistent with other mapgens Remove now unused 'vertical spawn range' setting --- src/defaultsettings.cpp | 1 - src/emerge.cpp | 12 ++++++++++++ src/emerge.h | 1 + src/mapgen.h | 7 +++++++ src/mapgen_flat.cpp | 21 ++++++++++++++------- src/mapgen_flat.h | 2 +- src/mapgen_fractal.cpp | 27 +++++++++++++++++++-------- src/mapgen_fractal.h | 2 +- src/mapgen_singlenode.cpp | 2 +- src/mapgen_singlenode.h | 2 +- src/mapgen_v5.cpp | 27 ++++++++++++++------------- src/mapgen_v5.h | 2 +- src/mapgen_v6.cpp | 11 +++++++++++ src/mapgen_v6.h | 1 + src/mapgen_v7.cpp | 22 ++++++++++++---------- src/mapgen_v7.h | 2 +- src/mapgen_valleys.cpp | 33 ++++++++++++++------------------- src/mapgen_valleys.h | 8 ++++---- src/server.cpp | 16 +++++++--------- 19 files changed, 122 insertions(+), 77 deletions(-) diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index ddd7b5fe..95785797 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -247,7 +247,6 @@ void set_default_settings(Settings *settings) settings->setDefault("default_privs", "interact, shout"); settings->setDefault("player_transfer_distance", "0"); settings->setDefault("enable_pvp", "true"); - settings->setDefault("vertical_spawn_range", "16"); settings->setDefault("disallow_empty_password", "false"); settings->setDefault("disable_anticheat", "false"); settings->setDefault("enable_rollback_recording", "false"); diff --git a/src/emerge.cpp b/src/emerge.cpp index ccb4c170..93e8f2b3 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -334,6 +334,18 @@ v3s16 EmergeManager::getContainingChunk(v3s16 blockpos, s16 chunksize) } +int EmergeManager::getSpawnLevelAtPoint(v2s16 p) +{ + if (m_mapgens.size() == 0 || !m_mapgens[0]) { + errorstream << "EmergeManager: getSpawnLevelAtPoint() called" + " before mapgen init" << std::endl; + return 0; + } + + return m_mapgens[0]->getSpawnLevelAtPoint(p); +} + + int EmergeManager::getGroundLevelAtPoint(v2s16 p) { if (m_mapgens.size() == 0 || !m_mapgens[0]) { diff --git a/src/emerge.h b/src/emerge.h index 02bdf7e6..825ac1c0 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -136,6 +136,7 @@ public: // Mapgen helpers methods Biome *getBiomeAtPoint(v3s16 p); + int getSpawnLevelAtPoint(v2s16 p); int getGroundLevelAtPoint(v2s16 p); bool isBlockUnderground(v3s16 blockpos); diff --git a/src/mapgen.h b/src/mapgen.h index 9bb7d03b..abc3d2e8 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -181,6 +181,13 @@ public: virtual void makeChunk(BlockMakeData *data) {} virtual int getGroundLevelAtPoint(v2s16 p) { return 0; } + // getSpawnLevelAtPoint() is a function within each mapgen that returns a + // suitable y co-ordinate for player spawn ('suitable' usually meaning + // within 16 nodes of water_level). If a suitable spawn level cannot be + // found at the specified (X, Z) 'MAX_MAP_GENERATION_LIMIT' is returned to + // signify this and to cause Server::findSpawnPos() to try another (X, Z). + virtual int getSpawnLevelAtPoint(v2s16 p) { return 0; } + private: DISABLE_CLASS_COPY(Mapgen); }; diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index 3b7178dd..0d071411 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -192,18 +192,25 @@ void MapgenFlatParams::writeParams(Settings *settings) const ///////////////////////////////////////////////////////////////// -int MapgenFlat::getGroundLevelAtPoint(v2s16 p) +int MapgenFlat::getSpawnLevelAtPoint(v2s16 p) { + s16 level_at_point = ground_level; float n_terrain = NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed); + if ((spflags & MGFLAT_LAKES) && n_terrain < lake_threshold) { - s16 depress = (lake_threshold - n_terrain) * lake_steepness; - return ground_level - depress; + level_at_point = ground_level - + (lake_threshold - n_terrain) * lake_steepness; } else if ((spflags & MGFLAT_HILLS) && n_terrain > hill_threshold) { - s16 rise = (n_terrain - hill_threshold) * hill_steepness; - return ground_level + rise; - } else { - return ground_level; + level_at_point = ground_level + + (n_terrain - hill_threshold) * hill_steepness; } + + if (ground_level < water_level) // Ocean world, allow spawn in water + return MYMAX(level_at_point, water_level); + else if (level_at_point > water_level) + return level_at_point; // Spawn on land + else + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point } diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h index 0e15df78..282e4297 100644 --- a/src/mapgen_flat.h +++ b/src/mapgen_flat.h @@ -102,7 +102,7 @@ public: ~MapgenFlat(); virtual void makeChunk(BlockMakeData *data); - int getGroundLevelAtPoint(v2s16 p); + int getSpawnLevelAtPoint(v2s16 p); void calculateNoise(); s16 generateTerrain(); MgStoneType generateBiomes(float *heat_map, float *humidity_map); diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 9cb682a9..8a5c1e2b 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -209,17 +209,28 @@ void MapgenFractalParams::writeParams(Settings *settings) const ///////////////////////////////////////////////////////////////// -int MapgenFractal::getGroundLevelAtPoint(v2s16 p) +int MapgenFractal::getSpawnLevelAtPoint(v2s16 p) { - s16 search_start = 128; - s16 search_end = -128; - - for (s16 y = search_start; y >= search_end; y--) { - if (getFractalAtPoint(p.X, y, p.Y)) - return y; + bool solid_below = false; // Dry solid node is present below to spawn on + u8 air_count = 0; // Consecutive air nodes above the dry solid node + s16 seabed_level = NoisePerlin2D(&noise_seabed->np, p.X, p.Y, seed); + // Seabed can rise above water_level or might be raised to create dry land + s16 search_start = MYMAX(seabed_level, water_level + 1); + if (seabed_level > water_level) + solid_below = true; + + for (s16 y = search_start; y <= search_start + 128; y++) { + if (getFractalAtPoint(p.X, y, p.Y)) { // Fractal node + solid_below = true; + air_count = 0; + } else if (solid_below) { // Air above solid node + air_count++; + if (air_count == 2) + return y - 2; + } } - return -MAX_MAP_GENERATION_LIMIT; + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point } diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index 3d4f7ee8..ffb2acfb 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -114,7 +114,7 @@ public: ~MapgenFractal(); virtual void makeChunk(BlockMakeData *data); - int getGroundLevelAtPoint(v2s16 p); + int getSpawnLevelAtPoint(v2s16 p); void calculateNoise(); bool getFractalAtPoint(s16 x, s16 y, s16 z); s16 generateTerrain(); diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp index f8711526..ff985dd3 100644 --- a/src/mapgen_singlenode.cpp +++ b/src/mapgen_singlenode.cpp @@ -99,7 +99,7 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) } -int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p) +int MapgenSinglenode::getSpawnLevelAtPoint(v2s16 p) { return 0; } diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h index f9c97b50..2c6496c0 100644 --- a/src/mapgen_singlenode.h +++ b/src/mapgen_singlenode.h @@ -41,7 +41,7 @@ public: ~MapgenSinglenode(); void makeChunk(BlockMakeData *data); - int getGroundLevelAtPoint(v2s16 p); + int getSpawnLevelAtPoint(v2s16 p); }; struct MapgenFactorySinglenode : public MapgenFactory { diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 06e5f1ca..0bb3715a 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -171,7 +171,7 @@ void MapgenV5Params::writeParams(Settings *settings) const } -int MapgenV5::getGroundLevelAtPoint(v2s16 p) +int MapgenV5::getSpawnLevelAtPoint(v2s16 p) { //TimeTaker t("getGroundLevelAtPoint", NULL, PRECISION_MICRO); @@ -182,24 +182,25 @@ int MapgenV5::getGroundLevelAtPoint(v2s16 p) f *= 1.6; float h = NoisePerlin2D(&noise_height->np, p.X, p.Y, seed); - s16 search_start = 128; // Only bother searching this range, actual - s16 search_end = -128; // ground level is rarely higher or lower. - - for (s16 y = search_start; y >= search_end; y--) { + for (s16 y = 128; y >= -128; y--) { float n_ground = NoisePerlin3D(&noise_ground->np, p.X, y, p.Y, seed); - // If solid - if (n_ground * f > y - h) { + + if (n_ground * f > y - h) { // If solid // If either top 2 nodes of search are solid this is inside a - // mountain or floatland with no space for the player to spawn. - if (y >= search_start - 1) - return MAX_MAP_GENERATION_LIMIT; - else - return y; // Ground below at least 2 nodes of space + // mountain or floatland with possibly no space for the player to spawn. + if (y >= 127) { + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point + } else { // Ground below at least 2 nodes of empty space + if (y <= water_level || y > water_level + 16) + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point + else + return y; + } } } //printf("getGroundLevelAtPoint: %dus\n", t.stop()); - return -MAX_MAP_GENERATION_LIMIT; + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn position, no ground found } diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h index 4112bbfa..44a06907 100644 --- a/src/mapgen_v5.h +++ b/src/mapgen_v5.h @@ -90,7 +90,7 @@ public: ~MapgenV5(); virtual void makeChunk(BlockMakeData *data); - int getGroundLevelAtPoint(v2s16 p); + int getSpawnLevelAtPoint(v2s16 p); void calculateNoise(); int generateBaseTerrain(); MgStoneType generateBiomes(float *heat_map, float *humidity_map); diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 57d0f59b..e24083cf 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -318,6 +318,17 @@ int MapgenV6::getGroundLevelAtPoint(v2s16 p) } +int MapgenV6::getSpawnLevelAtPoint(v2s16 p) +{ + s16 level_at_point = baseTerrainLevelFromNoise(p) + MGV6_AVERAGE_MUD_AMOUNT; + if (level_at_point <= water_level || + level_at_point > water_level + 16) + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point + else + return level_at_point; +} + + //////////////////////// Noise functions float MapgenV6::getMudAmount(v2s16 p) diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 612e2322..a55fc6d5 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -129,6 +129,7 @@ public: void makeChunk(BlockMakeData *data); int getGroundLevelAtPoint(v2s16 p); + int getSpawnLevelAtPoint(v2s16 p); float baseTerrainLevel(float terrain_base, float terrain_higher, float steepness, float height_select); diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index aec00b93..029f56a4 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -202,7 +202,7 @@ void MapgenV7Params::writeParams(Settings *settings) const /////////////////////////////////////// -int MapgenV7::getGroundLevelAtPoint(v2s16 p) +int MapgenV7::getSpawnLevelAtPoint(v2s16 p) { // Base terrain calculation s16 y = baseTerrainLevelAtPoint(p.X, p.Y); @@ -210,22 +210,24 @@ int MapgenV7::getGroundLevelAtPoint(v2s16 p) // Ridge/river terrain calculation float width = 0.2; float uwatern = NoisePerlin2D(&noise_ridge_uwater->np, p.X, p.Y, seed) * 2; - // actually computing the depth of the ridge is much more expensive; - // if inside a river, simply guess + // if inside a river this is an unsuitable spawn point if (fabs(uwatern) <= width) - return water_level - 10; + return MAX_MAP_GENERATION_LIMIT; // Mountain terrain calculation - int iters = 128; // don't even bother iterating more than 128 times.. + int iters = 128; while (iters--) { - //current point would have been air - if (!getMountainTerrainAtPoint(p.X, y, p.Y)) - return y; - + if (!getMountainTerrainAtPoint(p.X, y + 1, p.Y)) { // Air, y is ground level + if (y <= water_level || y > water_level + 16) + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point + else + return y; + } y++; } - return y; + // Unsuitable spawn point, no ground surface found + return MAX_MAP_GENERATION_LIMIT; } diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h index 9b483b04..82f89387 100644 --- a/src/mapgen_v7.h +++ b/src/mapgen_v7.h @@ -103,7 +103,7 @@ public: ~MapgenV7(); virtual void makeChunk(BlockMakeData *data); - int getGroundLevelAtPoint(v2s16 p); + int getSpawnLevelAtPoint(v2s16 p); Biome *getBiomeAtPoint(v3s16 p); float baseTerrainLevelAtPoint(s16 x, s16 z); diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index ceb2c774..2f96c339 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -56,8 +56,8 @@ with this program; if not, write to the Free Software Foundation, Inc., //Profiler *mapgen_profiler = &mapgen_prof; static FlagDesc flagdesc_mapgen_valleys[] = { - {"altitude_chill", MG_VALLEYS_ALT_CHILL}, - {"humid_rivers", MG_VALLEYS_HUMID_RIVERS}, + {"altitude_chill", MGVALLEYS_ALT_CHILL}, + {"humid_rivers", MGVALLEYS_HUMID_RIVERS}, {NULL, 0} }; @@ -86,8 +86,8 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * MapgenValleysParams *sp = (MapgenValleysParams *)params->sparams; this->spflags = sp->spflags; - this->humid_rivers = (spflags & MG_VALLEYS_HUMID_RIVERS); - this->use_altitude_chill = (spflags & MG_VALLEYS_ALT_CHILL); + this->humid_rivers = (spflags & MGVALLEYS_HUMID_RIVERS); + this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL); this->altitude_chill = sp->altitude_chill; this->humidity_adjust = params->np_biome_humidity.offset - 50.f; @@ -181,7 +181,7 @@ MapgenValleys::~MapgenValleys() MapgenValleysParams::MapgenValleysParams() { - spflags = MG_VALLEYS_HUMID_RIVERS | MG_VALLEYS_ALT_CHILL; + spflags = MGVALLEYS_HUMID_RIVERS | MGVALLEYS_ALT_CHILL; altitude_chill = 90; // The altitude at which temperature drops by 20C. large_cave_depth = -33; @@ -513,24 +513,19 @@ float MapgenValleys::adjustedTerrainLevelFromNoise(TerrainNoise *tn) } -int MapgenValleys::getGroundLevelAtPoint(v2s16 p) +int MapgenValleys::getSpawnLevelAtPoint(v2s16 p) { - // *********************************** - // This method (deliberately) does not - // return correct terrain values. - // *********************************** - - // Since MT doesn't normally deal with rivers, check - // to make sure this isn't a request for a location - // in a river. + // Check to make sure this isn't a request for a location in a river. float rivers = NoisePerlin2D(&noise_rivers->np, p.X, p.Y, seed); - - // If it's wet, return an unusable number. if (fabs(rivers) < river_size_factor) - return MAX_MAP_GENERATION_LIMIT; + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point - // Otherwise, return the real result. - return terrainLevelAtPoint(p.X, p.Y); + s16 level_at_point = terrainLevelAtPoint(p.X, p.Y); + if (level_at_point <= water_level || + level_at_point > water_level + 16) + return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point + else + return level_at_point; } diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h index ee4052d7..6b3eb9cf 100644 --- a/src/mapgen_valleys.h +++ b/src/mapgen_valleys.h @@ -30,9 +30,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen.h" -/////////////////// Mapgen Valleys flags -#define MG_VALLEYS_ALT_CHILL 0x01 -#define MG_VALLEYS_HUMID_RIVERS 0x02 +////////////// Mapgen Valleys flags +#define MGVALLEYS_ALT_CHILL 0x01 +#define MGVALLEYS_HUMID_RIVERS 0x02 // Feed only one variable into these. #define MYSQUARE(x) (x) * (x) @@ -96,7 +96,7 @@ public: ~MapgenValleys(); virtual void makeChunk(BlockMakeData *data); - int getGroundLevelAtPoint(v2s16 p); + int getSpawnLevelAtPoint(v2s16 p); s16 large_cave_depth; diff --git a/src/server.cpp b/src/server.cpp index 86096055..57253314 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3383,26 +3383,24 @@ v3f Server::findSpawnPos() return nodeposf * BS; } - s16 water_level = map.getWaterLevel(); - s16 vertical_spawn_range = g_settings->getS16("vertical_spawn_range"); bool is_good = false; // Try to find a good place a few times - for(s32 i = 0; i < 1000 && !is_good; i++) { + for(s32 i = 0; i < 4000 && !is_good; i++) { s32 range = 1 + i; // We're going to try to throw the player to this position v2s16 nodepos2d = v2s16( -range + (myrand() % (range * 2)), -range + (myrand() % (range * 2))); - // Get ground height at point - s16 groundheight = map.findGroundLevel(nodepos2d); - // Don't go underwater or to high places - if (groundheight <= water_level || - groundheight > water_level + vertical_spawn_range) + // Get spawn level at point + s16 spawn_level = m_emerge->getSpawnLevelAtPoint(nodepos2d); + // Continue if MAX_MAP_GENERATION_LIMIT was returned by + // the mapgen to signify an unsuitable spawn position + if (spawn_level == MAX_MAP_GENERATION_LIMIT) continue; - v3s16 nodepos(nodepos2d.X, groundheight, nodepos2d.Y); + v3s16 nodepos(nodepos2d.X, spawn_level, nodepos2d.Y); s32 air_count = 0; for (s32 i = 0; i < 10; i++) { From 180893e79dd358d2f8f720b200a62daa2838e341 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Sun, 7 Feb 2016 04:24:24 +0100 Subject: [PATCH 246/531] Remove ClientMap::m_camera_mutex All places that lock this mutex are only called by the main thread: ClientMap::updateCamera(), ClientMap::updateDrawList(), ClientMap::renderMap(), ClientMap::renderPostFx(). --- src/clientmap.cpp | 11 +---------- src/clientmap.h | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/clientmap.cpp b/src/clientmap.cpp index b865c278..024f2a26 100644 --- a/src/clientmap.cpp +++ b/src/clientmap.cpp @@ -157,12 +157,9 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) } m_drawlist.clear(); - m_camera_mutex.lock(); v3f camera_position = m_camera_position; v3f camera_direction = m_camera_direction; f32 camera_fov = m_camera_fov; - //v3s16 camera_offset = m_camera_offset; - m_camera_mutex.unlock(); // Use a higher fov to accomodate faster camera movements. // Blocks are cropped better when they are drawn. @@ -433,11 +430,9 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) int crack = m_client->getCrackLevel(); u32 daynight_ratio = m_client->getEnv().getDayNightRatio(); - m_camera_mutex.lock(); v3f camera_position = m_camera_position; v3f camera_direction = m_camera_direction; f32 camera_fov = m_camera_fov; - m_camera_mutex.unlock(); /* Get all blocks and draw all visible ones @@ -799,11 +794,7 @@ void ClientMap::renderPostFx(CameraMode cam_mode) // Sadly ISceneManager has no "post effects" render pass, in that case we // could just register for that and handle it in renderMap(). - m_camera_mutex.lock(); - v3f camera_position = m_camera_position; - m_camera_mutex.unlock(); - - MapNode n = getNodeNoEx(floatToInt(camera_position, BS)); + MapNode n = getNodeNoEx(floatToInt(m_camera_position, BS)); // - If the player is in a solid node, make everything black. // - If the player is in liquid, draw a semi-transparent overlay. diff --git a/src/clientmap.h b/src/clientmap.h index 54d1dc96..d9239b52 100644 --- a/src/clientmap.h +++ b/src/clientmap.h @@ -89,7 +89,6 @@ public: void updateCamera(v3f pos, v3f dir, f32 fov, v3s16 offset) { - MutexAutoLock lock(m_camera_mutex); m_camera_position = pos; m_camera_direction = dir; m_camera_fov = fov; @@ -149,7 +148,6 @@ private: v3f m_camera_direction; f32 m_camera_fov; v3s16 m_camera_offset; - Mutex m_camera_mutex; std::map m_drawlist; From eb3840a3f88dd9902ff1c5ea50d90a7f33e08d82 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Mon, 25 Jan 2016 13:33:22 +0100 Subject: [PATCH 247/531] Filmic HDR tone mapping --- builtin/settingtypes.txt | 5 ++ .../shaders/nodes_shader/opengl_fragment.glsl | 48 ++++++++++++++--- .../water_surface_shader/opengl_fragment.glsl | 52 ++++++++++++++++--- minetest.conf.example | 6 +++ src/defaultsettings.cpp | 1 + src/shader.cpp | 3 ++ 6 files changed, 101 insertions(+), 14 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 79a64c2d..eebccf78 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -326,6 +326,11 @@ fsaa (FSAA) enum 0 0,1,2,4,8,16 # Thy only work with the OpenGL video backend. enable_shaders (Shaders) bool true +[****Tone Mapping] + +# Enables filmic tone mapping +tone_mapping (Filmic tone mapping) bool false + [****Bumpmapping] # Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl index b3789e1c..49befa8d 100644 --- a/client/shaders/nodes_shader/opengl_fragment.glsl +++ b/client/shaders/nodes_shader/opengl_fragment.glsl @@ -20,6 +20,38 @@ bool normalTexturePresent = false; const float e = 2.718281828459; const float BS = 10.0; +#ifdef ENABLE_TONE_MAPPING + +/* Hable's UC2 Tone mapping parameters + A = 0.22; + B = 0.30; + C = 0.10; + D = 0.20; + E = 0.01; + F = 0.30; + W = 11.2; + equation used: ((x * (A * x + C * B) + D * E) / (x * (A * x + B) + D * F)) - E / F +*/ + +vec3 uncharted2Tonemap(vec3 x) +{ + return ((x * (0.22 * x + 0.03) + 0.002) / (x * (0.22 * x + 0.3) + 0.06)) - 0.03334; +} + +vec4 applyToneMapping(vec4 color) +{ + color = vec4(pow(color.rgb, vec3(2.2)), color.a); + const float gamma = 1.6; + const float exposureBias = 5.5; + color.rgb = uncharted2Tonemap(exposureBias * color.rgb); + // Precalculated white_scale from + //vec3 whiteScale = 1.0 / uncharted2Tonemap(vec3(W)); + vec3 whiteScale = vec3(1.036015346); + color.rgb *= whiteScale; + return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a); +} +#endif + void get_texture_flags() { vec4 flags = texture2D(textureFlags, vec2(0.0, 0.0)); @@ -160,22 +192,26 @@ void main(void) color = base.rgb; #endif + vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); + #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE float alpha = gl_Color.a; - vec4 col = vec4(color.rgb, alpha); - col *= gl_Color; if (fogDistance != 0.0) { float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); alpha = mix(alpha, 0.0, d); } - gl_FragColor = vec4(col.rgb, alpha); + col = vec4(col.rgb, alpha); #else - vec4 col = vec4(color.rgb, base.a); - col *= gl_Color; if (fogDistance != 0.0) { float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); col = mix(col, skyBgColor, d); } - gl_FragColor = vec4(col.rgb, base.a); + col = vec4(col.rgb, base.a); +#endif + +#ifdef ENABLE_TONE_MAPPING + gl_FragColor = applyToneMapping(col); +#else + gl_FragColor = col; #endif } diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl index 75751e24..1fa66954 100644 --- a/client/shaders/water_surface_shader/opengl_fragment.glsl +++ b/client/shaders/water_surface_shader/opengl_fragment.glsl @@ -22,6 +22,38 @@ bool texSeamless = false; const float e = 2.718281828459; const float BS = 10.0; +#ifdef ENABLE_TONE_MAPPING + +/* Hable's UC2 Tone mapping parameters + A = 0.22; + B = 0.30; + C = 0.10; + D = 0.20; + E = 0.01; + F = 0.30; + W = 11.2; + equation used: ((x * (A * x + C * B) + D * E) / (x * (A * x + B) + D * F)) - E / F +*/ + +vec3 uncharted2Tonemap(vec3 x) +{ + return ((x * (0.22 * x + 0.03) + 0.002) / (x * (0.22 * x + 0.3) + 0.06)) - 0.03334; +} + +vec4 applyToneMapping(vec4 color) +{ + color = vec4(pow(color.rgb, vec3(2.2)), color.a); + const float gamma = 1.6; + const float exposureBias = 5.5; + color.rgb = uncharted2Tonemap(exposureBias * color.rgb); + // Precalculated white_scale from + //vec3 whiteScale = 1.0 / uncharted2Tonemap(vec3(W)); + vec3 whiteScale = vec3(1.036015346); + color.rgb *= whiteScale; + return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a); +} +#endif + void get_texture_flags() { vec4 flags = texture2D(textureFlags, vec2(0.0, 0.0)); @@ -116,22 +148,26 @@ vec4 base = texture2D(baseTexture, uv).rgba; color = base.rgb; #endif + vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); + #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE float alpha = gl_Color.a; - vec4 col = vec4(color.rgb, alpha); - col *= gl_Color; - if(fogDistance != 0.0){ + if (fogDistance != 0.0) { float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); alpha = mix(alpha, 0.0, d); } - gl_FragColor = vec4(col.rgb, alpha); + col = vec4(col.rgb, alpha); #else - vec4 col = vec4(color.rgb, base.a); - col *= gl_Color; - if(fogDistance != 0.0){ + if (fogDistance != 0.0) { float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); col = mix(col, skyBgColor, d); } - gl_FragColor = vec4(col.rgb, base.a); + col = vec4(col.rgb, base.a); +#endif + +#ifdef ENABLE_TONE_MAPPING + gl_FragColor = applyToneMapping(col); +#else + gl_FragColor = col; #endif } diff --git a/minetest.conf.example b/minetest.conf.example index 1bf56720..09e86ef0 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -353,6 +353,12 @@ # type: bool # enable_shaders = true +##### Tone mapping +# Enables filmic tone mapping. +# Requires shaders to be enabled. +# type: bool +# tone_mapping = false + ##### Bumpmapping # Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 95785797..271214a4 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -160,6 +160,7 @@ void set_default_settings(Settings *settings) settings->setDefault("texture_clean_transparent", "false"); settings->setDefault("texture_min_size", "64"); settings->setDefault("preload_item_visuals", "false"); + settings->setDefault("tone_mapping", "false"); settings->setDefault("enable_bumpmapping", "false"); settings->setDefault("enable_parallax_occlusion", "false"); settings->setDefault("generate_normalmaps", "false"); diff --git a/src/shader.cpp b/src/shader.cpp index 917d878b..a2473ffb 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -764,6 +764,9 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype, else shaders_header += "0\n"; + if (g_settings->getBool("tone_mapping")) + shaders_header += "#define ENABLE_TONE_MAPPING\n"; + if(pixel_program != "") pixel_program = shaders_header + pixel_program; if(vertex_program != "") From baa7c8f8ad4e5717e324948c85d3da6bbbf17c16 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Tue, 9 Feb 2016 06:06:10 +0100 Subject: [PATCH 248/531] FormSpec: Add StaticTextSpec and superimpose over item image buttons --- src/guiFormSpecMenu.cpp | 18 +++++++++++++++++- src/guiFormSpecMenu.h | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 116688e9..226cc6cf 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -1497,7 +1497,7 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) 258 + m_fields.size() ); - gui::IGUIButton *e = Environment->addButton(rect, this, spec.fid, spec.flabel.c_str()); + gui::IGUIButton *e = Environment->addButton(rect, this, spec.fid, L""); if (spec.fname == data->focused_fieldname) { Environment->setFocus(e); @@ -1515,6 +1515,12 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) pos.X += stof(v_pos[0]) * (float) spacing.X; pos.Y += stof(v_pos[1]) * (float) spacing.Y; m_itemimages.push_back(ImageDrawSpec("", item_name, pos, geom)); + + StaticTextSpec label_spec( + utf8_to_wide(label), + rect + ); + m_static_texts.push_back(label_spec); return; } errorstream<< "Invalid ItemImagebutton element(" << parts.size() << "): '" << element << "'" << std::endl; @@ -1883,6 +1889,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize) m_boxes.clear(); m_tooltips.clear(); m_inventory_rings.clear(); + m_static_texts.clear(); // Set default values (fits old formspec values) m_bgcolor = video::SColor(140,0,0,0); @@ -2462,6 +2469,15 @@ void GUIFormSpecMenu::drawMenu() m_pointer = m_device->getCursorControl()->getPosition(); #endif + /* + Draw static text elements + */ + for (u32 i = 0; i < m_static_texts.size(); i++) { + const StaticTextSpec &spec = m_static_texts[i]; + video::SColor color(255, 255, 255, 255); + m_font->draw(spec.text.c_str(), spec.rect, color, true, true, &spec.rect); + } + /* Draw fields/buttons tooltips */ diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 9b892f19..0677e87a 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -228,6 +228,20 @@ class GUIFormSpecMenu : public GUIModalMenu irr::video::SColor color; }; + struct StaticTextSpec { + StaticTextSpec() + { + } + StaticTextSpec(const std::wstring &a_text, + const core::rect &a_rect): + text(a_text), + rect(a_rect) + { + } + std::wstring text; + core::rect rect; + }; + public: GUIFormSpecMenu(irr::IrrlichtDevice* dev, gui::IGUIElement* parent, s32 id, @@ -339,6 +353,7 @@ protected: std::vector m_itemimages; std::vector m_boxes; std::vector m_fields; + std::vector m_static_texts; std::vector > m_tables; std::vector > m_checkboxes; std::map m_tooltips; From 4e3fe460e38bed832266ee3168463a262d7fa444 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 9 Feb 2016 23:03:54 +0100 Subject: [PATCH 249/531] shader.cpp: don't test twice if shader programs are present Also use string::empty method, it is better than comparing with empty strings. --- src/shader.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/shader.cpp b/src/shader.cpp index a2473ffb..138ad2aa 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -767,22 +767,22 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype, if (g_settings->getBool("tone_mapping")) shaders_header += "#define ENABLE_TONE_MAPPING\n"; - if(pixel_program != "") - pixel_program = shaders_header + pixel_program; - if(vertex_program != "") - vertex_program = shaders_header + vertex_program; - if(geometry_program != "") - geometry_program = shaders_header + geometry_program; // Call addHighLevelShaderMaterial() or addShaderMaterial() const c8* vertex_program_ptr = 0; const c8* pixel_program_ptr = 0; const c8* geometry_program_ptr = 0; - if(vertex_program != "") + if (!vertex_program.empty()) { + pixel_program = shaders_header + pixel_program; vertex_program_ptr = vertex_program.c_str(); - if(pixel_program != "") + } + if (!pixel_program.empty()) { + vertex_program = shaders_header + vertex_program; pixel_program_ptr = pixel_program.c_str(); - if(geometry_program != "") + } + if (!geometry_program.empty()) { + geometry_program = shaders_header + geometry_program; geometry_program_ptr = geometry_program.c_str(); + } s32 shadermat = -1; if(is_highlevel){ infostream<<"Compiling high level shaders for "< Date: Tue, 9 Feb 2016 23:46:20 +0100 Subject: [PATCH 250/531] Fix inverted conditions in shader.cpp --- src/shader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shader.cpp b/src/shader.cpp index 138ad2aa..d39a8307 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -772,11 +772,11 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype, const c8* pixel_program_ptr = 0; const c8* geometry_program_ptr = 0; if (!vertex_program.empty()) { - pixel_program = shaders_header + pixel_program; + vertex_program = shaders_header + vertex_program; vertex_program_ptr = vertex_program.c_str(); } if (!pixel_program.empty()) { - vertex_program = shaders_header + vertex_program; + pixel_program = shaders_header + pixel_program; pixel_program_ptr = pixel_program.c_str(); } if (!geometry_program.empty()) { From 47464c9344a1a4817ad6e4c6ec44526df305b1f6 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Sat, 23 Jan 2016 19:53:27 -0800 Subject: [PATCH 251/531] Fix backface culling when connecting to new servers. Introduce a new contentfeatures version (8). When clients connect using v27 protocol version, they can assume that the tiledef.backface_culling is trustable, but if clients connect to servers providing contentfeatures version 7, then the v27 clients know that backface culling settings provided by the server in tiledefs are bogus for mesh, plantlike, firelike or liquid drawtype nodes. thanks to hmmmm, est31, nerzhul. Tested on new client - new server, new client - old server old client - new server. --- src/nodedef.cpp | 43 ++++++++++++++++++------------------------ src/nodedef.h | 50 ++++++++++++++++++++++++------------------------- 2 files changed, 43 insertions(+), 50 deletions(-) diff --git a/src/nodedef.cpp b/src/nodedef.cpp index c60958ba..31366f7e 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -139,7 +139,7 @@ void TileDef::serialize(std::ostream &os, u16 protocol_version) const } } -void TileDef::deSerialize(std::istream &is, bool culling_ignore) +void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, const NodeDrawType drawtype) { int version = readU8(is); name = deSerializeString(is); @@ -153,10 +153,12 @@ void TileDef::deSerialize(std::istream &is, bool culling_ignore) tileable_horizontal = readU8(is); tileable_vertical = readU8(is); } - // when connecting to old servers - do not use - // provided values here since culling needs to be - // disabled by default for these drawtypes - if (culling_ignore) + + if ((contenfeatures_version < 8) && + ((drawtype == NDT_MESH) || + (drawtype == NDT_FIRELIKE) || + (drawtype == NDT_LIQUID) || + (drawtype == NDT_PLANTLIKE))) backface_culling = false; } @@ -268,7 +270,8 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const return; } - writeU8(os, 7); // version + writeU8(os, protocol_version < 27 ? 7 : 8); + os< 8) { + throw SerializationError("unsupported ContentFeatures version"); } name = deSerializeString(is); @@ -345,21 +350,15 @@ void ContentFeatures::deSerialize(std::istream &is) } drawtype = (enum NodeDrawType)readU8(is); - bool ignore_culling = ((version <= 26) && - ((drawtype == NDT_MESH) || - (drawtype == NDT_PLANTLIKE) || - (drawtype == NDT_FIRELIKE) || - (drawtype == NDT_LIQUID))); - visual_scale = readF1000(is); if(readU8(is) != 6) throw SerializationError("unsupported tile count"); for(u32 i = 0; i < 6; i++) - tiledef[i].deSerialize(is, ignore_culling); + tiledef[i].deSerialize(is, version, drawtype); if(readU8(is) != CF_SPECIAL_COUNT) throw SerializationError("unsupported CF_SPECIAL_COUNT"); for(u32 i = 0; i < CF_SPECIAL_COUNT; i++) - tiledef_special[i].deSerialize(is, ignore_culling); + tiledef_special[i].deSerialize(is, version, drawtype); alpha = readU8(is); post_effect_color.setAlpha(readU8(is)); post_effect_color.setRed(readU8(is)); @@ -1284,21 +1283,15 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version) } drawtype = (enum NodeDrawType)readU8(is); - bool ignore_culling = ((version <= 26) && - ((drawtype == NDT_MESH) || - (drawtype == NDT_PLANTLIKE) || - (drawtype == NDT_FIRELIKE) || - (drawtype == NDT_LIQUID))); - visual_scale = readF1000(is); if (readU8(is) != 6) throw SerializationError("unsupported tile count"); for (u32 i = 0; i < 6; i++) - tiledef[i].deSerialize(is, ignore_culling); + tiledef[i].deSerialize(is, version, drawtype); if (readU8(is) != CF_SPECIAL_COUNT) throw SerializationError("unsupported CF_SPECIAL_COUNT"); for (u32 i = 0; i < CF_SPECIAL_COUNT; i++) - tiledef_special[i].deSerialize(is, ignore_culling); + tiledef_special[i].deSerialize(is, version, drawtype); alpha = readU8(is); post_effect_color.setAlpha(readU8(is)); post_effect_color.setRed(readU8(is)); @@ -1342,12 +1335,12 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version) if (readU8(is) != 6) throw SerializationError("unsupported tile count"); for (u32 i = 0; i < 6; i++) - tiledef[i].deSerialize(is, drawtype); + tiledef[i].deSerialize(is, version, drawtype); // CF_SPECIAL_COUNT in version 6 = 2 if (readU8(is) != 2) throw SerializationError("unsupported CF_SPECIAL_COUNT"); for (u32 i = 0; i < 2; i++) - tiledef_special[i].deSerialize(is, drawtype); + tiledef_special[i].deSerialize(is, version, drawtype); alpha = readU8(is); post_effect_color.setAlpha(readU8(is)); post_effect_color.setRed(readU8(is)); diff --git a/src/nodedef.h b/src/nodedef.h index 182bd09b..db36021c 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -104,6 +104,30 @@ struct NodeBox struct MapNode; class NodeMetadata; +enum NodeDrawType +{ + NDT_NORMAL, // A basic solid block + NDT_AIRLIKE, // Nothing is drawn + NDT_LIQUID, // Do not draw face towards same kind of flowing/source liquid + NDT_FLOWINGLIQUID, // A very special kind of thing + NDT_GLASSLIKE, // Glass-like, don't draw faces towards other glass + NDT_ALLFACES, // Leaves-like, draw all faces no matter what + NDT_ALLFACES_OPTIONAL, // Fancy -> allfaces, fast -> normal + NDT_TORCHLIKE, + NDT_SIGNLIKE, + NDT_PLANTLIKE, + NDT_FENCELIKE, + NDT_RAILLIKE, + NDT_NODEBOX, + NDT_GLASSLIKE_FRAMED, // Glass-like, draw connected frames and all all + // visible faces + // uses 2 textures, one for frames, second for faces + NDT_FIRELIKE, // Draw faces slightly rotated and only on connecting nodes, + NDT_GLASSLIKE_FRAMED_OPTIONAL, // enabled -> connected, disabled -> Glass-like + // uses 2 textures, one for frames, second for faces + NDT_MESH, // Uses static meshes +}; + /* Stand-alone definition of a TileSpec (basically a server-side TileSpec) */ @@ -137,31 +161,7 @@ struct TileDef } void serialize(std::ostream &os, u16 protocol_version) const; - void deSerialize(std::istream &is, bool culling_ignore); -}; - -enum NodeDrawType -{ - NDT_NORMAL, // A basic solid block - NDT_AIRLIKE, // Nothing is drawn - NDT_LIQUID, // Do not draw face towards same kind of flowing/source liquid - NDT_FLOWINGLIQUID, // A very special kind of thing - NDT_GLASSLIKE, // Glass-like, don't draw faces towards other glass - NDT_ALLFACES, // Leaves-like, draw all faces no matter what - NDT_ALLFACES_OPTIONAL, // Fancy -> allfaces, fast -> normal - NDT_TORCHLIKE, - NDT_SIGNLIKE, - NDT_PLANTLIKE, - NDT_FENCELIKE, - NDT_RAILLIKE, - NDT_NODEBOX, - NDT_GLASSLIKE_FRAMED, // Glass-like, draw connected frames and all all - // visible faces - // uses 2 textures, one for frames, second for faces - NDT_FIRELIKE, // Draw faces slightly rotated and only on connecting nodes, - NDT_GLASSLIKE_FRAMED_OPTIONAL, // enabled -> connected, disabled -> Glass-like - // uses 2 textures, one for frames, second for faces - NDT_MESH, // Uses static meshes + void deSerialize(std::istream &is, const u8 contentfeatures_version, const NodeDrawType drawtype); }; #define CF_SPECIAL_COUNT 6 From b1428ab4bb1e2cf73bc8ac951d41d22203ea68a0 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Mon, 8 Feb 2016 22:20:04 +0100 Subject: [PATCH 252/531] Add '/clearobjects quick' --- builtin/game/chatcommands.lua | 12 +++- doc/lua_api.txt | 8 ++- src/environment.cpp | 115 +++++++++++++++++++++------------- src/environment.h | 20 +++++- src/script/lua_api/l_env.cpp | 18 +++++- src/script/lua_api/l_env.h | 2 + 6 files changed, 124 insertions(+), 51 deletions(-) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index fff893b2..9557a27c 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -848,14 +848,24 @@ core.register_chatcommand("kick", { }) core.register_chatcommand("clearobjects", { + params = "[full|quick]", description = "clear all objects in world", privs = {server=true}, func = function(name, param) + options = {} + if param == "" or param == "full" then + options.mode = "full" + elseif param == "quick" then + options.mode = "quick" + else + return false, "Invalid usage, see /help clearobjects." + end + core.log("action", name .. " clears all objects.") core.chat_send_all("Clearing all objects. This may take long." .. " You may experience a timeout. (by " .. name .. ")") - core.clear_objects() + core.clear_objects(options) core.log("action", "Object clearing done.") core.chat_send_all("*** Cleared all objects.") end, diff --git a/doc/lua_api.txt b/doc/lua_api.txt index b6bc957c..5f4e0642 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2046,8 +2046,12 @@ and `minetest.auth_reload` call the authetification handler. * `minetest.generate_decorations(vm, pos1, pos2)` * Generate all registered decorations within the VoxelManip `vm` and in the area from `pos1` to `pos2`. * `pos1` and `pos2` are optional and default to mapchunk minp and maxp. -* `minetest.clear_objects()` - * clear all objects in the environments +* `minetest.clear_objects([options])` + * Clear all objects in the environment + * Takes an optional table as an argument with the field `mode`. + * mode = `"full"`: Load and go through every mapblock, clearing objects (default). + * mode = `"quick"`: Clear objects immediately in loaded mapblocks; + clear objects in unloaded mapblocks only when the mapblocks are next activated. * `minetest.emerge_area(pos1, pos2, [callback], [param])` * Queue all blocks in the area from `pos1` to `pos2`, inclusive, to be asynchronously * fetched from memory, loaded from disk, or if inexistent, generates them. diff --git a/src/environment.cpp b/src/environment.cpp index 38316cb3..3bf5e1f0 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -354,6 +354,7 @@ ServerEnvironment::ServerEnvironment(ServerMap *map, m_active_block_interval_overload_skip(0), m_game_time(0), m_game_time_fraction_counter(0), + m_last_clear_objects_time(0), m_recommended_send_interval(0.1), m_max_lag_estimate(0.1) { @@ -503,6 +504,7 @@ void ServerEnvironment::saveMeta() Settings args; args.setU64("game_time", m_game_time); args.setU64("time_of_day", getTimeOfDay()); + args.setU64("last_clear_objects_time", m_last_clear_objects_time); args.writeLines(ss); ss<<"EnvArgsEnd\n"; @@ -546,6 +548,13 @@ void ServerEnvironment::loadMeta() // This is not as important setTimeOfDay(9000); } + + try { + m_last_clear_objects_time = args.getU64("last_clear_objects_time"); + } catch (SettingNotFoundException &e) { + // If missing, do as if clearObjects was never called + m_last_clear_objects_time = 0; + } } struct ActiveABM @@ -739,13 +748,19 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime) // Get time difference u32 dtime_s = 0; u32 stamp = block->getTimestamp(); - if(m_game_time > stamp && stamp != BLOCK_TIMESTAMP_UNDEFINED) - dtime_s = m_game_time - block->getTimestamp(); + if (m_game_time > stamp && stamp != BLOCK_TIMESTAMP_UNDEFINED) + dtime_s = m_game_time - stamp; dtime_s += additional_dtime; /*infostream<<"ServerEnvironment::activateBlock(): block timestamp: " <m_static_objects.m_stored.clear(); + // do not set changed flag to avoid unnecessary mapblock writes + } + // Set current time as timestamp block->setTimestampNoChangedFlag(m_game_time); @@ -858,22 +873,22 @@ void ServerEnvironment::getObjectsInsideRadius(std::vector &objects, v3f po } } -void ServerEnvironment::clearAllObjects() +void ServerEnvironment::clearObjects(ClearObjectsMode mode) { - infostream<<"ServerEnvironment::clearAllObjects(): " - <<"Removing all active objects"< objects_to_remove; - for(std::map::iterator + for (std::map::iterator i = m_active_objects.begin(); i != m_active_objects.end(); ++i) { ServerActiveObject* obj = i->second; - if(obj->getType() == ACTIVEOBJECT_TYPE_PLAYER) + if (obj->getType() == ACTIVEOBJECT_TYPE_PLAYER) continue; u16 id = i->first; // Delete static object if block is loaded - if(obj->m_static_exists){ + if (obj->m_static_exists) { MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block); - if(block){ + if (block) { block->m_static_objects.remove(id); block->raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_CLEAR_ALL_OBJECTS); @@ -881,7 +896,7 @@ void ServerEnvironment::clearAllObjects() } } // If known by some client, don't delete immediately - if(obj->m_known_by_count > 0){ + if (obj->m_known_by_count > 0) { obj->m_pending_deactivation = true; obj->m_removed = true; continue; @@ -893,39 +908,46 @@ void ServerEnvironment::clearAllObjects() m_script->removeObjectReference(obj); // Delete active object - if(obj->environmentDeletes()) + if (obj->environmentDeletes()) delete obj; // Id to be removed from m_active_objects objects_to_remove.push_back(id); } // Remove references from m_active_objects - for(std::vector::iterator i = objects_to_remove.begin(); + for (std::vector::iterator i = objects_to_remove.begin(); i != objects_to_remove.end(); ++i) { m_active_objects.erase(*i); } // Get list of loaded blocks std::vector loaded_blocks; - infostream<<"ServerEnvironment::clearAllObjects(): " - <<"Listing all loaded blocks"<listAllLoadedBlocks(loaded_blocks); - infostream<<"ServerEnvironment::clearAllObjects(): " - <<"Done listing all loaded blocks: " - < loadable_blocks; - infostream<<"ServerEnvironment::clearAllObjects(): " - <<"Listing all loadable blocks"<listAllLoadableBlocks(loadable_blocks); - infostream<<"ServerEnvironment::clearAllObjects(): " - <<"Done listing all loadable blocks: " - <listAllLoadableBlocks(loadable_blocks); + infostream << "ServerEnvironment::clearObjects(): " + << "Done listing all loadable blocks: " + << loadable_blocks.size() << std::endl; + } else { + loadable_blocks = loaded_blocks; + } + + infostream << "ServerEnvironment::clearObjects(): " + << "Now clearing objects in " << loadable_blocks.size() + << " blocks" << std::endl; // Grab a reference on each loaded block to avoid unloading it - for(std::vector::iterator i = loaded_blocks.begin(); + for (std::vector::iterator i = loaded_blocks.begin(); i != loaded_blocks.end(); ++i) { v3s16 p = *i; MapBlock *block = m_map->getBlockNoCreateNoEx(p); @@ -934,24 +956,27 @@ void ServerEnvironment::clearAllObjects() } // Remove objects in all loadable blocks - u32 unload_interval = g_settings->getS32("max_clearobjects_extra_loaded_blocks"); - unload_interval = MYMAX(unload_interval, 1); + u32 unload_interval = U32_MAX; + if (mode == CLEAR_OBJECTS_MODE_FULL) { + unload_interval = g_settings->getS32("max_clearobjects_extra_loaded_blocks"); + unload_interval = MYMAX(unload_interval, 1); + } u32 report_interval = loadable_blocks.size() / 10; u32 num_blocks_checked = 0; u32 num_blocks_cleared = 0; u32 num_objs_cleared = 0; - for(std::vector::iterator i = loadable_blocks.begin(); + for (std::vector::iterator i = loadable_blocks.begin(); i != loadable_blocks.end(); ++i) { v3s16 p = *i; MapBlock *block = m_map->emergeBlock(p, false); - if(!block){ - errorstream<<"ServerEnvironment::clearAllObjects(): " - <<"Failed to emerge block "<m_static_objects.m_stored.size(); u32 num_active = block->m_static_objects.m_active.size(); - if(num_stored != 0 || num_active != 0){ + if (num_stored != 0 || num_active != 0) { block->m_static_objects.m_stored.clear(); block->m_static_objects.m_active.clear(); block->raiseModified(MOD_STATE_WRITE_NEEDED, @@ -961,23 +986,23 @@ void ServerEnvironment::clearAllObjects() } num_blocks_checked++; - if(report_interval != 0 && - num_blocks_checked % report_interval == 0){ + if (report_interval != 0 && + num_blocks_checked % report_interval == 0) { float percent = 100.0 * (float)num_blocks_checked / - loadable_blocks.size(); - infostream<<"ServerEnvironment::clearAllObjects(): " - <<"Cleared "<unloadUnreferencedBlocks(); } } m_map->unloadUnreferencedBlocks(); // Drop references that were added above - for(std::vector::iterator i = loaded_blocks.begin(); + for (std::vector::iterator i = loaded_blocks.begin(); i != loaded_blocks.end(); ++i) { v3s16 p = *i; MapBlock *block = m_map->getBlockNoCreateNoEx(p); @@ -985,9 +1010,11 @@ void ServerEnvironment::clearAllObjects() block->refDrop(); } - infostream<<"ServerEnvironment::clearAllObjects(): " - <<"Finished: Cleared "< &objects, v3f pos, float radius); - // Clear all objects, loading and going through every MapBlock - void clearAllObjects(); + // Clear objects, loading and going through every MapBlock + void clearObjects(ClearObjectsMode mode); // This makes stuff happen void step(f32 dtime); @@ -410,6 +422,10 @@ private: u32 m_game_time; // A helper variable for incrementing the latter float m_game_time_fraction_counter; + // Time of last clearObjects call (game time). + // When a mapblock older than this is loaded, its objects are cleared. + u32 m_last_clear_objects_time; + // Active block modifiers std::vector m_abms; // An interval for generally sending object positions and stuff float m_recommended_send_interval; diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index 084b1b44..b445b1eb 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -36,6 +36,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "emerge.h" #include "pathfinder.h" +struct EnumString ModApiEnvMod::es_ClearObjectsMode[] = +{ + {CLEAR_OBJECTS_MODE_FULL, "full"}, + {CLEAR_OBJECTS_MODE_QUICK, "quick"}, + {0, NULL}, +}; + /////////////////////////////////////////////////////////////////////////////// @@ -727,13 +734,20 @@ int ModApiEnvMod::l_get_voxel_manip(lua_State *L) return 1; } -// clear_objects() +// clear_objects([options]) // clear all objects in the environment +// where options = {mode = "full" or "quick"} int ModApiEnvMod::l_clear_objects(lua_State *L) { GET_ENV_PTR; - env->clearAllObjects(); + ClearObjectsMode mode = CLEAR_OBJECTS_MODE_FULL; + if (lua_istable(L, 1)) { + mode = (ClearObjectsMode)getenumfield(L, 1, "mode", + ModApiEnvMod::es_ClearObjectsMode, mode); + } + + env->clearObjects(mode); return 0; } diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h index 424556d4..4f8dfcd3 100644 --- a/src/script/lua_api/l_env.h +++ b/src/script/lua_api/l_env.h @@ -170,6 +170,8 @@ private: public: static void Initialize(lua_State *L, int top); + + static struct EnumString es_ClearObjectsMode[]; }; class LuaABM : public ActiveBlockModifier { From 0f03547b033690932707b2dde1ce3eeb09ddcf7e Mon Sep 17 00:00:00 2001 From: Kahrl Date: Tue, 9 Feb 2016 08:56:40 +0100 Subject: [PATCH 253/531] Log /clearobjects mode --- builtin/game/chatcommands.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 9557a27c..6b4ca0d1 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -861,7 +861,8 @@ core.register_chatcommand("clearobjects", { return false, "Invalid usage, see /help clearobjects." end - core.log("action", name .. " clears all objects.") + core.log("action", name .. " clears all objects (" + .. options.mode .. " mode).") core.chat_send_all("Clearing all objects. This may take long." .. " You may experience a timeout. (by " .. name .. ")") From 13dd7959dbb62ca9327062181d7c4f04b469c38c Mon Sep 17 00:00:00 2001 From: Diego Martinez Date: Tue, 9 Feb 2016 21:46:22 -0300 Subject: [PATCH 254/531] Initialize facedir and wallmounted tables only once. This makes the functions a bit faster since they don't have to recreate the tables every invocation, and makes the code more readable. Also, document `wallmounted_to_dir`. The function was implemented but not documented in `lua_api.txt`. --- builtin/game/item.lua | 57 ++++++++++++++++++++++--------------------- doc/lua_api.txt | 2 ++ 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index c168bf09..c42aff5b 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -88,25 +88,26 @@ function core.dir_to_facedir(dir, is6d) end end +-- Table of possible dirs +local facedir_to_dir = { + {x= 0, y=0, z= 1}, + {x= 1, y=0, z= 0}, + {x= 0, y=0, z=-1}, + {x=-1, y=0, z= 0}, + {x= 0, y=-1, z= 0}, + {x= 0, y=1, z= 0}, +} +-- Mapping from facedir value to index in facedir_to_dir. +local facedir_to_dir_map = { + [0]=1, 2, 3, 4, + 5, 2, 6, 4, + 6, 2, 5, 4, + 1, 5, 3, 6, + 1, 6, 3, 5, + 1, 4, 3, 2, +} function core.facedir_to_dir(facedir) - --a table of possible dirs - return ({{x=0, y=0, z=1}, - {x=1, y=0, z=0}, - {x=0, y=0, z=-1}, - {x=-1, y=0, z=0}, - {x=0, y=-1, z=0}, - {x=0, y=1, z=0}}) - - --indexed into by a table of correlating facedirs - [({[0]=1, 2, 3, 4, - 5, 2, 6, 4, - 6, 2, 5, 4, - 1, 5, 3, 6, - 1, 6, 3, 5, - 1, 4, 3, 2}) - - --indexed into by the facedir in question - [facedir]] + return facedir_to_dir[facedir_to_dir_map[facedir]] end function core.dir_to_wallmounted(dir) @@ -131,17 +132,17 @@ function core.dir_to_wallmounted(dir) end end +-- table of dirs in wallmounted order +local wallmounted_to_dir = { + [0] = {x = 0, y = 1, z = 0}, + {x = 0, y = -1, z = 0}, + {x = 1, y = 0, z = 0}, + {x = -1, y = 0, z = 0}, + {x = 0, y = 0, z = 1}, + {x = 0, y = 0, z = -1}, +} function core.wallmounted_to_dir(wallmounted) - -- table of dirs in wallmounted order - return ({[0] = {x = 0, y = 1, z = 0}, - {x = 0, y = -1, z = 0}, - {x = 1, y = 0, z = 0}, - {x = -1, y = 0, z = 0}, - {x = 0, y = 0, z = 1}, - {x = 0, y = 0, z = -1}}) - - --indexed into by the wallmounted in question - [wallmounted] + return wallmounted_to_dir[wallmounted] end function core.get_node_drops(nodename, toolname) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 5f4e0642..d9a8bea9 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2153,6 +2153,8 @@ and `minetest.auth_reload` call the authetification handler. * Convert a facedir back into a vector aimed directly out the "back" of a node * `minetest.dir_to_wallmounted(dir)` * Convert a vector to a wallmounted value, used for `paramtype2="wallmounted"` +* `minetest.wallmounted_to_dir(wallmounted)` + * Convert a wallmounted value back into a vector aimed directly out the "back" of a node * `minetest.get_node_drops(nodename, toolname)` * Returns list of item names. * **Note**: This will be removed or modified in a future version. From 7e5eea9ad5f6b5a88c5b4b5bc1b2733cf451b9fd Mon Sep 17 00:00:00 2001 From: paramat Date: Thu, 11 Feb 2016 03:40:50 +0000 Subject: [PATCH 255/531] Documentation: Remove now unused 'vertical spawn range' --- builtin/settingtypes.txt | 6 ------ minetest.conf.example | 7 ------- 2 files changed, 13 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index eebccf78..2bb1c93b 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -702,12 +702,6 @@ enable_pvp (Player versus Player) bool true # If this is set, players will always (re)spawn at the given position. static_spawnpoint (Static spawnpoint) string -# Maximum distance above water level for player spawn. -# Larger values result in spawn points closer to (x = 0, z = 0). -# Smaller values may result in a suitable spawn point not being found, -# resulting in a spawn at (0, 0, 0) possibly buried underground. -vertical_spawn_range (Vertical spawn range) int 16 - # If enabled, new players cannot join with an empty password. disallow_empty_password (Disallow empty passwords) bool false diff --git a/minetest.conf.example b/minetest.conf.example index 09e86ef0..4cfb8dd2 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -839,13 +839,6 @@ # type: string # static_spawnpoint = -# Maximum distance above water level for player spawn. -# Larger values result in spawn points closer to (x = 0, z = 0). -# Smaller values may result in a suitable spawn point not being found, -# resulting in a spawn at (0, 0, 0) possibly buried underground. -# type: int -# vertical_spawn_range = 16 - # If enabled, new players cannot join with an empty password. # type: bool # disallow_empty_password = false From f253ff9f1ab246c67ee5d3fb520c584b384ee708 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Wed, 10 Feb 2016 04:27:45 +0100 Subject: [PATCH 256/531] Dump shader programs on compile errors --- src/shader.cpp | 23 +++++++++++++++++++++++ src/shader.h | 3 +++ 2 files changed, 26 insertions(+) diff --git a/src/shader.cpp b/src/shader.cpp index d39a8307..1d990eaf 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -808,6 +808,9 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype, "failed to generate \""< Date: Thu, 11 Feb 2016 07:22:15 +0100 Subject: [PATCH 257/531] Set proper GLSL pixel shader version --- src/shader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shader.cpp b/src/shader.cpp index 1d990eaf..ed6585bd 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -792,7 +792,7 @@ ShaderInfo generate_shader(std::string name, u8 material_type, u8 drawtype, video::EVST_VS_1_1, // Vertex shader version pixel_program_ptr, // Pixel shader program "pixelMain", // Pixel shader entry point - video::EPST_PS_1_1, // Pixel shader version + video::EPST_PS_1_2, // Pixel shader version geometry_program_ptr, // Geometry shader program "geometryMain", // Geometry shader entry point video::EGST_GS_4_0, // Geometry shader version From 9357294cfc4c73aa5ccc56a34aae8834a4766378 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Thu, 11 Feb 2016 04:57:01 +0100 Subject: [PATCH 258/531] Use single box for halo mesh --- src/hud.cpp | 21 ++++++++++++++++++--- src/hud.h | 1 + src/mesh.cpp | 30 +++++++++--------------------- src/mesh.h | 3 ++- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/hud.cpp b/src/hud.cpp index 0a77a1a2..6b28021a 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -84,6 +84,8 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr, m_selection_mesh = NULL; m_selection_boxes.clear(); + m_halo_boxes.clear(); + m_selection_pos = v3f(0.0, 0.0, 0.0); std::string mode = g_settings->get("node_highlighting"); m_selection_material.Lighting = false; @@ -574,10 +576,23 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset) 0,0,1,1 }; - m_selection_mesh = convertNodeboxesToMesh(m_selection_boxes, texture_uv); + // Use single halo box instead of multiple overlapping boxes. + // Temporary solution - problem can be solved with multiple + // rendering targets, or some method to remove inner surfaces. + // Thats because of halo transparency. - // scale final halo mesh - scaleMesh(m_selection_mesh, v3f(1.08, 1.08, 1.08)); + aabb3f halo_box(100.0, 100.0, 100.0, -100.0, -100.0, -100.0); + m_halo_boxes.clear(); + + for (std::vector::iterator + i = m_selection_boxes.begin(); + i != m_selection_boxes.end(); ++i) { + halo_box.addInternalBox(*i); + } + + m_halo_boxes.push_back(halo_box); + m_selection_mesh = convertNodeboxesToMesh( + m_halo_boxes, texture_uv, 0.5); } void Hud::resizeHotbar() { diff --git a/src/hud.h b/src/hud.h index d0158b2f..9583d660 100644 --- a/src/hud.h +++ b/src/hud.h @@ -162,6 +162,7 @@ private: video::SColor hbar_colors[4]; std::vector m_selection_boxes; + std::vector m_halo_boxes; v3f m_selection_pos; v3f m_selection_pos_with_offset; diff --git a/src/mesh.cpp b/src/mesh.cpp index d79f545f..3c393220 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -406,7 +406,7 @@ scene::IMesh* cloneMesh(scene::IMesh *src_mesh) } scene::IMesh* convertNodeboxesToMesh(const std::vector &boxes, - const f32 *uv_coords) + const f32 *uv_coords, float expand) { scene::SMesh* dst_mesh = new scene::SMesh(); @@ -421,31 +421,19 @@ scene::IMesh* convertNodeboxesToMesh(const std::vector &boxes, video::SColor c(255,255,255,255); - for(std::vector::const_iterator + for (std::vector::const_iterator i = boxes.begin(); i != boxes.end(); ++i) { aabb3f box = *i; + box.repair(); - f32 temp; - if (box.MinEdge.X > box.MaxEdge.X) - { - temp=box.MinEdge.X; - box.MinEdge.X=box.MaxEdge.X; - box.MaxEdge.X=temp; - } - if (box.MinEdge.Y > box.MaxEdge.Y) - { - temp=box.MinEdge.Y; - box.MinEdge.Y=box.MaxEdge.Y; - box.MaxEdge.Y=temp; - } - if (box.MinEdge.Z > box.MaxEdge.Z) - { - temp=box.MinEdge.Z; - box.MinEdge.Z=box.MaxEdge.Z; - box.MaxEdge.Z=temp; - } + box.MinEdge.X -= expand; + box.MinEdge.Y -= expand; + box.MinEdge.Z -= expand; + box.MaxEdge.X += expand; + box.MaxEdge.Y += expand; + box.MaxEdge.Z += expand; // Compute texture UV coords f32 tx1 = (box.MinEdge.X / BS) + 0.5; diff --git a/src/mesh.h b/src/mesh.h index ad3f8db4..8e189377 100644 --- a/src/mesh.h +++ b/src/mesh.h @@ -86,9 +86,10 @@ scene::IMesh* cloneMesh(scene::IMesh *src_mesh); Convert nodeboxes to mesh. boxes - set of nodeboxes to be converted into cuboids uv_coords[24] - table of texture uv coords for each cuboid face + expand - factor by which cuboids will be resized */ scene::IMesh* convertNodeboxesToMesh(const std::vector &boxes, - const f32 *uv_coords = NULL); + const f32 *uv_coords = NULL, float expand = 0); /* Update bounding box for a mesh. From 24b312cc085b7fae6477c8a47fffb57484b20f6e Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Thu, 11 Feb 2016 00:10:05 +0100 Subject: [PATCH 259/531] Drop luaentity_common.h which is not included anywhere --- src/luaentity_common.h | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 src/luaentity_common.h diff --git a/src/luaentity_common.h b/src/luaentity_common.h deleted file mode 100644 index 35b079ad..00000000 --- a/src/luaentity_common.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Minetest -Copyright (C) 2013 celeron55, Perttu Ahola - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef LUAENTITY_COMMON_HEADER -#define LUAENTITY_COMMON_HEADER - -#define LUAENTITY_CMD_UPDATE_POSITION 0 -#define LUAENTITY_CMD_SET_TEXTURE_MOD 1 -#define LUAENTITY_CMD_SET_SPRITE 2 -#define LUAENTITY_CMD_PUNCHED 3 -#define LUAENTITY_CMD_UPDATE_ARMOR_GROUPS 4 - -#endif - From fefa148d694364cb4c60fbb4ffdc0f8ae6388df6 Mon Sep 17 00:00:00 2001 From: nerzhul Date: Thu, 11 Feb 2016 15:21:21 +0100 Subject: [PATCH 260/531] v2d & aabbox3d & sky cleanups * Sky: rename Box => m_box and inline getBoundingBox * Uniformize aabbox3d to aabb3f --- src/client.cpp | 4 ++-- src/client/tile.h | 1 - src/clientmap.cpp | 2 +- src/clientmap.h | 4 ++-- src/clientobject.h | 2 +- src/clouds.cpp | 2 +- src/clouds.h | 6 +++--- src/content_cao.cpp | 8 ++++---- src/content_cao.h | 4 ++-- src/content_sao.cpp | 4 ++-- src/mesh.cpp | 6 +++--- src/object_properties.h | 2 +- src/particles.cpp | 4 ++-- src/particles.h | 6 +++--- src/player.h | 4 ++-- src/script/lua_api/l_areastore.cpp | 1 + src/script/lua_api/l_areastore.h | 1 - src/sky.cpp | 9 ++------- src/sky.h | 5 +++-- src/util/numeric.h | 4 ++-- src/wieldmesh.h | 4 ++-- 21 files changed, 39 insertions(+), 44 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index a845277b..2dc53778 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1471,13 +1471,13 @@ ClientActiveObject * Client::getSelectedActiveObject( { ClientActiveObject *obj = objects[i].obj; - core::aabbox3d *selection_box = obj->getSelectionBox(); + aabb3f *selection_box = obj->getSelectionBox(); if(selection_box == NULL) continue; v3f pos = obj->getPosition(); - core::aabbox3d offsetted_box( + aabb3f offsetted_box( selection_box->MinEdge + pos, selection_box->MaxEdge + pos ); diff --git a/src/client/tile.h b/src/client/tile.h index 7796e801..b7591684 100644 --- a/src/client/tile.h +++ b/src/client/tile.h @@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #define TILE_HEADER #include "irrlichttypes.h" -#include "irr_v2d.h" #include "irr_v3d.h" #include #include diff --git a/src/clientmap.cpp b/src/clientmap.cpp index 024f2a26..e67b6cbf 100644 --- a/src/clientmap.cpp +++ b/src/clientmap.cpp @@ -50,7 +50,7 @@ ClientMap::ClientMap( m_camera_direction(0,0,1), m_camera_fov(M_PI) { - m_box = core::aabbox3d(-BS*1000000,-BS*1000000,-BS*1000000, + m_box = aabb3f(-BS*1000000,-BS*1000000,-BS*1000000, BS*1000000,BS*1000000,BS*1000000); /* TODO: Add a callback function so these can be updated when a setting diff --git a/src/clientmap.h b/src/clientmap.h index d9239b52..ae5ab6d3 100644 --- a/src/clientmap.h +++ b/src/clientmap.h @@ -115,7 +115,7 @@ public: renderMap(driver, SceneManager->getSceneNodeRenderPass()); } - virtual const core::aabbox3d& getBoundingBox() const + virtual const aabb3f &getBoundingBox() const { return m_box; } @@ -140,7 +140,7 @@ public: private: Client *m_client; - core::aabbox3d m_box; + aabb3f m_box; MapDrawControl &m_control; diff --git a/src/clientobject.h b/src/clientobject.h index be24e138..3cc7c239 100644 --- a/src/clientobject.h +++ b/src/clientobject.h @@ -56,7 +56,7 @@ public: virtual void updateLight(u8 light_at_pos){} virtual void updateLightNoCheck(u8 light_at_pos){} virtual v3s16 getLightPosition(){return v3s16(0,0,0);} - virtual core::aabbox3d* getSelectionBox(){return NULL;} + virtual aabb3f *getSelectionBox() { return NULL; } virtual bool getCollisionBox(aabb3f *toset){return false;} virtual bool collideWithObjects(){return false;} virtual v3f getPosition(){return v3f(0,0,0);} diff --git a/src/clouds.cpp b/src/clouds.cpp index 29210e2b..82b63b6b 100644 --- a/src/clouds.cpp +++ b/src/clouds.cpp @@ -62,7 +62,7 @@ Clouds::Clouds( g_settings->registerChangedCallback("enable_3d_clouds", &cloud_3d_setting_changed, this); - m_box = core::aabbox3d(-BS*1000000,m_cloud_y-BS,-BS*1000000, + m_box = aabb3f(-BS*1000000,m_cloud_y-BS,-BS*1000000, BS*1000000,m_cloud_y+BS,BS*1000000); } diff --git a/src/clouds.h b/src/clouds.h index 195f48de..9c6b4178 100644 --- a/src/clouds.h +++ b/src/clouds.h @@ -53,7 +53,7 @@ public: virtual void render(); - virtual const core::aabbox3d& getBoundingBox() const + virtual const aabb3f &getBoundingBox() const { return m_box; } @@ -79,7 +79,7 @@ public: void updateCameraOffset(v3s16 camera_offset) { m_camera_offset = camera_offset; - m_box = core::aabbox3d(-BS * 1000000, m_cloud_y - BS - BS * camera_offset.Y, -BS * 1000000, + m_box = aabb3f(-BS * 1000000, m_cloud_y - BS - BS * camera_offset.Y, -BS * 1000000, BS * 1000000, m_cloud_y + BS - BS * camera_offset.Y, BS * 1000000); } @@ -87,7 +87,7 @@ public: private: video::SMaterial m_material; - core::aabbox3d m_box; + aabb3f m_box; s16 m_passed_cloud_y; float m_cloud_y; u16 m_cloud_radius_i; diff --git a/src/content_cao.cpp b/src/content_cao.cpp index c3247bd1..e7c7a0be 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -309,7 +309,7 @@ public: void initialize(const std::string &data); - core::aabbox3d* getSelectionBox() + aabb3f *getSelectionBox() {return &m_selection_box;} v3f getPosition() {return m_position;} @@ -319,7 +319,7 @@ public: bool getCollisionBox(aabb3f *toset) { return false; } private: - core::aabbox3d m_selection_box; + aabb3f m_selection_box; scene::IMeshSceneNode *m_node; v3f m_position; std::string m_itemstring; @@ -674,7 +674,7 @@ GenericCAO::~GenericCAO() removeFromScene(true); } -core::aabbox3d* GenericCAO::getSelectionBox() +aabb3f *GenericCAO::getSelectionBox() { if(!m_prop.is_visible || !m_is_visible || m_is_local_player || getParent() != NULL) return NULL; @@ -1185,7 +1185,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) if(m_prop.physical) { - core::aabbox3d box = m_prop.collisionbox; + aabb3f box = m_prop.collisionbox; box.MinEdge *= BS; box.MaxEdge *= BS; collisionMoveResult moveresult; diff --git a/src/content_cao.h b/src/content_cao.h index abb242aa..f71dfeb1 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -65,7 +65,7 @@ private: // scene::ISceneManager *m_smgr; IrrlichtDevice *m_irr; - core::aabbox3d m_selection_box; + aabb3f m_selection_box; scene::IMeshSceneNode *m_meshnode; scene::IAnimatedMeshSceneNode *m_animated_meshnode; WieldMeshSceneNode *m_wield_meshnode; @@ -127,7 +127,7 @@ public: bool collideWithObjects(); - core::aabbox3d* getSelectionBox(); + aabb3f *getSelectionBox(); v3f getPosition(); diff --git a/src/content_sao.cpp b/src/content_sao.cpp index fa245482..53bf3154 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -259,7 +259,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) else { if(m_prop.physical){ - core::aabbox3d box = m_prop.collisionbox; + aabb3f box = m_prop.collisionbox; box.MinEdge *= BS; box.MaxEdge *= BS; collisionMoveResult moveresult; @@ -786,7 +786,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, m_prop.hp_max = PLAYER_MAX_HP; m_prop.physical = false; m_prop.weight = 75; - m_prop.collisionbox = core::aabbox3d(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.); + m_prop.collisionbox = aabb3f(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.); // start of default appearance, this should be overwritten by LUA m_prop.visual = "upright_sprite"; m_prop.visual_size = v2f(1, 2); diff --git a/src/mesh.cpp b/src/mesh.cpp index 3c393220..b5bf8660 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -104,7 +104,7 @@ void scaleMesh(scene::IMesh *mesh, v3f scale) if (mesh == NULL) return; - core::aabbox3d bbox; + aabb3f bbox; bbox.reset(0, 0, 0); u32 mc = mesh->getMeshBufferCount(); @@ -132,7 +132,7 @@ void translateMesh(scene::IMesh *mesh, v3f vec) if (mesh == NULL) return; - core::aabbox3d bbox; + aabb3f bbox; bbox.reset(0, 0, 0); u32 mc = mesh->getMeshBufferCount(); @@ -346,7 +346,7 @@ void rotateMeshBy6dFacedir(scene::IMesh *mesh, int facedir) void recalculateBoundingBox(scene::IMesh *src_mesh) { - core::aabbox3d bbox; + aabb3f bbox; bbox.reset(0,0,0); for (u16 j = 0; j < src_mesh->getMeshBufferCount(); j++) { scene::IMeshBuffer *buf = src_mesh->getMeshBuffer(j); diff --git a/src/object_properties.h b/src/object_properties.h index 02ec9d1f..082d9a52 100644 --- a/src/object_properties.h +++ b/src/object_properties.h @@ -33,7 +33,7 @@ struct ObjectProperties bool physical; bool collideWithObjects; float weight; - core::aabbox3d collisionbox; + aabb3f collisionbox; std::string visual; std::string mesh; v2f visual_size; diff --git a/src/particles.cpp b/src/particles.cpp index 8150e19a..ab77e9f5 100644 --- a/src/particles.cpp +++ b/src/particles.cpp @@ -88,7 +88,7 @@ Particle::Particle( m_vertical = vertical; // Irrlicht stuff - m_collisionbox = core::aabbox3d + m_collisionbox = aabb3f (-size/2,-size/2,-size/2,size/2,size/2,size/2); this->setAutomaticCulling(scene::EAC_OFF); @@ -128,7 +128,7 @@ void Particle::step(float dtime) m_time += dtime; if (m_collisiondetection) { - core::aabbox3d box = m_collisionbox; + aabb3f box = m_collisionbox; v3f p_pos = m_pos*BS; v3f p_velocity = m_velocity*BS; collisionMoveSimple(m_env, m_gamedef, diff --git a/src/particles.h b/src/particles.h index 0ad8d71b..dda84385 100644 --- a/src/particles.h +++ b/src/particles.h @@ -52,7 +52,7 @@ class Particle : public scene::ISceneNode ); ~Particle(); - virtual const core::aabbox3d& getBoundingBox() const + virtual const aabb3f &getBoundingBox() const { return m_box; } @@ -85,8 +85,8 @@ private: ClientEnvironment *m_env; IGameDef *m_gamedef; - core::aabbox3d m_box; - core::aabbox3d m_collisionbox; + aabb3f m_box; + aabb3f m_collisionbox; video::SMaterial m_material; v2f m_texpos; v2f m_texsize; diff --git a/src/player.h b/src/player.h index 48b0a499..0d99297c 100644 --- a/src/player.h +++ b/src/player.h @@ -198,7 +198,7 @@ public: return m_name; } - core::aabbox3d getCollisionbox() + aabb3f getCollisionbox() { return m_collisionbox; } @@ -398,7 +398,7 @@ protected: f32 m_yaw; v3f m_speed; v3f m_position; - core::aabbox3d m_collisionbox; + aabb3f m_collisionbox; bool m_dirty; diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp index 72fe24b2..4148780a 100644 --- a/src/script/lua_api/l_areastore.cpp +++ b/src/script/lua_api/l_areastore.cpp @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "lua_api/l_internal.h" #include "common/c_converter.h" #include "cpp_api/s_security.h" +#include "irr_v3d.h" #include "areastore.h" #include "filesys.h" #ifndef ANDROID diff --git a/src/script/lua_api/l_areastore.h b/src/script/lua_api/l_areastore.h index a2552962..543a2aa3 100644 --- a/src/script/lua_api/l_areastore.h +++ b/src/script/lua_api/l_areastore.h @@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #define L_AREASTORE_H_ #include "lua_api/l_base.h" -#include "irr_v3d.h" #include "areastore.h" /* diff --git a/src/sky.cpp b/src/sky.cpp index 01fb8ef8..682ff05e 100644 --- a/src/sky.cpp +++ b/src/sky.cpp @@ -25,8 +25,8 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id, m_cloudcolor_bright_f(1,1,1,1) { setAutomaticCulling(scene::EAC_OFF); - Box.MaxEdge.set(0,0,0); - Box.MinEdge.set(0,0,0); + m_box.MaxEdge.set(0,0,0); + m_box.MinEdge.set(0,0,0); // create material @@ -94,11 +94,6 @@ void Sky::OnRegisterSceneNode() scene::ISceneNode::OnRegisterSceneNode(); } -const core::aabbox3d& Sky::getBoundingBox() const -{ - return Box; -} - //! renders the node. void Sky::render() { diff --git a/src/sky.h b/src/sky.h index 5023cc68..f1989177 100644 --- a/src/sky.h +++ b/src/sky.h @@ -42,7 +42,8 @@ public: //! renders the node. virtual void render(); - virtual const core::aabbox3d& getBoundingBox() const; + virtual const aabb3f &getBoundingBox() const + { return m_box; } // Used by Irrlicht for optimizing rendering virtual video::SMaterial& getMaterial(u32 i) @@ -74,7 +75,7 @@ public: } private: - core::aabbox3d Box; + aabb3f m_box; video::SMaterial m_materials[SKY_MATERIAL_COUNT]; // How much sun & moon transition should affect horizon color diff --git a/src/util/numeric.h b/src/util/numeric.h index e742ab24..61532786 100644 --- a/src/util/numeric.h +++ b/src/util/numeric.h @@ -310,9 +310,9 @@ inline v3f intToFloat(v3s16 p, f32 d) } // Random helper. Usually d=BS -inline core::aabbox3d getNodeBox(v3s16 p, float d) +inline aabb3f getNodeBox(v3s16 p, float d) { - return core::aabbox3d( + return aabb3f( (float)p.X * d - 0.5*d, (float)p.Y * d - 0.5*d, (float)p.Z * d - 0.5*d, diff --git a/src/wieldmesh.h b/src/wieldmesh.h index c29c06f9..0b3136bc 100644 --- a/src/wieldmesh.h +++ b/src/wieldmesh.h @@ -53,7 +53,7 @@ public: virtual void render(); - virtual const core::aabbox3d& getBoundingBox() const + virtual const aabb3f &getBoundingBox() const { return m_bounding_box; } private: @@ -74,7 +74,7 @@ private: // Bounding box culling is disabled for this type of scene node, // so this variable is just required so we can implement // getBoundingBox() and is set to an empty box. - core::aabbox3d m_bounding_box; + aabb3f m_bounding_box; }; scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item); From bd439338282fccb2c50fd1395e55843259914e25 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 13 Feb 2016 01:45:06 +0100 Subject: [PATCH 261/531] Remove unused 'm_selection_active' field Thanks @ExcaliburZero for noticing. Fixes #3698. --- src/guiFormSpecMenu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 0677e87a..9955048a 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -401,7 +401,6 @@ private: TextDest *m_text_dst; unsigned int m_formspec_version; std::string m_focused_element; - bool m_selection_active; typedef struct { bool explicit_size; From 5ca48a35a610aefd5c34d615cb49900f423b7aa6 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Tue, 9 Feb 2016 10:43:38 +0100 Subject: [PATCH 262/531] Formspec: recreate item_image_button pressed state for its image and label --- src/guiFormSpecMenu.cpp | 28 +++++++++++++----------- src/guiFormSpecMenu.h | 48 ++++++++++++++++++++++++++++++++--------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 226cc6cf..8a657a2f 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -1503,10 +1503,6 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) Environment->setFocus(e); } - e->setUseAlphaChannel(true); - e->setImage(guiScalingImageButton(Environment->getVideoDriver(), NULL, geom.X, geom.Y)); - e->setPressedImage(guiScalingImageButton(Environment->getVideoDriver(), NULL, geom.X, geom.Y)); - e->setScaleImage(true); spec.ftype = f_Button; rect+=data->basepos-padding; spec.rect=rect; @@ -1514,13 +1510,8 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) pos = padding + AbsoluteRect.UpperLeftCorner; pos.X += stof(v_pos[0]) * (float) spacing.X; pos.Y += stof(v_pos[1]) * (float) spacing.Y; - m_itemimages.push_back(ImageDrawSpec("", item_name, pos, geom)); - - StaticTextSpec label_spec( - utf8_to_wide(label), - rect - ); - m_static_texts.push_back(label_spec); + m_itemimages.push_back(ImageDrawSpec("", item_name, e, pos, geom)); + m_static_texts.push_back(StaticTextSpec(utf8_to_wide(label), rect, e)); return; } errorstream<< "Invalid ItemImagebutton element(" << parts.size() << "): '" << element << "'" << std::endl; @@ -2442,6 +2433,11 @@ void GUIFormSpecMenu::drawMenu() core::rect imgrect(0, 0, spec.geom.X, spec.geom.Y); // Viewport rectangle on screen core::rect rect = imgrect + spec.pos; + if (spec.parent_button && spec.parent_button->isPressed()) { + rect += core::dimension2d( + skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), + skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); + } drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect, m_gamedef, IT_ROT_NONE); } @@ -2474,8 +2470,16 @@ void GUIFormSpecMenu::drawMenu() */ for (u32 i = 0; i < m_static_texts.size(); i++) { const StaticTextSpec &spec = m_static_texts[i]; + core::rect rect = spec.rect; + if (spec.parent_button && spec.parent_button->isPressed()) { + // Use image offset instead of text's because its a bit smaller + // and fits better, also TEXT_OFFSET_X is always 0 + rect += core::dimension2d( + skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), + skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); + } video::SColor color(255, 255, 255, 255); - m_font->draw(spec.text.c_str(), spec.rect, color, true, true, &spec.rect); + m_font->draw(spec.text.c_str(), rect, color, true, true, &rect); } /* diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 9955048a..005b9136 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -139,36 +139,53 @@ class GUIFormSpecMenu : public GUIModalMenu struct ImageDrawSpec { - ImageDrawSpec() + ImageDrawSpec(): + parent_button(NULL) + { + } + ImageDrawSpec(const std::string &a_name, + const std::string &a_item_name, + gui::IGUIButton *a_parent_button, + const v2s32 &a_pos, const v2s32 &a_geom): + name(a_name), + item_name(a_item_name), + parent_button(a_parent_button), + pos(a_pos), + geom(a_geom), + scale(true) { } ImageDrawSpec(const std::string &a_name, const std::string &a_item_name, const v2s32 &a_pos, const v2s32 &a_geom): name(a_name), - item_name (a_item_name), + item_name(a_item_name), + parent_button(NULL), pos(a_pos), - geom(a_geom) + geom(a_geom), + scale(true) { - scale = true; } ImageDrawSpec(const std::string &a_name, const v2s32 &a_pos, const v2s32 &a_geom): name(a_name), + parent_button(NULL), pos(a_pos), - geom(a_geom) + geom(a_geom), + scale(true) { - scale = true; } ImageDrawSpec(const std::string &a_name, const v2s32 &a_pos): name(a_name), - pos(a_pos) + parent_button(NULL), + pos(a_pos), + scale(false) { - scale = false; } std::string name; std::string item_name; + gui::IGUIButton *parent_button; v2s32 pos; v2s32 geom; bool scale; @@ -229,17 +246,28 @@ class GUIFormSpecMenu : public GUIModalMenu }; struct StaticTextSpec { - StaticTextSpec() + StaticTextSpec(): + parent_button(NULL) { } StaticTextSpec(const std::wstring &a_text, const core::rect &a_rect): text(a_text), - rect(a_rect) + rect(a_rect), + parent_button(NULL) + { + } + StaticTextSpec(const std::wstring &a_text, + const core::rect &a_rect, + gui::IGUIButton *a_parent_button): + text(a_text), + rect(a_rect), + parent_button(a_parent_button) { } std::wstring text; core::rect rect; + gui::IGUIButton *parent_button; }; public: From c17c40a0f5f4276c576400259e691f1273370193 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 13 Feb 2016 22:08:58 +0100 Subject: [PATCH 263/531] Formspec: fix broken irrlicht 1.7 build Fixes #3701. --- src/guiFormSpecMenu.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 8a657a2f..2e9421b3 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2434,9 +2434,14 @@ void GUIFormSpecMenu::drawMenu() // Viewport rectangle on screen core::rect rect = imgrect + spec.pos; if (spec.parent_button && spec.parent_button->isPressed()) { +#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) + rect += core::dimension2d( + 0.05 * (float)rect.getWidth(), 0.05 * (float)rect.getHeight()); +#else rect += core::dimension2d( skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); +#endif } drawItemStack(driver, m_font, item, rect, &AbsoluteClippingRect, m_gamedef, IT_ROT_NONE); @@ -2472,11 +2477,16 @@ void GUIFormSpecMenu::drawMenu() const StaticTextSpec &spec = m_static_texts[i]; core::rect rect = spec.rect; if (spec.parent_button && spec.parent_button->isPressed()) { +#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) + rect += core::dimension2d( + 0.05 * (float)rect.getWidth(), 0.05 * (float)rect.getHeight()); +#else // Use image offset instead of text's because its a bit smaller // and fits better, also TEXT_OFFSET_X is always 0 rect += core::dimension2d( skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X), skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y)); +#endif } video::SColor color(255, 255, 255, 255); m_font->draw(spec.text.c_str(), rect, color, true, true, &rect); From cfc8e447595db0351754a2eae29a18918742d29d Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sun, 14 Feb 2016 09:00:34 +0100 Subject: [PATCH 264/531] Use proper variable types for uniform sampler layers --- src/game.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index cae468d4..44b35ff5 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -907,15 +907,18 @@ public: services->setPixelShaderConstant("yawVec", (irr::f32 *)&minimap_yaw_vec, 3); // Uniform sampler layers - int layer0 = 0; - int layer1 = 1; - int layer2 = 2; // before 1.8 there isn't a "integer interface", only float #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) + f32 layer0 = 0; + f32 layer1 = 1; + f32 layer2 = 2; services->setPixelShaderConstant("baseTexture" , (irr::f32 *)&layer0, 1); services->setPixelShaderConstant("normalTexture" , (irr::f32 *)&layer1, 1); services->setPixelShaderConstant("textureFlags" , (irr::f32 *)&layer2, 1); #else + s32 layer0 = 0; + s32 layer1 = 1; + s32 layer2 = 2; services->setPixelShaderConstant("baseTexture" , (irr::s32 *)&layer0, 1); services->setPixelShaderConstant("normalTexture" , (irr::s32 *)&layer1, 1); services->setPixelShaderConstant("textureFlags" , (irr::s32 *)&layer2, 1); From 3a74b84007f2c0f0690524459cc935616f8805d2 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sun, 14 Feb 2016 17:45:06 +0100 Subject: [PATCH 265/531] Player::accelerateHorizontal/Vertical should be member of LocalPlayer --- src/localplayer.cpp | 33 +++++++++++++++++++++++++++++++++ src/localplayer.h | 5 ++++- src/player.cpp | 35 ----------------------------------- src/player.h | 3 --- 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 60aec95d..524c6272 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -622,3 +622,36 @@ v3s16 LocalPlayer::getStandingNodePos() return floatToInt(getPosition() - v3f(0, BS, 0), BS); } +// Horizontal acceleration (X and Z), Y direction is ignored +void LocalPlayer::accelerateHorizontal(const v3f &target_speed, const f32 max_increase) +{ + if (max_increase == 0) + return; + + v3f d_wanted = target_speed - m_speed; + d_wanted.Y = 0; + f32 dl = d_wanted.getLength(); + if (dl > max_increase) + dl = max_increase; + + v3f d = d_wanted.normalize() * dl; + + m_speed.X += d.X; + m_speed.Z += d.Z; +} + +// Vertical acceleration (Y), X and Z directions are ignored +void LocalPlayer::accelerateVertical(const v3f &target_speed, const f32 max_increase) +{ + if (max_increase == 0) + return; + + f32 d_wanted = target_speed.Y - m_speed.Y; + if (d_wanted > max_increase) + d_wanted = max_increase; + else if (d_wanted < -max_increase) + d_wanted = -max_increase; + + m_speed.Y += d_wanted; +} + diff --git a/src/localplayer.h b/src/localplayer.h index 40a7f089..3ae0c4e5 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -45,7 +45,7 @@ public: bool isAttached; v3f overridePosition; - + void move(f32 dtime, Environment *env, f32 pos_max_d); void move(f32 dtime, Environment *env, f32 pos_max_d, std::vector *collision_info); @@ -81,6 +81,9 @@ public: } private: + void accelerateHorizontal(const v3f &target_speed, const f32 max_increase); + void accelerateVertical(const v3f &target_speed, const f32 max_increase); + // This is used for determining the sneaking range v3s16 m_sneak_node; // Whether the player is allowed to sneak diff --git a/src/player.cpp b/src/player.cpp index dd5e0450..623dde23 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -111,41 +111,6 @@ Player::~Player() clearHud(); } -// Horizontal acceleration (X and Z), Y direction is ignored -void Player::accelerateHorizontal(v3f target_speed, f32 max_increase) -{ - if(max_increase == 0) - return; - - v3f d_wanted = target_speed - m_speed; - d_wanted.Y = 0; - f32 dl = d_wanted.getLength(); - if(dl > max_increase) - dl = max_increase; - - v3f d = d_wanted.normalize() * dl; - - m_speed.X += d.X; - m_speed.Z += d.Z; - -} - -// Vertical acceleration (Y), X and Z directions are ignored -void Player::accelerateVertical(v3f target_speed, f32 max_increase) -{ - if(max_increase == 0) - return; - - f32 d_wanted = target_speed.Y - m_speed.Y; - if(d_wanted > max_increase) - d_wanted = max_increase; - else if(d_wanted < -max_increase) - d_wanted = -max_increase; - - m_speed.Y += d_wanted; - -} - v3s16 Player::getLightPosition() const { return floatToInt(m_position + v3f(0,BS+BS/2,0), BS); diff --git a/src/player.h b/src/player.h index 0d99297c..50267c72 100644 --- a/src/player.h +++ b/src/player.h @@ -119,9 +119,6 @@ public: m_speed = speed; } - void accelerateHorizontal(v3f target_speed, f32 max_increase); - void accelerateVertical(v3f target_speed, f32 max_increase); - v3f getPosition() { return m_position; From 7ea40e45b1bf893aa693c179cbe8612ede86faee Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Fri, 12 Feb 2016 12:25:20 +0100 Subject: [PATCH 266/531] Use vertices with tangents only when its needed. --- src/client.cpp | 6 +- src/client.h | 1 + src/mapblock_mesh.cpp | 178 +++++++++++++++++++++++++++--------------- src/mapblock_mesh.h | 13 ++- 4 files changed, 131 insertions(+), 67 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 2dc53778..ed5ff96f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -263,6 +263,9 @@ Client::Client( m_cache_smooth_lighting = g_settings->getBool("smooth_lighting"); m_cache_enable_shaders = g_settings->getBool("enable_shaders"); + m_cache_use_tangent_vertices = m_cache_enable_shaders && ( + g_settings->getBool("enable_bumpmapping") || + g_settings->getBool("enable_parallax_occlusion")); } void Client::Stop() @@ -1582,7 +1585,8 @@ void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent) Create a task to update the mesh of the block */ - MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders); + MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders, + m_cache_use_tangent_vertices); { //TimeTaker timer("data fill"); diff --git a/src/client.h b/src/client.h index 98a8bc12..c16e9b77 100644 --- a/src/client.h +++ b/src/client.h @@ -677,6 +677,7 @@ private: // TODO: Add callback to update these when g_settings changes bool m_cache_smooth_lighting; bool m_cache_enable_shaders; + bool m_cache_use_tangent_vertices; DISABLE_CLASS_COPY(Client); }; diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 9486220e..8b3d3c0d 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -33,24 +33,26 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/directiontables.h" #include -static void applyFacesShading(video::SColor& color, float factor) +static void applyFacesShading(video::SColor &color, const float factor) { - color.setRed(core::clamp(core::round32(color.getRed()*factor), 0, 255)); - color.setGreen(core::clamp(core::round32(color.getGreen()*factor), 0, 255)); + color.setRed(core::clamp(core::round32(color.getRed() * factor), 0, 255)); + color.setGreen(core::clamp(core::round32(color.getGreen() * factor), 0, 255)); } /* MeshMakeData */ -MeshMakeData::MeshMakeData(IGameDef *gamedef, bool use_shaders): +MeshMakeData::MeshMakeData(IGameDef *gamedef, bool use_shaders, + bool use_tangent_vertices): m_vmanip(), m_blockpos(-1337,-1337,-1337), m_crack_pos_relative(-1337, -1337, -1337), m_smooth_lighting(false), m_show_hud(false), m_gamedef(gamedef), - m_use_shaders(use_shaders) + m_use_shaders(use_shaders), + m_use_tangent_vertices(use_tangent_vertices) {} void MeshMakeData::fill(MapBlock *block) @@ -1032,6 +1034,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): m_daynight_diffs() { m_enable_shaders = data->m_use_shaders; + m_use_tangent_vertices = data->m_use_tangent_vertices; if (g_settings->getBool("enable_minimap")) { m_minimap_mapblock = new MinimapMapblock; @@ -1064,15 +1067,14 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): Convert FastFaces to MeshCollector */ - MeshCollector collector; + MeshCollector collector(m_use_tangent_vertices); { // avg 0ms (100ms spikes when loading textures the first time) // (NOTE: probably outdated) //TimeTaker timer2("MeshCollector building"); - for(u32 i=0; iColor; - if (!vc.getBlue()) { - if (vertex->Normal.Y < -0.5) { - applyFacesShading (vc, 0.447213); - } else if (vertex->Normal.X > 0.5) { - applyFacesShading (vc, 0.670820); - } else if (vertex->Normal.X < -0.5) { - applyFacesShading (vc, 0.670820); - } else if (vertex->Normal.Z > 0.5) { - applyFacesShading (vc, 0.836660); - } else if (vertex->Normal.Z < -0.5) { - applyFacesShading (vc, 0.836660); + if (!vc->getBlue()) { + if (Normal->Y < -0.5) { + applyFacesShading(*vc, 0.447213); + } else if (Normal->X > 0.5) { + applyFacesShading(*vc, 0.670820); + } else if (Normal->X < -0.5) { + applyFacesShading(*vc, 0.670820); + } else if (Normal->Z > 0.5) { + applyFacesShading(*vc, 0.836660); + } else if (Normal->Z < -0.5) { + applyFacesShading(*vc, 0.836660); } } - if(!m_enable_shaders) - { + if (!m_enable_shaders) { // - Classic lighting (shaders handle this by themselves) // Set initial real color and store for later updates - u8 day = vc.getRed(); - u8 night = vc.getGreen(); - finalColorBlend(vc, day, night, 1000); - if(day != night) + u8 day = vc->getRed(); + u8 night = vc->getGreen(); + finalColorBlend(*vc, day, night, 1000); + if (day != night) { m_daynight_diffs[i][j] = std::make_pair(day, night); + } } } @@ -1201,34 +1211,46 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): p.tile.applyMaterialOptions(material); } - // Create meshbuffer - scene::SMeshBuffer *buf = new scene::SMeshBuffer(); - // Set material - buf->Material = material; - // Add to mesh - scene::SMesh *mesh = (scene::SMesh *)m_mesh; - mesh->addMeshBuffer(buf); - // Mesh grabbed it - buf->drop(); - buf->append(&p.vertices[0], p.vertices.size(), - &p.indices[0], p.indices.size()); -} - m_camera_offset = camera_offset; + scene::SMesh *mesh = (scene::SMesh *)m_mesh; + + // Create meshbuffer, add to mesh + if (m_use_tangent_vertices) { + scene::SMeshBufferTangents *buf = new scene::SMeshBufferTangents(); + // Set material + buf->Material = material; + // Add to mesh + mesh->addMeshBuffer(buf); + // Mesh grabbed it + buf->drop(); + buf->append(&p.tangent_vertices[0], p.tangent_vertices.size(), + &p.indices[0], p.indices.size()); + } else { + scene::SMeshBuffer *buf = new scene::SMeshBuffer(); + // Set material + buf->Material = material; + // Add to mesh + mesh->addMeshBuffer(buf); + // Mesh grabbed it + buf->drop(); + buf->append(&p.vertices[0], p.vertices.size(), + &p.indices[0], p.indices.size()); + } + } /* Do some stuff to the mesh */ + m_camera_offset = camera_offset; + translateMesh(m_mesh, + intToFloat(data->m_blockpos * MAP_BLOCKSIZE - camera_offset, BS)); - translateMesh(m_mesh, intToFloat(data->m_blockpos * MAP_BLOCKSIZE - camera_offset, BS)); - - if (m_enable_shaders) { - scene::IMeshManipulator* meshmanip = m_gamedef->getSceneManager()->getMeshManipulator(); - scene::IMesh* tangentMesh = meshmanip->createMeshWithTangents(m_mesh); - m_mesh->drop(); - m_mesh = tangentMesh; + if (m_use_tangent_vertices) { + scene::IMeshManipulator* meshmanip = + m_gamedef->getSceneManager()->getMeshManipulator(); + meshmanip->recalculateTangents(m_mesh, true, false, false); } - if(m_mesh) + if (m_mesh) { #if 0 // Usually 1-700 faces and 1-7 materials @@ -1400,17 +1422,30 @@ void MeshCollector::append(const TileSpec &tile, p = &prebuffers[prebuffers.size() - 1]; } - u32 vertex_count = p->vertices.size(); - for (u32 i = 0; i < numIndices; i++) { + u32 vertex_count; + if (m_use_tangent_vertices) { + vertex_count = p->tangent_vertices.size(); + p->tangent_vertices.reserve(vertex_count + numVertices); + for (u32 i = 0; i < numVertices; i++) { + video::S3DVertexTangents vert(vertices[i].Pos, vertices[i].Normal, + vertices[i].Color, vertices[i].TCoords); + p->tangent_vertices.push_back(vert); + } + } else { + vertex_count = p->vertices.size(); + p->vertices.reserve(vertex_count + numVertices); + for (u32 i = 0; i < numVertices; i++) { + video::S3DVertex vert(vertices[i].Pos, vertices[i].Normal, + vertices[i].Color, vertices[i].TCoords); + p->vertices.push_back(vert); + } + } + + p->indices.reserve(p->indices.size() + numIndices); + for (u32 i = 0; i < numIndices; i++) { u32 j = indices[i] + vertex_count; p->indices.push_back(j); } - - for (u32 i = 0; i < numVertices; i++) { - video::S3DVertex vert(vertices[i].Pos, vertices[i].Normal, - vertices[i].Color, vertices[i].TCoords); - p->vertices.push_back(vert); - } } /* @@ -1446,15 +1481,28 @@ void MeshCollector::append(const TileSpec &tile, p = &prebuffers[prebuffers.size() - 1]; } - u32 vertex_count = p->vertices.size(); + u32 vertex_count; + if (m_use_tangent_vertices) { + vertex_count = p->tangent_vertices.size(); + p->tangent_vertices.reserve(vertex_count + numVertices); + for (u32 i = 0; i < numVertices; i++) { + video::S3DVertexTangents vert(vertices[i].Pos + pos, + vertices[i].Normal, c, vertices[i].TCoords); + p->tangent_vertices.push_back(vert); + } + } else { + vertex_count = p->vertices.size(); + p->vertices.reserve(vertex_count + numVertices); + for (u32 i = 0; i < numVertices; i++) { + video::S3DVertex vert(vertices[i].Pos + pos, + vertices[i].Normal, c, vertices[i].TCoords); + p->vertices.push_back(vert); + } + } + + p->indices.reserve(p->indices.size() + numIndices); for (u32 i = 0; i < numIndices; i++) { u32 j = indices[i] + vertex_count; p->indices.push_back(j); } - - for (u32 i = 0; i < numVertices; i++) { - video::S3DVertex vert(vertices[i].Pos + pos, vertices[i].Normal, - c, vertices[i].TCoords); - p->vertices.push_back(vert); - } } diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h index 421e8f2b..98749040 100644 --- a/src/mapblock_mesh.h +++ b/src/mapblock_mesh.h @@ -46,8 +46,10 @@ struct MeshMakeData IGameDef *m_gamedef; bool m_use_shaders; + bool m_use_tangent_vertices; - MeshMakeData(IGameDef *gamedef, bool use_shaders); + MeshMakeData(IGameDef *gamedef, bool use_shaders, + bool use_tangent_vertices = false); /* Copy central data directly from block, and other data from @@ -130,6 +132,7 @@ private: IShaderSource *m_shdrsrc; bool m_enable_shaders; + bool m_use_tangent_vertices; // Must animate() be called before rendering? bool m_has_animation; @@ -167,11 +170,19 @@ struct PreMeshBuffer TileSpec tile; std::vector indices; std::vector vertices; + std::vector tangent_vertices; }; struct MeshCollector { std::vector prebuffers; + bool m_use_tangent_vertices; + + MeshCollector(bool use_tangent_vertices): + m_use_tangent_vertices(use_tangent_vertices) + { + } + void append(const TileSpec &material, const video::S3DVertex *vertices, u32 numVertices, const u16 *indices, u32 numIndices); From 08517244f7d19556f0449ff5d90f66e9ef079977 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Tue, 16 Feb 2016 03:51:57 +0100 Subject: [PATCH 267/531] Mapblock mesh: Eliminate meshgen lags --- src/mapblock_mesh.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 8b3d3c0d..42e84b75 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -1425,7 +1425,6 @@ void MeshCollector::append(const TileSpec &tile, u32 vertex_count; if (m_use_tangent_vertices) { vertex_count = p->tangent_vertices.size(); - p->tangent_vertices.reserve(vertex_count + numVertices); for (u32 i = 0; i < numVertices; i++) { video::S3DVertexTangents vert(vertices[i].Pos, vertices[i].Normal, vertices[i].Color, vertices[i].TCoords); @@ -1433,7 +1432,6 @@ void MeshCollector::append(const TileSpec &tile, } } else { vertex_count = p->vertices.size(); - p->vertices.reserve(vertex_count + numVertices); for (u32 i = 0; i < numVertices; i++) { video::S3DVertex vert(vertices[i].Pos, vertices[i].Normal, vertices[i].Color, vertices[i].TCoords); @@ -1441,7 +1439,6 @@ void MeshCollector::append(const TileSpec &tile, } } - p->indices.reserve(p->indices.size() + numIndices); for (u32 i = 0; i < numIndices; i++) { u32 j = indices[i] + vertex_count; p->indices.push_back(j); @@ -1484,7 +1481,6 @@ void MeshCollector::append(const TileSpec &tile, u32 vertex_count; if (m_use_tangent_vertices) { vertex_count = p->tangent_vertices.size(); - p->tangent_vertices.reserve(vertex_count + numVertices); for (u32 i = 0; i < numVertices; i++) { video::S3DVertexTangents vert(vertices[i].Pos + pos, vertices[i].Normal, c, vertices[i].TCoords); @@ -1492,7 +1488,6 @@ void MeshCollector::append(const TileSpec &tile, } } else { vertex_count = p->vertices.size(); - p->vertices.reserve(vertex_count + numVertices); for (u32 i = 0; i < numVertices; i++) { video::S3DVertex vert(vertices[i].Pos + pos, vertices[i].Normal, c, vertices[i].TCoords); @@ -1500,7 +1495,6 @@ void MeshCollector::append(const TileSpec &tile, } } - p->indices.reserve(p->indices.size() + numIndices); for (u32 i = 0; i < numIndices; i++) { u32 j = indices[i] + vertex_count; p->indices.push_back(j); From 4c654557ecc32620b78c146bd6d90f531a71d25a Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 16 Feb 2016 23:58:30 +0100 Subject: [PATCH 268/531] Clientiface: remove "value is dummy" from docs Commit 6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 "Migrate to STL containers/algorithms." has replaced core::map with std::set, but didn't update the accompanying comment saying "value is dummy". This happened at two places. --- src/clientiface.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/clientiface.h b/src/clientiface.h index 0d2bca19..d7622cad 100644 --- a/src/clientiface.h +++ b/src/clientiface.h @@ -322,7 +322,6 @@ public: /* List of active objects that the client knows of. - Value is dummy. */ std::set m_known_objects; @@ -377,7 +376,7 @@ private: - A block is cleared from here when client says it has deleted it from it's memory - Key is position, value is dummy. + List of block positions. No MapBlock* is stored here because the blocks can get deleted. */ std::set m_blocks_sent; From c3b279750ece0b5144bf8e973d55108347462223 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Mon, 15 Feb 2016 14:01:01 +0100 Subject: [PATCH 269/531] Move object nametags to camera --- src/camera.cpp | 49 ++++++++++++++++++++++++++ src/camera.h | 30 ++++++++++++++-- src/client.cpp | 1 + src/client.h | 8 +++++ src/content_cao.cpp | 83 ++++++++++++++++++--------------------------- src/content_cao.h | 7 +++- src/drawscene.cpp | 7 +++- src/game.cpp | 1 + src/gamedef.h | 6 ++++ 9 files changed, 138 insertions(+), 54 deletions(-) diff --git a/src/camera.cpp b/src/camera.cpp index 94bbe988..8aac3212 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/numeric.h" #include "util/mathconstants.h" #include "constants.h" +#include "fontengine.h" #define CAMERA_OFFSET_STEP 200 @@ -81,6 +82,7 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control, { //dstream<getVideoDriver(); // note: making the camera node a child of the player node // would lead to unexpected behaviour, so we don't do that. m_playernode = smgr->addEmptySceneNode(smgr->getRootSceneNode()); @@ -110,6 +112,7 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control, m_cache_wanted_fps = g_settings->getFloat("wanted_fps"); m_cache_fov = g_settings->getFloat("fov"); m_cache_view_bobbing = g_settings->getBool("view_bobbing"); + m_nametags.clear(); } Camera::~Camera() @@ -662,3 +665,49 @@ void Camera::drawWieldedTool(irr::core::matrix4* translation) } m_wieldmgr->drawAll(); } + +void Camera::drawNametags() +{ + core::matrix4 trans = m_cameranode->getProjectionMatrix(); + trans *= m_cameranode->getViewMatrix(); + + for (std::list::const_iterator + i = m_nametags.begin(); + i != m_nametags.end(); ++i) { + Nametag *nametag = *i; + v3f pos = nametag->parent_node->getPosition() - + intToFloat(m_camera_offset, BS) + v3f(0.0, 1.1 * BS, 0.0); + f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f }; + trans.multiplyWith1x4Matrix(transformed_pos); + if (transformed_pos[3] > 0) { + core::dimension2d textsize = + g_fontengine->getFont()->getDimension( + utf8_to_wide(nametag->nametag_text).c_str()); + f32 zDiv = transformed_pos[3] == 0.0f ? 1.0f : + core::reciprocal(transformed_pos[3]); + v2u32 screensize = m_driver->getScreenSize(); + v2s32 screen_pos; + screen_pos.X = screensize.X * + (0.5 * transformed_pos[0] * zDiv + 0.5) - textsize.Width / 2; + screen_pos.Y = screensize.Y * + (0.5 - transformed_pos[1] * zDiv * 0.5) - textsize.Height / 2; + core::rect size(0, 0, textsize.Width, textsize.Height); + g_fontengine->getFont()->draw(utf8_to_wide(nametag->nametag_text).c_str(), + size + screen_pos, nametag->nametag_color); + } + } +} + +Nametag *Camera::addNametag(scene::ISceneNode *parent_node, + std::string nametag_text, video::SColor nametag_color) +{ + Nametag *nametag = new Nametag(parent_node, nametag_text, nametag_color); + m_nametags.push_back(nametag); + return nametag; +} + +void Camera::removeNametag(Nametag *nametag) +{ + m_nametags.remove(nametag); + delete nametag; +} diff --git a/src/camera.h b/src/camera.h index 006f4b3c..2df7da2b 100644 --- a/src/camera.h +++ b/src/camera.h @@ -26,6 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "client/tile.h" #include "util/numeric.h" #include +#include +#include #include "client.h" @@ -34,6 +36,20 @@ struct MapDrawControl; class IGameDef; class WieldMeshSceneNode; +struct Nametag { + Nametag(scene::ISceneNode *a_parent_node, + const std::string &a_nametag_text, + const video::SColor &a_nametag_color): + parent_node(a_parent_node), + nametag_text(a_nametag_text), + nametag_color(a_nametag_color) + { + } + scene::ISceneNode *parent_node; + std::string nametag_text; + video::SColor nametag_color; +}; + enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT}; /* @@ -84,7 +100,7 @@ public: { return m_camera_direction; } - + // Get the camera offset inline v3s16 getOffset() const { @@ -151,6 +167,13 @@ public: return m_camera_mode; } + Nametag *addNametag(scene::ISceneNode *parent_node, + std::string nametag_text, video::SColor nametag_color); + + void removeNametag(Nametag *nametag); + + void drawNametags(); + private: // Nodes scene::ISceneNode* m_playernode; @@ -162,8 +185,9 @@ private: // draw control MapDrawControl& m_draw_control; - + IGameDef *m_gamedef; + video::IVideoDriver *m_driver; // Absolute camera position v3f m_camera_position; @@ -214,6 +238,8 @@ private: f32 m_cache_wanted_fps; f32 m_cache_fov; bool m_cache_view_bobbing; + + std::list m_nametags; }; #endif diff --git a/src/client.cpp b/src/client.cpp index ed5ff96f..3fe67d64 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -228,6 +228,7 @@ Client::Client( m_particle_manager(&m_env), m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this), m_device(device), + m_camera(NULL), m_minimap_disabled_by_server(false), m_server_ser_ver(SER_FMT_VER_INVALID), m_proto_ver(0), diff --git a/src/client.h b/src/client.h index c16e9b77..cdadb9d3 100644 --- a/src/client.h +++ b/src/client.h @@ -50,6 +50,7 @@ struct PointedThing; class Database; class Mapper; struct MinimapMapblock; +class Camera; struct QueuedMeshUpdate { @@ -507,6 +508,12 @@ public: Mapper* getMapper () { return m_mapper; } + void setCamera(Camera* camera) + { m_camera = camera; } + + Camera* getCamera () + { return m_camera; } + bool isMinimapDisabledByServer() { return m_minimap_disabled_by_server; } @@ -589,6 +596,7 @@ private: ParticleManager m_particle_manager; con::Connection m_con; IrrlichtDevice *m_device; + Camera *m_camera; Mapper *m_mapper; bool m_minimap_disabled_by_server; // Server serialization version diff --git a/src/content_cao.cpp b/src/content_cao.cpp index e7c7a0be..d701e4f7 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -546,12 +546,14 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env): // m_smgr(NULL), m_irr(NULL), + m_camera(NULL), + m_gamedef(NULL), m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.), m_meshnode(NULL), m_animated_meshnode(NULL), m_wield_meshnode(NULL), m_spritenode(NULL), - m_textnode(NULL), + m_nametag(NULL), m_position(v3f(0,10*BS,0)), m_velocity(v3f(0,0,0)), m_acceleration(v3f(0,0,0)), @@ -580,8 +582,11 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env): m_last_light(255), m_is_visible(false) { - if(gamedef == NULL) + if (gamedef == NULL) { ClientActiveObject::registerType(getType(), create); + } else { + m_gamedef = gamedef; + } } bool GenericCAO::getCollisionBox(aabb3f *toset) @@ -667,8 +672,7 @@ void GenericCAO::initialize(const std::string &data) GenericCAO::~GenericCAO() { - if(m_is_player) - { + if (m_is_player) { m_env->removePlayerName(m_name.c_str()); } removeFromScene(true); @@ -695,14 +699,15 @@ v3f GenericCAO::getPosition() scene::ISceneNode* GenericCAO::getSceneNode() { - if (m_meshnode) + if (m_meshnode) { return m_meshnode; - if (m_animated_meshnode) + } else if (m_animated_meshnode) { return m_animated_meshnode; - if (m_wield_meshnode) + } else if (m_wield_meshnode) { return m_wield_meshnode; - if (m_spritenode) + } else if (m_spritenode) { return m_spritenode; + } return NULL; } @@ -775,56 +780,47 @@ void GenericCAO::removeFromScene(bool permanent) } } - if(m_meshnode) - { + if (m_meshnode) { m_meshnode->remove(); m_meshnode->drop(); m_meshnode = NULL; - } - if(m_animated_meshnode) - { + } else if (m_animated_meshnode) { m_animated_meshnode->remove(); m_animated_meshnode->drop(); m_animated_meshnode = NULL; - } - if(m_wield_meshnode) - { + } else if (m_wield_meshnode) { m_wield_meshnode->remove(); m_wield_meshnode->drop(); m_wield_meshnode = NULL; - } - if(m_spritenode) - { + } else if (m_spritenode) { m_spritenode->remove(); m_spritenode->drop(); m_spritenode = NULL; } - if (m_textnode) - { - m_textnode->remove(); - m_textnode->drop(); - m_textnode = NULL; + + if (m_nametag) { + m_gamedef->getCamera()->removeNametag(m_nametag); + m_nametag = NULL; } } -void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr) +void GenericCAO::addToScene(scene::ISceneManager *smgr, + ITextureSource *tsrc, IrrlichtDevice *irr) { m_smgr = smgr; m_irr = irr; - if (getSceneNode() != NULL) + if (getSceneNode() != NULL) { return; + } m_visuals_expired = false; - if(!m_prop.is_visible) + if (!m_prop.is_visible) { return; + } - //video::IVideoDriver* driver = smgr->getVideoDriver(); - - if(m_prop.visual == "sprite") - { + if (m_prop.visual == "sprite") { infostream<<"GenericCAO::addToScene(): single_sprite"<addBillboardSceneNode( NULL, v2f(1, 1), v3f(0,0,0), -1); @@ -972,18 +968,9 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, scene::ISceneNode *node = getSceneNode(); if (node && m_prop.nametag != "" && !m_is_local_player) { - // Add a text node for showing the name - gui::IGUIEnvironment* gui = irr->getGUIEnvironment(); - std::wstring nametag_text = utf8_to_wide(m_prop.nametag); - m_textnode = smgr->addTextSceneNode(gui->getSkin()->getFont(), - nametag_text.c_str(), m_prop.nametag_color, node); - m_textnode->grab(); - m_textnode->setPosition(v3f(0, BS*1.1, 0)); - - // Enforce hiding nametag, - // because if freetype is enabled, a grey - // shadow can remain. - m_textnode->setVisible(m_prop.nametag_color.getAlpha() > 0); + // Add nametag + m_nametag = m_gamedef->getCamera()->addNametag(node, + m_prop.nametag, m_prop.nametag_color); } updateNodePos(); @@ -1785,12 +1772,8 @@ void GenericCAO::processMessage(const std::string &data) // Deprecated, for backwards compatibility only. readU8(is); // version m_prop.nametag_color = readARGB8(is); - if (m_textnode != NULL) { - m_textnode->setTextColor(m_prop.nametag_color); - - // Enforce hiding nametag, - // because if freetype is enabled, a grey shadow can remain. - m_textnode->setVisible(m_prop.nametag_color.getAlpha() > 0); + if (m_nametag != NULL) { + m_nametag->nametag_color = m_prop.nametag_color; } } } diff --git a/src/content_cao.h b/src/content_cao.h index f71dfeb1..a166ff49 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -26,6 +26,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "object_properties.h" #include "itemgroup.h" +class Camera; +struct Nametag; + /* SmoothTranslator */ @@ -65,12 +68,14 @@ private: // scene::ISceneManager *m_smgr; IrrlichtDevice *m_irr; + Camera* m_camera; + IGameDef *m_gamedef; aabb3f m_selection_box; scene::IMeshSceneNode *m_meshnode; scene::IAnimatedMeshSceneNode *m_animated_meshnode; WieldMeshSceneNode *m_wield_meshnode; scene::IBillboardSceneNode *m_spritenode; - scene::ITextSceneNode* m_textnode; + Nametag* m_nametag; v3f m_position; v3f m_velocity; v3f m_acceleration; diff --git a/src/drawscene.cpp b/src/drawscene.cpp index 32eafeb2..c6abda4a 100644 --- a/src/drawscene.cpp +++ b/src/drawscene.cpp @@ -195,7 +195,7 @@ video::ITexture* draw_hud(video::IVideoDriver* driver, const v2u32& screensize, hud.drawCrosshair(); hud.drawHotbar(client.getPlayerItem()); hud.drawLuaElements(camera.getOffset()); - + camera.drawNametags(); guienv->drawAll(); } @@ -416,6 +416,7 @@ void draw_pageflip_3d_mode(Camera& camera, bool show_hud, camera.drawWieldedTool(&leftMove); hud.drawHotbar(client.getPlayerItem()); hud.drawLuaElements(camera.getOffset()); + camera.drawNametags(); } guienv->drawAll(); @@ -443,6 +444,7 @@ void draw_pageflip_3d_mode(Camera& camera, bool show_hud, camera.drawWieldedTool(&rightMove); hud.drawHotbar(client.getPlayerItem()); hud.drawLuaElements(camera.getOffset()); + camera.drawNametags(); } guienv->drawAll(); @@ -538,8 +540,11 @@ void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr, { if (draw_crosshair) hud.drawCrosshair(); + hud.drawHotbar(client.getPlayerItem()); hud.drawLuaElements(camera.getOffset()); + camera.drawNametags(); + if (show_minimap) mapper.drawMinimap(); } diff --git a/src/game.cpp b/src/game.cpp index 44b35ff5..53db14fb 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2087,6 +2087,7 @@ bool Game::createClient(const std::string &playername, camera = new Camera(smgr, *draw_control, gamedef); if (!camera || !camera->successfullyCreated(*error_message)) return false; + client->setCamera(camera); /* Clouds */ diff --git a/src/gamedef.h b/src/gamedef.h index a5f6b596..7e3da4ca 100644 --- a/src/gamedef.h +++ b/src/gamedef.h @@ -32,6 +32,8 @@ class IShaderSource; class MtEventManager; class IRollbackManager; class EmergeManager; +class Camera; + namespace irr { namespace scene { class IAnimatedMesh; class ISceneManager; @@ -67,6 +69,10 @@ public: { return NULL; } virtual scene::ISceneManager* getSceneManager()=0; + virtual Camera* getCamera() + { return NULL; } + virtual void setCamera(Camera *camera) {} + // Only usable on the server, and NOT thread-safe. It is usable from the // environment thread. virtual IRollbackManager* getRollbackManager(){return NULL;} From 1ec1a605d664b42a034cecb9f2e768fab3d738d4 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 13 Feb 2016 23:39:37 +0100 Subject: [PATCH 270/531] HOTFIX: fix too agressive block culling --- src/util/numeric.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp index bfd5d6e3..42ebd902 100644 --- a/src/util/numeric.cpp +++ b/src/util/numeric.cpp @@ -244,7 +244,10 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir, f32 cosangle = dforward / blockpos_adj.getLength(); // If block is not in the field of view, skip it - if(cosangle < cos(camera_fov / 2)) + // HOTFIX: use sligthly increased angle (+10%) to fix too agressive + // culling. Somebody have to find out whats wrong with the math here. + // Previous value: camera_fov / 2 + if(cosangle < cos(camera_fov * 0.55)) return false; return true; From 997be666e37e9494bb92a50521b4b749156a609c Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 17 Feb 2016 02:39:21 +0000 Subject: [PATCH 271/531] Clientmap: Define p_nodes_min/max as v3s32 instead of v3s16 'cam_pos_nodes -/+ box_nodes_d' can exceed the range of v3s16 when a player is near the world edge using a large view range This previously caused world to disappear Create new function getBlocksInViewRange() called from updateDrawList() and renderMap() Correct code style throughout updateDrawList() and renderMap() --- src/clientmap.cpp | 253 +++++++++++++++++++++------------------------- src/clientmap.h | 2 + 2 files changed, 116 insertions(+), 139 deletions(-) diff --git a/src/clientmap.cpp b/src/clientmap.cpp index e67b6cbf..ea2b8e4e 100644 --- a/src/clientmap.cpp +++ b/src/clientmap.cpp @@ -141,6 +141,33 @@ static bool isOccluded(Map *map, v3s16 p0, v3s16 p1, float step, float stepfac, return false; } +void ClientMap::getBlocksInViewRange(v3s16 cam_pos_nodes, + v3s16 *p_blocks_min, v3s16 *p_blocks_max) +{ + v3s16 box_nodes_d = m_control.wanted_range * v3s16(1, 1, 1); + // Define p_nodes_min/max as v3s32 because 'cam_pos_nodes -/+ box_nodes_d' + // can exceed the range of v3s16 when a large view range is used near the + // world edges. + v3s32 p_nodes_min( + cam_pos_nodes.X - box_nodes_d.X, + cam_pos_nodes.Y - box_nodes_d.Y, + cam_pos_nodes.Z - box_nodes_d.Z); + v3s32 p_nodes_max( + cam_pos_nodes.X + box_nodes_d.X, + cam_pos_nodes.Y + box_nodes_d.Y, + cam_pos_nodes.Z + box_nodes_d.Z); + // Take a fair amount as we will be dropping more out later + // Umm... these additions are a bit strange but they are needed. + *p_blocks_min = v3s16( + p_nodes_min.X / MAP_BLOCKSIZE - 3, + p_nodes_min.Y / MAP_BLOCKSIZE - 3, + p_nodes_min.Z / MAP_BLOCKSIZE - 3); + *p_blocks_max = v3s16( + p_nodes_max.X / MAP_BLOCKSIZE + 1, + p_nodes_max.Y / MAP_BLOCKSIZE + 1, + p_nodes_max.Z / MAP_BLOCKSIZE + 1); +} + void ClientMap::updateDrawList(video::IVideoDriver* driver) { ScopeProfiler sp(g_profiler, "CM::updateDrawList()", SPT_AVG); @@ -148,10 +175,8 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) INodeDefManager *nodemgr = m_gamedef->ndef(); - for(std::map::iterator - i = m_drawlist.begin(); - i != m_drawlist.end(); ++i) - { + for (std::map::iterator i = m_drawlist.begin(); + i != m_drawlist.end(); ++i) { MapBlock *block = i->second; block->refDrop(); } @@ -167,19 +192,9 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) camera_fov *= 1.2; v3s16 cam_pos_nodes = floatToInt(camera_position, BS); - v3s16 box_nodes_d = m_control.wanted_range * v3s16(1,1,1); - v3s16 p_nodes_min = cam_pos_nodes - box_nodes_d; - v3s16 p_nodes_max = cam_pos_nodes + box_nodes_d; - // Take a fair amount as we will be dropping more out later - // Umm... these additions are a bit strange but they are needed. - v3s16 p_blocks_min( - p_nodes_min.X / MAP_BLOCKSIZE - 3, - p_nodes_min.Y / MAP_BLOCKSIZE - 3, - p_nodes_min.Z / MAP_BLOCKSIZE - 3); - v3s16 p_blocks_max( - p_nodes_max.X / MAP_BLOCKSIZE + 1, - p_nodes_max.Y / MAP_BLOCKSIZE + 1, - p_nodes_max.Z / MAP_BLOCKSIZE + 1); + v3s16 p_blocks_min; + v3s16 p_blocks_max; + getBlocksInViewRange(cam_pos_nodes, &p_blocks_min, &p_blocks_max); // Number of blocks in rendering range u32 blocks_in_range = 0; @@ -199,19 +214,14 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) // Distance to farthest drawn block float farthest_drawn = 0; - for(std::map::iterator - si = m_sectors.begin(); - si != m_sectors.end(); ++si) - { + for (std::map::iterator si = m_sectors.begin(); + si != m_sectors.end(); ++si) { MapSector *sector = si->second; v2s16 sp = sector->getPos(); - if(m_control.range_all == false) - { - if(sp.X < p_blocks_min.X - || sp.X > p_blocks_max.X - || sp.Y < p_blocks_min.Z - || sp.Y > p_blocks_max.Z) + if (m_control.range_all == false) { + if (sp.X < p_blocks_min.X || sp.X > p_blocks_max.X || + sp.Y < p_blocks_min.Z || sp.Y > p_blocks_max.Z) continue; } @@ -224,9 +234,8 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) u32 sector_blocks_drawn = 0; - for(MapBlockVect::iterator i = sectorblocks.begin(); - i != sectorblocks.end(); ++i) - { + for (MapBlockVect::iterator i = sectorblocks.begin(); + i != sectorblocks.end(); ++i) { MapBlock *block = *i; /* @@ -238,16 +247,13 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) block->mesh->updateCameraOffset(m_camera_offset); float range = 100000 * BS; - if(m_control.range_all == false) + if (m_control.range_all == false) range = m_control.wanted_range * BS; float d = 0.0; - if(isBlockInSight(block->getPos(), camera_position, - camera_direction, camera_fov, - range, &d) == false) - { + if (!isBlockInSight(block->getPos(), camera_position, + camera_direction, camera_fov, range, &d)) continue; - } // This is ugly (spherical distance limit?) /*if(m_control.range_all == false && @@ -262,7 +268,7 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) { //MutexAutoLock lock(block->mesh_mutex); - if(block->mesh == NULL){ + if (block->mesh == NULL) { blocks_in_range_without_mesh++; continue; } @@ -275,44 +281,41 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) // No occlusion culling when free_move is on and camera is // inside ground bool occlusion_culling_enabled = true; - if(g_settings->getBool("free_move")){ + if (g_settings->getBool("free_move")) { MapNode n = getNodeNoEx(cam_pos_nodes); - if(n.getContent() == CONTENT_IGNORE || + if (n.getContent() == CONTENT_IGNORE || nodemgr->get(n).solidness == 2) occlusion_culling_enabled = false; } v3s16 cpn = block->getPos() * MAP_BLOCKSIZE; - cpn += v3s16(MAP_BLOCKSIZE/2, MAP_BLOCKSIZE/2, MAP_BLOCKSIZE/2); - float step = BS*1; + cpn += v3s16(MAP_BLOCKSIZE / 2, MAP_BLOCKSIZE / 2, MAP_BLOCKSIZE / 2); + float step = BS * 1; float stepfac = 1.1; - float startoff = BS*1; - float endoff = -BS*MAP_BLOCKSIZE*1.42*1.42; - v3s16 spn = cam_pos_nodes + v3s16(0,0,0); - s16 bs2 = MAP_BLOCKSIZE/2 + 1; + float startoff = BS * 1; + float endoff = -BS*MAP_BLOCKSIZE * 1.42 * 1.42; + v3s16 spn = cam_pos_nodes + v3s16(0, 0, 0); + s16 bs2 = MAP_BLOCKSIZE / 2 + 1; u32 needed_count = 1; - if( - occlusion_culling_enabled && - isOccluded(this, spn, cpn + v3s16(0,0,0), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(bs2,bs2,bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(bs2,bs2,-bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(bs2,-bs2,bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(bs2,-bs2,-bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(-bs2,bs2,bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(-bs2,bs2,-bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) && - isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,-bs2), - step, stepfac, startoff, endoff, needed_count, nodemgr) - ) - { + if (occlusion_culling_enabled && + isOccluded(this, spn, cpn + v3s16(0, 0, 0), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(bs2,bs2,bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(bs2,bs2,-bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(bs2,-bs2,bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(bs2,-bs2,-bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(-bs2,bs2,bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(-bs2,bs2,-bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr) && + isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,-bs2), + step, stepfac, startoff, endoff, needed_count, nodemgr)) { blocks_occlusion_culled++; continue; } @@ -322,9 +325,9 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) // Limit block count in case of a sudden increase blocks_would_have_drawn++; - if(blocks_drawn >= m_control.wanted_max_blocks - && m_control.range_all == false - && d > m_control.wanted_min_range * BS) + if (blocks_drawn >= m_control.wanted_max_blocks && + !m_control.range_all && + d > m_control.wanted_min_range * BS) continue; // Add to set @@ -333,12 +336,12 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) sector_blocks_drawn++; blocks_drawn++; - if(d/BS > farthest_drawn) - farthest_drawn = d/BS; + if (d / BS > farthest_drawn) + farthest_drawn = d / BS; } // foreach sectorblocks - if(sector_blocks_drawn != 0) + if (sector_blocks_drawn != 0) m_last_drawn_sectors.insert(sp); } @@ -348,9 +351,9 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) g_profiler->avg("CM: blocks in range", blocks_in_range); g_profiler->avg("CM: blocks occlusion culled", blocks_occlusion_culled); - if(blocks_in_range != 0) + if (blocks_in_range != 0) g_profiler->avg("CM: blocks in range without mesh (frac)", - (float)blocks_in_range_without_mesh/blocks_in_range); + (float)blocks_in_range_without_mesh / blocks_in_range); g_profiler->avg("CM: blocks drawn", blocks_drawn); g_profiler->avg("CM: farthest drawn", farthest_drawn); g_profiler->avg("CM: wanted max blocks", m_control.wanted_max_blocks); @@ -402,7 +405,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) bool is_transparent_pass = pass == scene::ESNRP_TRANSPARENT; std::string prefix; - if(pass == scene::ESNRP_SOLID) + if (pass == scene::ESNRP_SOLID) prefix = "CM: solid: "; else prefix = "CM: transparent: "; @@ -410,10 +413,8 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) /* This is called two times per frame, reset on the non-transparent one */ - if(pass == scene::ESNRP_SOLID) - { + if (pass == scene::ESNRP_SOLID) m_last_drawn_sectors.clear(); - } /* Get time for measuring timeout. @@ -439,22 +440,9 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) */ v3s16 cam_pos_nodes = floatToInt(camera_position, BS); - - v3s16 box_nodes_d = m_control.wanted_range * v3s16(1,1,1); - - v3s16 p_nodes_min = cam_pos_nodes - box_nodes_d; - v3s16 p_nodes_max = cam_pos_nodes + box_nodes_d; - - // Take a fair amount as we will be dropping more out later - // Umm... these additions are a bit strange but they are needed. - v3s16 p_blocks_min( - p_nodes_min.X / MAP_BLOCKSIZE - 3, - p_nodes_min.Y / MAP_BLOCKSIZE - 3, - p_nodes_min.Z / MAP_BLOCKSIZE - 3); - v3s16 p_blocks_max( - p_nodes_max.X / MAP_BLOCKSIZE + 1, - p_nodes_max.Y / MAP_BLOCKSIZE + 1, - p_nodes_max.Z / MAP_BLOCKSIZE + 1); + v3s16 p_blocks_min; + v3s16 p_blocks_max; + getBlocksInViewRange(cam_pos_nodes, &p_blocks_min, &p_blocks_max); u32 vertex_count = 0; u32 meshbuffer_count = 0; @@ -475,27 +463,22 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) */ { - ScopeProfiler sp(g_profiler, prefix+"drawing blocks", SPT_AVG); + ScopeProfiler sp(g_profiler, prefix + "drawing blocks", SPT_AVG); MeshBufListList drawbufs; - for(std::map::iterator - i = m_drawlist.begin(); - i != m_drawlist.end(); ++i) - { + for (std::map::iterator i = m_drawlist.begin(); + i != m_drawlist.end(); ++i) { MapBlock *block = i->second; // If the mesh of the block happened to get deleted, ignore it - if(block->mesh == NULL) + if (block->mesh == NULL) continue; float d = 0.0; - if(isBlockInSight(block->getPos(), camera_position, - camera_direction, camera_fov, - 100000*BS, &d) == false) - { + if (!isBlockInSight(block->getPos(), camera_position, + camera_direction, camera_fov, 100000 * BS, &d)) continue; - } // Mesh animation { @@ -503,24 +486,17 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) MapBlockMesh *mapBlockMesh = block->mesh; assert(mapBlockMesh); // Pretty random but this should work somewhat nicely - bool faraway = d >= BS*50; + bool faraway = d >= BS * 50; //bool faraway = d >= m_control.wanted_range * BS; - if(mapBlockMesh->isAnimationForced() || - !faraway || - mesh_animate_count_far < (m_control.range_all ? 200 : 50)) - { - bool animated = mapBlockMesh->animate( - faraway, - animation_time, - crack, - daynight_ratio); - if(animated) + if (mapBlockMesh->isAnimationForced() || !faraway || + mesh_animate_count_far < (m_control.range_all ? 200 : 50)) { + bool animated = mapBlockMesh->animate(faraway, animation_time, + crack, daynight_ratio); + if (animated) mesh_animate_count++; - if(animated && faraway) + if (animated && faraway) mesh_animate_count_far++; - } - else - { + } else { mapBlockMesh->decreaseAnimationForceTimer(); } } @@ -538,7 +514,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) assert(mesh); u32 c = mesh->getMeshBufferCount(); - for(u32 i=0; igetMeshBuffer(i); @@ -550,11 +526,10 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) video::IMaterialRenderer* rnd = driver->getMaterialRenderer(material.MaterialType); bool transparent = (rnd && rnd->isTransparent()); - if(transparent == is_transparent_pass) - { - if(buf->getVertexCount() == 0) - errorstream<<"Block ["<getVertexCount() == 0) + errorstream << "Block [" << analyze_block(block) + << "] contains an empty meshbuf" << std::endl; drawbufs.add(buf); } } @@ -564,13 +539,13 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) std::vector &lists = drawbufs.lists; int timecheck_counter = 0; - for(std::vector::iterator i = lists.begin(); + for (std::vector::iterator i = lists.begin(); i != lists.end(); ++i) { timecheck_counter++; - if(timecheck_counter > 50) { + if (timecheck_counter > 50) { timecheck_counter = 0; int time2 = time(0); - if(time2 > time1 + 4) { + if (time2 > time1 + 4) { infostream << "ClientMap::renderMap(): " "Rendering takes ages, returning." << std::endl; @@ -582,7 +557,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) driver->setMaterial(list.m); - for(std::vector::iterator j = list.bufs.begin(); + for (std::vector::iterator j = list.bufs.begin(); j != list.bufs.end(); ++j) { scene::IMeshBuffer *buf = *j; driver->drawMeshBuffer(buf); @@ -594,18 +569,18 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) } // ScopeProfiler // Log only on solid pass because values are the same - if(pass == scene::ESNRP_SOLID){ + if (pass == scene::ESNRP_SOLID) { g_profiler->avg("CM: animated meshes", mesh_animate_count); g_profiler->avg("CM: animated meshes (far)", mesh_animate_count_far); } - g_profiler->avg(prefix+"vertices drawn", vertex_count); - if(blocks_had_pass_meshbuf != 0) - g_profiler->avg(prefix+"meshbuffers per block", - (float)meshbuffer_count / (float)blocks_had_pass_meshbuf); - if(blocks_drawn != 0) - g_profiler->avg(prefix+"empty blocks (frac)", - (float)blocks_without_stuff / blocks_drawn); + g_profiler->avg(prefix + "vertices drawn", vertex_count); + if (blocks_had_pass_meshbuf != 0) + g_profiler->avg(prefix + "meshbuffers per block", + (float)meshbuffer_count / (float)blocks_had_pass_meshbuf); + if (blocks_drawn != 0) + g_profiler->avg(prefix + "empty blocks (frac)", + (float)blocks_without_stuff / blocks_drawn); /*infostream<<"renderMap(): is_transparent_pass="< Date: Thu, 18 Feb 2016 16:06:07 -0500 Subject: [PATCH 272/531] Require request_insecure_environment to be called from the mod's main scope Previously you could steal a secure environment from a trusted mod by wrapping request_insecure_environment with some code like this: local rie_cp = minetest.request_insecure_environment local stolen_ie function minetest.request_insecure_environment() local ie = rie_cp() stolen_ie = stolen_ie or ie return ie end --- doc/lua_api.txt | 2 +- src/script/lua_api/l_util.cpp | 32 +++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index d9a8bea9..2df0cac7 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2437,7 +2437,7 @@ These functions return the leftover itemstack. * `minetest.request_insecure_environment()`: returns an environment containing insecure functions if the calling mod has been listed as trusted in the `secure.trusted_mods` setting or security is disabled, otherwise returns `nil`. - * Only works at init time. + * Only works at init time and must be called from the mod's main scope (not from a function). * **DO NOT ALLOW ANY OTHER MODS TO ACCESS THE RETURNED ENVIRONMENT, STORE IT IN A LOCAL VARIABLE!** diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index 39863b98..c1e883a9 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -357,22 +357,44 @@ int ModApiUtil::l_get_dir_list(lua_State *L) int ModApiUtil::l_request_insecure_environment(lua_State *L) { NO_MAP_LOCK_REQUIRED; + + // Just return _G if security is disabled if (!ScriptApiSecurity::isSecure(L)) { lua_getglobal(L, "_G"); return 1; } + + // We have to make sure that this function is being called directly by + // a mod, otherwise a malicious mod could override this function and + // steal its return value. + lua_Debug info; + // Make sure there's only one item below this function on the stack... + if (lua_getstack(L, 2, &info)) { + return 0; + } + assert(lua_getstack(L, 1, &info)); + assert(lua_getinfo(L, "S", &info)); + // ...and that that item is the main file scope. + if (strcmp(info.what, "main") != 0) { + return 0; + } + + // Get mod name lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME); if (!lua_isstring(L, -1)) { - lua_pushnil(L); - return 1; + return 0; } + + // Check secure.trusted_mods const char *mod_name = lua_tostring(L, -1); std::string trusted_mods = g_settings->get("secure.trusted_mods"); std::vector mod_list = str_split(trusted_mods, ','); - if (std::find(mod_list.begin(), mod_list.end(), mod_name) == mod_list.end()) { - lua_pushnil(L); - return 1; + if (std::find(mod_list.begin(), mod_list.end(), mod_name) == + mod_list.end()) { + return 0; } + + // Push insecure environment lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_GLOBALS_BACKUP); return 1; } From 5dbaa689677e89ee10e2c6e3a4e8eb57b79f3140 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Fri, 19 Feb 2016 14:13:21 +0100 Subject: [PATCH 273/531] Camera: Don't count camera offset twice for Nametagged CAOs --- src/camera.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/camera.cpp b/src/camera.cpp index 8aac3212..0ce6bb34 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -675,8 +675,7 @@ void Camera::drawNametags() i = m_nametags.begin(); i != m_nametags.end(); ++i) { Nametag *nametag = *i; - v3f pos = nametag->parent_node->getPosition() - - intToFloat(m_camera_offset, BS) + v3f(0.0, 1.1 * BS, 0.0); + v3f pos = nametag->parent_node->getPosition() + v3f(0.0, 1.1 * BS, 0.0); f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f }; trans.multiplyWith1x4Matrix(transformed_pos); if (transformed_pos[3] > 0) { From 5f4ed94d90668af58a3e677e7401f0028871acce Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Thu, 18 Feb 2016 17:17:17 +0100 Subject: [PATCH 274/531] Minimap: show player markers --- src/camera.h | 3 + src/minimap.cpp | 69 +++++++++++++++++++++++ src/minimap.h | 6 ++ textures/base/pack/object_marker_red.png | Bin 0 -> 663 bytes 4 files changed, 78 insertions(+) create mode 100644 textures/base/pack/object_marker_red.png diff --git a/src/camera.h b/src/camera.h index 2df7da2b..36fc72f1 100644 --- a/src/camera.h +++ b/src/camera.h @@ -172,6 +172,9 @@ public: void removeNametag(Nametag *nametag); + std::list *getNametags() + { return &m_nametags; } + void drawNametags(); private: diff --git a/src/minimap.cpp b/src/minimap.cpp index ded8470c..8cd0a7be 100644 --- a/src/minimap.cpp +++ b/src/minimap.cpp @@ -211,6 +211,7 @@ void MinimapUpdateThread::getMap(v3s16 pos, s16 size, s16 height, bool is_radar) Mapper::Mapper(IrrlichtDevice *device, Client *client) { + this->client = client; this->driver = device->getVideoDriver(); this->m_tsrc = client->getTextureSource(); this->m_shdrsrc = client->getShaderSource(); @@ -250,6 +251,8 @@ Mapper::Mapper(IrrlichtDevice *device, Client *client) // Create player marker texture data->player_marker = m_tsrc->getTexture("player_marker.png"); + // Create object marker texture + data->object_marker_red = m_tsrc->getTexture("object_marker_red.png"); // Create mesh buffer for minimap m_meshbuffer = getMinimapMeshBuffer(); @@ -274,6 +277,7 @@ Mapper::~Mapper() driver->removeTexture(data->heightmap_texture); driver->removeTexture(data->minimap_overlay_round); driver->removeTexture(data->minimap_overlay_square); + driver->removeTexture(data->object_marker_red); delete data; delete m_minimap_update_thread; @@ -468,6 +472,7 @@ void Mapper::drawMinimap() if (!minimap_texture) return; + updateActiveMarkers(); v2u32 screensize = porting::getWindowSize(); const u32 size = 0.25 * screensize.Y; @@ -527,6 +532,70 @@ void Mapper::drawMinimap() driver->setTransform(video::ETS_VIEW, oldViewMat); driver->setTransform(video::ETS_PROJECTION, oldProjMat); driver->setViewPort(oldViewPort); + + // Draw player markers + v2s32 s_pos(screensize.X - size - 10, 10); + core::dimension2di imgsize(data->object_marker_red->getOriginalSize()); + core::rect img_rect(0, 0, imgsize.Width, imgsize.Height); + static const video::SColor col(255, 255, 255, 255); + static const video::SColor c[4] = {col, col, col, col}; + f32 sin_angle = sin(m_angle * core::DEGTORAD); + f32 cos_angle = cos(m_angle * core::DEGTORAD); + s32 marker_size2 = 0.025 * (float)size; + for (std::list::const_iterator + i = m_active_markers.begin(); + i != m_active_markers.end(); ++i) { + v2f posf = *i; + if (data->minimap_shape_round) { + f32 t1 = posf.X * cos_angle - posf.Y * sin_angle; + f32 t2 = posf.X * sin_angle + posf.Y * cos_angle; + posf.X = t1; + posf.Y = t2; + } + posf.X = (posf.X + 0.5) * (float)size; + posf.Y = (posf.Y + 0.5) * (float)size; + core::rect dest_rect( + s_pos.X + posf.X - marker_size2, + s_pos.Y + posf.Y - marker_size2, + s_pos.X + posf.X + marker_size2, + s_pos.Y + posf.Y + marker_size2); + driver->draw2DImage(data->object_marker_red, dest_rect, + img_rect, &dest_rect, &c[0], true); + } +} + +void Mapper::updateActiveMarkers () +{ + video::IImage *minimap_mask = data->minimap_shape_round ? + data->minimap_mask_round : data->minimap_mask_square; + + std::list *nametags = client->getCamera()->getNametags(); + + m_active_markers.clear(); + + for (std::list::const_iterator + i = nametags->begin(); + i != nametags->end(); ++i) { + Nametag *nametag = *i; + v3s16 pos = floatToInt(nametag->parent_node->getPosition() + + intToFloat(client->getCamera()->getOffset(), BS), BS); + pos -= data->pos - v3s16(data->map_size / 2, + data->scan_height / 2, + data->map_size / 2); + if (pos.X < 0 || pos.X > data->map_size || + pos.Y < 0 || pos.Y > data->scan_height || + pos.Z < 0 || pos.Z > data->map_size) { + continue; + } + pos.X = ((float)pos.X / data->map_size) * MINIMAP_MAX_SX; + pos.Z = ((float)pos.Z / data->map_size) * MINIMAP_MAX_SY; + video::SColor mask_col = minimap_mask->getPixel(pos.X, pos.Z); + if (!mask_col.getAlpha()) { + continue; + } + m_active_markers.push_back(v2f(((float)pos.X / (float)MINIMAP_MAX_SX) - 0.5, + (1.0 - (float)pos.Z / (float)MINIMAP_MAX_SY) - 0.5)); + } } //// diff --git a/src/minimap.h b/src/minimap.h index dd1397d5..743b2bff 100644 --- a/src/minimap.h +++ b/src/minimap.h @@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include "camera.h" #define MINIMAP_MAX_SX 512 #define MINIMAP_MAX_SY 512 @@ -82,6 +83,7 @@ struct MinimapData { video::ITexture *minimap_overlay_round; video::ITexture *minimap_overlay_square; video::ITexture *player_marker; + video::ITexture *object_marker_red; }; struct QueuedMinimapUpdate { @@ -138,9 +140,12 @@ public: video::IImage *heightmap_image); scene::SMeshBuffer *getMinimapMeshBuffer(); + + void updateActiveMarkers(); void drawMinimap(); video::IVideoDriver *driver; + Client* client; MinimapData *data; private: @@ -153,6 +158,7 @@ private: u16 m_surface_mode_scan_height; f32 m_angle; Mutex m_mutex; + std::list m_active_markers; }; #endif diff --git a/textures/base/pack/object_marker_red.png b/textures/base/pack/object_marker_red.png new file mode 100644 index 0000000000000000000000000000000000000000..552a546e3e225942b9c8c47ca84adb6573ea369d GIT binary patch literal 663 zcmV;I0%-k-P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00I9=L_t(2&wbOqi(W+($MMgZ zx%YXNeQ`Arvg?WgH-#>QEiE*XLa>QwX<=ny>7O8irC=#o*hfgLg=}FF5UmUtkf{}8GUs#@(d+%86JgAKa4(H4azxkc{!tmc%6|P9Wh~ywB5soESg*UMRLY$U=;>F0` zKa*VEW@CHMjC)JdY<4%B{W5s;+hDI0pDKRPh=urtruFf~@am<`%7sDRtTrb&!kwht z%ua4`qo4Z_w=z~D`(QVDXmy5JRoWnYv#xpoqSSv<tx|r-Ssfy<4tGFOzj2Z4F?S5Epf=klCB+2n4o1avN^gmfD z{Ylmh$-`9m`ffHmtnX>7!=f(w(J6r=F8L-IT>W|Q_)g-85*5rsFsf@fCT<7! zizA&cv+!WTg;}=q1f%7`(!ZSJbfU6Pe3#hEW Date: Fri, 19 Feb 2016 21:14:38 +0100 Subject: [PATCH 275/531] Ignore spaces in secure.trusted_mods setting --- src/script/lua_api/l_util.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index c1e883a9..c04f09f9 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -388,6 +388,8 @@ int ModApiUtil::l_request_insecure_environment(lua_State *L) // Check secure.trusted_mods const char *mod_name = lua_tostring(L, -1); std::string trusted_mods = g_settings->get("secure.trusted_mods"); + trusted_mods.erase(std::remove(trusted_mods.begin(), + trusted_mods.end(), ' '), trusted_mods.end()); std::vector mod_list = str_split(trusted_mods, ','); if (std::find(mod_list.begin(), mod_list.end(), mod_name) == mod_list.end()) { From a44393e43a39d2b78ff6673fc646be44698c9d37 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 19 Feb 2016 19:55:31 -0500 Subject: [PATCH 276/531] Don't print locale directory error message when GetText is disabled Also, downgrade the error to a warning. --- src/porting.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/porting.cpp b/src/porting.cpp index fd1915b0..98b85b7d 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -558,8 +558,9 @@ void initializePaths() infostream << "Detected user path: " << path_user << std::endl; infostream << "Detected cache path: " << path_cache << std::endl; +#ifdef USE_GETTEXT bool found_localedir = false; -#ifdef STATIC_LOCALEDIR +# ifdef STATIC_LOCALEDIR if (STATIC_LOCALEDIR[0] && fs::PathExists(STATIC_LOCALEDIR)) { found_localedir = true; path_locale = STATIC_LOCALEDIR; @@ -573,15 +574,16 @@ void initializePaths() << "(RUN_IN_PLACE or CUSTOM_LOCALEDIR)." << std::endl; } } -#else +# else path_locale = getDataPath("locale"); if (fs::PathExists(path_locale)) { found_localedir = true; } -#endif +# endif if (!found_localedir) { - errorstream << "Couldn't find a locale directory!" << std::endl; + warningstream << "Couldn't find a locale directory!" << std::endl; } +#endif // USE_GETTEXT } From 60dc01dc258db842e229351b871d0989e3e7d62c Mon Sep 17 00:00:00 2001 From: gregorycu Date: Tue, 27 Jan 2015 23:33:54 +1100 Subject: [PATCH 277/531] Fix jumping at node edge --- src/collision.cpp | 66 ++++++++++++----------------------------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/src/collision.cpp b/src/collision.cpp index 2ae59b38..a2d17d51 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -248,8 +248,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, bool any_position_valid = false; + // The order is important here, must be y first + for(s16 y = max_y; y >= min_y; y--) for(s16 x = min_x; x <= max_x; x++) - for(s16 y = min_y; y <= max_y; y++) for(s16 z = min_z; z <= max_z; z++) { v3s16 p(x,y,z); @@ -404,15 +405,17 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, Go through every nodebox, find nearest collision */ for (u32 boxindex = 0; boxindex < cboxes.size(); boxindex++) { - // Ignore if already stepped up this nodebox. - if(is_step_up[boxindex]) - continue; - // Find nearest collision of the two boxes (raytracing-like) f32 dtime_tmp; int collided = axisAlignedCollision( cboxes[boxindex], movingbox, *speed_f, d, &dtime_tmp); + // Ignore if already stepped up this nodebox. + if (is_step_up[boxindex]) { + pos_f->Y += (cboxes[boxindex].MaxEdge.Y - movingbox.MinEdge.Y); + continue; + } + if (collided == -1 || dtime_tmp >= nearest_dtime) continue; @@ -462,10 +465,12 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, is_collision = false; CollisionInfo info; - if (is_object[nearest_boxindex]) + if (is_object[nearest_boxindex]) { info.type = COLLISION_OBJECT; - else + result.standing_on_object = true; + } else { info.type = COLLISION_NODE; + } info.node_p = node_positions[nearest_boxindex]; info.bouncy = bouncy; @@ -483,12 +488,13 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, speed_f->X = 0; result.collides = true; result.collides_xz = true; - } - else if(nearest_collided == 1) { // Y - if (fabs(speed_f->Y) > BS * 3) + } else if(nearest_collided == 1) { // Y + if (fabs(speed_f->Y) > BS * 3) { speed_f->Y *= bounce; - else + } else { speed_f->Y = 0; + result.touching_ground = true; + } result.collides = true; } else if(nearest_collided == 2) { // Z if (fabs(speed_f->Z) > BS * 3) @@ -509,43 +515,5 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, } } - /* - Final touches: Check if standing on ground, step up stairs. - */ - aabb3f box = box_0; - box.MinEdge += *pos_f; - box.MaxEdge += *pos_f; - for (u32 boxindex = 0; boxindex < cboxes.size(); boxindex++) { - const aabb3f& cbox = cboxes[boxindex]; - - /* - See if the object is touching ground. - - Object touches ground if object's minimum Y is near node's - maximum Y and object's X-Z-area overlaps with the node's - X-Z-area. - - Use 0.15*BS so that it is easier to get on a node. - */ - if (cbox.MaxEdge.X - d > box.MinEdge.X && cbox.MinEdge.X + d < box.MaxEdge.X && - cbox.MaxEdge.Z - d > box.MinEdge.Z && - cbox.MinEdge.Z + d < box.MaxEdge.Z) { - if (is_step_up[boxindex]) { - pos_f->Y += (cbox.MaxEdge.Y - box.MinEdge.Y); - box = box_0; - box.MinEdge += *pos_f; - box.MaxEdge += *pos_f; - } - if (fabs(cbox.MaxEdge.Y - box.MinEdge.Y) < 0.15 * BS) { - result.touching_ground = true; - - if (is_object[boxindex]) - result.standing_on_object = true; - if (is_unloaded[boxindex]) - result.standing_on_unloaded = true; - } - } - } - return result; } From c6d7d2097c3736b3de82f074c63eda959c07290f Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 20 Feb 2016 09:44:22 +0100 Subject: [PATCH 278/531] Little collision.cpp cleanups --- src/collision.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/collision.cpp b/src/collision.cpp index a2d17d51..4680e0a5 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -235,7 +235,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, std::vector node_positions; { //TimeTaker tt2("collisionMoveSimple collect boxes"); - ScopeProfiler sp(g_profiler, "collisionMoveSimple collect boxes avg", SPT_AVG); + ScopeProfiler sp(g_profiler, "collisionMoveSimple collect boxes avg", SPT_AVG); v3s16 oldpos_i = floatToInt(*pos_f, BS); v3s16 newpos_i = floatToInt(*pos_f + *speed_f * dtime, BS); @@ -383,13 +383,12 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, while(dtime > BS * 1e-10) { //TimeTaker tt3("collisionMoveSimple dtime loop"); - ScopeProfiler sp(g_profiler, "collisionMoveSimple dtime loop avg", SPT_AVG); + ScopeProfiler sp(g_profiler, "collisionMoveSimple dtime loop avg", SPT_AVG); // Avoid infinite loop loopcount++; if (loopcount >= 100) { warningstream << "collisionMoveSimple: Loop count exceeded, aborting to avoid infiniite loop" << std::endl; - dtime = 0; break; } @@ -399,7 +398,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, int nearest_collided = -1; f32 nearest_dtime = dtime; - u32 nearest_boxindex = -1; + int nearest_boxindex = -1; /* Go through every nodebox, find nearest collision From ecc8b70182b9ad3aaec910d7c8b32fc54cac824a Mon Sep 17 00:00:00 2001 From: BlockMen Date: Fri, 19 Feb 2016 10:03:02 +0100 Subject: [PATCH 279/531] Restore simple settings tab and add advanced settings as dialog --- builtin/mainmenu/dlg_settings_advanced.lua | 756 ++++++++++++++ builtin/mainmenu/init.lua | 1 + builtin/mainmenu/tab_settings.lua | 1028 +++++++------------- 3 files changed, 1106 insertions(+), 679 deletions(-) create mode 100644 builtin/mainmenu/dlg_settings_advanced.lua diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua new file mode 100644 index 00000000..35883f05 --- /dev/null +++ b/builtin/mainmenu/dlg_settings_advanced.lua @@ -0,0 +1,756 @@ +--Minetest +--Copyright (C) 2015 PilzAdam +-- +--This program is free software; you can redistribute it and/or modify +--it under the terms of the GNU Lesser General Public License as published by +--the Free Software Foundation; either version 2.1 of the License, or +--(at your option) any later version. +-- +--This program is distributed in the hope that it will be useful, +--but WITHOUT ANY WARRANTY; without even the implied warranty of +--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +--GNU Lesser General Public License for more details. +-- +--You should have received a copy of the GNU Lesser General Public License along +--with this program; if not, write to the Free Software Foundation, Inc., +--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +local FILENAME = "settingtypes.txt" + +local CHAR_CLASSES = { + SPACE = "[%s]", + VARIABLE = "[%w_%-%.]", + INTEGER = "[+-]?[%d]", + FLOAT = "[+-]?[%d%.]", + FLAGS = "[%w_%-%.,]", +} + +-- returns error message, or nil +local function parse_setting_line(settings, line, read_all, base_level, allow_secure) + -- comment + local comment = line:match("^#" .. CHAR_CLASSES.SPACE .. "*(.*)$") + if comment then + if settings.current_comment == "" then + settings.current_comment = comment + else + settings.current_comment = settings.current_comment .. "\n" .. comment + end + return + end + + -- clear current_comment so only comments directly above a setting are bound to it + -- but keep a local reference to it for variables in the current line + local current_comment = settings.current_comment + settings.current_comment = "" + + -- empty lines + if line:match("^" .. CHAR_CLASSES.SPACE .. "*$") then + return + end + + -- category + local stars, category = line:match("^%[([%*]*)([^%]]+)%]$") + if category then + table.insert(settings, { + name = category, + level = stars:len() + base_level, + type = "category", + }) + return + end + + -- settings + local first_part, name, readable_name, setting_type = line:match("^" + -- this first capture group matches the whole first part, + -- so we can later strip it from the rest of the line + .. "(" + .. "([" .. CHAR_CLASSES.VARIABLE .. "+)" -- variable name + .. CHAR_CLASSES.SPACE .. "*" + .. "%(([^%)]*)%)" -- readable name + .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.VARIABLE .. "+)" -- type + .. CHAR_CLASSES.SPACE .. "*" + .. ")") + + if not first_part then + return "Invalid line" + end + + if name:match("secure%.[.]*") and not allow_secure then + return "Tried to add \"secure.\" setting" + end + + if readable_name == "" then + readable_name = nil + end + local remaining_line = line:sub(first_part:len() + 1) + + if setting_type == "int" then + local default, min, max = remaining_line:match("^" + -- first int is required, the last 2 are optional + .. "(" .. CHAR_CLASSES.INTEGER .. "+)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.INTEGER .. "*)" + .. "$") + + if not default or not tonumber(default) then + return "Invalid integer setting" + end + + min = tonumber(min) + max = tonumber(max) + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "int", + default = default, + min = min, + max = max, + comment = current_comment, + }) + return + end + + if setting_type == "string" or setting_type == "noise_params" + or setting_type == "key" or setting_type == "v3f" then + local default = remaining_line:match("^(.*)$") + + if not default then + return "Invalid string setting" + end + if setting_type == "key" and not read_all then + -- ignore key type if read_all is false + return + end + + table.insert(settings, { + name = name, + readable_name = readable_name, + type = setting_type, + default = default, + comment = current_comment, + }) + return + end + + if setting_type == "bool" then + if remaining_line ~= "false" and remaining_line ~= "true" then + return "Invalid boolean setting" + end + + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "bool", + default = remaining_line, + comment = current_comment, + }) + return + end + + if setting_type == "float" then + local default, min, max = remaining_line:match("^" + -- first float is required, the last 2 are optional + .. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "?" + .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "?" + .. "(" .. CHAR_CLASSES.FLOAT .. "*)" + .."$") + + if not default or not tonumber(default) then + return "Invalid float setting" + end + + min = tonumber(min) + max = tonumber(max) + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "float", + default = default, + min = min, + max = max, + comment = current_comment, + }) + return + end + + if setting_type == "enum" then + local default, values = remaining_line:match("^" + -- first value (default) may be empty (i.e. is optional) + .. "(" .. CHAR_CLASSES.VARIABLE .. "*)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.FLAGS .. "+)" + .. "$") + + if not default or values == "" then + return "Invalid enum setting" + end + + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "enum", + default = default, + values = values:split(",", true), + comment = current_comment, + }) + return + end + + if setting_type == "path" then + local default = remaining_line:match("^(.*)$") + + if not default then + return "Invalid path setting" + end + + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "path", + default = default, + comment = current_comment, + }) + return + end + + if setting_type == "flags" then + local default, possible = remaining_line:match("^" + -- first value (default) may be empty (i.e. is optional) + -- this is implemented by making the last value optional, and + -- swapping them around if it turns out empty. + .. "(" .. CHAR_CLASSES.FLAGS .. "+)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.FLAGS .. "*)" + .. "$") + + if not default or not possible then + return "Invalid flags setting" + end + + if possible == "" then + possible = default + default = "" + end + + table.insert(settings, { + name = name, + readable_name = readable_name, + type = "flags", + default = default, + possible = possible, + comment = current_comment, + }) + return + end + + return "Invalid setting type \"" .. setting_type .. "\"" +end + +local function parse_single_file(file, filepath, read_all, result, base_level, allow_secure) + -- store this helper variable in the table so it's easier to pass to parse_setting_line() + result.current_comment = "" + + local line = file:read("*line") + while line do + local error_msg = parse_setting_line(result, line, read_all, base_level, allow_secure) + if error_msg then + core.log("error", error_msg .. " in " .. filepath .. " \"" .. line .. "\"") + end + line = file:read("*line") + end + + result.current_comment = nil +end + +-- read_all: whether to ignore certain setting types for GUI or not +-- parse_mods: whether to parse settingtypes.txt in mods and games +local function parse_config_file(read_all, parse_mods) + local builtin_path = core.get_builtin_path() .. DIR_DELIM .. FILENAME + local file = io.open(builtin_path, "r") + local settings = {} + if not file then + core.log("error", "Can't load " .. FILENAME) + return settings + end + + parse_single_file(file, builtin_path, read_all, settings, 0, true) + + file:close() + + if parse_mods then + -- Parse games + local games_category_initialized = false + local index = 1 + local game = gamemgr.get_game(index) + while game do + local path = game.path .. DIR_DELIM .. FILENAME + local file = io.open(path, "r") + if file then + if not games_category_initialized then + local translation = fgettext_ne("Games"), -- not used, but needed for xgettext + table.insert(settings, { + name = "Games", + level = 0, + type = "category", + }) + games_category_initialized = true + end + + table.insert(settings, { + name = game.name, + level = 1, + type = "category", + }) + + parse_single_file(file, path, read_all, settings, 2, false) + + file:close() + end + + index = index + 1 + game = gamemgr.get_game(index) + end + + -- Parse mods + local mods_category_initialized = false + local mods = {} + get_mods(core.get_modpath(), mods) + for _, mod in ipairs(mods) do + local path = mod.path .. DIR_DELIM .. FILENAME + local file = io.open(path, "r") + if file then + if not mods_category_initialized then + local translation = fgettext_ne("Mods"), -- not used, but needed for xgettext + table.insert(settings, { + name = "Mods", + level = 0, + type = "category", + }) + mods_category_initialized = true + end + + table.insert(settings, { + name = mod.name, + level = 1, + type = "category", + }) + + parse_single_file(file, path, read_all, settings, 2, false) + + file:close() + end + end + end + + return settings +end + +local settings = parse_config_file(false, true) +local selected_setting = 1 + +local function get_current_value(setting) + local value = core.setting_get(setting.name) + if value == nil then + value = setting.default + end + return value +end + +local function create_change_setting_formspec(dialogdata) + local setting = settings[selected_setting] + local formspec = "size[10,5.2,true]" .. + "button[5,4.5;2,1;btn_done;" .. fgettext("Save") .. "]" .. + "button[3,4.5;2,1;btn_cancel;" .. fgettext("Cancel") .. "]" .. + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[0,0;10,3;info;" + + if setting.readable_name then + formspec = formspec .. "#FFFF00," .. fgettext(setting.readable_name) + .. " (" .. core.formspec_escape(setting.name) .. ")," + else + formspec = formspec .. "#FFFF00," .. core.formspec_escape(setting.name) .. "," + end + + formspec = formspec .. ",," + + local comment_text = "" + + if setting.comment == "" then + comment_text = fgettext_ne("(No description of setting given)") + else + comment_text = fgettext_ne(setting.comment) + end + for _, comment_line in ipairs(comment_text:split("\n", true)) do + formspec = formspec .. "," .. core.formspec_escape(comment_line) .. "," + end + + if setting.type == "flags" then + formspec = formspec .. ",," + .. "," .. fgettext("Please enter a comma seperated list of flags.") .. "," + .. "," .. fgettext("Possible values are: ") + .. core.formspec_escape(setting.possible:gsub(",", ", ")) .. "," + elseif setting.type == "noise_params" then + formspec = formspec .. ",," + .. "," .. fgettext("Format: , , (, , ), , , ") .. "," + .. "," .. fgettext("Optionally the lacunarity can be appended with a leading comma.") .. "," + elseif setting.type == "v3f" then + formspec = formspec .. ",," + .. "," .. fgettext_ne("Format is 3 numbers separated by commas and inside brackets.") .. "," + end + + formspec = formspec:sub(1, -2) -- remove trailing comma + + formspec = formspec .. ";1]" + + if setting.type == "bool" then + local selected_index + if core.is_yes(get_current_value(setting)) then + selected_index = 2 + else + selected_index = 1 + end + formspec = formspec .. "dropdown[0.5,3.5;3,1;dd_setting_value;" + .. fgettext("Disabled") .. "," .. fgettext("Enabled") .. ";" + .. selected_index .. "]" + + elseif setting.type == "enum" then + local selected_index = 0 + formspec = formspec .. "dropdown[0.5,3.5;3,1;dd_setting_value;" + for index, value in ipairs(setting.values) do + -- translating value is not possible, since it's the value + -- that we set the setting to + formspec = formspec .. core.formspec_escape(value) .. "," + if get_current_value(setting) == value then + selected_index = index + end + end + if #setting.values > 0 then + formspec = formspec:sub(1, -2) -- remove trailing comma + end + formspec = formspec .. ";" .. selected_index .. "]" + + elseif setting.type == "path" then + local current_value = dialogdata.selected_path + if not current_value then + current_value = get_current_value(setting) + end + formspec = formspec .. "field[0.5,4;7.5,1;te_setting_value;;" + .. core.formspec_escape(current_value) .. "]" + .. "button[8,3.75;2,1;btn_browser_path;" .. fgettext("Browse") .. "]" + + else + -- TODO: fancy input for float, int, flags, noise_params, v3f + local width = 10 + local text = get_current_value(setting) + if dialogdata.error_message then + formspec = formspec .. "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[5,3.9;5,0.6;error_message;#FF0000," + .. core.formspec_escape(dialogdata.error_message) .. ";0]" + width = 5 + if dialogdata.entered_text then + text = dialogdata.entered_text + end + end + formspec = formspec .. "field[0.5,4;" .. width .. ",1;te_setting_value;;" + .. core.formspec_escape(text) .. "]" + end + return formspec +end + +local function handle_change_setting_buttons(this, fields) + if fields["btn_done"] or fields["key_enter"] then + local setting = settings[selected_setting] + if setting.type == "bool" then + local new_value = fields["dd_setting_value"] + -- Note: new_value is the actual (translated) value shown in the dropdown + core.setting_setbool(setting.name, new_value == fgettext("Enabled")) + + elseif setting.type == "enum" then + local new_value = fields["dd_setting_value"] + core.setting_set(setting.name, new_value) + + elseif setting.type == "int" then + local new_value = tonumber(fields["te_setting_value"]) + if not new_value or math.floor(new_value) ~= new_value then + this.data.error_message = fgettext_ne("Please enter a valid integer.") + this.data.entered_text = fields["te_setting_value"] + core.update_formspec(this:get_formspec()) + return true + end + if setting.min and new_value < setting.min then + this.data.error_message = fgettext_ne("The value must be greater than $1.", setting.min) + this.data.entered_text = fields["te_setting_value"] + core.update_formspec(this:get_formspec()) + return true + end + if setting.max and new_value > setting.max then + this.data.error_message = fgettext_ne("The value must be lower than $1.", setting.max) + this.data.entered_text = fields["te_setting_value"] + core.update_formspec(this:get_formspec()) + return true + end + core.setting_set(setting.name, new_value) + + elseif setting.type == "float" then + local new_value = tonumber(fields["te_setting_value"]) + if not new_value then + this.data.error_message = fgettext_ne("Please enter a valid number.") + this.data.entered_text = fields["te_setting_value"] + core.update_formspec(this:get_formspec()) + return true + end + core.setting_set(setting.name, new_value) + + elseif setting.type == "flags" then + local new_value = fields["te_setting_value"] + for _,value in ipairs(new_value:split(",", true)) do + value = value:trim() + local possible = "," .. setting.possible .. "," + if not possible:find("," .. value .. ",", 0, true) then + this.data.error_message = fgettext_ne("\"$1\" is not a valid flag.", value) + this.data.entered_text = fields["te_setting_value"] + core.update_formspec(this:get_formspec()) + return true + end + end + core.setting_set(setting.name, new_value) + + else + local new_value = fields["te_setting_value"] + core.setting_set(setting.name, new_value) + end + core.setting_save() + this:delete() + return true + end + + if fields["btn_cancel"] then + this:delete() + return true + end + + if fields["btn_browser_path"] then + core.show_file_open_dialog("dlg_browse_path", fgettext_ne("Select path")) + end + + if fields["dlg_browse_path_accepted"] then + this.data.selected_path = fields["dlg_browse_path_accepted"] + core.update_formspec(this:get_formspec()) + end + + return false +end + +local function create_settings_formspec(tabview, name, tabdata) + local formspec = "size[12,6.5;true]" .. + "tablecolumns[color;tree;text;text]" .. + "tableoptions[background=#00000000;border=false]" .. + "table[0,0;12,5.5;list_settings;" + + local current_level = 0 + for _, entry in ipairs(settings) do + local name + if not core.setting_getbool("main_menu_technical_settings") and entry.readable_name then + name = fgettext_ne(entry.readable_name) + else + name = entry.name + end + + if entry.type == "category" then + current_level = entry.level + formspec = formspec .. "#FFFF00," .. current_level .. "," .. fgettext(name) .. ",," + + elseif entry.type == "bool" then + local value = get_current_value(entry) + if core.is_yes(value) then + value = fgettext("Enabled") + else + value = fgettext("Disabled") + end + formspec = formspec .. "," .. (current_level + 1) .. "," .. core.formspec_escape(name) .. "," + .. value .. "," + + elseif entry.type == "key" then + -- ignore key settings, since we have a special dialog for them + + else + formspec = formspec .. "," .. (current_level + 1) .. "," .. core.formspec_escape(name) .. "," + .. core.formspec_escape(get_current_value(entry)) .. "," + end + end + + if #settings > 0 then + formspec = formspec:sub(1, -2) -- remove trailing comma + end + formspec = formspec .. ";" .. selected_setting .. "]" .. + "button[0,6;4,1;btn_back;".. fgettext("< Back to Settings page") .. "]" .. + "button[10,6;2,1;btn_edit;" .. fgettext("Edit") .. "]" .. + "button[7,6;3,1;btn_restore;" .. fgettext("Restore Default") .. "]" .. + "checkbox[0,5.3;cb_tech_settings;" .. fgettext("Show technical names") .. ";" + .. dump(core.setting_getbool("main_menu_technical_settings")) .. "]" + + return formspec +end + +local function handle_settings_buttons(this, fields, tabname, tabdata) + local list_enter = false + if fields["list_settings"] then + selected_setting = core.get_table_index("list_settings") + if core.explode_table_event(fields["list_settings"]).type == "DCL" then + -- Directly toggle booleans + local setting = settings[selected_setting] + if setting.type == "bool" then + local current_value = get_current_value(setting) + core.setting_setbool(setting.name, not core.is_yes(current_value)) + core.setting_save() + return true + else + list_enter = true + end + else + return true + end + end + + if fields["btn_edit"] or list_enter then + local setting = settings[selected_setting] + if setting.type ~= "category" then + local edit_dialog = dialog_create("change_setting", create_change_setting_formspec, + handle_change_setting_buttons) + edit_dialog:set_parent(this) + this:hide() + edit_dialog:show() + end + return true + end + + if fields["btn_restore"] then + local setting = settings[selected_setting] + if setting.type ~= "category" then + core.setting_set(setting.name, setting.default) + core.setting_save() + core.update_formspec(this:get_formspec()) + end + return true + end + + if fields["btn_back"] then + this:delete() + return true + end + + if fields["cb_tech_settings"] then + core.setting_set("main_menu_technical_settings", fields["cb_tech_settings"]) + core.setting_save() + core.update_formspec(this:get_formspec()) + return true + end + + return false +end + +function create_adv_settings_dlg() + local dlg = dialog_create("settings_advanced", + create_settings_formspec, + handle_settings_buttons, + nil) + + return dlg +end + +local function create_minetest_conf_example() + local result = "# This file contains a list of all available settings and their default value for minetest.conf\n" .. + "\n" .. + "# By default, all the settings are commented and not functional.\n" .. + "# Uncomment settings by removing the preceding #.\n" .. + "\n" .. + "# minetest.conf is read by default from:\n" .. + "# ../minetest.conf\n" .. + "# ../../minetest.conf\n" .. + "# Any other path can be chosen by passing the path as a parameter\n" .. + "# to the program, eg. \"minetest.exe --config ../minetest.conf.example\".\n" .. + "\n" .. + "# Further documentation:\n" .. + "# http://wiki.minetest.net/\n" .. + "\n" + + local settings = parse_config_file(true, false) + for _, entry in ipairs(settings) do + if entry.type == "category" then + if entry.level == 0 then + result = result .. "#\n# " .. entry.name .. "\n#\n\n" + else + for i = 1, entry.level do + result = result .. "#" + end + result = result .. "# " .. entry.name .. "\n\n" + end + else + if entry.comment ~= "" then + for _, comment_line in ipairs(entry.comment:split("\n", true)) do + result = result .."# " .. comment_line .. "\n" + end + end + result = result .. "# type: " .. entry.type + if entry.min then + result = result .. " min: " .. entry.min + end + if entry.max then + result = result .. " max: " .. entry.max + end + if entry.values then + result = result .. " values: " .. table.concat(entry.values, ", ") + end + if entry.possible then + result = result .. " possible values: " .. entry.possible:gsub(",", ", ") + end + result = result .. "\n" + result = result .. "# " .. entry.name .. " = ".. entry.default .. "\n\n" + end + end + return result +end + +local function create_translation_file() + local result = "// This file is automatically generated\n" .. + "// It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files\n" .. + "// To update it, refer to the bottom of builtin/mainmenu/tab_settings.lua\n\n" .. + "fake_function() {\n" + + local settings = parse_config_file(true, false) + for _, entry in ipairs(settings) do + if entry.type == "category" then + local name_escaped = entry.name:gsub("\"", "\\\"") + result = result .. "\tgettext(\"" .. name_escaped .. "\");\n" + else + if entry.readable_name then + local readable_name_escaped = entry.readable_name:gsub("\"", "\\\"") + result = result .. "\tgettext(\"" .. readable_name_escaped .. "\");\n" + end + if entry.comment ~= "" then + local comment_escaped = entry.comment:gsub("\n", "\\n") + comment_escaped = comment_escaped:gsub("\"", "\\\"") + result = result .. "\tgettext(\"" .. comment_escaped .. "\");\n" + end + end + end + result = result .. "}\n" + return result +end + +if false then + local file = io.open("minetest.conf.example", "w") + if file then + file:write(create_minetest_conf_example()) + file:close() + end +end + +if false then + local file = io.open("src/settings_translation_file.cpp", "w") + if file then + file:write(create_translation_file()) + file:close() + end +end diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 176796be..69536630 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -41,6 +41,7 @@ dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua") dofile(menupath .. DIR_DELIM .. "tab_credits.lua") dofile(menupath .. DIR_DELIM .. "tab_mods.lua") dofile(menupath .. DIR_DELIM .. "tab_settings.lua") +dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua") if PLATFORM ~= "Android" then dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua") dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua") diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 99138a09..dc2bcff1 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -1,5 +1,5 @@ --Minetest ---Copyright (C) 2015 PilzAdam +--Copyright (C) 2013 sapier -- --This program is free software; you can redistribute it and/or modify --it under the terms of the GNU Lesser General Public License as published by @@ -15,739 +15,409 @@ --with this program; if not, write to the Free Software Foundation, Inc., --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -local FILENAME = "settingtypes.txt" +-------------------------------------------------------------------------------- -local CHAR_CLASSES = { - SPACE = "[%s]", - VARIABLE = "[%w_%-%.]", - INTEGER = "[+-]?[%d]", - FLOAT = "[+-]?[%d%.]", - FLAGS = "[%w_%-%.,]", +local leaves_style_labels = { + fgettext("Opaque Leaves"), + fgettext("Simple Leaves"), + fgettext("Fancy Leaves") } --- returns error message, or nil -local function parse_setting_line(settings, line, read_all, base_level, allow_secure) - -- comment - local comment = line:match("^#" .. CHAR_CLASSES.SPACE .. "*(.*)$") - if comment then - if settings.current_comment == "" then - settings.current_comment = comment - else - settings.current_comment = settings.current_comment .. "\n" .. comment - end - return +local leaves_style = { + {leaves_style_labels[1] .. "," .. leaves_style_labels[2] .. "," .. leaves_style_labels[3]}, + {"opaque", "simple", "fancy"}, +} + +local dd_filter_labels = { + fgettext("No Filter"), + fgettext("Bilinear Filter"), + fgettext("Trilinear Filter") +} + +local filters = { + {dd_filter_labels[1] .. "," .. dd_filter_labels[2] .. "," .. dd_filter_labels[3]}, + {"", "bilinear_filter", "trilinear_filter"}, +} + +local dd_mipmap_labels = { + fgettext("No Mipmap"), + fgettext("Mipmap"), + fgettext("Mipmap + Aniso. Filter") +} + +local mipmap = { + {dd_mipmap_labels[1] .. "," .. dd_mipmap_labels[2] .. "," .. dd_mipmap_labels[3]}, + {"", "mip_map", "anisotropic_filter"}, +} + +local function getLeavesStyleSettingIndex() + local style = core.setting_get("leaves_style") + if (style == leaves_style[2][3]) then + return 3 + elseif (style == leaves_style[2][2]) then + return 2 end - - -- clear current_comment so only comments directly above a setting are bound to it - -- but keep a local reference to it for variables in the current line - local current_comment = settings.current_comment - settings.current_comment = "" - - -- empty lines - if line:match("^" .. CHAR_CLASSES.SPACE .. "*$") then - return - end - - -- category - local stars, category = line:match("^%[([%*]*)([^%]]+)%]$") - if category then - table.insert(settings, { - name = category, - level = stars:len() + base_level, - type = "category", - }) - return - end - - -- settings - local first_part, name, readable_name, setting_type = line:match("^" - -- this first capture group matches the whole first part, - -- so we can later strip it from the rest of the line - .. "(" - .. "([" .. CHAR_CLASSES.VARIABLE .. "+)" -- variable name - .. CHAR_CLASSES.SPACE .. "*" - .. "%(([^%)]*)%)" -- readable name - .. CHAR_CLASSES.SPACE .. "*" - .. "(" .. CHAR_CLASSES.VARIABLE .. "+)" -- type - .. CHAR_CLASSES.SPACE .. "*" - .. ")") - - if not first_part then - return "Invalid line" - end - - if name:match("secure%.[.]*") and not allow_secure then - return "Tried to add \"secure.\" setting" - end - - if readable_name == "" then - readable_name = nil - end - local remaining_line = line:sub(first_part:len() + 1) - - if setting_type == "int" then - local default, min, max = remaining_line:match("^" - -- first int is required, the last 2 are optional - .. "(" .. CHAR_CLASSES.INTEGER .. "+)" .. CHAR_CLASSES.SPACE .. "*" - .. "(" .. CHAR_CLASSES.INTEGER .. "*)" .. CHAR_CLASSES.SPACE .. "*" - .. "(" .. CHAR_CLASSES.INTEGER .. "*)" - .. "$") - - if not default or not tonumber(default) then - return "Invalid integer setting" - end - - min = tonumber(min) - max = tonumber(max) - table.insert(settings, { - name = name, - readable_name = readable_name, - type = "int", - default = default, - min = min, - max = max, - comment = current_comment, - }) - return - end - - if setting_type == "string" or setting_type == "noise_params" - or setting_type == "key" or setting_type == "v3f" then - local default = remaining_line:match("^(.*)$") - - if not default then - return "Invalid string setting" - end - if setting_type == "key" and not read_all then - -- ignore key type if read_all is false - return - end - - table.insert(settings, { - name = name, - readable_name = readable_name, - type = setting_type, - default = default, - comment = current_comment, - }) - return - end - - if setting_type == "bool" then - if remaining_line ~= "false" and remaining_line ~= "true" then - return "Invalid boolean setting" - end - - table.insert(settings, { - name = name, - readable_name = readable_name, - type = "bool", - default = remaining_line, - comment = current_comment, - }) - return - end - - if setting_type == "float" then - local default, min, max = remaining_line:match("^" - -- first float is required, the last 2 are optional - .. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "*" - .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "*" - .. "(" .. CHAR_CLASSES.FLOAT .. "*)" - .."$") - - if not default or not tonumber(default) then - return "Invalid float setting" - end - - min = tonumber(min) - max = tonumber(max) - table.insert(settings, { - name = name, - readable_name = readable_name, - type = "float", - default = default, - min = min, - max = max, - comment = current_comment, - }) - return - end - - if setting_type == "enum" then - local default, values = remaining_line:match("^" - -- first value (default) may be empty (i.e. is optional) - .. "(" .. CHAR_CLASSES.VARIABLE .. "*)" .. CHAR_CLASSES.SPACE .. "*" - .. "(" .. CHAR_CLASSES.FLAGS .. "+)" - .. "$") - - if not default or values == "" then - return "Invalid enum setting" - end - - table.insert(settings, { - name = name, - readable_name = readable_name, - type = "enum", - default = default, - values = values:split(",", true), - comment = current_comment, - }) - return - end - - if setting_type == "path" then - local default = remaining_line:match("^(.*)$") - - if not default then - return "Invalid path setting" - end - - table.insert(settings, { - name = name, - readable_name = readable_name, - type = "path", - default = default, - comment = current_comment, - }) - return - end - - if setting_type == "flags" then - local default, possible = remaining_line:match("^" - -- first value (default) may be empty (i.e. is optional) - -- this is implemented by making the last value optional, and - -- swapping them around if it turns out empty. - .. "(" .. CHAR_CLASSES.FLAGS .. "+)" .. CHAR_CLASSES.SPACE .. "*" - .. "(" .. CHAR_CLASSES.FLAGS .. "*)" - .. "$") - - if not default or not possible then - return "Invalid flags setting" - end - - if possible == "" then - possible = default - default = "" - end - - table.insert(settings, { - name = name, - readable_name = readable_name, - type = "flags", - default = default, - possible = possible, - comment = current_comment, - }) - return - end - - return "Invalid setting type \"" .. setting_type .. "\"" + return 1 end -local function parse_single_file(file, filepath, read_all, result, base_level, allow_secure) - -- store this helper variable in the table so it's easier to pass to parse_setting_line() - result.current_comment = "" +local dd_antialiasing_labels = { + fgettext("None"), + fgettext("2x"), + fgettext("4x"), + fgettext("8x"), +} - local line = file:read("*line") - while line do - local error_msg = parse_setting_line(result, line, read_all, base_level, allow_secure) - if error_msg then - core.log("error", error_msg .. " in " .. filepath .. " \"" .. line .. "\"") - end - line = file:read("*line") +local antialiasing = { + {dd_antialiasing_labels[1] .. "," .. dd_antialiasing_labels[2] .. "," .. + dd_antialiasing_labels[3] .. "," .. dd_antialiasing_labels[4]}, + {"0", "2", "4", "8"} +} + +local function getFilterSettingIndex() + if (core.setting_get(filters[2][3]) == "true") then + return 3 end - - result.current_comment = nil + if (core.setting_get(filters[2][3]) == "false" and core.setting_get(filters[2][2]) == "true") then + return 2 + end + return 1 end --- read_all: whether to ignore certain setting types for GUI or not --- parse_mods: whether to parse settingtypes.txt in mods and games -local function parse_config_file(read_all, parse_mods) - local builtin_path = core.get_builtin_path() .. DIR_DELIM .. FILENAME - local file = io.open(builtin_path, "r") - local settings = {} - if not file then - core.log("error", "Can't load " .. FILENAME) - return settings +local function getMipmapSettingIndex() + if (core.setting_get(mipmap[2][3]) == "true") then + return 3 end + if (core.setting_get(mipmap[2][3]) == "false" and core.setting_get(mipmap[2][2]) == "true") then + return 2 + end + return 1 +end - parse_single_file(file, builtin_path, read_all, settings, 0, true) +local function getAntialiasingSettingIndex() + local antialiasing_setting = core.setting_get("fsaa") + for i = 1, #(antialiasing[2]) do + if antialiasing_setting == antialiasing[2][i] then + return i + end + end + return 1 +end - file:close() +local function antialiasing_fname_to_name(fname) + for i = 1, #(dd_antialiasing_labels) do + if fname == dd_antialiasing_labels[i] then + return antialiasing[2][i] + end + end + return 0 +end - if parse_mods then - -- Parse games - local games_category_initialized = false - local index = 1 - local game = gamemgr.get_game(index) - while game do - local path = game.path .. DIR_DELIM .. FILENAME - local file = io.open(path, "r") - if file then - if not games_category_initialized then - local translation = fgettext_ne("Games"), -- not used, but needed for xgettext - table.insert(settings, { - name = "Games", - level = 0, - type = "category", - }) - games_category_initialized = true - end +local function dlg_confirm_reset_formspec(data) + local retval = + "size[8,3]" .. + "label[1,1;" .. fgettext("Are you sure to reset your singleplayer world?") .. "]" .. + "button[1,2;2.6,0.5;dlg_reset_singleplayer_confirm;" .. + fgettext("Yes") .. "]" .. + "button[4,2;2.8,0.5;dlg_reset_singleplayer_cancel;" .. + fgettext("No!!!") .. "]" + return retval +end - table.insert(settings, { - name = game.name, - level = 1, - type = "category", - }) +local function dlg_confirm_reset_btnhandler(this, fields, dialogdata) - parse_single_file(file, path, read_all, settings, 2, false) + if fields["dlg_reset_singleplayer_confirm"] ~= nil then + local worldlist = core.get_worlds() + local found_singleplayerworld = false - file:close() + for i = 1, #worldlist, 1 do + if worldlist[i].name == "singleplayerworld" then + found_singleplayerworld = true + gamedata.worldindex = i end - - index = index + 1 - game = gamemgr.get_game(index) end - -- Parse mods - local mods_category_initialized = false - local mods = {} - get_mods(core.get_modpath(), mods) - for _, mod in ipairs(mods) do - local path = mod.path .. DIR_DELIM .. FILENAME - local file = io.open(path, "r") - if file then - if not mods_category_initialized then - local translation = fgettext_ne("Mods"), -- not used, but needed for xgettext - table.insert(settings, { - name = "Mods", - level = 0, - type = "category", - }) - mods_category_initialized = true - end + if found_singleplayerworld then + core.delete_world(gamedata.worldindex) + end - table.insert(settings, { - name = mod.name, - level = 1, - type = "category", - }) + core.create_world("singleplayerworld", 1) - parse_single_file(file, path, read_all, settings, 2, false) + worldlist = core.get_worlds() - file:close() + found_singleplayerworld = false + + for i = 1, #worldlist, 1 do + if worldlist[i].name == "singleplayerworld" then + found_singleplayerworld = true + gamedata.worldindex = i end end end - return settings + this.parent:show() + this:hide() + this:delete() + return true end -local settings = parse_config_file(false, true) -local selected_setting = 1 +local function showconfirm_reset(tabview) + local new_dlg = dialog_create("reset_spworld", + dlg_confirm_reset_formspec, + dlg_confirm_reset_btnhandler, + nil) + new_dlg:set_parent(tabview) + tabview:hide() + new_dlg:show() +end -local function get_current_value(setting) - local value = core.setting_get(setting.name) - if value == nil then - value = setting.default +local function gui_scale_to_scrollbar() + local current_value = tonumber(core.setting_get("gui_scaling")) + + if (current_value == nil) or current_value < 0.25 then + return 0 end - return value + if current_value <= 1.25 then + return ((current_value - 0.25)/ 1.0) * 700 + end + if current_value <= 6 then + return ((current_value -1.25) * 100) + 700 + end + + return 1000 end -local function create_change_setting_formspec(dialogdata) - local setting = settings[selected_setting] - local formspec = "size[10,5.2,true]" .. - "button[5,4.5;2,1;btn_done;" .. fgettext("Save") .. "]" .. - "button[3,4.5;2,1;btn_cancel;" .. fgettext("Cancel") .. "]" .. - "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[0,0;10,3;info;" +local function scrollbar_to_gui_scale(value) + value = tonumber(value) - if setting.readable_name then - formspec = formspec .. "#FFFF00," .. fgettext(setting.readable_name) - .. " (" .. core.formspec_escape(setting.name) .. ")," + if (value <= 700) then + return ((value / 700) * 1.0) + 0.25 + end + if (value <= 1000) then + return ((value - 700) / 100) + 1.25 + end + + return 1 +end + +local function formspec(tabview, name, tabdata) + local tab_string = + "box[0,0;3.5,4.3;#999999]" .. + "checkbox[0.25,0;cb_smooth_lighting;" .. fgettext("Smooth Lighting") + .. ";" .. dump(core.setting_getbool("smooth_lighting")) .. "]" .. + "checkbox[0.25,0.5;cb_particles;" .. fgettext("Enable Particles") .. ";" + .. dump(core.setting_getbool("enable_particles")) .. "]" .. + "checkbox[0.25,1;cb_3d_clouds;" .. fgettext("3D Clouds") .. ";" + .. dump(core.setting_getbool("enable_3d_clouds")) .. "]" .. + "checkbox[0.25,1.5;cb_opaque_water;" .. fgettext("Opaque Water") .. ";" + .. dump(core.setting_getbool("opaque_water")) .. "]" .. + "checkbox[0.25,2.0;cb_connected_glass;" .. fgettext("Connected Glass") .. ";" + .. dump(core.setting_getbool("connected_glass")) .. "]" .. + "checkbox[0.25,2.5;cb_node_highlighting;" .. fgettext("Node Highlighting") .. ";" + .. dump(core.setting_getbool("enable_node_highlighting")) .. "]" .. + "dropdown[0.25,3.4;3.3;dd_leaves_style;" .. leaves_style[1][1] .. ";" + .. getLeavesStyleSettingIndex() .. "]" .. + "box[3.75,0;3.75,3.45;#999999]" .. + "label[3.85,0.1;" .. fgettext("Texturing:") .. "]" .. + "dropdown[3.85,0.55;3.85;dd_filters;" .. filters[1][1] .. ";" + .. getFilterSettingIndex() .. "]" .. + "dropdown[3.85,1.35;3.85;dd_mipmap;" .. mipmap[1][1] .. ";" + .. getMipmapSettingIndex() .. "]" .. + "label[3.85,2.15;" .. fgettext("Antialiasing:") .. "]" .. + "dropdown[3.85,2.6;3.85;dd_antialiasing;" .. antialiasing[1][1] .. ";" + .. getAntialiasingSettingIndex() .. "]" .. + "box[7.75,0;4,4;#999999]" .. + "checkbox[8,0;cb_shaders;" .. fgettext("Shaders") .. ";" + .. dump(core.setting_getbool("enable_shaders")) .. "]" + + tab_string = tab_string .. + "button[8,4.75;3.75,0.5;btn_change_keys;" .. fgettext("Change keys") .. "]" .. + "button[0,4.75;3.75,0.5;btn_advanced_settings;" .. fgettext("Advanced Settings") .. "]" + + + if core.setting_get("touchscreen_threshold") ~= nil then + tab_string = tab_string .. + "label[4.3,4.1;" .. fgettext("Touchthreshold (px)") .. "]" .. + "dropdown[3.85,4.55;3.85;dd_touchthreshold;0,10,20,30,40,50;" .. + ((tonumber(core.setting_get("touchscreen_threshold"))/10)+1) .. "]" + end + + if core.setting_getbool("enable_shaders") then + tab_string = tab_string .. + "checkbox[8,0.5;cb_bumpmapping;" .. fgettext("Bumpmapping") .. ";" + .. dump(core.setting_getbool("enable_bumpmapping")) .. "]" .. + "checkbox[8,1.0;cb_generate_normalmaps;" .. fgettext("Generate Normalmaps") .. ";" + .. dump(core.setting_getbool("generate_normalmaps")) .. "]" .. + "checkbox[8,1.5;cb_parallax;" .. fgettext("Parallax Occlusion") .. ";" + .. dump(core.setting_getbool("enable_parallax_occlusion")) .. "]" .. + "checkbox[8,2.0;cb_waving_water;" .. fgettext("Waving Water") .. ";" + .. dump(core.setting_getbool("enable_waving_water")) .. "]" .. + "checkbox[8,2.5;cb_waving_leaves;" .. fgettext("Waving Leaves") .. ";" + .. dump(core.setting_getbool("enable_waving_leaves")) .. "]" .. + "checkbox[8,3.0;cb_waving_plants;" .. fgettext("Waving Plants") .. ";" + .. dump(core.setting_getbool("enable_waving_plants")) .. "]" else - formspec = formspec .. "#FFFF00," .. core.formspec_escape(setting.name) .. "," + tab_string = tab_string .. + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[8.33,0.7;3.5,4;shaders;" .. + "#888888," .. fgettext("Bumpmapping") .. "," .. + "#888888," .. fgettext("Generate Normalmaps") .. "," .. + "#888888," .. fgettext("Parallax Occlusion") .. "," .. + "#888888," .. fgettext("Waving Water") .. "," .. + "#888888," .. fgettext("Waving Leaves") .. "," .. + "#888888," .. fgettext("Waving Plants") .. "," .. + ";1]" end - formspec = formspec .. ",," - - local comment_text = "" - - if setting.comment == "" then - comment_text = fgettext_ne("(No description of setting given)") - else - comment_text = fgettext_ne(setting.comment) - end - for _, comment_line in ipairs(comment_text:split("\n", true)) do - formspec = formspec .. "," .. core.formspec_escape(comment_line) .. "," - end - - if setting.type == "flags" then - formspec = formspec .. ",," - .. "," .. fgettext("Please enter a comma seperated list of flags.") .. "," - .. "," .. fgettext("Possible values are: ") - .. core.formspec_escape(setting.possible:gsub(",", ", ")) .. "," - elseif setting.type == "noise_params" then - formspec = formspec .. ",," - .. "," .. fgettext("Format: , , (, , ), , , ") .. "," - .. "," .. fgettext("Optionally the lacunarity can be appended with a leading comma.") .. "," - elseif setting.type == "v3f" then - formspec = formspec .. ",," - .. "," .. fgettext_ne("Format is 3 numbers separated by commas and inside brackets.") .. "," - end - - formspec = formspec:sub(1, -2) -- remove trailing comma - - formspec = formspec .. ";1]" - - if setting.type == "bool" then - local selected_index - if core.is_yes(get_current_value(setting)) then - selected_index = 2 - else - selected_index = 1 - end - formspec = formspec .. "dropdown[0.5,3.5;3,1;dd_setting_value;" - .. fgettext("Disabled") .. "," .. fgettext("Enabled") .. ";" - .. selected_index .. "]" - - elseif setting.type == "enum" then - local selected_index = 0 - formspec = formspec .. "dropdown[0.5,3.5;3,1;dd_setting_value;" - for index, value in ipairs(setting.values) do - -- translating value is not possible, since it's the value - -- that we set the setting to - formspec = formspec .. core.formspec_escape(value) .. "," - if get_current_value(setting) == value then - selected_index = index - end - end - if #setting.values > 0 then - formspec = formspec:sub(1, -2) -- remove trailing comma - end - formspec = formspec .. ";" .. selected_index .. "]" - - elseif setting.type == "path" then - local current_value = dialogdata.selected_path - if not current_value then - current_value = get_current_value(setting) - end - formspec = formspec .. "field[0.5,4;7.5,1;te_setting_value;;" - .. core.formspec_escape(current_value) .. "]" - .. "button[8,3.75;2,1;btn_browser_path;" .. fgettext("Browse") .. "]" - - else - -- TODO: fancy input for float, int, flags, noise_params, v3f - local width = 10 - local text = get_current_value(setting) - if dialogdata.error_message then - formspec = formspec .. "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[5,3.9;5,0.6;error_message;#FF0000," - .. core.formspec_escape(dialogdata.error_message) .. ";0]" - width = 5 - if dialogdata.entered_text then - text = dialogdata.entered_text - end - end - formspec = formspec .. "field[0.5,4;" .. width .. ",1;te_setting_value;;" - .. core.formspec_escape(text) .. "]" - end - return formspec -end - -local function handle_change_setting_buttons(this, fields) - if fields["btn_done"] or fields["key_enter"] then - local setting = settings[selected_setting] - if setting.type == "bool" then - local new_value = fields["dd_setting_value"] - -- Note: new_value is the actual (translated) value shown in the dropdown - core.setting_setbool(setting.name, new_value == fgettext("Enabled")) - - elseif setting.type == "enum" then - local new_value = fields["dd_setting_value"] - core.setting_set(setting.name, new_value) - - elseif setting.type == "int" then - local new_value = tonumber(fields["te_setting_value"]) - if not new_value or math.floor(new_value) ~= new_value then - this.data.error_message = fgettext_ne("Please enter a valid integer.") - this.data.entered_text = fields["te_setting_value"] - core.update_formspec(this:get_formspec()) - return true - end - if setting.min and new_value < setting.min then - this.data.error_message = fgettext_ne("The value must be greater than $1.", setting.min) - this.data.entered_text = fields["te_setting_value"] - core.update_formspec(this:get_formspec()) - return true - end - if setting.max and new_value > setting.max then - this.data.error_message = fgettext_ne("The value must be lower than $1.", setting.max) - this.data.entered_text = fields["te_setting_value"] - core.update_formspec(this:get_formspec()) - return true - end - core.setting_set(setting.name, new_value) - - elseif setting.type == "float" then - local new_value = tonumber(fields["te_setting_value"]) - if not new_value then - this.data.error_message = fgettext_ne("Please enter a valid number.") - this.data.entered_text = fields["te_setting_value"] - core.update_formspec(this:get_formspec()) - return true - end - core.setting_set(setting.name, new_value) - - elseif setting.type == "flags" then - local new_value = fields["te_setting_value"] - for _,value in ipairs(new_value:split(",", true)) do - value = value:trim() - local possible = "," .. setting.possible .. "," - if not possible:find("," .. value .. ",", 0, true) then - this.data.error_message = fgettext_ne("\"$1\" is not a valid flag.", value) - this.data.entered_text = fields["te_setting_value"] - core.update_formspec(this:get_formspec()) - return true - end - end - core.setting_set(setting.name, new_value) - - else - local new_value = fields["te_setting_value"] - core.setting_set(setting.name, new_value) - end - core.setting_save() - this:delete() - return true - end - - if fields["btn_cancel"] then - this:delete() - return true - end - - if fields["btn_browser_path"] then - core.show_file_open_dialog("dlg_browse_path", fgettext_ne("Select path")) - end - - if fields["dlg_browse_path_accepted"] then - this.data.selected_path = fields["dlg_browse_path_accepted"] - core.update_formspec(this:get_formspec()) - end - - return false -end - -local function create_settings_formspec(tabview, name, tabdata) - local formspec = "tablecolumns[color;tree;text;text]" .. - "tableoptions[background=#00000000;border=false]" .. - "table[0,0;12,4.5;list_settings;" - - local current_level = 0 - for _, entry in ipairs(settings) do - local name - if not core.setting_getbool("main_menu_technical_settings") and entry.readable_name then - name = fgettext_ne(entry.readable_name) - else - name = entry.name - end - - if entry.type == "category" then - current_level = entry.level - formspec = formspec .. "#FFFF00," .. current_level .. "," .. fgettext(name) .. ",," - - elseif entry.type == "bool" then - local value = get_current_value(entry) - if core.is_yes(value) then - value = fgettext("Enabled") - else - value = fgettext("Disabled") - end - formspec = formspec .. "," .. (current_level + 1) .. "," .. core.formspec_escape(name) .. "," - .. value .. "," - - elseif entry.type == "key" then - -- ignore key settings, since we have a special dialog for them - - else - formspec = formspec .. "," .. (current_level + 1) .. "," .. core.formspec_escape(name) .. "," - .. core.formspec_escape(get_current_value(entry)) .. "," - end - end - - if #settings > 0 then - formspec = formspec:sub(1, -2) -- remove trailing comma - end - formspec = formspec .. ";" .. selected_setting .. "]" .. - "button[4,4.5;3,1;btn_change_keys;".. fgettext("Change keys") .. "]" .. - "button[10,4.5;2,1;btn_edit;" .. fgettext("Edit") .. "]" .. - "button[7,4.5;3,1;btn_restore;" .. fgettext("Restore Default") .. "]" .. - "checkbox[0,4.5;cb_tech_settings;" .. fgettext("Show technical names") .. ";" - .. dump(core.setting_getbool("main_menu_technical_settings")) .. "]" - - return formspec + return tab_string end +-------------------------------------------------------------------------------- local function handle_settings_buttons(this, fields, tabname, tabdata) - local list_enter = false - if fields["list_settings"] then - selected_setting = core.get_table_index("list_settings") - if core.explode_table_event(fields["list_settings"]).type == "DCL" then - -- Directly toggle booleans - local setting = settings[selected_setting] - if setting.type == "bool" then - local current_value = get_current_value(setting) - core.setting_setbool(setting.name, not core.is_yes(current_value)) - core.setting_save() - return true - else - list_enter = true - end + + if fields["btn_advanced_settings"] ~= nil then + local adv_settings_dlg = create_adv_settings_dlg() + adv_settings_dlg:set_parent(this) + this:hide() + adv_settings_dlg:show() + --mm_texture.update("singleplayer", current_game()) + return true + end + + if fields["cb_smooth_lighting"] then + core.setting_set("smooth_lighting", fields["cb_smooth_lighting"]) + return true + end + if fields["cb_particles"] then + core.setting_set("enable_particles", fields["cb_particles"]) + return true + end + if fields["cb_3d_clouds"] then + core.setting_set("enable_3d_clouds", fields["cb_3d_clouds"]) + return true + end + if fields["cb_opaque_water"] then + core.setting_set("opaque_water", fields["cb_opaque_water"]) + return true + end + if fields["cb_connected_glass"] then + core.setting_set("connected_glass", fields["cb_connected_glass"]) + return true + end + if fields["cb_node_highlighting"] then + core.setting_set("enable_node_highlighting", fields["cb_node_highlighting"]) + return true + end + if fields["cb_shaders"] then + if (core.setting_get("video_driver") == "direct3d8" + or core.setting_get("video_driver") == "direct3d9") then + core.setting_set("enable_shaders", "false") + gamedata.errormessage = fgettext("To enable shaders the OpenGL driver needs to be used.") else + core.setting_set("enable_shaders", fields["cb_shaders"]) + end + return true + end + if fields["cb_bumpmapping"] then + core.setting_set("enable_bumpmapping", fields["cb_bumpmapping"]) + end + if fields["cb_generate_normalmaps"] then + core.setting_set("generate_normalmaps", fields["cb_generate_normalmaps"]) + end + if fields["cb_parallax"] then + core.setting_set("enable_parallax_occlusion", fields["cb_parallax"]) + return true + end + if fields["cb_waving_water"] then + core.setting_set("enable_waving_water", fields["cb_waving_water"]) + return true + end + if fields["cb_waving_leaves"] then + core.setting_set("enable_waving_leaves", fields["cb_waving_leaves"]) + end + if fields["cb_waving_plants"] then + core.setting_set("enable_waving_plants", fields["cb_waving_plants"]) + return true + end + + if fields["sb_gui_scaling"] then + local event = core.explode_scrollbar_event(fields["sb_gui_scaling"]) + + if event.type == "CHG" then + local tosave = string.format("%.2f",scrollbar_to_gui_scale(event.value)) + core.setting_set("gui_scaling", tosave) return true end end - if fields["btn_edit"] or list_enter then - local setting = settings[selected_setting] - if setting.type ~= "category" then - local edit_dialog = dialog_create("change_setting", create_change_setting_formspec, - handle_change_setting_buttons) - edit_dialog:set_parent(this) - this:hide() - edit_dialog:show() - end - return true - end - - if fields["btn_restore"] then - local setting = settings[selected_setting] - if setting.type ~= "category" then - core.setting_set(setting.name, setting.default) - core.setting_save() - core.update_formspec(this:get_formspec()) - end - return true - end - if fields["btn_change_keys"] then core.show_keys_menu() return true end - - if fields["cb_tech_settings"] then - core.setting_set("main_menu_technical_settings", fields["cb_tech_settings"]) - core.setting_save() - core.update_formspec(this:get_formspec()) + if fields["cb_touchscreen_target"] then + core.setting_set("touchtarget", fields["cb_touchscreen_target"]) + return true + end + if fields["btn_reset_singleplayer"] then + showconfirm_reset(this) return true end - return false + --Note dropdowns have to be handled LAST! + local ddhandled = false + + if fields["dd_leaves_style"] == leaves_style_labels[1] then + core.setting_set("leaves_style", leaves_style[2][1]) + ddhandled = true + elseif fields["dd_leaves_style"] == leaves_style_labels[2] then + core.setting_set("leaves_style", leaves_style[2][2]) + ddhandled = true + elseif fields["dd_leaves_style"] == leaves_style_labels[3] then + core.setting_set("leaves_style", leaves_style[2][3]) + ddhandled = true + end + if fields["dd_filters"] == dd_filter_labels[1] then + core.setting_set("bilinear_filter", "false") + core.setting_set("trilinear_filter", "false") + ddhandled = true + elseif fields["dd_filters"] == dd_filter_labels[2] then + core.setting_set("bilinear_filter", "true") + core.setting_set("trilinear_filter", "false") + ddhandled = true + elseif fields["dd_filters"] == dd_filter_labels[3] then + core.setting_set("bilinear_filter", "false") + core.setting_set("trilinear_filter", "true") + ddhandled = true + end + if fields["dd_mipmap"] == dd_mipmap_labels[1] then + core.setting_set("mip_map", "false") + core.setting_set("anisotropic_filter", "false") + ddhandled = true + elseif fields["dd_mipmap"] == dd_mipmap_labels[2] then + core.setting_set("mip_map", "true") + core.setting_set("anisotropic_filter", "false") + ddhandled = true + elseif fields["dd_mipmap"] == dd_mipmap_labels[3] then + core.setting_set("mip_map", "true") + core.setting_set("anisotropic_filter", "true") + ddhandled = true + end + if fields["dd_antialiasing"] then + core.setting_set("fsaa", + antialiasing_fname_to_name(fields["dd_antialiasing"])) + ddhandled = true + end + if fields["dd_touchthreshold"] then + core.setting_set("touchscreen_threshold",fields["dd_touchthreshold"]) + ddhandled = true + end + + return ddhandled end tab_settings = { name = "settings", caption = fgettext("Settings"), - cbf_formspec = create_settings_formspec, - cbf_button_handler = handle_settings_buttons, + cbf_formspec = formspec, + cbf_button_handler = handle_settings_buttons } - -local function create_minetest_conf_example() - local result = "# This file contains a list of all available settings and their default value for minetest.conf\n" .. - "\n" .. - "# By default, all the settings are commented and not functional.\n" .. - "# Uncomment settings by removing the preceding #.\n" .. - "\n" .. - "# minetest.conf is read by default from:\n" .. - "# ../minetest.conf\n" .. - "# ../../minetest.conf\n" .. - "# Any other path can be chosen by passing the path as a parameter\n" .. - "# to the program, eg. \"minetest.exe --config ../minetest.conf.example\".\n" .. - "\n" .. - "# Further documentation:\n" .. - "# http://wiki.minetest.net/\n" .. - "\n" - - local settings = parse_config_file(true, false) - for _, entry in ipairs(settings) do - if entry.type == "category" then - if entry.level == 0 then - result = result .. "#\n# " .. entry.name .. "\n#\n\n" - else - for i = 1, entry.level do - result = result .. "#" - end - result = result .. "# " .. entry.name .. "\n\n" - end - else - if entry.comment ~= "" then - for _, comment_line in ipairs(entry.comment:split("\n", true)) do - result = result .."# " .. comment_line .. "\n" - end - end - result = result .. "# type: " .. entry.type - if entry.min then - result = result .. " min: " .. entry.min - end - if entry.max then - result = result .. " max: " .. entry.max - end - if entry.values then - result = result .. " values: " .. table.concat(entry.values, ", ") - end - if entry.possible then - result = result .. " possible values: " .. entry.possible:gsub(",", ", ") - end - result = result .. "\n" - result = result .. "# " .. entry.name .. " = ".. entry.default .. "\n\n" - end - end - return result -end - -local function create_translation_file() - local result = "// This file is automatically generated\n" .. - "// It conatins a bunch of fake gettext calls, to tell xgettext about the strings in config files\n" .. - "// To update it, refer to the bottom of builtin/mainmenu/tab_settings.lua\n\n" .. - "fake_function() {\n" - - local settings = parse_config_file(true, false) - for _, entry in ipairs(settings) do - if entry.type == "category" then - local name_escaped = entry.name:gsub("\"", "\\\"") - result = result .. "\tgettext(\"" .. name_escaped .. "\");\n" - else - if entry.readable_name then - local readable_name_escaped = entry.readable_name:gsub("\"", "\\\"") - result = result .. "\tgettext(\"" .. readable_name_escaped .. "\");\n" - end - if entry.comment ~= "" then - local comment_escaped = entry.comment:gsub("\n", "\\n") - comment_escaped = comment_escaped:gsub("\"", "\\\"") - result = result .. "\tgettext(\"" .. comment_escaped .. "\");\n" - end - end - end - result = result .. "}\n" - return result -end - -if false then - local file = io.open("minetest.conf.example", "w") - if file then - file:write(create_minetest_conf_example()) - file:close() - end -end - -if false then - local file = io.open("src/settings_translation_file.cpp", "w") - if file then - file:write(create_translation_file()) - file:close() - end -end From 354635f9fbe67cebbcd147db94b48983aa3799eb Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Feb 2016 06:53:56 +0100 Subject: [PATCH 280/531] Dont make fastface if tile is not seamless Fixes #3378 Closes #3751 --- src/mapblock_mesh.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index 42e84b75..e1ec50ab 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -885,8 +885,9 @@ static void updateFastFaceRow( && next_lights[3] == lights[3] && next_tile == tile && tile.rotation == 0 - && next_light_source == light_source) - { + && next_light_source == light_source + && (tile.material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL) + && (tile.material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)) { next_is_different = false; } else{ From 2f4cf0bcca1ce5941dd3d2625fe4636e86e73e75 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Feb 2016 03:37:26 +0100 Subject: [PATCH 281/531] Remove preload_item_visuals code Closes #3748 --- builtin/settingtypes.txt | 5 ----- minetest.conf.example | 6 ------ src/client.cpp | 23 ----------------------- src/defaultsettings.cpp | 2 -- src/settings_translation_file.cpp | 2 -- 5 files changed, 38 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 2bb1c93b..df915825 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -311,11 +311,6 @@ texture_clean_transparent (Clean transparent textures) bool false # enabled. texture_min_size (Minimum texture size for filters) int 64 -# Pre-generate all item visuals used in the inventory. -# This increases startup time, but runs smoother in-game. -# The generated textures can easily exceed your VRAM, causing artifacts in the inventory. -preload_item_visuals (Preload inventory textures) bool false - # Experimental option, might cause visible spaces between blocks # when set to higher number than 0. fsaa (FSAA) enum 0 0,1,2,4,8,16 diff --git a/minetest.conf.example b/minetest.conf.example index 4cfb8dd2..4813adad 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -335,12 +335,6 @@ # type: int # texture_min_size = 64 -# Pre-generate all item visuals used in the inventory. -# This increases startup time, but runs smoother in-game. -# The generated textures can easily exceed your VRAM, causing artifacts in the inventory. -# type: bool -# preload_item_visuals = false - # Experimental option, might cause visible spaces between blocks # when set to higher number than 0. # type: enum values: 0, 1, 2, 4, 8, 16 diff --git a/src/client.cpp b/src/client.cpp index 3fe67d64..f27f031c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1766,29 +1766,6 @@ void Client::afterContentReceived(IrrlichtDevice *device) m_nodedef->updateTextures(this, texture_update_progress, &tu_args); delete[] tu_args.text_base; - // Preload item textures and meshes if configured to - if(g_settings->getBool("preload_item_visuals")) - { - verbosestream<<"Updating item textures and meshes"< names = m_itemdef->getAll(); - size_t size = names.size(); - size_t count = 0; - int percent = 0; - for(std::set::const_iterator - i = names.begin(); i != names.end(); ++i) - { - // Asking for these caches the result - m_itemdef->getInventoryTexture(*i, this); - m_itemdef->getWieldMesh(*i, this); - count++; - percent = (count * 100 / size * 0.2) + 80; - draw_load_screen(text, device, guienv, 0, percent); - } - delete[] text; - } - // Start mesh update thread after setting up content definitions infostream<<"- Starting mesh update thread"<setDefault("trilinear_filter", "false"); settings->setDefault("texture_clean_transparent", "false"); settings->setDefault("texture_min_size", "64"); - settings->setDefault("preload_item_visuals", "false"); settings->setDefault("tone_mapping", "false"); settings->setDefault("enable_bumpmapping", "false"); settings->setDefault("enable_parallax_occlusion", "false"); @@ -345,7 +344,6 @@ void set_default_settings(Settings *settings) settings->setDefault("max_simultaneous_block_sends_per_client", "3"); settings->setDefault("emergequeue_limit_diskonly", "8"); settings->setDefault("emergequeue_limit_generate", "8"); - settings->setDefault("preload_item_visuals", "false"); settings->setDefault("viewing_range_nodes_max", "50"); settings->setDefault("viewing_range_nodes_min", "20"); diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index b078e4d1..d3bf5a1f 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -136,8 +136,6 @@ fake_function() { gettext("Filtered textures can blend RGB values with fully-transparent neighbors,\nwhich PNG optimizers usually discard, sometimes resulting in a dark or\nlight edge to transparent textures. Apply this filter to clean that up\nat texture load time."); gettext("Minimum texture size for filters"); gettext("When using bilinear/trilinear/anisotropic filters, low-resolution textures\ncan be blurred, so automatically upscale them with nearest-neighbor\ninterpolation to preserve crisp pixels. This sets the minimum texture size\nfor the upscaled textures; higher values look sharper, but require more\nmemory. Powers of 2 are recommended. Setting this higher than 1 may not\nhave a visible effect unless bilinear/trilinear/anisotropic filtering is\nenabled."); - gettext("Preload inventory textures"); - gettext("Pre-generate all item visuals used in the inventory.\nThis increases startup time, but runs smoother in-game.\nThe generated textures can easily exceed your VRAM, causing artifacts in the inventory."); gettext("FSAA"); gettext("Experimental option, might cause visible spaces between blocks\nwhen set to higher number than 0."); gettext("Shaders"); From b2aabdfe074d361b69c59f7ea29a85f060330f12 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Feb 2016 04:42:35 +0100 Subject: [PATCH 282/531] Camera: remove auto tune FPS, single view range setting --- builtin/settingtypes.txt | 18 ++--- minetest.conf.example | 20 ++---- src/camera.cpp | 151 +++------------------------------------ src/camera.h | 13 +--- src/clientmap.cpp | 2 +- src/clientmap.h | 5 +- src/defaultsettings.cpp | 8 +-- src/game.cpp | 23 +++--- 8 files changed, 33 insertions(+), 207 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index df915825..c21a0325 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -209,11 +209,11 @@ keymap_toggle_profiler (Profiler toggle key) key KEY_F6 # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 keymap_camera_mode (Toggle camera mode key) key KEY_F7 -# Key for increasing the viewing range. Modifies the minimum viewing range. +# Key for increasing the viewing range. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 keymap_increase_viewing_range_min (View range increase key) key + -# Key for decreasing the viewing range. Modifies the minimum viewing range. +# Key for decreasing the viewing range. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 keymap_decrease_viewing_range_min (View range decrease key) key - @@ -388,10 +388,6 @@ enable_waving_plants (Waving plants) bool false [***Advanced] -# Minimum wanted FPS. -# The amount of rendered stuff is dynamically set according to this. and viewing range min and max. -wanted_fps (Wanted FPS) int 30 - # If FPS would go higher than this, limit it by sleeping # to not waste CPU power for no benefit. fps_max (Maximum FPS) int 60 @@ -399,13 +395,9 @@ fps_max (Maximum FPS) int 60 # Maximum FPS when game is paused. pause_fps_max (FPS in pause menu) int 20 -# The allowed adjustment range for the automatic rendering range adjustment. -# Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm. -viewing_range_nodes_max (Viewing range maximum) int 160 - -# The allowed adjustment range for the automatic rendering range adjustment. -# Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm. -viewing_range_nodes_min (Viewing range minimum) int 35 +# View distance in nodes. +# Min = 20 +viewing_range (Viewing range) int 100 # Width component of the initial window size. screenW (Screen width) int 800 diff --git a/minetest.conf.example b/minetest.conf.example index 4813adad..ee605453 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -214,12 +214,12 @@ # type: key # keymap_camera_mode = KEY_F7 -# Key for increasing the viewing range. Modifies the minimum viewing range. +# Key for increasing the viewing range. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key # keymap_increase_viewing_range_min = + -# Key for decreasing the viewing range. Modifies the minimum viewing range. +# Key for decreasing the viewing range. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key # keymap_decrease_viewing_range_min = - @@ -431,11 +431,6 @@ #### Advanced -# Minimum wanted FPS. -# The amount of rendered stuff is dynamically set according to this. and viewing range min and max. -# type: int -# wanted_fps = 30 - # If FPS would go higher than this, limit it by sleeping # to not waste CPU power for no benefit. # type: int @@ -445,15 +440,10 @@ # type: int # pause_fps_max = 20 -# The allowed adjustment range for the automatic rendering range adjustment. -# Set this to be equal to viewing range minimum to disable the auto-adjustment algorithm. +# View range in nodes. +# Min = 20. # type: int -# viewing_range_nodes_max = 160 - -# The allowed adjustment range for the automatic rendering range adjustment. -# Set this to be equal to viewing range maximum to disable the auto-adjustment algorithm. -# type: int -# viewing_range_nodes_min = 35 +# viewing_range = 100 # Width component of the initial window size. # type: int diff --git a/src/camera.cpp b/src/camera.cpp index 0ce6bb34..6c0f5d54 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -60,13 +60,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control, m_fov_x(1.0), m_fov_y(1.0), - m_added_busytime(0), - m_added_frames(0), - m_range_old(0), - m_busytime_old(0), - m_frametime_counter(0), - m_time_per_range(30. / 50), // a sane default of 30ms per 50 nodes of range - m_view_bobbing_anim(0), m_view_bobbing_state(0), m_view_bobbing_speed(0), @@ -109,7 +102,6 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control, */ m_cache_fall_bobbing_amount = g_settings->getFloat("fall_bobbing_amount"); m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount"); - m_cache_wanted_fps = g_settings->getFloat("wanted_fps"); m_cache_fov = g_settings->getFloat("fov"); m_cache_view_bobbing = g_settings->getBool("view_bobbing"); m_nametags.clear(); @@ -455,8 +447,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, m_wieldnode->setColor(player->light_color); - // Render distance feedback loop - updateViewingRange(frametime, busytime); + // Set render distance + updateViewingRange(); // If the player is walking, swimming, or climbing, // view bobbing is enabled and free_move is off, @@ -484,143 +476,16 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, } } -void Camera::updateViewingRange(f32 frametime_in, f32 busytime_in) +void Camera::updateViewingRange() { - if (m_draw_control.range_all) - return; - - m_added_busytime += busytime_in; - m_added_frames += 1; - - m_frametime_counter -= frametime_in; - if (m_frametime_counter > 0) - return; - m_frametime_counter = 0.2; // Same as ClientMap::updateDrawList interval - - /*dstream<getFloat("viewing_range_nodes_max"); - viewing_range_max = MYMAX(viewing_range_min, viewing_range_max); - - // Immediately apply hard limits - if(m_draw_control.wanted_range < viewing_range_min) - m_draw_control.wanted_range = viewing_range_min; - if(m_draw_control.wanted_range > viewing_range_max) - m_draw_control.wanted_range = viewing_range_max; - - // Just so big a value that everything rendered is visible - // Some more allowance than viewing_range_max * BS because of clouds, - // active objects, etc. - if(viewing_range_max < 200*BS) - m_cameranode->setFarValue(200 * BS * 10); - else - m_cameranode->setFarValue(viewing_range_max * BS * 10); - - f32 wanted_fps = m_cache_wanted_fps; - wanted_fps = MYMAX(wanted_fps, 1.0); - f32 wanted_frametime = 1.0 / wanted_fps; - - m_draw_control.wanted_min_range = viewing_range_min; - m_draw_control.wanted_max_blocks = (2.0*m_draw_control.blocks_would_have_drawn)+1; - if (m_draw_control.wanted_max_blocks < 10) - m_draw_control.wanted_max_blocks = 10; - - f32 block_draw_ratio = 1.0; - if (m_draw_control.blocks_would_have_drawn != 0) - { - block_draw_ratio = (f32)m_draw_control.blocks_drawn - / (f32)m_draw_control.blocks_would_have_drawn; - } - - // Calculate the average frametime in the case that all wanted - // blocks had been drawn - f32 frametime = m_added_busytime / m_added_frames / block_draw_ratio; - - m_added_busytime = 0.0; - m_added_frames = 0; - - f32 wanted_frametime_change = wanted_frametime - frametime; - //dstream<<"wanted_frametime_change="<avg("wanted_frametime_change", wanted_frametime_change); - - // If needed frametime change is small, just return - // This value was 0.4 for many months until 2011-10-18 by c55; - if (fabs(wanted_frametime_change) < wanted_frametime*0.33) - { - //dstream<<"ignoring small wanted_frametime_change"<setFarValue(100000.0); return; } - f32 range = m_draw_control.wanted_range; - f32 new_range = range; - - f32 d_range = range - m_range_old; - f32 d_busytime = busytime_in - m_busytime_old; - if (d_range != 0) - { - m_time_per_range = d_busytime / d_range; - } - //dstream<<"time_per_range="<avg("time_per_range", m_time_per_range); - - // The minimum allowed calculated frametime-range derivative: - // Practically this sets the maximum speed of changing the range. - // The lower this value, the higher the maximum changing speed. - // A low value here results in wobbly range (0.001) - // A low value can cause oscillation in very nonlinear time/range curves. - // A high value here results in slow changing range (0.0025) - // SUGG: This could be dynamically adjusted so that when - // the camera is turning, this is lower - //f32 min_time_per_range = 0.0010; // Up to 0.4.7 - f32 min_time_per_range = 0.0005; - if(m_time_per_range < min_time_per_range) - { - m_time_per_range = min_time_per_range; - //dstream<<"m_time_per_range="<getFloat("viewing_range"); + m_draw_control.wanted_range = viewing_range; + m_cameranode->setFarValue((viewing_range < 2000) ? 2000 * BS : viewing_range * BS); } void Camera::setDigging(s32 button) diff --git a/src/camera.h b/src/camera.h index 36fc72f1..ce46c319 100644 --- a/src/camera.h +++ b/src/camera.h @@ -136,8 +136,8 @@ public: void update(LocalPlayer* player, f32 frametime, f32 busytime, f32 tool_reload_ratio, ClientEnvironment &c_env); - // Render distance feedback loop - void updateViewingRange(f32 frametime_in, f32 busytime_in); + // Update render distance + void updateViewingRange(); // Start digging animation // Pass 0 for left click, 1 for right click @@ -204,14 +204,6 @@ private: f32 m_fov_x; f32 m_fov_y; - // Stuff for viewing range calculations - f32 m_added_busytime; - s16 m_added_frames; - f32 m_range_old; - f32 m_busytime_old; - f32 m_frametime_counter; - f32 m_time_per_range; - // View bobbing animation frame (0 <= m_view_bobbing_anim < 1) f32 m_view_bobbing_anim; // If 0, view bobbing is off (e.g. player is standing). @@ -238,7 +230,6 @@ private: f32 m_cache_fall_bobbing_amount; f32 m_cache_view_bobbing_amount; - f32 m_cache_wanted_fps; f32 m_cache_fov; bool m_cache_view_bobbing; diff --git a/src/clientmap.cpp b/src/clientmap.cpp index ea2b8e4e..a0a78025 100644 --- a/src/clientmap.cpp +++ b/src/clientmap.cpp @@ -327,7 +327,7 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) blocks_would_have_drawn++; if (blocks_drawn >= m_control.wanted_max_blocks && !m_control.range_all && - d > m_control.wanted_min_range * BS) + d > m_control.wanted_range * BS) continue; // Add to set diff --git a/src/clientmap.h b/src/clientmap.h index 445f10c9..396e68f6 100644 --- a/src/clientmap.h +++ b/src/clientmap.h @@ -30,9 +30,8 @@ struct MapDrawControl { MapDrawControl(): range_all(false), - wanted_range(50), + wanted_range(0), wanted_max_blocks(0), - wanted_min_range(0), blocks_drawn(0), blocks_would_have_drawn(0), farthest_drawn(0) @@ -44,8 +43,6 @@ struct MapDrawControl float wanted_range; // Maximum number of blocks to draw u32 wanted_max_blocks; - // Blocks in this range are drawn regardless of number of blocks drawn - float wanted_min_range; // Number of blocks rendered is written here by the renderer u32 blocks_drawn; // Number of blocks that would have been drawn in wanted_range diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index a043ef00..b1e75487 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -89,12 +89,9 @@ void set_default_settings(Settings *settings) settings->setDefault("show_debug", "true"); #endif - settings->setDefault("wanted_fps", "30"); settings->setDefault("fps_max", "60"); settings->setDefault("pause_fps_max", "20"); - // A bit more than the server will send around the player, to make fog blend well - settings->setDefault("viewing_range_nodes_max", "240"); - settings->setDefault("viewing_range_nodes_min", "35"); + settings->setDefault("viewing_range", "100"); settings->setDefault("map_generation_limit", "31000"); settings->setDefault("screenW", "800"); settings->setDefault("screenH", "600"); @@ -345,8 +342,7 @@ void set_default_settings(Settings *settings) settings->setDefault("emergequeue_limit_diskonly", "8"); settings->setDefault("emergequeue_limit_generate", "8"); - settings->setDefault("viewing_range_nodes_max", "50"); - settings->setDefault("viewing_range_nodes_min", "20"); + settings->setDefault("viewing_range", "50"); settings->setDefault("inventory_image_hack", "false"); //check for device with small screen diff --git a/src/game.cpp b/src/game.cpp index 53db14fb..9729ca47 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -3039,10 +3039,10 @@ void Game::toggleProfiler(float *statustext_time, u32 *profiler_current_page, void Game::increaseViewRange(float *statustext_time) { - s16 range = g_settings->getS16("viewing_range_nodes_min"); + s16 range = g_settings->getS16("viewing_range"); s16 range_new = range + 10; - g_settings->set("viewing_range_nodes_min", itos(range_new)); - statustext = utf8_to_wide("Minimum viewing range changed to " + g_settings->set("viewing_range", itos(range_new)); + statustext = utf8_to_wide("Viewing range changed to " + itos(range_new)); *statustext_time = 0; } @@ -3050,14 +3050,14 @@ void Game::increaseViewRange(float *statustext_time) void Game::decreaseViewRange(float *statustext_time) { - s16 range = g_settings->getS16("viewing_range_nodes_min"); + s16 range = g_settings->getS16("viewing_range"); s16 range_new = range - 10; - if (range_new < 0) - range_new = range; + if (range_new < 20) + range_new = 20; - g_settings->set("viewing_range_nodes_min", itos(range_new)); - statustext = utf8_to_wide("Minimum viewing range changed to " + g_settings->set("viewing_range", itos(range_new)); + statustext = utf8_to_wide("Viewing range changed to " + itos(range_new)); *statustext_time = 0; } @@ -3935,12 +3935,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, if (draw_control->range_all) { runData->fog_range = 100000 * BS; } else { - runData->fog_range = draw_control->wanted_range * BS - + 0.0 * MAP_BLOCKSIZE * BS; - runData->fog_range = MYMIN( - runData->fog_range, - (draw_control->farthest_drawn + 20) * BS); - runData->fog_range *= 0.9; + runData->fog_range = 0.9 * draw_control->wanted_range * BS; } /* From a3892f5a6632550bf0c14c18e6902f6ae06bb567 Mon Sep 17 00:00:00 2001 From: Jeija Date: Wed, 17 Feb 2016 20:36:51 +0100 Subject: [PATCH 283/531] Fix HTTPFetchRequest performing a GET request if post_data is supplied Instead, perform a POST request with post_data. --- src/httpfetch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp index f10351a0..1a19dd08 100644 --- a/src/httpfetch.cpp +++ b/src/httpfetch.cpp @@ -262,7 +262,7 @@ HTTPFetchOngoing::HTTPFetchOngoing(HTTPFetchRequest request_, CurlHandlePool *po } // Set POST (or GET) data - if (request.post_fields.empty()) { + if (request.post_fields.empty() && request.post_data.empty()) { curl_easy_setopt(curl, CURLOPT_HTTPGET, 1); } else if (request.multipart) { curl_httppost *last = NULL; From 31e0667a4a53a238d0321194b57b083bd74c0a5b Mon Sep 17 00:00:00 2001 From: Jeija Date: Thu, 18 Feb 2016 11:38:47 +0100 Subject: [PATCH 284/531] Add Lua interface to HTTPFetchRequest This allows mods to perform both asynchronous and synchronous HTTP requests. Mods are only granted access to HTTP APIs if either mod security is disabled or if they are whitelisted in any of the the secure.http_mods and secure.trusted_mods settings. Adds httpfetch_caller_alloc_secure to generate random, non-predictable caller IDs so that lua mods cannot spy on each others HTTP queries. --- builtin/game/misc.lua | 19 ++++ builtin/settingtypes.txt | 4 + doc/lua_api.txt | 54 +++++++++ src/defaultsettings.cpp | 1 + src/httpfetch.cpp | 37 ++++++- src/httpfetch.h | 3 + src/script/common/c_converter.cpp | 9 ++ src/script/common/c_converter.h | 2 + src/script/lua_api/CMakeLists.txt | 1 + src/script/lua_api/l_http.cpp | 176 ++++++++++++++++++++++++++++++ src/script/lua_api/l_http.h | 50 +++++++++ src/script/scripting_game.cpp | 2 + 12 files changed, 357 insertions(+), 1 deletion(-) create mode 100644 src/script/lua_api/l_http.cpp create mode 100644 src/script/lua_api/l_http.h diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua index bacadf18..d0e67bd8 100644 --- a/builtin/game/misc.lua +++ b/builtin/game/misc.lua @@ -178,3 +178,22 @@ function core.raillike_group(name) end return id end + +-- HTTP callback interface +function core.http_add_fetch(httpenv) + httpenv.fetch = function(req, callback) + local handle = httpenv.fetch_async(req) + + local function update_http_status() + local res = httpenv.fetch_async_get(handle) + if res.completed then + callback(res) + else + core.after(0, update_http_status) + end + end + core.after(0, update_http_status) + end + + return httpenv +end diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index c21a0325..9e1997cc 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1100,6 +1100,10 @@ secure.enable_security (Enable mod security) bool false # functions even when mod security is on (via request_insecure_environment()). secure.trusted_mods (Trusted mods) string +# Comma-seperated list of mods that are allowed to access HTTP APIs, which +# allow them to upload and download data to/from the internet. +secure.http_mods (HTTP Mods) string + [Client and Server] # Name of the player. diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 2df0cac7..aee3674d 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2330,6 +2330,26 @@ These functions return the leftover itemstack. * If `lua_num_indent_spaces` is a nonzero number and `format` is "lua", the Lua code generated * will use that number of spaces as indentation instead of a tab character. +### HTTP Requests: +* `minetest.request_http_api()`: + * returns `HTTPApiTable` containing http functions if the calling mod has been granted + access by being listed in the `secure.http_mods` or `secure.trusted_mods` setting, + otherwise returns `nil`. + * The returned table contains the functions `fetch`, `fetch_async` and `fetch_async_get` + described below. + * Only works at init time. + * Function only exists if minetest server was built with cURL support. + * **DO NOT ALLOW ANY OTHER MODS TO ACCESS THE RETURNED TABLE, STORE IT IN + A LOCAL VARIABLE!** +* `HTTPApiTable.fetch(HTTPRequest req, callback)` + * Performs given request asynchronously and calls callback upon completion + * callback: `function(HTTPRequestResult res)` + * Use this HTTP function if you are unsure, the others are for advanced use. +* `HTTPApiTable.fetch_async(HTTPRequest req)`: returns handle + * Performs given request asynchronously and returns handle for `minetest.http_fetch_async_get` +* `HTTPApiTable.fetch_async_get(handle)`: returns HTTPRequestResult + * Return response data for given asynchronous HTTP request + ### Misc. * `minetest.get_connected_players()`: returns list of `ObjectRefs` * `minetest.hash_node_position({x=,y=,z=})`: returns an 48-bit integer @@ -3837,3 +3857,37 @@ Definition tables playername = "singleplayer" -- ^ Playername is optional, if specified spawns particle only on the player's client } + +### `HTTPRequest` definition (`http_fetch`, `http_fetch_async`) + + { + url = "http://example.org", + timeout = 10, + -- ^ Timeout for connection in seconds. Default is 3 seconds. + post_data = "Raw POST request data string" OR { field1 = "data1", field2 = "data2" }, + -- ^ Optional, if specified a POST request with post_data is performed. + -- ^ Accepts both a string and a table. If a table is specified, encodes table + -- ^ as x-www-form-urlencoded key-value pairs. + -- ^ If post_data ist not specified, a GET request is performed instead. + user_agent = "ExampleUserAgent", + -- ^ Optional, if specified replaces the default minetest user agent with given string + extra_headers = { "Accept-Language: en-us", "Accept-Charset: utf-8" }, + -- ^ Optional, if specified adds additional headers to the HTTP request. You must make sure + -- ^ that the header strings follow HTTP specification ("Key: Value"). + multipart = boolean + -- ^ Optional, if true performs a multipart HTTP request. Default is false. + } + +### `HTTPRequestResult` definition (`http_fetch` callback, `http_fetch_async_get`) + + { + completed = true, + -- ^ If true, the request has finished (either succeeded, failed or timed out) + succeeded = true, + -- ^ If true, the request was succesful + timeout = false, + -- ^ If true, the request timed out + code = 200, + -- ^ HTTP status code + data = "response" + } diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index b1e75487..49e03a26 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -285,6 +285,7 @@ void set_default_settings(Settings *settings) settings->setDefault("num_emerge_threads", "1"); settings->setDefault("secure.enable_security", "false"); settings->setDefault("secure.trusted_mods", ""); + settings->setDefault("secure.http_mods", ""); // physics stuff settings->setDefault("movement_acceleration_default", "3"); diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp index 1a19dd08..f64c9f71 100644 --- a/src/httpfetch.cpp +++ b/src/httpfetch.cpp @@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "socket.h" // for select() -#include "porting.h" // for sleep_ms(), get_sysinfo() +#include "porting.h" // for sleep_ms(), get_sysinfo(), secure_rand_fill_buf() #include "httpfetch.h" #include #include @@ -34,9 +34,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/thread.h" #include "version.h" #include "settings.h" +#include "noise.h" Mutex g_httpfetch_mutex; std::map > g_httpfetch_results; +PcgRandom g_callerid_randomness; HTTPFetchRequest::HTTPFetchRequest() { @@ -84,6 +86,34 @@ unsigned long httpfetch_caller_alloc() return discard; } +unsigned long httpfetch_caller_alloc_secure() +{ + MutexAutoLock lock(g_httpfetch_mutex); + + // Generate random caller IDs and make sure they're not + // already used or equal to HTTPFETCH_DISCARD + // Give up after 100 tries to prevent infinite loop + u8 tries = 100; + unsigned long caller; + + do { + caller = (((u64) g_callerid_randomness.next()) << 32) | + g_callerid_randomness.next(); + + if (--tries < 1) { + FATAL_ERROR("httpfetch_caller_alloc_secure: ran out of caller IDs"); + return HTTPFETCH_DISCARD; + } + } while (g_httpfetch_results.find(caller) != g_httpfetch_results.end()); + + verbosestream << "httpfetch_caller_alloc_secure: allocating " + << caller << std::endl; + + // Access element to create it + g_httpfetch_results[caller]; + return caller; +} + void httpfetch_caller_free(unsigned long caller) { verbosestream<<"httpfetch_caller_free: freeing " @@ -710,6 +740,11 @@ void httpfetch_init(int parallel_limit) FATAL_ERROR_IF(res != CURLE_OK, "CURL init failed"); g_httpfetch_thread = new CurlFetchThread(parallel_limit); + + // Initialize g_callerid_randomness for httpfetch_caller_alloc_secure + u64 randbuf[2]; + porting::secure_rand_fill_buf(randbuf, sizeof(u64) * 2); + g_callerid_randomness = PcgRandom(randbuf[0], randbuf[1]); } void httpfetch_cleanup() diff --git a/src/httpfetch.h b/src/httpfetch.h index c44c8d2d..f57ed878 100644 --- a/src/httpfetch.h +++ b/src/httpfetch.h @@ -116,6 +116,9 @@ bool httpfetch_async_get(unsigned long caller, HTTPFetchResult &fetch_result); // Not required if you want to set caller = HTTPFETCH_DISCARD unsigned long httpfetch_caller_alloc(); +// Allocates a non-predictable caller ID for httpfetch_async +unsigned long httpfetch_caller_alloc_secure(); + // Frees a caller ID allocated with httpfetch_caller_alloc // Note: This can be expensive, because the httpfetch thread is told // to stop any ongoing fetches for the given caller. diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp index f1d3cc42..55c4a5f5 100644 --- a/src/script/common/c_converter.cpp +++ b/src/script/common/c_converter.cpp @@ -517,6 +517,15 @@ bool getboolfield_default(lua_State *L, int table, return result; } +void setstringfield(lua_State *L, int table, + const char *fieldname, const char *value) +{ + lua_pushstring(L, value); + if(table < 0) + table -= 1; + lua_setfield(L, table, fieldname); +} + void setintfield(lua_State *L, int table, const char *fieldname, int value) { diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h index 18a045d2..eefac0ed 100644 --- a/src/script/common/c_converter.h +++ b/src/script/common/c_converter.h @@ -69,6 +69,8 @@ bool getfloatfield(lua_State *L, int table, std::string checkstringfield(lua_State *L, int table, const char *fieldname); +void setstringfield(lua_State *L, int table, + const char *fieldname, const char *value); void setintfield(lua_State *L, int table, const char *fieldname, int value); void setfloatfield(lua_State *L, int table, diff --git a/src/script/lua_api/CMakeLists.txt b/src/script/lua_api/CMakeLists.txt index 2501ce6d..d507dcf7 100644 --- a/src/script/lua_api/CMakeLists.txt +++ b/src/script/lua_api/CMakeLists.txt @@ -16,6 +16,7 @@ set(common_SCRIPT_LUA_API_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/l_util.cpp ${CMAKE_CURRENT_SOURCE_DIR}/l_vmanip.cpp ${CMAKE_CURRENT_SOURCE_DIR}/l_settings.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/l_http.cpp PARENT_SCOPE) set(client_SCRIPT_LUA_API_SRCS diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp new file mode 100644 index 00000000..b0357e3e --- /dev/null +++ b/src/script/lua_api/l_http.cpp @@ -0,0 +1,176 @@ +/* +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "lua_api/l_internal.h" +#include "common/c_converter.h" +#include "common/c_content.h" +#include "lua_api/l_http.h" +#include "httpfetch.h" +#include "settings.h" +#include "log.h" + +#include +#include +#include + +#define HTTP_API(name) \ + lua_pushstring(L, #name); \ + lua_pushcfunction(L, l_http_##name); \ + lua_settable(L, -3); + +#if USE_CURL +void ModApiHttp::read_http_fetch_request(lua_State *L, HTTPFetchRequest &req) +{ + luaL_checktype(L, 1, LUA_TTABLE); + + req.caller = httpfetch_caller_alloc_secure(); + getstringfield(L, 1, "url", req.url); + lua_getfield(L, 1, "user_agent"); + if (lua_isstring(L, -1)) + req.useragent = getstringfield_default(L, 1, "user_agent", ""); + lua_pop(L, 1); + req.multipart = getboolfield_default(L, 1, "multipart", false); + req.timeout = getintfield_default(L, 1, "timeout", 3) * 1000; + + // post_data: if table, post form data, otherwise raw data + lua_getfield(L, 1, "post_data"); + if (lua_istable(L, 2)) { + lua_pushnil(L); + while (lua_next(L, 2) != 0) + { + req.post_fields[luaL_checkstring(L, -2)] = luaL_checkstring(L, -1); + lua_pop(L, 1); + } + } else if (lua_isstring(L, 2)) { + req.post_data = lua_tostring(L, 2); + } + lua_pop(L, 1); + + lua_getfield(L, 1, "extra_headers"); + if (lua_istable(L, 2)) { + lua_pushnil(L); + while (lua_next(L, 2) != 0) + { + const char *header = luaL_checkstring(L, -1); + req.extra_headers.push_back(header); + lua_pop(L, 1); + } + } + lua_pop(L, 1); +} + +void ModApiHttp::push_http_fetch_result(lua_State *L, HTTPFetchResult &res, bool completed) +{ + lua_newtable(L); + setboolfield(L, -1, "succeeded", res.succeeded); + setboolfield(L, -1, "timeout", res.timeout); + setboolfield(L, -1, "completed", completed); + setintfield(L, -1, "code", res.response_code); + setstringfield(L, -1, "data", res.data.c_str()); +} + +// http_api.fetch_async(HTTPRequest definition) +int ModApiHttp::l_http_fetch_async(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + + HTTPFetchRequest req; + read_http_fetch_request(L, req); + + actionstream << "Mod performs HTTP request with URL " << req.url << std::endl; + httpfetch_async(req); + + // Convert handle to hex string since lua can't handle 64-bit integers + std::stringstream handle_conversion_stream; + handle_conversion_stream << std::hex << req.caller; + std::string caller_handle(handle_conversion_stream.str()); + + lua_pushstring(L, caller_handle.c_str()); + return 1; +} + +// http_api.fetch_async_get(handle) +int ModApiHttp::l_http_fetch_async_get(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + + std::string handle_str = luaL_checkstring(L, 1); + + // Convert hex string back to 64-bit handle + u64 handle; + std::stringstream handle_conversion_stream; + handle_conversion_stream << std::hex << handle_str; + handle_conversion_stream >> handle; + + HTTPFetchResult res; + bool completed = httpfetch_async_get(handle, res); + + push_http_fetch_result(L, res, completed); + + return 1; +} + +int ModApiHttp::l_request_http_api(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + + // Mod must be listed in secure.http_mods or secure.trusted_mods + lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME); + if (!lua_isstring(L, -1)) { + lua_pushnil(L); + return 1; + } + + const char *mod_name = lua_tostring(L, -1); + std::string http_mods = g_settings->get("secure.http_mods"); + http_mods.erase(std::remove(http_mods.begin(), http_mods.end(), ' '), http_mods.end()); + std::vector mod_list_http = str_split(http_mods, ','); + + std::string trusted_mods = g_settings->get("secure.trusted_mods"); + trusted_mods.erase(std::remove(trusted_mods.begin(), trusted_mods.end(), ' '), trusted_mods.end()); + std::vector mod_list_trusted = str_split(trusted_mods, ','); + + mod_list_http.insert(mod_list_http.end(), mod_list_trusted.begin(), mod_list_trusted.end()); + if (std::find(mod_list_http.begin(), mod_list_http.end(), mod_name) == mod_list_http.end()) { + lua_pushnil(L); + return 1; + } + + lua_getglobal(L, "core"); + lua_getfield(L, -1, "http_add_fetch"); + + lua_newtable(L); + HTTP_API(fetch_async); + HTTP_API(fetch_async_get); + + // Stack now looks like this: + // + // Now call core.http_add_fetch to append .fetch(request, callback) to table + lua_call(L, 1, 1); + + return 1; +} +#endif + +void ModApiHttp::Initialize(lua_State *L, int top) +{ +#if USE_CURL + API_FCT(request_http_api); +#endif +} diff --git a/src/script/lua_api/l_http.h b/src/script/lua_api/l_http.h new file mode 100644 index 00000000..077ade69 --- /dev/null +++ b/src/script/lua_api/l_http.h @@ -0,0 +1,50 @@ +/* +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef L_HTTP_H_ +#define L_HTTP_H_ + +#include "lua_api/l_base.h" +#include "config.h" + +struct HTTPFetchRequest; +struct HTTPFetchResult; + +class ModApiHttp : public ModApiBase { +private: +#if USE_CURL + // Helpers for HTTP fetch functions + static void read_http_fetch_request(lua_State *L, HTTPFetchRequest &req); + static void push_http_fetch_result(lua_State *L, HTTPFetchResult &res, bool completed = true); + + // http_fetch_async({url=, timeout=, post_data=}) + static int l_http_fetch_async(lua_State *L); + + // http_fetch_async_get(handle) + static int l_http_fetch_async_get(lua_State *L); + + // request_http_api() + static int l_request_http_api(lua_State *L); +#endif + +public: + static void Initialize(lua_State *L, int top); +}; + +#endif /* L_HTTP_H_ */ diff --git a/src/script/scripting_game.cpp b/src/script/scripting_game.cpp index 33bc5c2a..e313d55f 100644 --- a/src/script/scripting_game.cpp +++ b/src/script/scripting_game.cpp @@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "lua_api/l_util.h" #include "lua_api/l_vmanip.h" #include "lua_api/l_settings.h" +#include "lua_api/l_http.h" extern "C" { #include "lualib.h" @@ -89,6 +90,7 @@ void GameScripting::InitializeModApi(lua_State *L, int top) ModApiRollback::Initialize(L, top); ModApiServer::Initialize(L, top); ModApiUtil::Initialize(L, top); + ModApiHttp::Initialize(L, top); // Register reference classes (userdata) InvRef::Register(L); From 9961185550ff2a8ada61455ac351f85ea7122aa2 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Feb 2016 10:58:40 +0100 Subject: [PATCH 285/531] Fix getting pointed node Fixes #3719 Closes #3753 --- src/game.cpp | 136 +++++++++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 59 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 9729ca47..18ca11d6 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -304,7 +304,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio INodeDefManager *nodedef = client->getNodeDefManager(); ClientMap &map = client->getEnv().getClientMap(); - f32 mindistance = BS * 1001; + f32 min_distance = BS * 1001; // First try to find a pointed at active object if (look_for_object) { @@ -324,7 +324,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio hud->setSelectionPos(pos, camera_offset); } - mindistance = (selected_object->getPosition() - camera_position).getLength(); + min_distance = (selected_object->getPosition() - camera_position).getLength(); result.type = POINTEDTHING_OBJECT; result.object_id = selected_object->getId(); @@ -333,14 +333,13 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio // That didn't work, try to find a pointed at node - v3s16 pos_i = floatToInt(player_position, BS); /*infostream<<"pos_i=("< 0 ? a : 1); @@ -357,24 +356,25 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio if (xend == 32767) xend = 32766; - for (s16 y = ystart; y <= yend; y++) - for (s16 z = zstart; z <= zend; z++) + v3s16 pointed_pos(0, 0, 0); + + for (s16 y = ystart; y <= yend; y++) { + for (s16 z = zstart; z <= zend; z++) { for (s16 x = xstart; x <= xend; x++) { MapNode n; bool is_valid_position; n = map.getNodeNoEx(v3s16(x, y, z), &is_valid_position); - if (!is_valid_position) + if (!is_valid_position) { continue; - - if (!isPointableNode(n, client, liquids_pointable)) + } + if (!isPointableNode(n, client, liquids_pointable)) { continue; - + } std::vector boxes = n.getSelectionBoxes(nodedef); v3s16 np(x, y, z); v3f npf = intToFloat(np, BS); - for (std::vector::const_iterator i = boxes.begin(); i != boxes.end(); ++i) { @@ -382,62 +382,80 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio box.MinEdge += npf; box.MaxEdge += npf; - for (u16 j = 0; j < 6; j++) { - v3s16 facedir = g_6dirs[j]; - aabb3f facebox = box; - - f32 d = 0.001 * BS; - - if (facedir.X > 0) - facebox.MinEdge.X = facebox.MaxEdge.X - d; - else if (facedir.X < 0) - facebox.MaxEdge.X = facebox.MinEdge.X + d; - else if (facedir.Y > 0) - facebox.MinEdge.Y = facebox.MaxEdge.Y - d; - else if (facedir.Y < 0) - facebox.MaxEdge.Y = facebox.MinEdge.Y + d; - else if (facedir.Z > 0) - facebox.MinEdge.Z = facebox.MaxEdge.Z - d; - else if (facedir.Z < 0) - facebox.MaxEdge.Z = facebox.MinEdge.Z + d; - - v3f centerpoint = facebox.getCenter(); - f32 distance = (centerpoint - camera_position).getLength(); - - if (distance >= mindistance) - continue; - - if (!facebox.intersectsWithLine(shootline)) - continue; - - v3s16 np_above = np + facedir; - - result.type = POINTEDTHING_NODE; - result.node_undersurface = np; - result.node_abovesurface = np_above; - mindistance = distance; - - selectionboxes->clear(); - for (std::vector::const_iterator - i2 = boxes.begin(); - i2 != boxes.end(); ++i2) { - aabb3f box = *i2; - box.MinEdge += v3f(-d, -d, -d); - box.MaxEdge += v3f(d, d, d); - selectionboxes->push_back(box); - } - hud->setSelectionPos(npf, camera_offset); + v3f centerpoint = box.getCenter(); + f32 distance = (centerpoint - camera_position).getLength(); + if (distance >= min_distance) { + continue; } + if (!box.intersectsWithLine(shootline)) { + continue; + } + result.type = POINTEDTHING_NODE; + min_distance = distance; + pointed_pos = np; } - } // for coords + } + } + } + + if (result.type == POINTEDTHING_NODE) { + f32 d = 0.001 * BS; + MapNode n = map.getNodeNoEx(pointed_pos); + v3f npf = intToFloat(pointed_pos, BS); + std::vector boxes = n.getSelectionBoxes(nodedef); + f32 face_min_distance = 1000 * BS; + for (std::vector::const_iterator + i = boxes.begin(); + i != boxes.end(); ++i) { + aabb3f box = *i; + box.MinEdge += npf; + box.MaxEdge += npf; + for (u16 j = 0; j < 6; j++) { + v3s16 facedir = g_6dirs[j]; + aabb3f facebox = box; + if (facedir.X > 0) { + facebox.MinEdge.X = facebox.MaxEdge.X - d; + } else if (facedir.X < 0) { + facebox.MaxEdge.X = facebox.MinEdge.X + d; + } else if (facedir.Y > 0) { + facebox.MinEdge.Y = facebox.MaxEdge.Y - d; + } else if (facedir.Y < 0) { + facebox.MaxEdge.Y = facebox.MinEdge.Y + d; + } else if (facedir.Z > 0) { + facebox.MinEdge.Z = facebox.MaxEdge.Z - d; + } else if (facedir.Z < 0) { + facebox.MaxEdge.Z = facebox.MinEdge.Z + d; + } + v3f centerpoint = facebox.getCenter(); + f32 distance = (centerpoint - camera_position).getLength(); + if (distance >= face_min_distance) + continue; + if (!facebox.intersectsWithLine(shootline)) + continue; + result.node_abovesurface = pointed_pos + facedir; + face_min_distance = distance; + } + } + selectionboxes->clear(); + for (std::vector::const_iterator + i = boxes.begin(); + i != boxes.end(); ++i) { + aabb3f box = *i; + box.MinEdge += v3f(-d, -d, -d); + box.MaxEdge += v3f(d, d, d); + selectionboxes->push_back(box); + } + hud->setSelectionPos(intToFloat(pointed_pos, BS), camera_offset); + result.node_undersurface = pointed_pos; + } // Update selection mesh light level and vertex colors if (selectionboxes->size() > 0) { v3f pf = hud->getSelectionPos(); - v3s16 p = floatToInt(pf, BS); + v3s16 p = floatToInt(pf, BS); // Get selection mesh light level - MapNode n = map.getNodeNoEx(p); + MapNode n = map.getNodeNoEx(p); u16 node_light = getInteriorLight(n, -1, nodedef); u16 light_level = node_light; From a26970cdd4aec995416566cd75dd271c6b485f16 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 22 Feb 2016 17:43:42 +0100 Subject: [PATCH 286/531] Android: hardcode leveldb revision Newest leveldb commit breaks build. With no fix in sight, there is no other way than to fall back to the last working leveldb revision, and hardcode it. Workaround for upstream bug https://github.com/google/leveldb/issues/340 --- build/android/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/android/Makefile b/build/android/Makefile index 64a50330..2fa4aa9a 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -90,6 +90,7 @@ LEVELDB_LIB = $(LEVELDB_DIR)libleveldb.a LEVELDB_TIMESTAMP = $(LEVELDB_DIR)/timestamp LEVELDB_TIMESTAMP_INT = $(ROOT)/deps/leveldb_timestamp LEVELDB_URL_GIT = https://github.com/google/leveldb +LEVELDB_COMMIT = 2d0320a458d0e6a20fff46d5f80b18bfdcce7018 OPENAL_DIR = $(ROOT)/deps/openal-soft/ OPENAL_LIB = $(OPENAL_DIR)libs/$(TARGET_ABI)/libopenal.so @@ -363,6 +364,8 @@ leveldb_download : mkdir -p ${ROOT}/deps; \ cd ${ROOT}/deps ; \ git clone ${LEVELDB_URL_GIT} || exit 1; \ + cd ${LEVELDB_DIR} || exit 1; \ + git checkout ${LEVELDB_COMMIT} || exit 1; \ fi leveldb : $(LEVELDB_LIB) From e17fbb31d6db3e6d2d9b68f5793ad8b2146f7bcc Mon Sep 17 00:00:00 2001 From: orwell96 Date: Mon, 1 Feb 2016 19:29:53 +0100 Subject: [PATCH 287/531] Reset block send timer when invoking setBlock(s)NotSent() As stated in this forum thread [1], I noticed that there is a 2 second interval in which inventory changes are shown on the client. @yyt16384 found the source of these 2 seconds: m_nothing_to_send_pause_timer is set to 2.0 every time there are no changes to make, but this timer is not reset when SetBlockNotSent or setBlocksNotSent are invoked. So in worst case, the changed block will be sent over 2 seconds too late. With this change, changed inventories are updated almost immediately, but it causes additional connection load. --- src/clientiface.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/clientiface.cpp b/src/clientiface.cpp index e7f127b8..8a1a6269 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -391,6 +391,7 @@ void RemoteClient::SentBlock(v3s16 p) void RemoteClient::SetBlockNotSent(v3s16 p) { m_nearest_unsent_d = 0; + m_nothing_to_send_pause_timer = 0; if(m_blocks_sending.find(p) != m_blocks_sending.end()) m_blocks_sending.erase(p); @@ -401,6 +402,7 @@ void RemoteClient::SetBlockNotSent(v3s16 p) void RemoteClient::SetBlocksNotSent(std::map &blocks) { m_nearest_unsent_d = 0; + m_nothing_to_send_pause_timer = 0; for(std::map::iterator i = blocks.begin(); From f3f4af3fb9148d30480ffa1c9f4cf55e879c51c0 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 23 Feb 2016 01:14:00 +0100 Subject: [PATCH 288/531] Fix android build Android had a linker error since commit: 31e0667a4a53a238d0321194b57b083bd74c0a5b "Add Lua interface to HTTPFetchRequest" Fixes #3766. Thanks to @MoNTE48 for reporting the bug. --- build/android/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index ff9d9ec4..0528c560 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -303,6 +303,7 @@ LOCAL_SRC_FILES += \ jni/src/script/lua_api/l_rollback.cpp \ jni/src/script/lua_api/l_server.cpp \ jni/src/script/lua_api/l_settings.cpp \ + jni/src/script/lua_api/l_http.cpp \ jni/src/script/lua_api/l_util.cpp \ jni/src/script/lua_api/l_vmanip.cpp \ jni/src/script/scripting_game.cpp \ From 147425483a9e1afa2a2a4d9c0d5fa8b68d105644 Mon Sep 17 00:00:00 2001 From: nerzhul Date: Tue, 23 Feb 2016 10:58:13 +0100 Subject: [PATCH 289/531] GOTBLOCKS & DELETEBLOCKS: test packet size only once --- src/network/serverpackethandler.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 7e348a94..ef99a634 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -762,14 +762,14 @@ void Server::handleCommand_GotBlocks(NetworkPacket* pkt) RemoteClient *client = getClient(pkt->getPeerId()); - for (u16 i = 0; i < count; i++) { - if ((s16)pkt->getSize() < 1 + (i + 1) * 6) - throw con::InvalidIncomingDataException + if ((s16)pkt->getSize() < 1 + (int)count * 6) { + throw con::InvalidIncomingDataException ("GOTBLOCKS length is too short"); + } + + for (u16 i = 0; i < count; i++) { v3s16 p; - *pkt >> p; - client->GotBlock(p); } } @@ -865,13 +865,14 @@ void Server::handleCommand_DeletedBlocks(NetworkPacket* pkt) RemoteClient *client = getClient(pkt->getPeerId()); - for (u16 i = 0; i < count; i++) { - if ((s16)pkt->getSize() < 1 + (i + 1) * 6) - throw con::InvalidIncomingDataException + if ((s16)pkt->getSize() < 1 + (int)count * 6) { + throw con::InvalidIncomingDataException ("DELETEDBLOCKS length is too short"); + } + + for (u16 i = 0; i < count; i++) { v3s16 p; *pkt >> p; - client->SetBlockNotSent(p); } } From 8591713405419c434801c61ca59a9b6c019eb957 Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 21 Feb 2016 13:28:34 +0000 Subject: [PATCH 290/531] Sheet Ore: Eliminate crash caused by PcgRandom range max < min In the calculation of y_start, when 'column height max' was large it caused nmin.Y + max_height > nmax.Y - max_height Now, in this situation y_start is set to the midpoint between nmin.Y and nmax.Y Limit y0 and y1 to between nmin.Y and nmax.Y, otherwise index calculation, which has no checks for limits, places them at unwanted locations in the voxelmanip --- src/mg_ore.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp index 6b6e0d7a..25790161 100644 --- a/src/mg_ore.cpp +++ b/src/mg_ore.cpp @@ -179,7 +179,12 @@ void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed, MapNode n_ore(c_ore, 0, ore_param2); u16 max_height = column_height_max; - int y_start = pr.range(nmin.Y + max_height, nmax.Y - max_height); + int y_start_min = nmin.Y + max_height; + int y_start_max = nmax.Y - max_height; + + int y_start = y_start_min < y_start_max ? + pr.range(y_start_min, y_start_max) : + (y_start_min + y_start_max) / 2; if (!noise) { int sx = nmax.X - nmin.X + 1; @@ -204,10 +209,10 @@ void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed, u16 height = pr.range(column_height_min, column_height_max); int ymidpoint = y_start + noiseval; - int y0 = ymidpoint - height * (1 - column_midpoint_factor); - int y1 = y0 + height; + int y0 = MYMAX(nmin.Y, ymidpoint - height * (1 - column_midpoint_factor)); + int y1 = MYMIN(nmax.Y, y0 + height - 1); - for (int y = y0; y < y1; y++) { + for (int y = y0; y <= y1; y++) { u32 i = vm->m_area.index(x, y, z); if (!vm->m_area.contains(i)) continue; From e8a3d22cbef3aa2764c1ad217585667276df8c80 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Tue, 23 Feb 2016 20:32:57 +0100 Subject: [PATCH 291/531] Shaders: fix fog not affecting opaque liquids --- client/shaders/nodes_shader/opengl_fragment.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl index 49befa8d..6862842a 100644 --- a/client/shaders/nodes_shader/opengl_fragment.glsl +++ b/client/shaders/nodes_shader/opengl_fragment.glsl @@ -194,7 +194,7 @@ void main(void) vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); -#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE +#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT float alpha = gl_Color.a; if (fogDistance != 0.0) { float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); From f77b35b35bf028f4a4a3d9b40e6524608e46fb0a Mon Sep 17 00:00:00 2001 From: Nathaniel Olsen Date: Wed, 24 Feb 2016 18:22:22 -0600 Subject: [PATCH 292/531] Add dependencies for Fedora systems --- README.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.txt b/README.txt index a9a57ada..c62143ff 100644 --- a/README.txt +++ b/README.txt @@ -105,11 +105,17 @@ Compiling on GNU/Linux: Install dependencies. Here's an example for Debian/Ubuntu: $ sudo apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev +For Fedora users: +$ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal* libvorbis* libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-dev bzip2-dev + You can install git for easily keeping your copy up to date. If you dont want git, read below on how to get the source without git. This is an example for installing git on Debian/Ubuntu: $ sudo apt-get install git-core +For Fedora users: +$ sudo dnf install git-core + Download source (this is the URL to the latest of source repository, which might not work at all times) using git: $ git clone --depth 1 https://github.com/minetest/minetest.git $ cd minetest From 4efb7eb7347bfd712297f5e11d3a055bb74cf597 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Wed, 2 Sep 2015 20:21:55 +0100 Subject: [PATCH 293/531] Cache some settings --- src/environment.cpp | 10 ++++------ src/server.cpp | 37 +++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/environment.cpp b/src/environment.cpp index 3bf5e1f0..081079a7 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1029,7 +1029,8 @@ void ServerEnvironment::step(float dtime) // Update this one // NOTE: This is kind of funny on a singleplayer game, but doesn't // really matter that much. - m_recommended_send_interval = g_settings->getFloat("dedicated_server_step"); + static const float server_step = g_settings->getFloat("dedicated_server_step"); + m_recommended_send_interval = server_step; /* Increment game time @@ -1086,7 +1087,7 @@ void ServerEnvironment::step(float dtime) /* Update list of active blocks, collecting changes */ - const s16 active_block_range = g_settings->getS16("active_block_range"); + static const s16 active_block_range = g_settings->getS16("active_block_range"); std::set blocks_removed; std::set blocks_added; m_active_blocks.update(players_blockpos, active_block_range, @@ -1101,8 +1102,7 @@ void ServerEnvironment::step(float dtime) for(std::set::iterator i = blocks_removed.begin(); - i != blocks_removed.end(); ++i) - { + i != blocks_removed.end(); ++i) { v3s16 p = *i; /* infostream<<"Server: Block " << PP(p) @@ -2636,5 +2636,3 @@ ClientEnvEvent ClientEnvironment::getClientEvent() } #endif // #ifndef SERVER - - diff --git a/src/server.cpp b/src/server.cpp index 57253314..c4ed3225 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -671,16 +671,18 @@ void Server::AsyncRunStep(bool initial_step) ScopeProfiler sp(g_profiler, "Server: checking added and deleted objs"); // Radius inside which objects are active - s16 radius = g_settings->getS16("active_object_send_range_blocks"); - s16 player_radius = g_settings->getS16("player_transfer_distance"); + static const s16 radius = + g_settings->getS16("active_object_send_range_blocks") * MAP_BLOCKSIZE; - if (player_radius == 0 && g_settings->exists("unlimited_player_transfer_distance") && - !g_settings->getBool("unlimited_player_transfer_distance")) + // Radius inside which players are active + static const bool is_transfer_limited = + g_settings->exists("unlimited_player_transfer_distance") && + !g_settings->getBool("unlimited_player_transfer_distance"); + static const s16 player_transfer_dist = g_settings->getS16("player_transfer_distance") * MAP_BLOCKSIZE; + s16 player_radius = player_transfer_dist; + if (player_radius == 0 && is_transfer_limited) player_radius = radius; - radius *= MAP_BLOCKSIZE; - player_radius *= MAP_BLOCKSIZE; - for (std::map::iterator i = clients.begin(); i != clients.end(); ++i) { @@ -984,8 +986,7 @@ void Server::AsyncRunStep(bool initial_step) { float &counter = m_emergethread_trigger_timer; counter += dtime; - if(counter >= 2.0) - { + if (counter >= 2.0) { counter = 0.0; m_emerge->startThreads(); @@ -996,8 +997,9 @@ void Server::AsyncRunStep(bool initial_step) { float &counter = m_savemap_timer; counter += dtime; - if(counter >= g_settings->getFloat("server_map_save_interval")) - { + static const float save_interval = + g_settings->getFloat("server_map_save_interval"); + if (counter >= save_interval) { counter = 0.0; MutexAutoLock lock(m_env_mutex); @@ -3512,9 +3514,11 @@ void dedicated_server_loop(Server &server, bool &kill) IntervalLimiter m_profiler_interval; - for(;;) - { - float steplen = g_settings->getFloat("dedicated_server_step"); + static const float steplen = g_settings->getFloat("dedicated_server_step"); + static const float profiler_print_interval = + g_settings->getFloat("profiler_print_interval"); + + for(;;) { // This is kind of a hack but can be done like this // because server.step() is very light { @@ -3536,10 +3540,7 @@ void dedicated_server_loop(Server &server, bool &kill) /* Profiler */ - float profiler_print_interval = - g_settings->getFloat("profiler_print_interval"); - if(profiler_print_interval != 0) - { + if (profiler_print_interval != 0) { if(m_profiler_interval.step(steplen, profiler_print_interval)) { infostream<<"Profiler:"< Date: Sun, 21 Feb 2016 07:34:29 +0100 Subject: [PATCH 294/531] Remove new_style_water --- builtin/settingtypes.txt | 5 ----- minetest.conf.example | 6 ------ src/content_mapblock.cpp | 43 +++++++++++++++------------------------- src/defaultsettings.cpp | 1 - src/nodedef.cpp | 3 +-- 5 files changed, 17 insertions(+), 41 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 9e1997cc..003a6685 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -255,11 +255,6 @@ serverlist_file (Serverlist file) string favoriteservers.txt # Whether to fog out the end of the visible area. enable_fog (Fog) bool true -# Enable a bit lower water surface, so it doesn't "fill" the node completely. -# Note that this is not quite optimized and that smooth lighting on the -# water surface doesn't work with this. -new_style_water (New style water) bool false - # Leaves style: # - Fancy: all faces visible # - Simple: only outer faces, if defined special_tiles are used diff --git a/minetest.conf.example b/minetest.conf.example index ee605453..5cf43aca 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -270,12 +270,6 @@ # type: bool # enable_fog = true -# Enable a bit lower water surface, so it doesn't "fill" the node completely. -# Note that this is not quite optimized and that smooth lighting on the -# water surface doesn't work with this. -# type: bool -# new_style_water = false - # Leaves style: # - Fancy: all faces visible # - Simple: only outer faces, if defined special_tiles are used diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index ab8091de..c15b9c42 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -181,11 +181,6 @@ void mapblock_mesh_generate_special(MeshMakeData *data, Some settings */ bool enable_mesh_cache = g_settings->getBool("enable_mesh_cache"); - bool new_style_water = g_settings->getBool("new_style_water"); - - float node_liquid_level = 1.0; - if (new_style_water) - node_liquid_level = 0.85; v3s16 blockpos_nodes = data->m_blockpos*MAP_BLOCKSIZE; @@ -287,35 +282,29 @@ void mapblock_mesh_generate_special(MeshMakeData *data, If our topside is liquid, set upper border of face at upper border of node */ - if(top_is_same_liquid) - { - vertices[2].Pos.Y = 0.5*BS; - vertices[3].Pos.Y = 0.5*BS; - } + if (top_is_same_liquid) { + vertices[2].Pos.Y = 0.5 * BS; + vertices[3].Pos.Y = 0.5 * BS; + } else { /* Otherwise upper position of face is liquid level */ - else - { - vertices[2].Pos.Y = (node_liquid_level-0.5)*BS; - vertices[3].Pos.Y = (node_liquid_level-0.5)*BS; + vertices[2].Pos.Y = 0.5 * BS; + vertices[3].Pos.Y = 0.5 * BS; } /* If neighbor is liquid, lower border of face is liquid level */ - if(neighbor_is_same_liquid) - { - vertices[0].Pos.Y = (node_liquid_level-0.5)*BS; - vertices[1].Pos.Y = (node_liquid_level-0.5)*BS; - } + if (neighbor_is_same_liquid) { + vertices[0].Pos.Y = 0.5 * BS; + vertices[1].Pos.Y = 0.5 * BS; + } else { /* If neighbor is not liquid, lower border of face is lower border of node */ - else - { - vertices[0].Pos.Y = -0.5*BS; - vertices[1].Pos.Y = -0.5*BS; + vertices[0].Pos.Y = -0.5 * BS; + vertices[1].Pos.Y = -0.5 * BS; } for(s32 j=0; j<4; j++) @@ -358,7 +347,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data, video::S3DVertex(-BS/2,0,-BS/2, 0,0,0, c, 0,0), }; - v3f offset(p.X*BS, p.Y*BS + (-0.5+node_liquid_level)*BS, p.Z*BS); + v3f offset(p.X * BS, (p.Y + 0.5) * BS, p.Z * BS); for(s32 i=0; i<4; i++) { vertices[i].Pos += offset; @@ -431,14 +420,14 @@ void mapblock_mesh_generate_special(MeshMakeData *data, content = n2.getContent(); if(n2.getContent() == c_source) - level = (-0.5+node_liquid_level) * BS; + level = 0.5 * BS; else if(n2.getContent() == c_flowing){ u8 liquid_level = (n2.param2&LIQUID_LEVEL_MASK); if (liquid_level <= LIQUID_LEVEL_MAX+1-range) liquid_level = 0; else liquid_level -= (LIQUID_LEVEL_MAX+1-range); - level = (-0.5 + ((float)liquid_level+ 0.5) / (float)range * node_liquid_level) * BS; + level = (-0.5 + ((float)liquid_level + 0.5) / (float)range) * BS; } // Check node above neighbor. @@ -486,7 +475,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data, // Source is always the same height else if(content == c_source) { - cornerlevel = (-0.5+node_liquid_level)*BS; + cornerlevel = 0.5 * BS; valid_count = 1; break; } diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 49e03a26..f7ac310b 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -106,7 +106,6 @@ void set_default_settings(Settings *settings) settings->setDefault("enable_fog", "true"); settings->setDefault("fov", "72"); settings->setDefault("view_bobbing", "true"); - settings->setDefault("new_style_water", "false"); settings->setDefault("leaves_style", "fancy"); settings->setDefault("connected_glass", "false"); settings->setDefault("smooth_lighting", "true"); diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 31366f7e..6d740fac 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -806,7 +806,6 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef, scene::ISceneManager* smgr = gamedef->getSceneManager(); scene::IMeshManipulator* meshmanip = smgr->getMeshManipulator(); - bool new_style_water = g_settings->getBool("new_style_water"); bool connected_glass = g_settings->getBool("connected_glass"); bool opaque_water = g_settings->getBool("opaque_water"); bool enable_shaders = g_settings->getBool("enable_shaders"); @@ -854,7 +853,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef, assert(f->liquid_type == LIQUID_SOURCE); if (opaque_water) f->alpha = 255; - f->solidness = new_style_water ? 0 : 1; + f->solidness = 0; is_liquid = true; break; case NDT_FLOWINGLIQUID: From f9d727764fc9c74990fc979d4966a33882d0c19b Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Mon, 22 Feb 2016 04:26:32 +0100 Subject: [PATCH 295/531] Mapblock mesh: Allow to use VBO --- builtin/settingtypes.txt | 3 +++ src/defaultsettings.cpp | 3 ++- src/mapblock_mesh.cpp | 28 +++++++++++++++++++--------- src/mapblock_mesh.h | 2 ++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 003a6685..493cedd6 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -252,6 +252,9 @@ serverlist_file (Serverlist file) string favoriteservers.txt [***Basic] +# Enable VBO +enable_vbo (VBO) bool true + # Whether to fog out the end of the visible area. enable_fog (Fog) bool true diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index f7ac310b..db2950fc 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -176,7 +176,8 @@ void set_default_settings(Settings *settings) settings->setDefault("repeat_rightclick_time", "0.25"); settings->setDefault("enable_particles", "true"); settings->setDefault("enable_mesh_cache", "false"); - + settings->setDefault("enable_vbo", "true"); + settings->setDefault("enable_minimap", "true"); settings->setDefault("minimap_shape_round", "true"); settings->setDefault("minimap_double_scan_height", "true"); diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index e1ec50ab..e1b04427 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -1026,6 +1026,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): m_mesh(new scene::SMesh()), m_minimap_mapblock(NULL), m_gamedef(data->m_gamedef), + m_driver(m_gamedef->tsrc()->getDevice()->getVideoDriver()), m_tsrc(m_gamedef->getTextureSource()), m_shdrsrc(m_gamedef->getShaderSource()), m_animation_force_timer(0), // force initial animation @@ -1036,7 +1037,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): { m_enable_shaders = data->m_use_shaders; m_use_tangent_vertices = data->m_use_tangent_vertices; - + m_enable_vbo = g_settings->getBool("enable_vbo"); + if (g_settings->getBool("enable_minimap")) { m_minimap_mapblock = new MinimapMapblock; m_minimap_mapblock->getMinimapNodes( @@ -1261,14 +1263,9 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): #endif // Use VBO for mesh (this just would set this for ever buffer) - // This will lead to infinite memory usage because or irrlicht. - //m_mesh->setHardwareMappingHint(scene::EHM_STATIC); - - /* - NOTE: If that is enabled, some kind of a queue to the main - thread should be made which would call irrlicht to delete - the hardware buffer and then delete the mesh - */ + if (m_enable_vbo) { + m_mesh->setHardwareMappingHint(scene::EHM_STATIC); + } } //std::cout<<"added "<getMeshBufferCount(); i++) { + scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(i); + m_driver->removeHardwareBuffer(buf); + } + } m_mesh->drop(); m_mesh = NULL; delete m_minimap_mapblock; @@ -1362,6 +1365,10 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat // Day-night transition if(!m_enable_shaders && (daynight_ratio != m_last_daynight_ratio)) { + // Force reload mesh to VBO + if (m_enable_vbo) { + m_mesh->setDirty(); + } for(std::map > >::iterator i = m_daynight_diffs.begin(); i != m_daynight_diffs.end(); ++i) @@ -1387,6 +1394,9 @@ void MapBlockMesh::updateCameraOffset(v3s16 camera_offset) { if (camera_offset != m_camera_offset) { translateMesh(m_mesh, intToFloat(m_camera_offset-camera_offset, BS)); + if (m_enable_vbo) { + m_mesh->setDirty(); + } m_camera_offset = camera_offset; } } diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h index 98749040..f89fbe66 100644 --- a/src/mapblock_mesh.h +++ b/src/mapblock_mesh.h @@ -128,11 +128,13 @@ private: scene::IMesh *m_mesh; MinimapMapblock *m_minimap_mapblock; IGameDef *m_gamedef; + video::IVideoDriver *m_driver; ITextureSource *m_tsrc; IShaderSource *m_shdrsrc; bool m_enable_shaders; bool m_use_tangent_vertices; + bool m_enable_vbo; // Must animate() be called before rendering? bool m_has_animation; From 033a510cf3f5b6bc36c976bec18ab98e69fb0d5e Mon Sep 17 00:00:00 2001 From: Jeija Date: Thu, 25 Feb 2016 09:47:28 +0100 Subject: [PATCH 296/531] Fix minetest.request_insecure_environment() always returning nil Fixes #3765 --- src/script/lua_api/l_util.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index c04f09f9..cc4467bb 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "cpp_api/s_security.h" #include "areastore.h" #include "porting.h" +#include "debug.h" #include "log.h" #include "tool.h" #include "filesys.h" @@ -372,8 +373,8 @@ int ModApiUtil::l_request_insecure_environment(lua_State *L) if (lua_getstack(L, 2, &info)) { return 0; } - assert(lua_getstack(L, 1, &info)); - assert(lua_getinfo(L, "S", &info)); + FATAL_ERROR_IF(!lua_getstack(L, 1, &info), "lua_getstack() failed"); + FATAL_ERROR_IF(!lua_getinfo(L, "S", &info), "lua_getinfo() failed"); // ...and that that item is the main file scope. if (strcmp(info.what, "main") != 0) { return 0; From af4cd48e417f7788c41d116ca63a137234f07559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kisbenedek=20M=C3=A1rton?= Date: Thu, 28 Jan 2016 20:32:40 +0100 Subject: [PATCH 297/531] Translated using Weblate (Hungarian) Currently translated at 69.1% (544 of 787 strings) (Merger of three commits) --- po/hu/minetest.po | 729 ++++++++++++++++++++++++++++------------------ 1 file changed, 439 insertions(+), 290 deletions(-) diff --git a/po/hu/minetest.po b/po/hu/minetest.po index f34f0fc2..f437d78a 100644 --- a/po/hu/minetest.po +++ b/po/hu/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-01-25 00:59+0000\n" +"PO-Revision-Date: 2016-02-07 12:19+0000\n" "Last-Translator: Kisbenedek Márton \n" "Language-Team: Hungarian " "\n" @@ -85,11 +85,11 @@ msgstr "Függ:" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" -msgstr "Csomag letiltás" +msgstr "Modpakk letiltás" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" -msgstr "Csomag engedélyez" +msgstr "Modpakk engedélyez" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" @@ -138,7 +138,7 @@ msgstr "Létrehoz" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "Tölts le egy al-játékot (pl. minetest_game) a minetest.net-ről" +msgstr "Tölts le egy al-játékot (mint a Minetest Game) a minetest.net-ről" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -442,9 +442,8 @@ msgid "Edit" msgstr "Szerkeszt" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" -msgstr "Engedélyez" +msgstr "Engedélyezve" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." @@ -510,7 +509,7 @@ msgstr "Modok beállítása" #: builtin/mainmenu/tab_simple_main.lua msgid "Main" -msgstr "Főmenü" +msgstr "Fő" #: builtin/mainmenu/tab_simple_main.lua msgid "Start Singleplayer" @@ -758,7 +757,7 @@ msgstr "Vissza" #: src/guiKeyChangeMenu.cpp msgid "Chat" -msgstr "Beszélgetés" +msgstr "Csevegés" #: src/guiKeyChangeMenu.cpp msgid "Command" @@ -819,9 +818,8 @@ msgid "Sneak" msgstr "Lopakodás" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Toggle Cinematic" +msgstr "Váltás \"cinematic\" módba" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1093,7 +1091,7 @@ msgstr "Plusz" #: src/keycode.cpp msgid "Print" -msgstr "Nyomtat" +msgstr "" #: src/keycode.cpp msgid "Prior" @@ -1243,18 +1241,25 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Cím a csatlakozáshoz.\n" +"Hagyd üresen helyi szerver indításához.\n" +"Megjegyzés: a cím mező a főmenüben felülírja ezt a beállítást." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Dpi konfiguráció igazítása a képernyődhöz (nem X11/csak Android) pl. 4k " +"képernyőkhöz." #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Gamma kódolás beállítása. Alacsonyabb számok - nagyobb fényerő.\n" +"Ez a beállítás csak a kliensre érvényes, a szerver nem veszi figyelembe." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1262,20 +1267,19 @@ msgstr "Haladó" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Repülés és gyorsaság mindig" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" -msgstr "Anzisztrópikus szűrés" +msgstr "Anizotrópikus szűrés" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Szerver kihirdetése" #: src/settings_translation_file.cpp msgid "" @@ -1283,28 +1287,29 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Bejelentés a szerverlistára.\n" +"Ha be akarod jelenteni az ipv6 címedet, használd ezt: serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Összeomlás után újracsatlakozás kérése" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Automatikus bejelentés a szerverlistára." #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "Vissza" +msgstr "Vissza gomb" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Alap" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" -msgstr "Bi-lineáris szűrés" +msgstr "Bilineáris szűrés" #: src/settings_translation_file.cpp #, fuzzy @@ -1313,12 +1318,12 @@ msgstr "Bind Address" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bit/pixel (vagyis színmélység) teljes képernyős módban." #: src/settings_translation_file.cpp #, fuzzy msgid "Build inside player" -msgstr "Többjátékos mód" +msgstr "Építés játékosba" #: src/settings_translation_file.cpp #, fuzzy @@ -1327,130 +1332,123 @@ msgstr "Bumpmapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Kamera simítás" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Kamera simítás \"cinematic\" módban" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Kamera frissítés váltás gomb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Gombok változtatása" +msgstr "Csevegés gomb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Gombok változtatása" +msgstr "Csevegés váltás gomb" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Térképdarab (chunk) mérete" #: src/settings_translation_file.cpp #, fuzzy msgid "Cinematic mode" -msgstr "Kreatív mód" +msgstr "\"Cinematic\" mód" #: src/settings_translation_file.cpp #, fuzzy msgid "Cinematic mode key" -msgstr "Kreatív mód" +msgstr "\"Cinematic\" mód gomb" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Tiszta átlátszó textúrák" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Kliens és szerver" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Mászás sebessége" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Felhő magasság" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Felhő rádiusz" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D felhők" +msgstr "Felhők" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "A felhők egy kliens oldali effekt." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Főmenü" +msgstr "Felhők a menüben" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Színezett köd" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Megbízható modok vesszővel elválasztott listája amiknek engedélyezettek nem " +"biztonságos\n" +"funkcióik még a mod biztonság bekapcsolása esetén is " +"(request_insecure_environment())." #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Parancs" +msgstr "Parancs gomb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Tiszta (csatlakozó) üveg" +msgstr "Üveg csatlakozása" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Csatlakozás a szerverhez..." +msgstr "Csatlakozás külső médiaszerverhez" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Üveg csatlakoztatása ha a blokk támogatja." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Konzol" +msgstr "Konzol alfa" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Konzol" +msgstr "Konzol szín" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Konzol" +msgstr "Konzol gomb" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Folyamatos előre" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Folyamatos mozgás előre (csak tesztelésre használatos)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Control" +msgstr "Irányítás" #: src/settings_translation_file.cpp msgid "" @@ -1458,49 +1456,54 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Nap/éjjel ciklus hossza.\n" +"Példák: 72 = 20 perc, 360 = 4 perc, 1 = 24 óra, 0 = nappal/éjjel/bármelyik " +"változatlan marad." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Sivatagok mérete és tengerpartok a v6 térképgenerátorban.\n" +"Amikor a havas területek engedélyezve vannak, 'mgv6_freq_desert' figyelmen " +"kívül hagyva." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Üzenet összeomláskor" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Célkereszt alfa" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Célkereszt alfa (átlátszatlanság, 0 és 255 között)." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Célkereszt színe" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Célkereszt színe (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Sebesség guggoláskor" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Sérülés engedélyezése" +msgstr "Sérülés" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Hibakereső infó váltás gomb" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1512,26 +1515,27 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Alapértelmezett gyorsulás" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "" +msgstr "Alapértelmezett játék" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Alapértelmezett játék új világ létrehozásánál.\n" +"A főmenüből történő világ létrehozása ezt felülírja." #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Új jelszó" +msgstr "Alapértelmezett jelszó" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Alap jogosultságok" #: src/settings_translation_file.cpp msgid "" @@ -1551,7 +1555,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Eszköztippek megjelenítésének késleltetése, miliszekundumban." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" @@ -1559,13 +1563,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Ereszkedés sebessége" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"A szerver leírása, ami a szerverlistában jelenik meg és amikor a játékosok " +"csatlakoznak." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" @@ -1580,31 +1586,28 @@ msgid "Detailed mod profiling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Részecskék engedélyezése" +msgstr "Csalás elleni védelem letiltása" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Üres jelszavak tiltása" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "A szerver domain neve, ami a szerverlistában megjelenik." #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" msgstr "Az \"ugrás\" gomb duplán a repüléshez" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Az \"ugrás\" gomb duplán a repüléshez" +msgstr "Az ugrás gomb kétszeri megnyomásával lehet repülés módba váltani." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Tárgy eldobás gomb" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." @@ -1617,15 +1620,18 @@ msgid "" "Note that this is not quite optimized and that smooth lighting on the\n" "water surface doesn't work with this." msgstr "" +"Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg teljesen " +"a blokkot.\n" +"Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n" +"így nem működik a víz felszínén." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Online mod tároló" +msgstr "Mod biztonság engedélyezése" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Játékosok sérülésének és halálának engedélyezése." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." @@ -1634,6 +1640,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enable selection highlighting for nodes (disables selectionbox)." msgstr "" +"Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a " +"kijelölődobozt)." #: src/settings_translation_file.cpp msgid "" @@ -1649,6 +1657,11 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Régi verziójú kliensek csatlakozásának tiltása.\n" +"A régi kliensek kompatibilisek olyan értelemben, hogy nem omlanak össze ha " +"egy új verziójú\n" +"szerverhez csatlakoznak, de nem biztos, hogy támogatnak minden elvárt " +"funkciót." #: src/settings_translation_file.cpp msgid "" @@ -1657,6 +1670,9 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Távoli média szerver használatának engedélyezése (ha a szerver biztosítja).\n" +"Ezekről jelentősen gyorsabb a média letöltése (pl. textúrák)\n" +"a szerverhez történő csatlakozáskor." #: src/settings_translation_file.cpp msgid "" @@ -1678,9 +1694,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Sérülés engedélyezése" +msgstr "Minitérkép engedélyezése." #: src/settings_translation_file.cpp msgid "" @@ -1699,10 +1714,12 @@ msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Kísérleti opció, látható rések jelenhetnek meg a blokkok között\n" +"ha nagyobbra van állítva, mint 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS a szünet menüben" #: src/settings_translation_file.cpp msgid "FSAA" @@ -1713,57 +1730,60 @@ msgid "Fall bobbing" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "needs_fallback_font" +msgstr "Tartalék betűtípus" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Tartalék betűtípus árnyék" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Tartalék betűtípus árnyék alfa" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Tartalék betűtípus méret" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Gyorsaság gomb" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Gyorsulás gyors módban" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Sebesség gyors módban" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Gyors mozgás" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Gyors mozgás (a használat gombbal).\n" +"Szükséges hozzá a \"fast\" (gyorsaság) jogosultság a szerveren." #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Látótávolság" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Látóterület fokokban." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"A client/serverlist/ mappában lévő fájl, ami tartalmazza a kedvenc " +"szervereket, amik a Többjátékos fül alatt jelennek meg." #: src/settings_translation_file.cpp msgid "" @@ -1774,9 +1794,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Nincs szűrés" +msgstr "Szűrés" #: src/settings_translation_file.cpp msgid "Fixed map seed" @@ -1784,52 +1803,51 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "" +msgstr "Repülés gomb" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Repülés" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Köd" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Köd váltás gomb" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Betűtípus helye" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Betűtípus árnyéka" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Betűtípus árnyék alfa" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Betűtípus árnyék alfa (átlátszatlanság, 0 és 255 között)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" +msgstr "Betűtípus árnyék eltolás, ha 0, akkor nem lesz árnyék rajzolva." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Betűtípus mérete" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Előre" +msgstr "Előre gomb" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Freetype betűtípusok" #: src/settings_translation_file.cpp msgid "" @@ -1849,32 +1867,31 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Teljes képernyő" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "Teljes képernyő BPP" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Teljes képernyős mód." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "GUI scaling filter" msgstr "Felhasználói felület méretaránya" +#: src/settings_translation_file.cpp +msgid "GUI scaling filter" +msgstr "Felhasználói felület méretarány szűrő" + #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "Felhasználói felület méretarány szűrő txr2img" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gamma" #: src/settings_translation_file.cpp #, fuzzy @@ -1892,15 +1909,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Grafika" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravitáció" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "HUD váltás gomb" #: src/settings_translation_file.cpp msgid "" @@ -1912,7 +1929,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "A felhők megjelenésének magassága." #: src/settings_translation_file.cpp msgid "High-precision FPU" @@ -1920,11 +1937,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "A szerver honlapja, ami a szerverlistában megjelenik." #: src/settings_translation_file.cpp msgid "Horizontal initial window size." -msgstr "" +msgstr "Kezdeti vízszintes ablak méret." #: src/settings_translation_file.cpp msgid "" @@ -1954,17 +1971,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "IPv6 szerver" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "IPv6 támogatás." #: src/settings_translation_file.cpp msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"Ha az FPS ennél magasabbra is tudna menni, lekorlátozható, \n" +"hogy ne pazaroljon CPU erőforrást feleslegesen." #: src/settings_translation_file.cpp msgid "" @@ -1978,12 +1997,17 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" +"Ha engedélyezve van együtt a repülés (fly) móddal, a játékos átrepülhet " +"szilárd\n" +"blokkokon. Szükséges hozzá a \"noclip\" jogosultság a szerveren." #: src/settings_translation_file.cpp msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" +"Ha engedélyezve van, a \"használat\" (use) gomb lesz használatban a \"" +"lopakodás\" (sneak) helyett lefelé mászáskor, vagy ereszkedéskor." #: src/settings_translation_file.cpp msgid "" @@ -1994,16 +2018,20 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." msgstr "" +"Ha ez engedélyezve van, kikapcsolja a csalás megelőzést többjátékos módban." #: src/settings_translation_file.cpp msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" +"Ha engedélyezve van, érvénytelen világ adat nem okozza a szerver leállítását." +"\n" +"Csak akkor engedélyezd, ha tudod, hogy mit csinálsz." #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." -msgstr "" +msgstr "Ha engedélyezve van, új játékosok nem csatlakozhatnak jelszó nélkül." #: src/settings_translation_file.cpp msgid "" @@ -2011,48 +2039,54 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Ha engedélyezve van, elhelyezhetsz blokkokat oda, ahol állsz (láb + " +"szemmagasság).\n" +"Ez segít, ha kis területen dolgozol." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." msgstr "" +"Ha be van állítva, a játékosok mindig a megadott pozícióban élednek újra (és " +"jelennek meg új csatlakozáskor)." #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Világ hibák figyelmen kívül hagyása" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Játék" +msgstr "Játékon belül" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." msgstr "" +"Játékon belüli csevegő konzol hátterének alfája (átlátszatlanság, 0 és 255 " +"között)." #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Játékon belüli csevegő konzol hátterének színe (R,G,B)." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." msgstr "" +"Fontos változások mentésének időköze a világban, másodpercekben megadva." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Inventory" +msgstr "Eszköztár gomb" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Egér invertálása" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Függőleges egérmozgás invertálása." #: src/settings_translation_file.cpp msgid "Item entity TTL" @@ -2105,13 +2139,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Ugrás" +msgstr "Ugrás gomb" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "Ugrás sebessége" #: src/settings_translation_file.cpp msgid "" @@ -2119,6 +2152,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2126,6 +2162,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb az éppen kijelölt tárgy eldobásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2133,6 +2172,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2140,6 +2182,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Ugrás gombja.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2147,6 +2192,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a gyors mozgáshoz gyors (fast) módban.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2154,6 +2202,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a játékos hátrafelé mozgásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2161,6 +2212,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a játékos előre mozgásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901" +"735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2168,6 +2222,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a játékos balra mozgatásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2175,6 +2232,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a játékos jobbra mozgatásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2182,6 +2242,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a csevegő konzol megnyitásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2189,6 +2252,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a csevegő ablak megnyitásához, parancsok beírásához.\n" +"Lásd: //irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3d" +"a1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2196,6 +2262,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a csevegő ablak megnyitásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2203,6 +2272,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb az Eszköztár megnyitásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2219,6 +2291,11 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a lopakodáshoz (sneak).\n" +"A lefelé mászáshoz és vízben történő ereszkedéshez is használt, ha a " +"aux1_descends le van tiltva.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2226,6 +2303,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a belső és külső nézetű kamera váltáshoz.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2233,6 +2313,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb képernyőfelvétel készítéshez.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2240,6 +2323,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a \"cinematic\" mód (filmkészítés) bekapcsolásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2247,6 +2333,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a minitérkép megjelenítéséhez.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2254,6 +2343,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a gyors (fast) módra váltáshoz.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2261,6 +2353,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a repülés (fly) módra váltáshoz.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2268,6 +2363,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a noclip módra váltáshoz.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2275,6 +2373,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a kamerafrissítés bekapcsolásához. Csak fejlesztők számára.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2282,6 +2383,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a hibakeresési infók megjelenítéséhez.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2289,6 +2393,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a HUD megjelenítéséhez/kikapcsolásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2296,6 +2403,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a csevegő megjelenítéséhez.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2303,6 +2413,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a köd megjelenítésének ki/bekapcsolásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2317,31 +2430,38 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Gomb a végtelen látóterület bekapcsolásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "Gomb használat a mászás/ereszkedéshez" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Nyelv" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Levelek stílusa" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Leaves style:\n" "- Fancy: all faces visible\n" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Levelek stílusa:\n" +"- Fancy: all faces visible\n" +"- Simple: only outer faces, if defined special_tiles are used\n" +"- Opaque: átlátszóság kikapcsolása" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Bal menü" +msgstr "Bal gomb" #: src/settings_translation_file.cpp msgid "" @@ -2380,11 +2500,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "Folyadék folyékonysága" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "Folyadék folyékonyságának simítása" #: src/settings_translation_file.cpp msgid "Liquid loop max" @@ -2408,22 +2528,21 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "Főmenü játék kezelő" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Főmenü" +msgstr "Főmenü mod kezelő" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Főmenü" +msgstr "Főmenü script" #: src/settings_translation_file.cpp msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" +"A köd és ég színe függjön a napszaktól (hajnal/naplemente) és a látószögtől." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." @@ -2453,7 +2572,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Térkép mappája" #: src/settings_translation_file.cpp msgid "" @@ -2489,7 +2608,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "Térkép mentésének időköze" #: src/settings_translation_file.cpp msgid "Mapblock limit" @@ -2512,9 +2631,8 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Térkép generátor" +msgstr "Térkép generátor hibakereső" #: src/settings_translation_file.cpp #, fuzzy @@ -2601,14 +2719,12 @@ msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Térkép generátor" +msgstr "Térkép generátor neve" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Térkép generátor" +msgstr "Térkép generátor v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2631,9 +2747,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Térkép generátor" +msgstr "Térkép generátor v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2692,9 +2807,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Térkép generátor" +msgstr "Térkép generátor v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2770,7 +2884,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "Maximum FPS a játék szüneteltetésekor." #: src/settings_translation_file.cpp msgid "" @@ -2779,6 +2893,12 @@ msgid "" "Smaller values may result in a suitable spawn point not being found,\n" "resulting in a spawn at (0, 0, 0) possibly buried underground." msgstr "" +"Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/" +"megjelenhetnek csatlakozáskor (spawn).\n" +"Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n" +"Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a " +"feléledéshez,\n" +"(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" @@ -2786,7 +2906,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "Maximum hotbar szélesség" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." @@ -2823,7 +2943,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "" +msgstr "Az egy időben csatlakozó játékosok maximális száma." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." @@ -2849,16 +2969,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "Maximum felhasználók" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "" +msgstr "Maximum objektum térképblokkonként" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" -msgstr "Menü" +msgstr "Menük" #: src/settings_translation_file.cpp msgid "Mesh cache" @@ -2866,19 +2985,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "Napi üzenet" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." -msgstr "" +msgstr "Napi üzenet a csatlakozó játékosoknak." #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Minitérkép" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Minitérkép gomb" #: src/settings_translation_file.cpp msgid "Minimap scan height" @@ -2889,11 +3008,15 @@ msgid "Minimum texture size for filters" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Minimum wanted FPS.\n" "The amount of rendered stuff is dynamically set according to this. and " "viewing range min and max." msgstr "" +"Minimum kívánt FPS.\n" +"A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a " +"látórerület min és max)." #: src/settings_translation_file.cpp #, fuzzy @@ -2918,19 +3041,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Monospace font path" -msgstr "" +msgstr "Monospace betűtípus útvonal" #: src/settings_translation_file.cpp msgid "Monospace font size" -msgstr "" +msgstr "Monospace betűtípus méret" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "Egér érzékenység" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "Egér érzékenység szorzó." #: src/settings_translation_file.cpp msgid "" @@ -2949,6 +3072,8 @@ msgid "" "Name of map generator to be used when creating a new world.\n" "Creating a world in the main menu will override this." msgstr "" +"A használni kívánt térképgenerátor neve új világ létrehozásakor.\n" +"A főmenüben történő világ létrehozás ezt felülírja." #: src/settings_translation_file.cpp msgid "" @@ -2956,15 +3081,20 @@ msgid "" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"A játékos neve.\n" +"Szerver indításakor ezzel a névvel csatlakozó játékos admin jogú.\n" +"A főmenüből történő indítás ezt felülírja." #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." msgstr "" +"A szerver neve, ami megjelenik a szerverlistában, és amikor a játékosok " +"csatlakoznak." #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "Hálózat" #: src/settings_translation_file.cpp msgid "" @@ -2974,11 +3104,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "New style water" -msgstr "" +msgstr "Új stílusú víz" #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "Az új felhasználóknak ezt a jelszót kell megadniuk." #: src/settings_translation_file.cpp msgid "Noclip" @@ -2986,12 +3116,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "" +msgstr "Noclip gomb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Node highlighting" -msgstr "Node kiemelés" +msgstr "Blokk kiemelés" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -3074,30 +3203,31 @@ msgstr "Parallax Occlusion" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." -msgstr "" +msgstr "A TrueType betűtípus (ttf) vagy bitmap útvonala." #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "Képernyőmentések mappája." #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." -msgstr "" +msgstr "Textúra mappa útvonala. Először minden textúrát itt keres a játék." #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "Fizika" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the \"fly\" privilege on the server." msgstr "" +"A játékos képes repülni, nem hat rá a gravitáció.\n" +"Szükséges hozzá a repülés jogosultság (fly) a szerveren." #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Túl hosszú játékosnév." +msgstr "Játékos neve" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -3105,13 +3235,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "Játékos játékos ellen (PvP)" #: src/settings_translation_file.cpp msgid "" "Port to connect to (UDP).\n" "Note that the port field in the main menu overrides this setting." msgstr "" +"Port a csatlakozáshoz (UDP).\n" +"A főmenü port mezője ezt a beállítást felülírja." #: src/settings_translation_file.cpp msgid "" @@ -3122,13 +3254,14 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Textúrák betöltése..." +msgstr "Eszköztár textúráinak előtöltése" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +"Annak megelőzése, hogy a modok nem biztonágos dolgokat futtassanak, pl. " +"shell parancsok." #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." @@ -3154,26 +3287,24 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Látótávolság választása" +msgstr "Látóterület választása gomb" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "Távoli média" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "Távoli port" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." -msgstr "" +msgstr "Az alapértelmezett főmenüt lecseréli egy másikkal." #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Jobb menü" +msgstr "Jobb gomb" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3185,7 +3316,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "Kör alakú minitérkép" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." @@ -3193,9 +3324,10 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "" +msgstr "A szerverről fogadott térkép mentése" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Scale gui by a user specified value.\n" "Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" @@ -3203,107 +3335,111 @@ msgid "" "pixels when scaling down, at the cost of blurring some\n" "edge pixels when images are scaled by non-integer sizes." msgstr "" +"A felhasználói felület méretezése egy meghatározott értékkel.\n" +"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" +"This will smooth over some of the rough edges, and blend\n" +"pixels when scaling down, at the cost of blurring some\n" +"edge pixels when images are scaled by non-integer sizes." #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "Képernyő magasság" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "Képernyő szélesség" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Pillanatkép" +msgstr "Képernyőkép" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "Képernyőkép mappa" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "Biztonság" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" +msgstr "Lásd: http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp msgid "Selection box border color (R,G,B)." -msgstr "" +msgstr "Kijelölő doboz keret színe (R,G,B)." #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "Kijelölő doboz színe" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "Kijelölő doboz szélesség" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Egyjátékos mód indítása" +msgstr "Szerver / Egyjátékos" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Szerver" +msgstr "Szerver URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Szerver port" +msgstr "Szerver címe" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Szerver port" +msgstr "Szerver leírása" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Szerver" +msgstr "Szerver neve" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Szerver port" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Nyilvános szerverlista" +msgstr "Szerverlista URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Nyilvános szerverlista" +msgstr "Szerverlista fájl" #: src/settings_translation_file.cpp msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" +"Nyelv beállítása. Hagyd üresen a rendszer nyelvének használatához.\n" +"A változtatás után a játék újraindítása szükséges." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"Ha \"true\" beállítás esetén hullámzó levelek.\n" +"A shaderek engedélyezése szükséges hozzá." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" +"A \"true\" beállítás esetén hullámzó növények.\n" +"A shaderek engedélyezése szükséges hozzá." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" +"A \"true\" beállítás esetén hullámzó víz.\n" +"A shaderek engedélyezése szükséges hozzá." #: src/settings_translation_file.cpp msgid "Shaders" @@ -3319,14 +3455,16 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." msgstr "" +"A minitérkép alakja. Engedélyezve (enabled) = kerek, letiltva (disabled) = " +"négyzet." #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "Hibakereső infó mutatása" #: src/settings_translation_file.cpp msgid "Shutdown message" -msgstr "" +msgstr "Leállítási üzenet" #: src/settings_translation_file.cpp msgid "" @@ -3335,7 +3473,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" msgstr "Simított megvilágítás" @@ -3344,23 +3481,25 @@ msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" +"Kamera mozgásának simítása mozgáskor és körbenézéskor.\n" +"Videofelvételekhez hasznos." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." msgstr "" +"A kamera forgását simítja a cinematic (filmkészítés) módban. 0 = letiltás." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "Kamera forgás simítása. 0 = letiltás." #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Lopakodás" +msgstr "Lopakodás gomb" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "Hang" #: src/settings_translation_file.cpp msgid "" @@ -3372,12 +3511,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "" +msgstr "Statikus feléledési (spawn) pont" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." -msgstr "Normálfelületek generálása" +msgstr "Generált normálfelületek erőssége." #: src/settings_translation_file.cpp msgid "Strength of parallax." @@ -3392,9 +3530,8 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Textúra pakkok" +msgstr "Textúrák útvonala" #: src/settings_translation_file.cpp msgid "" @@ -3412,6 +3549,9 @@ msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" +"Jogosultságok, amiket az új játékosok automatikusan megkapnak.\n" +"A játékban a /privs parancs beírásával láthatod a teljes listát a " +"szervereden." #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." @@ -3440,13 +3580,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "" +msgstr "Ezt a betűtípust bizonyos nyelvek használják." #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"Annak az ideje, hogy mennyi ideig \"élnek\" az eldobott tárgyak.\n" +"-1-re állítás kikapcsolja ezt a funkciót." #: src/settings_translation_file.cpp msgid "Time send interval" @@ -3454,7 +3596,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Time speed" -msgstr "" +msgstr "Idő sebessége" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." @@ -3467,14 +3609,18 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" +"A lag csökkentéséért a blokkok lerakása le van lassítva, ha a játékos épít " +"valamit.\n" +"Ez azt határozza meg, hogy mennyire van lelassítva blokkok elhelyezésekor, " +"vagy eltávolításakor." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "Kamera mód váltó gomb" #: src/settings_translation_file.cpp msgid "Tooltip delay" -msgstr "" +msgstr "Eszköztipp késleltetés" #: src/settings_translation_file.cpp #, fuzzy @@ -3490,7 +3636,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "" +msgstr "Megbízható modok" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." @@ -3506,37 +3652,37 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "3D felhő kinézet használata lapos helyett." #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." -msgstr "" +msgstr "Felhő animáció használata a főmenü háttereként." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" +msgstr "Anizotropikus szűrés használata, ha egy szögből nézzük a textúrákat." #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." -msgstr "" +msgstr "Bilineáris szűrés a textúrák méretezésekor." #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "Nyomj meg egy gombot" +msgstr "Használat gomb" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." msgstr "" +"Mip mapping használata a textúrák méretezéséhez. Kicsit növelheti a " +"teljesítményt." #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." -msgstr "" +msgstr "Trilineáris szűrés a textúrák méretezéséhez." #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Korábbi belső fejlesztők" +msgstr "Mod fejlesztőknek hasznos." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3544,15 +3690,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Vertical initial window size." -msgstr "" +msgstr "Függőleges kezdeti ablak méret." #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "" +msgstr "Függőleges képernyő szinkronizálás." #: src/settings_translation_file.cpp msgid "Vertical spawn range" -msgstr "" +msgstr "Az (újra)éledés függőleges irányú területe" #: src/settings_translation_file.cpp msgid "Video driver" @@ -3564,76 +3710,67 @@ msgstr "" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "" +msgstr "Látóterület csökkentés gomb" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "" +msgstr "Látóterület növelés gomb" #: src/settings_translation_file.cpp msgid "Viewing range maximum" -msgstr "" +msgstr "Maximum látóterület" #: src/settings_translation_file.cpp msgid "Viewing range minimum" -msgstr "" +msgstr "Minimum látóterület" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Hangerő" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Hullámzó levelek" +msgstr "Járás sebessége" #: src/settings_translation_file.cpp msgid "Wanted FPS" -msgstr "" +msgstr "Kívánt FPS" #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "Vízszint" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "A világ vízfelszínének szintje." #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "Hullámzó levelek" +msgstr "Hullámzó blokkok" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" msgstr "Hullámzó levelek" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" msgstr "Hullámzó növények" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "Hullámzó víz" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "Hullámzó víz" +msgstr "Hullámzó víz magassága" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "Hullámzó víz" +msgstr "Hullámzó víz szélessége" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Hullámzó víz" +msgstr "Hullámzó víz sebessége" #: src/settings_translation_file.cpp msgid "" @@ -3662,6 +3799,7 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Where the map generator stops.\n" "Please note:\n" @@ -3670,11 +3808,20 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"Hol áll meg a térkép generálás.\n" +"Fontos:\n" +"- 31000 -re van korlátozva (ha magasabbra állítjuk, nem lesz eredménye).\n" +"- A térképgenerátor 80x80x80-as csoportokban dolgozik (5x5x5-ös térkép " +"blokkok).\n" +"- Those groups have an offset of -32, -32 nodes from the origin.\n" +"- Only groups which are within the map_generation_limit are generated" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." msgstr "" +"Használatban vannak-e freetype betűtípusok. Szükséges a beépített freetype " +"támogatás." #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." @@ -3688,7 +3835,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "" +msgstr "Engedélyezve van-e, hogy a játékosok sebezzék, ill. megöljék egymást." #: src/settings_translation_file.cpp msgid "" @@ -3703,17 +3850,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" +msgstr "A hibakereső infó mutatása (ugyanaz a hatás, ha F5-öt nyomunk)." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "A kijelölődoboz vonalainak szélessége a blokkok körül." #: src/settings_translation_file.cpp msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" +"Világ (world) mappa (minden itt tárolódik ami a világban van).\n" +"Ez nem szükséges, ha a főmenüből indítunk." #: src/settings_translation_file.cpp msgid "cURL file download timeout" From e845ef09632fbecb023b8a041d421e5b4d23b7b5 Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Tue, 26 Jan 2016 16:32:41 +0100 Subject: [PATCH 298/531] Translated using Weblate (Indonesian) Currently translated at 42.4% (334 of 787 strings) --- po/id/minetest.po | 95 +++++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/po/id/minetest.po b/po/id/minetest.po index c54d377a..7cb82141 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-10-27 16:45+0200\n" -"Last-Translator: PilzAdam \n" -"Language-Team: Indonesian \n" +"PO-Revision-Date: 2016-01-26 16:32+0000\n" +"Last-Translator: Muhammad Rifqi Priyo Susanto " +"\n" +"Language-Team: Indonesian " +"\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Sebuah kesalahan muncul pada skrip Lua, seperti pada mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -49,7 +50,7 @@ msgstr "Memuat..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Versi protokol tidak cocok. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " @@ -423,7 +424,7 @@ msgstr "Mulai Permainan" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" bukan sebuah flag yang sah." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" @@ -438,9 +439,8 @@ msgid "Change keys" msgstr "Ubah tombol" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Disabled" -msgstr "Nonaktifkan PM" +msgstr "Nonaktif" #: builtin/mainmenu/tab_settings.lua msgid "Edit" @@ -453,6 +453,7 @@ msgstr "Diaktifkan" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" +"Format adalah 3 angka yang dipisahkan oleh koma dan di dalam tanda kurung." #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -464,7 +465,6 @@ msgstr "" ", " #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" msgstr "Permainan" @@ -474,7 +474,7 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Silakan masukan daftar flag yang dipisahkan dengan tanda koma." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." @@ -493,9 +493,8 @@ msgid "Restore Default" msgstr "Kembalikan ke Bawaan" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Select" +msgstr "Pilih jalur" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -503,7 +502,7 @@ msgstr "Pengaturan" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Tampilkan nama teknis" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." @@ -842,7 +841,7 @@ msgstr "Terbang" #: src/guiKeyChangeMenu.cpp msgid "Toggle noclip" -msgstr "Tembus blok" +msgstr "Beralih tembus blok" #: src/guiKeyChangeMenu.cpp msgid "Use" @@ -1002,7 +1001,7 @@ msgstr "Kurang" #: src/keycode.cpp msgid "Mode Change" -msgstr "Mode Change" +msgstr "Pergantian Mode" #: src/keycode.cpp msgid "Next" @@ -1173,6 +1172,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = parallax occlusion with slope information (cepat).\n" +"1 = relief mapping (pelan, lebih akurat)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1218,8 +1219,9 @@ msgstr "" "Sebuah pesan yang akan ditampilkan ke semua klien ketika server dimatikan." #: src/settings_translation_file.cpp +#, fuzzy msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Batas absolut dari antrian muncul" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1320,11 +1322,11 @@ msgstr "Alamat sambungan" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "Bits per pixel (aka color depth) dalam mode layar penuh." +msgstr "Bit per piksel (alias kedalaman warna) dalam mode layar penuh." #: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "" +msgstr "Bangun di dalam pemain" #: src/settings_translation_file.cpp msgid "Bumpmapping" @@ -1395,9 +1397,8 @@ msgid "Clouds in menu" msgstr "Awan dalam menu" #: src/settings_translation_file.cpp -#, fuzzy msgid "Colored fog" -msgstr "Berwarna kabut" +msgstr "Kabut berwarna" #: src/settings_translation_file.cpp msgid "" @@ -1455,12 +1456,17 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Mengatur panjang siklus pagi/malam.\n" +"Contoh: 72 = 20 menit, 360 = 4 menit, 1 = 24 jam, 0 = pagi/malam/lainnya " +"tidak berubah." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Mengatur ukuran padang gurun dan pantai dalam Mapgen v6.\n" +"Jika snowbiomes di aktifkan 'mgv6_freq_desert' akan dihiraukan." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1736,11 +1742,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Mode akselerasi cepat" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Mode cepat" #: src/settings_translation_file.cpp msgid "Fast movement" @@ -1784,9 +1790,8 @@ msgid "Fixed map seed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fly key" -msgstr "Mode terbang" +msgstr "Tombol terbang" #: src/settings_translation_file.cpp msgid "Flying" @@ -1851,7 +1856,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Layar penuh" #: src/settings_translation_file.cpp msgid "Full screen BPP" @@ -1859,16 +1864,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Mode layar penuh." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Skala antarmuka" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "Skala antarmuka" +msgstr "Filter skala antarmuka" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" @@ -1973,6 +1977,8 @@ msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" +"Jika dinonaktifkan tombol \"gunakan\" digunakan untuk terbang cepat jika " +"mode terbang dan cepat diaktifkan." #: src/settings_translation_file.cpp msgid "" @@ -1980,6 +1986,9 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" +"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat." +"\n" +"Hal ini memerlukan hak istimewa \"noclip\" pada server." #: src/settings_translation_file.cpp msgid "" @@ -2149,6 +2158,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk bergerak cepat dalam mode cepat.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2242,6 +2254,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk beralih mode sinema.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2256,6 +2271,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk beralih mode cepat.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2265,11 +2283,15 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Key for toggling noclip mode.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk beralih mode tembus blok.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2659,7 +2681,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "Frekuensi padang gurun pada generator peta v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" @@ -2984,11 +3006,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Noclip" -msgstr "" +msgstr "Tembus blok" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "" +msgstr "Tombol tembus blok" #: src/settings_translation_file.cpp msgid "Node highlighting" @@ -3063,9 +3085,8 @@ msgid "Parallax occlusion iterations" msgstr "Parallax Occlusion" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "Parallax Occlusion" +msgstr "Mode parallax occlusion" #: src/settings_translation_file.cpp #, fuzzy @@ -3347,7 +3368,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "" +msgstr "Menghaluskan rotasi kamera dalam modus sinema. 0 untuk menonaktifkan." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." @@ -3470,7 +3491,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "Tombol beralih mode kamera" #: src/settings_translation_file.cpp msgid "Tooltip delay" From 7a8687b83c2c35b8288dae08d54ce5881b83e651 Mon Sep 17 00:00:00 2001 From: Paolo DGZ Date: Mon, 25 Jan 2016 18:13:15 +0100 Subject: [PATCH 299/531] Translated using Weblate (Italian) Currently translated at 52.7% (415 of 787 strings) --- po/it/minetest.po | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 80858d29..cde084ea 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-01-24 15:00+0000\n" +"PO-Revision-Date: 2016-01-25 18:13+0000\n" "Last-Translator: Paolo DGZ \n" "Language-Team: Italian " "\n" @@ -1277,9 +1277,8 @@ msgid "Anisotropic filtering" msgstr "Filtro anisotropico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Announce server" -msgstr "Server annunciato" +msgstr "Annuncia il server" #: src/settings_translation_file.cpp msgid "" @@ -3118,9 +3117,8 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Selez. ad area" +msgstr "Comando della selezione ad area" #: src/settings_translation_file.cpp msgid "Remote media" @@ -3228,14 +3226,12 @@ msgid "Server port" msgstr "Porta del server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Elenco dei server pubblici" +msgstr "URL della lista server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Elenco dei server pubblici" +msgstr "File della lista server" #: src/settings_translation_file.cpp msgid "" @@ -3345,9 +3341,8 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Pacch. immagini" +msgstr "Trama delle texture" #: src/settings_translation_file.cpp msgid "" From acf40f15cc6a25b48fd94786775d5a3414bf3194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= Date: Mon, 25 Jan 2016 08:35:47 +0100 Subject: [PATCH 300/531] Translated using Weblate (Spanish) Currently translated at 45.9% (362 of 787 strings) --- po/es/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index a5aefebb..5b1cc805 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-13 21:07+0000\n" -"Last-Translator: Joan Ciprià Moreno \n" +"PO-Revision-Date: 2016-01-25 08:35+0000\n" +"Last-Translator: Diego Martínez \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -469,7 +469,7 @@ msgstr "Juegos" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "Opcionalmente, la lagunaridad puede ser agregada con una coma anterior." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." From f9dd819ff9bd111a099f99233814a9e1ec3d179c Mon Sep 17 00:00:00 2001 From: Fixer Date: Mon, 25 Jan 2016 23:23:31 +0100 Subject: [PATCH 301/531] Translated using Weblate (Ukrainian) Currently translated at 30.4% (240 of 787 strings) --- po/uk/minetest.po | 175 +++++++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 81 deletions(-) diff --git a/po/uk/minetest.po b/po/uk/minetest.po index e6f13fae..c737ddb4 100644 --- a/po/uk/minetest.po +++ b/po/uk/minetest.po @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-09-21 23:18+0200\n" -"Last-Translator: Olexandr \n" -"Language-Team: Ukrainian \n" +"PO-Revision-Date: 2016-01-25 23:23+0000\n" +"Last-Translator: Fixer \n" +"Language-Team: Ukrainian " +"\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.4\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -42,24 +42,23 @@ msgstr "Повторне підключення" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Сервер запросив перез'єднання:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." msgstr "Завантаження..." #: builtin/mainmenu/common.lua -#, fuzzy msgid "Protocol version mismatch. " -msgstr "Неспівпадіння версій протоколу, сервер: " +msgstr "Версія протоколу не співпадає. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "Сервер працює за протоколом версії $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Сервер підтримує версії протоколу між $1 і $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -69,11 +68,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Ми підтримуємо тільки протокол версії $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Ми підтримуємо протокол між версіями $1 і $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -102,8 +101,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" -"Не вдалося ввімкнути mod \"$1\", бо він містить заборонені символи. " -"Дозволяється використання таких символів: [a-z0-9_]." +"Не вдалося ввімкнути модифікацію \"$1\", тому що вона містить заборонені " +"символи. Дозволяється використання таких символів: [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -152,7 +151,7 @@ msgstr "Гра" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Генератор карти" +msgstr "Генератор світу" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -168,7 +167,7 @@ msgstr "Увага: мінімальна тестова версія призн #: builtin/mainmenu/dlg_create_world.lua msgid "World name" -msgstr "Назва Світу" +msgstr "Назва світу" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." @@ -208,7 +207,7 @@ msgstr "Прийняти" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "" +msgstr "Перейменувати Збірку модифікацій:" #: builtin/mainmenu/modmgr.lua msgid "" @@ -235,6 +234,8 @@ msgstr "" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" +"Встановлення модифікації: неможливо знайти відповідну назву папки для збірки " +"модифікацій $1" #: builtin/mainmenu/store.lua msgid "Close store" @@ -250,7 +251,7 @@ msgstr "Встановити" #: builtin/mainmenu/store.lua msgid "Page $1 of $2" -msgstr "Сторінка $1 із $2" +msgstr "Сторінка $1 з $2" #: builtin/mainmenu/store.lua msgid "Rating" @@ -282,7 +283,7 @@ msgstr "Активні учасники" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" -msgstr "" +msgstr "Основні розробники" #: builtin/mainmenu/tab_credits.lua msgid "Credits" @@ -290,11 +291,11 @@ msgstr "Подяка" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" -msgstr "" +msgstr "Попередні помічники" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "" +msgstr "Попередні основні розробники" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -326,7 +327,7 @@ msgstr "Видалити обрану модифікацію" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" -msgstr "" +msgstr "Видалити обрану збірку модифікацій" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" @@ -342,7 +343,7 @@ msgstr "Під'єднатися" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" -msgstr "Режим творчості" +msgstr "Творчий режим" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Damage enabled" @@ -363,11 +364,12 @@ msgstr "Список публічних серверів" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" -msgstr "PvP увімкнено" +msgstr "Бої увімкнено" #: builtin/mainmenu/tab_server.lua +#, fuzzy msgid "Bind Address" -msgstr "" +msgstr "Закріпити адресу" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" @@ -381,7 +383,7 @@ msgstr "Режим Створення" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Enable Damage" -msgstr "Увімкнути ушкодження" +msgstr "Увімкнути травмування" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua msgid "Name/Password" @@ -413,7 +415,7 @@ msgstr "Сервер" #: builtin/mainmenu/tab_server.lua msgid "Server Port" -msgstr "" +msgstr "Порт сервера" #: builtin/mainmenu/tab_server.lua msgid "Start Game" @@ -421,19 +423,19 @@ msgstr "Почати гру" #: builtin/mainmenu/tab_settings.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" не є правильним параметром." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(пояснення відсутнє)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "" +msgstr "Проглянути" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" -msgstr "Змінити клавіши" +msgstr "Змінити клавіші" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -442,27 +444,28 @@ msgstr "Вимкнути багатокористувацьку гру" #: builtin/mainmenu/tab_settings.lua msgid "Edit" -msgstr "" +msgstr "Правити" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enabled" msgstr "Увімкнено" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "Формат: 3 номера, відокремлених комами і всередині дужок." #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Формат: , , (, , ), , " +", " #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Games" -msgstr "Гра" +msgstr "Ігри" #: builtin/mainmenu/tab_settings.lua msgid "Optionally the lacunarity can be appended with a leading comma." @@ -470,28 +473,27 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Будь-ласка введіть перелік параметрів через кому." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Будь-ласка введіть дійсне ціле число." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Будь-ласка введіть дійсний номер." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "" +msgstr "Можливі значення: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" -msgstr "" +msgstr "Відновити як було" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Select path" -msgstr "Обрати" +msgstr "Вибрати шлях" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -499,15 +501,15 @@ msgstr "Налаштування" #: builtin/mainmenu/tab_settings.lua msgid "Show technical names" -msgstr "" +msgstr "Показувати технічні назви" #: builtin/mainmenu/tab_settings.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "Значення має бути більше за $1." #: builtin/mainmenu/tab_settings.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "Значення має бути менше ніж $1." #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -520,7 +522,7 @@ msgstr "Головне Меню" #: builtin/mainmenu/tab_simple_main.lua msgid "Start Singleplayer" -msgstr "Почати однокористувацьку гру" +msgstr "Почати одиночну гру" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -556,15 +558,15 @@ msgstr "Виконано!" #: src/client.cpp msgid "Initializing nodes" -msgstr "Ініціалізація вузлів" +msgstr "Ініціалізація блоків" #: src/client.cpp msgid "Initializing nodes..." -msgstr "Ініціалізація вузлів..." +msgstr "Ініціалізація блоків..." #: src/client.cpp msgid "Item textures..." -msgstr "Текстура предметів..." +msgstr "Текстури предметів..." #: src/client.cpp msgid "Loading textures..." @@ -596,7 +598,7 @@ msgstr "Жоден світ не вибрано та не надано адре #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "Ім'я гравця надто довге." +msgstr "Ім'я гравця занадто довге." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " @@ -652,10 +654,10 @@ msgid "" "- Mouse wheel: select item\n" "- T: chat\n" msgstr "" -"Управління за замовчанням:\n" +"Стандартне керування клавішами:\n" "- WASD: рух\n" -"- Space: стрибок/лізти в гору\n" -"- Shift: крастися/лізти в низ\n" +"- Space: стрибок/лізти вгору\n" +"- Shift: крастися/лізти вниз\n" "- Q: кинути предмет\n" "- I: інвентар\n" "- Мишка: поворот/дивитися\n" @@ -679,7 +681,7 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" -"Керування за замовчуванням:\n" +"Стандартне керування дотиком:\n" "Коли меню не відображається:\n" "- один дотик: активувати кнопку\n" "- дотикнутися двічі: встановити/використати\n" @@ -706,19 +708,20 @@ msgstr "Визначення предметів..." #: src/game.cpp msgid "KiB/s" -msgstr "" +msgstr "КіБ/сек" #: src/game.cpp +#, fuzzy msgid "Media..." -msgstr "" +msgstr "Ресурси..." #: src/game.cpp msgid "MiB/s" -msgstr "" +msgstr "МіБ/сек" #: src/game.cpp msgid "Node definitions..." -msgstr "" +msgstr "Визначення блоків..." #: src/game.cpp src/guiFormSpecMenu.cpp msgid "Proceed" @@ -746,14 +749,13 @@ msgstr "Ви загинули." #: src/guiFormSpecMenu.cpp msgid "Enter " -msgstr "" +msgstr "Ввід " #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "" +msgstr "гаразд" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "\"Use\" = climb down" msgstr "\"Використовувати\" = підніматися в гору" @@ -767,7 +769,7 @@ msgstr "Чат" #: src/guiKeyChangeMenu.cpp msgid "Command" -msgstr "Комманда" +msgstr "Команда" #: src/guiKeyChangeMenu.cpp msgid "Console" @@ -775,7 +777,7 @@ msgstr "Консоль" #: src/guiKeyChangeMenu.cpp msgid "Double tap \"jump\" to toggle fly" -msgstr "Подвійний \"Стрибок\" щоб полетіти" +msgstr "Двічі доторкніться до \"стрибок\" щоб полетіти" #: src/guiKeyChangeMenu.cpp msgid "Drop" @@ -808,8 +810,9 @@ msgid "Left" msgstr "Ліворуч" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp +#, fuzzy msgid "Print stacks" -msgstr "Надрукувати стек" +msgstr "Надрукувати купи" #: src/guiKeyChangeMenu.cpp msgid "Range select" @@ -824,9 +827,8 @@ msgid "Sneak" msgstr "Крастися" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Переключити швидкий режим" +msgstr "Переключити кінематографічний режим" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -838,7 +840,7 @@ msgstr "Переключити режим польоту" #: src/guiKeyChangeMenu.cpp msgid "Toggle noclip" -msgstr "Переключити режим проходження скрізь стін" +msgstr "Переключити режим проходження крізь стіни" #: src/guiKeyChangeMenu.cpp msgid "Use" @@ -920,8 +922,9 @@ msgid "Down" msgstr "Вниз" #: src/keycode.cpp +#, fuzzy msgid "End" -msgstr "Кінець" +msgstr "End" #: src/keycode.cpp #, fuzzy @@ -976,7 +979,7 @@ msgstr "Ліва кнопка" #: src/keycode.cpp msgid "Left Control" -msgstr "Ліва клавіша Control" +msgstr "Ліва клавіша Ctrl" #: src/keycode.cpp msgid "Left Menu" @@ -988,7 +991,7 @@ msgstr "Ліва клавіша Shift" #: src/keycode.cpp msgid "Left Windows" -msgstr "Ліва клавіша Win (Command)" +msgstr "Ліва клавіша Win" #: src/keycode.cpp msgid "Menu" @@ -1007,27 +1010,31 @@ msgid "Mode Change" msgstr "Змінити режим" #: src/keycode.cpp +#, fuzzy msgid "Next" -msgstr "Page Up" +msgstr "Наступний" #: src/keycode.cpp #, fuzzy msgid "Nonconvert" -msgstr "Не конвертуванно" +msgstr "Не обернено" #: src/keycode.cpp msgid "Num Lock" msgstr "Num Lock" #: src/keycode.cpp +#, fuzzy msgid "Numpad *" msgstr "Num *" #: src/keycode.cpp +#, fuzzy msgid "Numpad +" msgstr "Num +" #: src/keycode.cpp +#, fuzzy msgid "Numpad -" msgstr "Num -" @@ -1076,6 +1083,7 @@ msgid "Numpad 9" msgstr "Num 9" #: src/keycode.cpp +#, fuzzy msgid "OEM Clear" msgstr "Очистити OEM" @@ -1100,6 +1108,7 @@ msgid "Print" msgstr "Print Screen" #: src/keycode.cpp +#, fuzzy msgid "Prior" msgstr "Page Down" @@ -1109,12 +1118,13 @@ msgid "Return" msgstr "Enter" #: src/keycode.cpp +#, fuzzy msgid "Right Button" msgstr "Права кнопка" #: src/keycode.cpp msgid "Right Control" -msgstr "Права клавіша Control" +msgstr "Права клавіша Ctrl" #: src/keycode.cpp msgid "Right Menu" @@ -1126,7 +1136,7 @@ msgstr "Права клавіша Shift" #: src/keycode.cpp msgid "Right Windows" -msgstr "Права клавіша Win (Command)" +msgstr "Права клавіша Win" #: src/keycode.cpp msgid "Scroll Lock" @@ -1175,19 +1185,21 @@ msgid "Zoom" msgstr "Збільшити" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = технологія \"parallax occlusion\" з інформацією про криві (швидше)\n" +"1 = технологія \"relief mapping\" (повільніше, більш акуратніше)" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" -msgstr "3D Хмари" +msgstr "Об'ємні хмари" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "3D режим" #: src/settings_translation_file.cpp msgid "" @@ -3028,8 +3040,9 @@ msgid "Overall scale of parallax occlusion effect." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Parallax Occlusion" -msgstr "Оклюзія паралакса" +msgstr "Parallax Occlusion" #: src/settings_translation_file.cpp #, fuzzy From 8019562b0d63e3f1bd595276e77c39a8bb5cb10a Mon Sep 17 00:00:00 2001 From: Amadeo Date: Sun, 31 Jan 2016 17:19:31 +0100 Subject: [PATCH 302/531] Translated using Weblate (Polish) Currently translated at 33.9% (267 of 787 strings) --- po/pl/minetest.po | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/po/pl/minetest.po b/po/pl/minetest.po index 17888d00..ef967dfe 100644 --- a/po/pl/minetest.po +++ b/po/pl/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-12 13:08+0000\n" -"Last-Translator: Maciej Kasatkin \n" +"PO-Revision-Date: 2016-01-31 17:19+0000\n" +"Last-Translator: Amadeo \n" "Language-Team: Polish " "\n" "Language: pl\n" @@ -289,9 +289,8 @@ msgid "Previous Contributors" msgstr "Byli współautorzy" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "Twórcy" +msgstr "Poprzedni Główni Twórcy" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -339,7 +338,6 @@ msgid "Connect" msgstr "Połącz" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" msgstr "Tryb kreatywny" @@ -366,7 +364,7 @@ msgstr "PvP włączone" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" -msgstr "" +msgstr "Przypisz Adres" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" @@ -511,14 +509,12 @@ msgid "Config mods" msgstr "Skonfiguruj mody" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" msgstr "Menu główne" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Start Singleplayer" -msgstr "Pojedynczy gracz" +msgstr "Tryb jednoosobowy" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -541,14 +537,12 @@ msgid "Select texture pack:" msgstr "Wybierz paczkę tekstur:" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Texturepacks" msgstr "Paczki tekstur" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Błąd połączenia (brak odpowiedzi?)" +msgstr "Przekroczono limit czasu połączenia." #: src/client.cpp msgid "Done!" @@ -615,7 +609,6 @@ msgstr "" "Sprawdź plik debug.txt by uzyskać więcej informacji." #: src/game.cpp -#, fuzzy msgid "Change Keys" msgstr "Zmień klawisze" @@ -636,7 +629,6 @@ msgid "Creating client..." msgstr "Tworzenie klienta..." #: src/game.cpp -#, fuzzy msgid "Creating server..." msgstr "Tworzenie serwera...." @@ -681,6 +673,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Domyślne sterowanie:\n" +"Brak widocznego menu:\n" +"- pojedyncze dotknięcie: aktywacja\n" +"- podwójne dotknięcie: postaw/użyj\n" +"- przejechanie palcem: rozglądanie się\n" +"Menu/Ekwipunek widoczny:\n" +"- potwójne dotknięcie poza menu:\n" +" -->zamknij\n" +"- dotknięcie stacka, dotknięcie slota:\n" +" --> przenieś stack\n" +"- dotknięcie i przeciągnięcie, dotknięcie drugim palcem\n" +" --> umieść pojedynczy item w slocie\n" #: src/game.cpp msgid "Exit to Menu" @@ -696,7 +700,7 @@ msgstr "Definicje przedmiotów..." #: src/game.cpp msgid "KiB/s" -msgstr "" +msgstr "KiB/s" #: src/game.cpp msgid "Media..." @@ -704,7 +708,7 @@ msgstr "Media..." #: src/game.cpp msgid "MiB/s" -msgstr "" +msgstr "MiB/s" #: src/game.cpp msgid "Node definitions..." @@ -723,7 +727,6 @@ msgid "Respawn" msgstr "Wróć do gry" #: src/game.cpp -#, fuzzy msgid "Shutting down..." msgstr "Wyłączanie..." @@ -737,11 +740,11 @@ msgstr "Zginąłeś." #: src/guiFormSpecMenu.cpp msgid "Enter " -msgstr "" +msgstr "Enter " #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "" +msgstr "ok" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -814,9 +817,8 @@ msgid "Sneak" msgstr "Skradanie" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Przełącz tryb szybki" +msgstr "Włącz/Wyłącz tryb Cinematic" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1161,13 +1163,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "Chmury 3D" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "Modele 3D" #: src/settings_translation_file.cpp msgid "" From 8dcc808b507ec796da75aab5884c6714ecf7786d Mon Sep 17 00:00:00 2001 From: Bruno Borges Date: Wed, 3 Feb 2016 20:31:55 +0100 Subject: [PATCH 303/531] Translated using Weblate (Portuguese (Brazil)) Currently translated at 65.5% (516 of 787 strings) --- po/pt_BR/minetest.po | 481 +++++++++++++++++++++++++++++-------------- 1 file changed, 323 insertions(+), 158 deletions(-) diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index 4728e7ef..a673c993 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-01-14 20:25+0000\n" -"Last-Translator: Ian giestas pauli \n" +"PO-Revision-Date: 2016-02-03 20:31+0000\n" +"Last-Translator: Bruno Borges \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -62,7 +62,7 @@ msgstr "O servidor suporta entre as versões $1 e $2 do protocolo. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" -"Tente reabilitar a lista de servidores publicos e checar sua conexão de " +"Tente reabilitar a lista de servidores públicos e checar sua conexão de " "internet." #: builtin/mainmenu/common.lua @@ -81,7 +81,7 @@ msgstr "Cancelar" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua msgid "Depends:" -msgstr "Depende de:" +msgstr "Dependências:" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" @@ -89,7 +89,7 @@ msgstr "Desabilitar PMs" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" -msgstr "Habilitar PMs" +msgstr "Habilitar MP" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" @@ -428,7 +428,7 @@ msgstr "\"$1\" não é uma flag válida." #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "(Nenhuma descrição das configurações foi fornecida)" +msgstr "(Descrição de configuração não fornecida)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" @@ -452,7 +452,7 @@ msgstr "Habilitado" #: builtin/mainmenu/tab_settings.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "O formato é de 3 números separados por virgulas e dentro de colchetes." +msgstr "O formato é de 3 números separados por vírgulas dentro de colchetes." #: builtin/mainmenu/tab_settings.lua msgid "" @@ -477,11 +477,11 @@ msgstr "Por favor, digite uma lista de flags separadas por vírgulas." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid integer." -msgstr "Por favor entre com um inteiro válido." +msgstr "Por favor insira um inteiro válido." #: builtin/mainmenu/tab_settings.lua msgid "Please enter a valid number." -msgstr "Por favor entre com um número válido." +msgstr "Por favor, insira um número válido." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " @@ -516,14 +516,12 @@ msgid "Config mods" msgstr "Configurar Mods" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" -msgstr "Menu principal" +msgstr "Principal" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Start Singleplayer" -msgstr "Um jogador" +msgstr "Iniciar Um jogador" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -546,7 +544,6 @@ msgid "Select texture pack:" msgstr "Selecione o pacote de texturas:" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Texturepacks" msgstr "Pacotes de texturas" @@ -621,7 +618,6 @@ msgstr "" "Verifique o debug.txt para mais detalhes." #: src/game.cpp -#, fuzzy msgid "Change Keys" msgstr "Mudar teclas" @@ -642,7 +638,6 @@ msgid "Creating client..." msgstr "Criando o cliente..." #: src/game.cpp -#, fuzzy msgid "Creating server..." msgstr "Criando o servidor..." @@ -741,7 +736,6 @@ msgid "Respawn" msgstr "Reviver" #: src/game.cpp -#, fuzzy msgid "Shutting down..." msgstr "Desligando tudo..." @@ -754,7 +748,6 @@ msgid "You died." msgstr "Você morreu." #: src/guiFormSpecMenu.cpp -#, fuzzy msgid "Enter " msgstr "Entrar " @@ -1177,9 +1170,10 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = oclusão paralaxe com dados de inclinação (mais rápido).\n" +"1 = mapeamento de relevo (mais lento, mais preciso)." #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "Nuvens 3D" @@ -1227,7 +1221,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Limite absoluto de emergir filas" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1239,7 +1233,7 @@ msgstr "Limite para blocos ativos" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Alcance para envio de objetos ativos" #: src/settings_translation_file.cpp msgid "" @@ -1264,6 +1258,9 @@ msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Ajustar a gama de codificação para a tabela de claridade. Os números mais " +"baixos são mais brilhantes.\n" +"Esta configuração é somente para o cliente e é ignorada pelo servidor." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1271,14 +1268,13 @@ msgstr "Avançado" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Sempre voar e correr" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Gama de oclusão de ambiente" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" msgstr "Filtragem anisotrópica" @@ -1292,14 +1288,17 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Anunciar a esta lista de servidores.\n" +"Se você quiser anunciar seu endereço IPv6, use serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Peça para reconectar depois de queda" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Informar lista de servidores automaticamente." #: src/settings_translation_file.cpp #, fuzzy @@ -1311,7 +1310,6 @@ msgid "Basic" msgstr "Básico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" msgstr "Filtragem bi-linear" @@ -1331,9 +1329,8 @@ msgid "Build inside player" msgstr "Construir com o jogador dentro do bloco" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bumpmapping" -msgstr "Mipmapping" +msgstr "Bump mapping" #: src/settings_translation_file.cpp msgid "Camera smoothing" @@ -1348,18 +1345,16 @@ msgid "Camera update toggle key" msgstr "Tecla para alternar atualização da câmera" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Mudar teclas" +msgstr "Tecla de Chat" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Mudar teclas" +msgstr "Tecla comutadora de chat" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Tamanho do chunk" #: src/settings_translation_file.cpp msgid "Cinematic mode" @@ -1371,7 +1366,7 @@ msgstr "Tecla para modo cinematográfico" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Texturas transparentes limpas" #: src/settings_translation_file.cpp msgid "Client and Server" @@ -1415,9 +1410,8 @@ msgstr "" "request_insecure_environment())." #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Comando" +msgstr "Tecla de Comando" #: src/settings_translation_file.cpp msgid "Connect glass" @@ -1452,9 +1446,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "Movimento contínuo para frente (apenas usado para testes)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Ctrl" +msgstr "Controles" #: src/settings_translation_file.cpp msgid "" @@ -1548,24 +1541,30 @@ msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Tempo limite padrão para cURL, indicado em milissegundos.\n" +"Só tem efeito se compilado com cURL." #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"Define processo amostral de textura.\n" +"Um valor mais alto resulta em mais suaves mapas normais." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" +"Define a distância máxima de transferência de jogadores em blocos (0 = " +"ilimitado)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Dicas de ferramenta mostrando atraso. indicado em milissegundos." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Tratamento da API Lua rejeitado" #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1576,18 +1575,20 @@ msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"Descrição do servidor, a ser exibida quando os jogadores se se conectarem e " +"na lista de servidores." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "Dessincronizar animação do bloco" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" +msgstr "Dados detalhados do perfil do mod . Útil para desenvolvedores de mods." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "Perfilamento detalhado do mod" #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1602,14 +1603,12 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "Domínio do servidor, para ser mostrado na lista de servidores." #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "\"Pular\" duas vezes ativa o voo" +msgstr "\"Pular\" duas vezes ativa o vôo" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "\"Pular\" duas vezes ativa o voo" +msgstr "\"Pular\" duas vezes alterna o modo vôo." #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1654,6 +1653,8 @@ msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"Ativar iluminação suave com oclusão de ambiente simples.\n" +"Desativada para andar rápido ou para visões diferentes." #: src/settings_translation_file.cpp msgid "" @@ -1676,6 +1677,10 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Permitir o uso de servidor de mídia remoto (se fornecido pelo servidor).\n" +"Servidores remotos oferecem uma maneira significativamente mais rápida\n" +"para fazer o download de mídia (por exemplo texturas) ao se conectar ao " +"servidor." #: src/settings_translation_file.cpp msgid "" @@ -1683,6 +1688,11 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Habilitar/desabilitar a execução de um IPv6 do servidor. Um servidor com " +"IPv6 pode \n" +"ser restringido para clientes com IPv6, dependendo da configuração do " +"sistema.\n" +"Ignorado se bind_address estiver definido." #: src/settings_translation_file.cpp msgid "" @@ -1691,10 +1701,14 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"Ativar texturização bump mapping para texturas. Normalmaps precisam ser " +"fornecidos pelo\n" +"pacote de textura ou a necessidade de ser auto-gerada.\n" +"Requer shaders a serem ativados." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." -msgstr "" +msgstr "Ativar armazenamento em cache de direção de face girada das malhas." #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -1705,30 +1719,37 @@ msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" +"Ativa geração de normalmap (efeito de relevo) ao voar.\n" +"Requer texturização bump mapping para ser ativado." #: src/settings_translation_file.cpp msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"Ativar mapeamento de oclusão de paralaxe.\n" +"Requer shaders a serem ativados." #: src/settings_translation_file.cpp msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Opção experimental, pode causar espaços visíveis entre blocos\n" +"quando definido como número maior do que 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS em menu de pausa" #: src/settings_translation_file.cpp +#, fuzzy msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "Cair balançando" #: src/settings_translation_file.cpp #, fuzzy @@ -1749,7 +1770,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Tecla de correr" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" @@ -1768,6 +1789,8 @@ msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Movimento rápido (use a tecla).\n" +"Isso requer o privilegio \"fast\" no servidor." #: src/settings_translation_file.cpp msgid "Field of view" @@ -1792,6 +1815,10 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" +"Texturas filtradas podem misturar valores RGB com os vizinhos totalmente \n" +"transparentes, o qual otimizadores PNG geralmente descartam, por vezes \n" +"resultando em um escuro ou luz para texturas transparentes.\n" +"Aplicar esse filtro para limpar isso no tempo de carregamento da textura." #: src/settings_translation_file.cpp #, fuzzy @@ -1800,47 +1827,47 @@ msgstr "Filtragem anisotrópica" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Semente do mapa fixa" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "" +msgstr "Tecla de voar" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Voando" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Névoa" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Tecla de comutação de névoa" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Caminho fonte" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Fonte de sombra" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Fonte alpha de sombra" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Fonte alpha de sombra (opacidade, entre 0 e 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" +msgstr "Fonte de compensador de sombra, se 0 então sombra não será desenhada." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Tamanho da fonte" #: src/settings_translation_file.cpp #, fuzzy @@ -1849,55 +1876,61 @@ msgstr "Avançar" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Fontes Freetype" #: src/settings_translation_file.cpp msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"De quão longe blocos são gerados para os clientes, indicado em mapa de " +"blocos (16 nós)." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"De quão longe blocos são enviados aos clientes, indicado em mapas de blocos (" +"16 nós)." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" +"De quão longe os clientes sabem sobre objetos, indicado em mapas blocos (16 " +"nós)." #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Tela cheia" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "Tela cheia BPP" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Modo tela cheia." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Escala da GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter" -msgstr "" +msgstr "Filtro de escala da GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "Filtro txr2img de escala da GUI" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gama" #: src/settings_translation_file.cpp msgid "Generate normalmaps" -msgstr "" +msgstr "Gerar normalmaps" #: src/settings_translation_file.cpp msgid "" @@ -1907,18 +1940,23 @@ msgid "" "Flags starting with \"no\" are used to explicitly disable them.\n" "'trees' and 'flat' flags only have effect in mgv6." msgstr "" +"Atributos geração de mapa global.\n" +"Flags que não estão especificadas na string de flags não são modificados a " +"partir do padrão.\n" +"Flags começando com \"não\" são usadas para desativá-los explicitamente.\n" +"Flags 'trees' e 'flat' só tem efeito em mgv6." #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Gráficos" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravidade" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "Tecla de comutação HUD" #: src/settings_translation_file.cpp msgid "" @@ -1927,22 +1965,29 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +"Manipulação para chamadas de API Lua reprovados:\n" +"- legacy: (tentar) imitar o comportamento antigo (padrão para a " +"liberação).\n" +"- log: imitação e log de retraçamento da chamada reprovada (padrão para " +"depuração).\n" +"- error: abortar no uso da chamada reprovada (sugerido para " +"desenvolvedores de mods)." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "Altura em que as nuvens ficam aparecendo." #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "FPU de alta precisão" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "Pagina principal do servidor, a ser exibido na lista de servidores." #: src/settings_translation_file.cpp msgid "Horizontal initial window size." -msgstr "" +msgstr "Tamanho horizontal inicial da janela." #: src/settings_translation_file.cpp msgid "" @@ -1950,6 +1995,9 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" +"Quão grande área de blocos estão sujeitos ao material do bloco ativo, " +"indicado em mapas blocos (16 nós).\n" +"Em blocos ativos objetos são carregados e ABMs são executadas." #: src/settings_translation_file.cpp msgid "" @@ -1965,30 +2013,36 @@ msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" +"Quanto o servidor aguardará antes de descarregar mapblocks não utilizados. " +"Um valor mais elevado é mais suave, mas vai usar mais memória RAM." #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "Servidor de IPv6" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "Suporte a IPv6." #: src/settings_translation_file.cpp msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"Se o FPS for mais elevado do que isso, limitá-lo dormindo\n" +"para não gastar a potência da CPU desnecessariamente." #: src/settings_translation_file.cpp msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" +"Se tecla \"usar\" estiver desabilitada então ela vai ser usada para voar " +"rápido se modo de voar e rápido estiverem habilitados." #: src/settings_translation_file.cpp msgid "" @@ -1996,32 +2050,41 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" +"Se habilitado juntamente com o modo de vôo, o jogador é capaz de voar " +"através de nós de sólidos.\n" +"Isso requer o privilégio \"noclip\" no servidor." #: src/settings_translation_file.cpp msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" +"Se habilitado, tecla de \"usar\" em vez de \"esgueirar\" servirá para usada " +"descer." #: src/settings_translation_file.cpp msgid "" "If enabled, actions are recorded for rollback.\n" "This option is only read when server starts." msgstr "" +"Se habilitado, as ações são registradas para reversão.\n" +"Esta opção só é lido quando o servidor é iniciado." #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "" +msgstr "Se habilitado, desabilita prevenção de fraude no modo multijogador." #: src/settings_translation_file.cpp msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" +"Se habilitado, dados inválidos do mundo não vão causar o queda do servidor.\n" +"Só habilite isso, se você souber o que está fazendo." #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." -msgstr "" +msgstr "Se habilitado, novos jogadores não podem entrar com uma senha vazia." #: src/settings_translation_file.cpp msgid "" @@ -2029,68 +2092,80 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Se habilitado, você pode colocar os blocos na posição (pés + nível dos olhos)" +" onde você está.\n" +"Isto é útil quando se trabalha com nodeboxes em pequenas áreas." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." msgstr "" +"Se isso for definido, os jogadores vão sempre (re)desovar na posição " +"determinada." #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Ignorar erros do mundo" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Jogo" +msgstr "No jogo" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." msgstr "" +"Valor alfa do fundo do console do bate-papo no jogo (opacidade, entre 0 e " +"255)." #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Cor de fundo do Bate-papo no jogo (R,G,B)." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." msgstr "" +"Intervalo para cada salvamento de alterações importantes no mundo, indicado " +"em segundos." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "" +msgstr "Intervalo de envio de hora do dia para os clientes." #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" msgstr "Inventário" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Mouse invertido" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Inverta o movimento vertical do mouse." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "Entidade item TTL" #: src/settings_translation_file.cpp msgid "" "Julia set: (X,Y,Z) offsets from world centre.\n" "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." msgstr "" +"Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n" +"Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos em " +"nós." #: src/settings_translation_file.cpp msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "" +msgstr "Julia definido: Valores aproximados (X, Y, Z) em nós." #: src/settings_translation_file.cpp msgid "" "Julia set: Iterations of the recursive function.\n" "Controls scale of finest detail." msgstr "" +"Julia Definido: iterações da função recursiva.\n" +"Controles escala de pormenor." #: src/settings_translation_file.cpp msgid "" @@ -2123,13 +2198,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" msgstr "Pular" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "Velocidade de Pulo" #: src/settings_translation_file.cpp msgid "" @@ -2137,6 +2211,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para diminuir o intervalo de visualização. Modifica o intervalo mínimo " +"de visualização.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2144,6 +2222,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para deixar cair o item atualmente selecionado.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2151,6 +2232,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para aumentar o intervalo de visualização. Modifica o mínimo intervalo " +"de visualização.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2158,6 +2243,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para pular.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2165,6 +2253,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para mover-se rápido no modo rápido.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2172,6 +2263,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para mover o jogador para trás.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2179,6 +2273,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para mover o jogador para a frente.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2186,6 +2283,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para mover o jogador à esquerda.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2193,6 +2293,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para mover o jogador para a direita.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2200,6 +2303,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para abrir o console do bate-papo.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2207,6 +2313,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para abrir a janela de bate-papo para digitar comandos.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2214,6 +2323,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para abrir a janela de bate-papo.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2221,6 +2333,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para abrir o inventário.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2228,6 +2343,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para imprimir pilhas de depuração. Usado para o desenvolvimento.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2237,6 +2355,11 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla por esgueirar.\n" +"Também usado para descer e descendente na água se aux1_descends está " +"desativado.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2244,6 +2367,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para comutação entre câmera de primeira e terceira pessoa.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2251,6 +2377,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para tirar fotos da tela.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2258,6 +2387,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar modo cinematográfico.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2265,6 +2397,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Chave para ativar/desativar a exibição do minimapa.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2272,6 +2407,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar o modo rápido.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2279,6 +2417,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para alternar a voar.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2286,6 +2427,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para alternar modo noclip.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2293,6 +2437,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a atualização da câmera. Usado somente para " +"desenvolvimento\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2300,6 +2448,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a exibição de informações de depuração.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2307,6 +2458,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a exibição do HUD.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2314,6 +2468,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a exibição do bate-papo.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2321,6 +2478,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a exibição da névoa.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2328,6 +2488,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a exibição do profiler. Usado para o " +"desenvolvimento.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2335,18 +2499,21 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para alternar o alcance de visão ilimitado.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "Tecla usada para descer/esgueirar" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Linguagem" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Estilo de folhas" #: src/settings_translation_file.cpp msgid "" @@ -2355,6 +2522,10 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Folhas de estilo:\n" +"- Fancy: todas as faces visíveis\n" +"- Simple: apenas faces externas, se definidos special_tiles\n" +"- Opaque: desativar transparência" #: src/settings_translation_file.cpp #, fuzzy @@ -2366,6 +2537,8 @@ msgid "" "Length of a server tick and the interval at which objects are generally " "updated over network." msgstr "" +"Comprimento de um tick de servidor e o intervalo no qual os objetos são " +"geralmente atualizados em rede." #: src/settings_translation_file.cpp msgid "" @@ -2378,14 +2551,22 @@ msgid "" "- info\n" "- verbose" msgstr "" +"Nível de registro a serem gravados em debug.txt:\n" +"- (nenhum)\n" +"- none (mensagens sem nível de log)\n" +"- error\n" +"- warning\n" +"- action\n" +"- info\n" +"- verbose" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "" +msgstr "Limite de filas emerge no disco" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "" +msgstr "Limite de filas emerge para gerar" #: src/settings_translation_file.cpp msgid "" @@ -2395,30 +2576,37 @@ msgid "" "- Downloads performed by main menu (e.g. mod manager).\n" "Only has an effect if compiled with cURL." msgstr "" +"Limites número de solicitações HTTP paralelas. afeta:\n" +"- Media buscar se servidor usa configuração de remote_media.\n" +"- Download de lista de servidores e anúncio do servidor.\n" +"- Transferências realizadas pelo menu principal (por exemplo gerência de " +"mods).\n" +"Só tem efeito se compilado com cURL." #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "Fluidez líquida" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "Suavização do fluido líquido" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "" +msgstr "Limite de iteração do liquido" #: src/settings_translation_file.cpp +#, fuzzy msgid "Liquid queue purge time" -msgstr "" +msgstr "Tempo de limpeza de fila de líquido" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "Dissipação em liquido" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "Intervalo de atualização de líquido em segundos." #: src/settings_translation_file.cpp msgid "Liquid update tick" @@ -2426,26 +2614,26 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "Menu principal gestor de games" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Menu principal" +msgstr "Menu principal gestor de mods" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Menu principal" +msgstr "Menu principal do script" #: src/settings_translation_file.cpp msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" +"Fazer cores de névoa e céu dependerem do dia (amanhecer/pôr do sol) e exibir " +"a direção." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." -msgstr "" +msgstr "Faz o DirectX trabalhar com LuaJIT. Desative se causa problemas." #: src/settings_translation_file.cpp msgid "" @@ -2471,7 +2659,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Diretório do mapa" #: src/settings_translation_file.cpp msgid "" @@ -2503,19 +2691,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "Limite de geração de mapa" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "Intervalo de salvamento de mapa" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "Limite de mapblock" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "" +msgstr "Timeout de descarregamento do mapblock" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2530,14 +2718,12 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Mapgen" +msgstr "Debug do mapgen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Mapgen" +msgstr "Flags de mapgen" #: src/settings_translation_file.cpp #, fuzzy @@ -2618,14 +2804,12 @@ msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Mapgen" +msgstr "Nome do mapgen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Mapgen" +msgstr "Mapgen v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2648,9 +2832,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Mapgen" +msgstr "Mapgen v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2709,9 +2892,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Mapgen" +msgstr "Mapgen v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2873,9 +3055,8 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" -msgstr "Menu" +msgstr "Menus" #: src/settings_translation_file.cpp msgid "Mesh cache" @@ -2913,7 +3094,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" msgstr "Mipmapping" @@ -3130,9 +3310,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Preload inventory textures" -msgstr "Carregando..." +msgstr "pré-carregando texturas de inventário" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." @@ -3255,39 +3434,32 @@ msgid "Server / Singleplayer" msgstr "Um jogador" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Servidor" +msgstr "URL do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Porta do servidor" +msgstr "Endereço do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Porta do servidor" +msgstr "Descrição do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Servidor" +msgstr "Nome do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "Porta do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Servidores públicos" +msgstr "URL da lista de servidores" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Servidores públicos" +msgstr "arquivo da lista de servidores" #: src/settings_translation_file.cpp msgid "" @@ -3343,7 +3515,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" msgstr "Iluminação suave" @@ -3362,7 +3533,6 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" msgstr "Esgueirar" @@ -3399,7 +3569,6 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" msgstr "Pacotes de texturas" @@ -3484,7 +3653,6 @@ msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "Filtragem tri-linear" @@ -3528,7 +3696,6 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" msgstr "press. uma tecla" @@ -3541,9 +3708,8 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Desenvolvedores principais" +msgstr "Útil para desenvolvedores de mods." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3611,9 +3777,8 @@ msgid "Waving Nodes" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" -msgstr "Árvores melhores" +msgstr "Balanço das árvores" #: src/settings_translation_file.cpp msgid "Waving plants" From f63a7a8d8b28f0b28f0ef4e2b603c44f10c72c96 Mon Sep 17 00:00:00 2001 From: Laura Arjona Reina Date: Tue, 2 Feb 2016 19:22:47 +0100 Subject: [PATCH 304/531] Translated using Weblate (Spanish) Currently translated at 46.6% (367 of 787 strings) --- po/es/minetest.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 5b1cc805..300f2917 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-01-25 08:35+0000\n" -"Last-Translator: Diego Martínez \n" +"PO-Revision-Date: 2016-02-02 19:22+0000\n" +"Last-Translator: Laura Arjona Reina \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -1231,18 +1231,27 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Dirección a la cual conectarse.\n" +"Dejar en blanco para iniciar un servidor local.\n" +"A tener en cuenta: el campo de dirección en el menú principal sobreescribe " +"esta opción." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Ajustar la configuración de puntos por pulgada a la pantalla (no X11/solo " +"Android) p.ej. para pantallas 4K." #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Ajustar la codificación de gamma para las tablas de luz. Números bajos para " +"más brillante.\n" +"Esta opción es solamente para el cliente y es ignorada por el servidor." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1254,7 +1263,7 @@ msgstr "Siempre volar y rápido" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Gamma de oclusión de ambiente" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1398,7 +1407,7 @@ msgstr "Conectar a un servidor media externo" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Conectar gafas si el nodo lo soporta." #: src/settings_translation_file.cpp #, fuzzy From 40fa2e3b276dce8816eba581e6ba81838d01ee62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno?= Date: Sat, 6 Feb 2016 01:25:33 +0100 Subject: [PATCH 305/531] Translated using Weblate (Catalan) Currently translated at 37.3% (294 of 787 strings) --- po/ca/minetest.po | 103 ++++++++++++++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 36 deletions(-) diff --git a/po/ca/minetest.po b/po/ca/minetest.po index db1b4f19..759562c5 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-11-13 22:39+0000\n" +"PO-Revision-Date: 2016-02-06 01:25+0000\n" "Last-Translator: Joan Ciprià Moreno \n" "Language-Team: Catalan " "\n" @@ -256,7 +256,7 @@ msgstr "Instal·lat amb èxit:" #: builtin/mainmenu/store.lua msgid "Shortname:" -msgstr "" +msgstr "Nom curt:" #: builtin/mainmenu/store.lua msgid "Rating" @@ -427,11 +427,11 @@ msgstr "Jocs" #: builtin/mainmenu/tab_settings.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Cap descripció d'ajustament donada)" #: builtin/mainmenu/tab_settings.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Si us plau, introduïu una llista d'indicadors separada per comes." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " @@ -916,8 +916,9 @@ msgid "Control" msgstr "Control" #: src/keycode.cpp +#, fuzzy msgid "Kana" -msgstr "" +msgstr "Kana" #: src/keycode.cpp msgid "Menu" @@ -944,12 +945,14 @@ msgid "Final" msgstr "Fi" #: src/keycode.cpp +#, fuzzy msgid "Junja" -msgstr "" +msgstr "Junja" #: src/keycode.cpp +#, fuzzy msgid "Kanji" -msgstr "" +msgstr "Kanji" #: src/keycode.cpp msgid "Nonconvert" @@ -1136,8 +1139,9 @@ msgid "Attn" msgstr "Atentament" #: src/keycode.cpp +#, fuzzy msgid "CrSel" -msgstr "" +msgstr "CrSel" #: src/keycode.cpp msgid "Erase OEF" @@ -1152,16 +1156,18 @@ msgid "OEM Clear" msgstr "Netejar OEM" #: src/keycode.cpp +#, fuzzy msgid "PA1" -msgstr "" +msgstr "PA1" #: src/keycode.cpp +#, fuzzy msgid "Zoom" -msgstr "" +msgstr "Zoom" #: src/settings_translation_file.cpp msgid "Controls" -msgstr "" +msgstr "Controls" #: src/settings_translation_file.cpp msgid "Build inside player" @@ -1186,13 +1192,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Moviment ràpid" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Moviment ràpid (via utilitzar clau).\n" +"Això requereix el \"privilegi\" ràpid en el servidor." #: src/settings_translation_file.cpp msgid "Noclip" @@ -1207,45 +1215,48 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Cinematic mode" -msgstr "" +msgstr "Mode cinematogràfic" #: src/settings_translation_file.cpp msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" +"Suavitza la càmera quan estiga movent-se i mirant al seu voltant.\n" +"Útil per a la gravació de vídeos." #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Suavitzat de la càmera" #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "Suavitza la rotació de la càmera. 0 per deshabilitar." #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Suavitzat de la càmera en mode cinematogràfic" #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." msgstr "" +"Suavitza la rotació de la càmera en mode cinematogràfic. 0 per deshabilitar." #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Invertir ratolí" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Invertir moviment vertical del ratolí." #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "Sensibilitat del ratolí" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "Multiplicador de sensibilitat del ratolí." #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -1259,15 +1270,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Double tap jump for fly" -msgstr "" +msgstr "Polsar dues vegades \"botar\" per volar" #: src/settings_translation_file.cpp msgid "Double-tapping the jump key toggles fly mode." -msgstr "" +msgstr "Polsar dues vegades \"botar\" per alternar el mode de vol." #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Sempre volar y ràpid" #: src/settings_translation_file.cpp msgid "" @@ -1277,33 +1288,35 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "Interval de repetició del click dret" #: src/settings_translation_file.cpp msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" +"El temps en segons que es pren entre la repetició de clicks drets quan " +"s'està mantenint el botó dret del ratolí." #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "Entrada aleatòria" #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Habilitar l'entrada aleatòria d'usuari (només utilitzat per testing)." #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Avanç continu" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Avanç continu (sols utilitzat per a testing)." #: src/settings_translation_file.cpp msgid "Forward key" -msgstr "" +msgstr "Tecla Avançar" #: src/settings_translation_file.cpp msgid "" @@ -1311,10 +1324,13 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla per moure avant al jugador.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Backward key" -msgstr "" +msgstr "Tecla de retrocés" #: src/settings_translation_file.cpp msgid "" @@ -1322,10 +1338,13 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla per moure el jugador cap arrere.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Left key" -msgstr "" +msgstr "Tecla esquerra" #: src/settings_translation_file.cpp msgid "" @@ -1333,10 +1352,13 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla per moure el jugador cap a l'esquerra.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Right key" -msgstr "" +msgstr "Tecla dreta" #: src/settings_translation_file.cpp msgid "" @@ -1344,10 +1366,13 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla per moure el jugador cap a la dreta.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Jump key" -msgstr "" +msgstr "Tecla botar" #: src/settings_translation_file.cpp msgid "" @@ -1355,10 +1380,13 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla per botar.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Sneak key" -msgstr "" +msgstr "Tecla sigil" #: src/settings_translation_file.cpp msgid "" @@ -1371,7 +1399,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Inventory key" -msgstr "" +msgstr "Tecla Inventari" #: src/settings_translation_file.cpp msgid "" @@ -1379,10 +1407,13 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla per obrir el inventari.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Use key" -msgstr "" +msgstr "Utilitza la tecla" #: src/settings_translation_file.cpp msgid "" From 1528c9af60eb517bfdb444f1653e5e990d8d8523 Mon Sep 17 00:00:00 2001 From: Miguel Isaac Date: Thu, 11 Feb 2016 01:41:06 +0100 Subject: [PATCH 306/531] Translated using Weblate (Spanish) Currently translated at 47.0% (370 of 787 strings) (Merger of two commits from the same author) --- po/es/minetest.po | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 300f2917..ed408679 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-02-02 19:22+0000\n" -"Last-Translator: Laura Arjona Reina \n" +"PO-Revision-Date: 2016-02-20 00:31+0000\n" +"Last-Translator: Miguel Isaac \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -21,7 +21,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Ha ocurrido un error en un script Lua, por ejemplo un mod:" +msgstr "Un error ha ocurrido en un script de Lua, Como un mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -49,7 +49,7 @@ msgstr "Cargando..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "Desajuste con la versión del protocolo. " +msgstr "Desajuste con la versión de protocolo. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " @@ -57,21 +57,21 @@ msgstr "El servidor hace cumplir la versión $1 del protocolo " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "El servidor soporta versiones del protocolo entre $1 y $2." +msgstr "El servidor soporta versiones del protocolo entre $1 y $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" -"Intente re-habilitar la lista de servidores públicos y verifique su conexión " +"Intente rehabilitar la lista de servidores públicos y verifique su conexión " "a Internet." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "Sólo soportamos protocolos versión $1" +msgstr "Solo se soporta la version de protocolo $1" #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2." +msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -100,8 +100,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" -"Error al habilitar el mod \"$1\" por contener caracteres no permitidos. Solo " -"se permiten los caracteres [a-z0-9_]." +"Error al activar el mod \"$1\" por contener caracteres no permitidos. Solo " +"los caracteres [a-z0-9_] estan permitidos." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -109,7 +109,7 @@ msgstr "Ocultar juego" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "Ocultar contenido mp" +msgstr "Ocultar contenido" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -142,7 +142,7 @@ msgstr "Descarga un sub-juego, como minetest_game, desde minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "Descarga algunos desde minetest.net" +msgstr "Descarga uno desde minetest.net" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -188,7 +188,7 @@ msgstr "Modmgr: Ruta del mod \"$1\" inválida" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "¡No, por su puesto que no!" +msgstr "¡No, porque no!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua msgid "Yes" @@ -295,7 +295,7 @@ msgstr "Antiguos colaboradores" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "Antiguos desarrolladores" +msgstr "Antiguos desarrolladores principales" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -1168,10 +1168,13 @@ msgid "Zoom" msgstr "Zoom" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = Oclusion de paralaje cpn informacion pendiente (rapido).\n" +"1 = Mapeo Aliviado (Lento, Mas Preciso)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1191,12 +1194,23 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" +"Soporte 3D.\n" +"Soportado Actualmente:\n" +"- Ninguno: No hay salida 3D.\n" +"- Anaglifo: Color cyan/magenta 3D.\n" +"- Entrelazado: Soporte de pantalla en polarizacion basado en line par e " +"impar.\n" +"- Superior Inferior: Partir pantalla superior/inferior.\n" +"- Lado a lado: Partir pantalla lado a lado." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Una semilla de mapa para un mapa nuevo, deja vacio para una semilla al azar." +"\n" +"Sera borrado creando un nuevo mundo en el menu principal." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." @@ -1211,7 +1225,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Limite absoluto de colas emergentes" #: src/settings_translation_file.cpp msgid "Acceleration in air" From abcccffc21a58a388be945b7d1068647e603cc67 Mon Sep 17 00:00:00 2001 From: Vasily Pavlov Date: Sun, 21 Feb 2016 09:45:44 +0100 Subject: [PATCH 307/531] Translated using Weblate (Russian) Currently translated at 49.5% (390 of 787 strings) (Merger of three commits) --- po/ru/minetest.po | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 20d605e5..acb26046 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2015-12-18 09:44+0000\n" -"Last-Translator: Anton Tsyganenko \n" +"PO-Revision-Date: 2016-02-21 09:49+0000\n" +"Last-Translator: Vasily Pavlov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -3522,9 +3522,8 @@ msgid "Volume" msgstr "Громкость звука" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Покачивание листвы" +msgstr "Скорость ходьбы" #: src/settings_translation_file.cpp msgid "Wanted FPS" @@ -3559,19 +3558,16 @@ msgid "Waving water" msgstr "Волны на воде" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "Волны на воде" +msgstr "Высота волн на воде" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "Волны на воде" +msgstr "Длина волны на воде" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Волны на воде" +msgstr "Скорость волн на воде" #: src/settings_translation_file.cpp msgid "" From e9cd01045a8595aec45802d7ae46f1b3e0952932 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Sun, 21 Feb 2016 09:46:02 +0100 Subject: [PATCH 308/531] Translated using Weblate (Russian) Currently translated at 61.3% (483 of 787 strings) (Merger of five commits) --- po/ru/minetest.po | 484 +++++++++++++++++++++++++++++++++------------- 1 file changed, 345 insertions(+), 139 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index acb26046..260fb84a 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-08 21:23+0100\n" -"PO-Revision-Date: 2016-02-21 09:49+0000\n" -"Last-Translator: Vasily Pavlov \n" +"PO-Revision-Date: 2016-02-21 12:34+0000\n" +"Last-Translator: Dmitry Smirnov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -50,15 +50,15 @@ msgstr "Загрузка..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "Несоответствие версии протокола." +msgstr "Несоответствие версии протокола. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "Сервер обеспечивает соблюдение версии протокола $ 1." +msgstr "Сервер обеспечивает соблюдение версии протокола $ 1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "Сервер поддерживает версии протокола между $1 и $2." +msgstr "Сервер поддерживает версии протокола между $1 и $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." @@ -71,7 +71,7 @@ msgstr "Поддерживается только протокол версии #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "Мы поддерживаем версии протоколов между $1 и $2" +msgstr "Мы поддерживаем версии протоколов между $1 и $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua @@ -426,7 +426,7 @@ msgstr "(Отсутствует описание настройки)" #: builtin/mainmenu/tab_settings.lua msgid "Browse" -msgstr "Выбрать..." +msgstr "Выбрать" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -478,7 +478,7 @@ msgstr "Пожалуйста, введите корректное число." #: builtin/mainmenu/tab_settings.lua msgid "Possible values are: " -msgstr "Возможные значения:" +msgstr "Возможные значения: " #: builtin/mainmenu/tab_settings.lua msgid "Restore Default" @@ -1162,8 +1162,8 @@ msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" -"0 = Параллакс с информацией о наклоне (Быстрее)\n" -"1 = Рельефный маппинг (Медленнее, качественнее)" +"0 = Параллакс с информацией о наклоне (Быстрее).\n" +"1 = Рельефный маппинг (Медленнее, качественнее)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1183,12 +1183,14 @@ msgid "" "- topbottom: split screen top/bottom.\n" "- sidebyside: split screen side by side." msgstr "" -"Поддержка 3D\n" -"Нет: нет выходного сигнала.\n" -"Анаглиф: голубой\\пурпурный цвет в 3D\n" -"Чересстрочно: четное / нечетное линия поддержки процесса поляризации экрана\n" -"Верх\\низ: Разделение экрана низ/верх\n" -"Двестороны: Разделение экрана пополам (право/лево)" +"Поддержка 3D.\n" +"Сейчас поддерживаются:\n" +"- none: 3D отключен.\n" +"- anaglyph: голубой/пурпурный цвет в 3D.\n" +"- interlaced: четные/нечетные линии отображают два разных кадра для " +"экранов поддерживающих поляризацию.\n" +"- topbottom: Разделение экрана низ/верх.\n" +"- sidebyside: Разделение экрана право/лево." #: src/settings_translation_file.cpp msgid "" @@ -1209,7 +1211,7 @@ msgstr "Сообщение, которое будет показано всем #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "Абсолютный лимит появляющихся запросов." +msgstr "Абсолютный лимит появляющихся запросов" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1238,8 +1240,8 @@ msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" -"Настройте конфигурацию точек на дюйм для вашего экрана (Не 11/Только для " -"Android) Напр. для мониторов с разрешением в 4k" +"Настройка dpi (плотности точек на дюйм) для вашего экрана (не для X11, " +"только для Android). Например для мониторов с разрешением в 4k." #: src/settings_translation_file.cpp msgid "" @@ -1279,7 +1281,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Запрос переподключения после дисконнекта" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." @@ -1295,7 +1297,6 @@ msgid "Basic" msgstr "Базовый" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" msgstr "Билинейная фильтрация" @@ -1309,7 +1310,7 @@ msgstr "Биты на пиксель (глубина цвета) в полноэ #: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "Возможность строить внутри модели игрока." +msgstr "Разрешить ставить блоки на месте игрока" #: src/settings_translation_file.cpp msgid "Bumpmapping" @@ -1317,11 +1318,12 @@ msgstr "Бампмаппинг" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Сглаживание камеры" #: src/settings_translation_file.cpp +#, fuzzy msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Сглаживание камеры в кинематографическом режиме" #: src/settings_translation_file.cpp msgid "Camera update toggle key" @@ -1481,9 +1483,8 @@ msgid "Damage" msgstr "Урон" #: src/settings_translation_file.cpp -#, fuzzy msgid "Debug info toggle key" -msgstr "Клавиша переключения показа debug-информации" +msgstr "Клавиша переключения показа отладочной информации" #: src/settings_translation_file.cpp msgid "Debug log level" @@ -1520,6 +1521,8 @@ msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Стандартный тайм-аут для cURL, установленный в милисекундах.\n" +"Работает только на сборках с cURL." #: src/settings_translation_file.cpp msgid "" @@ -1536,22 +1539,24 @@ msgid "Delay showing tooltips, stated in milliseconds." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Устаревшее Lua API управление" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Скорость снижения" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." -msgstr "" +msgstr "Описание сервера, показываемое при входе игрока и в списке серверов" #: src/settings_translation_file.cpp +#, fuzzy msgid "Desynchronize block animation" -msgstr "" +msgstr "Рассинхронизировать анимацию блоков" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." @@ -1571,7 +1576,7 @@ msgstr "Запретить пустой пароль" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Доменное имя сервера, отображаемое в списке серверов." #: src/settings_translation_file.cpp msgid "Double tap jump for fly" @@ -1587,7 +1592,7 @@ msgstr "Кнопка выброса блока" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Дамп отладочной информации генератора мира." #: src/settings_translation_file.cpp msgid "" @@ -1596,6 +1601,9 @@ msgid "" "Note that this is not quite optimized and that smooth lighting on the\n" "water surface doesn't work with this." msgstr "" +"Включите немного более низкую поверхность воды, чтобы она\n" +"не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n" +"и мягкое освещение на поверхности воды не работает с этим." #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1603,7 +1611,7 @@ msgstr "Включить защиту модов" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Включает получение игроками урона и их смерть." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." @@ -1682,8 +1690,9 @@ msgid "FPS in pause menu" msgstr "FPS во время паузы" #: src/settings_translation_file.cpp +#, fuzzy msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" @@ -1711,21 +1720,24 @@ msgstr "Клавиша ускорения" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Ускорение быстрого перемещения" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Скорость быстрого перемещения" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Быстрое перемещение" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Быстрое перемещение (с использование клавиши).\n" +"Это требует привилегию \"fast\" на сервере." #: src/settings_translation_file.cpp msgid "Field of view" @@ -1736,10 +1748,12 @@ msgid "Field of view in degrees." msgstr "Поле зрения в градусах." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"Файл, содержащий ваши любимые серверы, отображаемые на вкладке Multiplayer." #: src/settings_translation_file.cpp msgid "" @@ -1771,11 +1785,11 @@ msgstr "Туман" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Клавиша переключения тумана" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Путь к шрифту" #: src/settings_translation_file.cpp msgid "Font shadow" @@ -1783,19 +1797,20 @@ msgstr "Тень шрифта" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Прозрачность тени шрифта" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Прозрачность тени шрифта (непрозрачность от 0 до 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." msgstr "" +"Смещение тени шрифта. Если установленно в 0, то тень не будет отрисовываться." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Размер шрифта" #: src/settings_translation_file.cpp msgid "Forward key" @@ -1803,7 +1818,7 @@ msgstr "Вперед" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "FreeType шрифты" #: src/settings_translation_file.cpp msgid "" @@ -1823,7 +1838,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Полный экран" #: src/settings_translation_file.cpp msgid "Full screen BPP" @@ -1831,11 +1846,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Полноэкранный режим." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Масштабирование интерфейса" #: src/settings_translation_file.cpp msgid "GUI scaling filter" @@ -1843,11 +1858,11 @@ msgstr "Фильтр масштабирования интерфейса" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "txr2img фильтр масштабирования интерфейса" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Гамма" #: src/settings_translation_file.cpp msgid "Generate normalmaps" @@ -1864,15 +1879,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Графика" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Гравитация" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "Клавиша переключения HUD" #: src/settings_translation_file.cpp msgid "" @@ -1892,7 +1907,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "Домашняя страница сервера, отображаемая в списке серверов." #: src/settings_translation_file.cpp msgid "Horizontal initial window size." @@ -1921,16 +1936,17 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "IPv6 сервер" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "IPv6 поддержка." #: src/settings_translation_file.cpp msgid "" @@ -1975,7 +1991,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." -msgstr "" +msgstr "Если включено, то новые игроки не смогут подключаться с пустым паролем." #: src/settings_translation_file.cpp msgid "" @@ -1983,14 +1999,17 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Если включено, то вы можете размещать новые блоки на месте игрока.\n" +"Это может быть полезно при строительстве в узких местах." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." -msgstr "" +msgstr "Если установлено, то игроки будут (ре)спавниться в указанной позиции." #: src/settings_translation_file.cpp +#, fuzzy msgid "Ignore world errors" -msgstr "" +msgstr "Игнорировать ошибки мира" #: src/settings_translation_file.cpp msgid "In-Game" @@ -1998,19 +2017,19 @@ msgstr "В игре" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Прозрачность фона внутриигровой консоли (непрозрачность от 0 до 255)." #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Цвет фона внутриигровой консоли (R, G, B)." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." -msgstr "" +msgstr "Интервал сохранения важных изменений в мире, установленный в секундах." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "" +msgstr "Интервал отправки клиентам сведений о времени дня." #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2018,15 +2037,15 @@ msgstr "Кнопка открытия инвентаря" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Инвертировать мышь" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Инвертировать мышь по вертикали." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "Время жизни выброшенной вещи" #: src/settings_translation_file.cpp msgid "" @@ -2076,11 +2095,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Jump key" -msgstr "Кнопка, отвечающая за прыжок" +msgstr "Кнопка прыжка" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "Скорость прыжков" #: src/settings_translation_file.cpp msgid "" @@ -2088,6 +2107,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность " +"отображения.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2095,6 +2118,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша выкинуть выбранный предмет.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2102,6 +2128,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность " +"отображения.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2109,13 +2139,20 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша прыжка.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Key for moving fast in fast mode.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша для быстрого перемещения.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2123,6 +2160,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша движения назад.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2130,6 +2170,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша движения вперед.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2137,6 +2180,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша движения влево.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2144,6 +2190,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша движения вправо.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2151,6 +2200,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша открытия чат-консоли.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2158,6 +2210,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша открытия окна чата для ввода комманды.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2165,6 +2220,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша открытия окна чата.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2172,6 +2230,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша открытия инвентаря.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2188,6 +2249,11 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша красться.\n" +"Также используется для спуска и погружения под воду, если aux1_descends " +"отключена.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2195,6 +2261,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения вида от первого и от третьего лица.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2202,6 +2271,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша снятия скриншота.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2209,6 +2281,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения кинематографического режима.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2216,6 +2291,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения отображения миникарты.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2223,6 +2301,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения режима быстрого перемещения.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2230,6 +2311,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения режима полета.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2237,6 +2321,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения режима проверки столкновений.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2251,6 +2338,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения показа отладочной информации.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2258,6 +2348,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения отображения HUD.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2265,6 +2358,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения отображения чата.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2272,6 +2368,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша переключения отображения тумана.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2286,6 +2385,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Клавиша отключения ограничения зоны видимости.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2293,11 +2395,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Язык" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Стиль листвы" #: src/settings_translation_file.cpp msgid "" @@ -2306,6 +2408,11 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Стили листвы:\n" +"- Fancy: включена прозрачность, все стороны видны\n" +"- Simple: прозрачность включена, видны только внешние стороны, если " +"используются special_tiles\n" +"- Opaque: прозрачность отключена" #: src/settings_translation_file.cpp msgid "Left key" @@ -2368,7 +2475,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "Интервал обновления жидкостей в секундах." #: src/settings_translation_file.cpp msgid "Liquid update tick" @@ -2390,6 +2497,7 @@ msgstr "Скрипт главного меню" msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" +"Включить зависимость цвета тумана и облаков от времени суток (рассвет/закат)." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." @@ -2419,7 +2527,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Каталог сохранения карт" #: src/settings_translation_file.cpp msgid "" @@ -2455,7 +2563,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "Интервал сохранения карты" #: src/settings_translation_file.cpp msgid "Mapblock limit" @@ -2726,11 +2834,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "Максимальный FPS" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "Максимальный FPS в режиме паузы." #: src/settings_translation_file.cpp msgid "" @@ -2746,7 +2854,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "Максимальная ширина хотбара" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." @@ -2809,7 +2917,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "Максимальное количество пользователей" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" @@ -2824,24 +2932,27 @@ msgid "Mesh cache" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Message of the day" -msgstr "" +msgstr "Фраза дня" #: src/settings_translation_file.cpp +#, fuzzy msgid "Message of the day displayed to players connecting." -msgstr "" +msgstr "Фраза дня отображаемая подключившимся игрокам." #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Миникарта" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Клавиша переключения миникарты" #: src/settings_translation_file.cpp +#, fuzzy msgid "Minimap scan height" -msgstr "" +msgstr "Высота сканирования миникарты" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" @@ -2875,20 +2986,22 @@ msgid "Modstore mods list URL" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Monospace font path" -msgstr "" +msgstr "Путь моноширинного шрифта" #: src/settings_translation_file.cpp +#, fuzzy msgid "Monospace font size" -msgstr "" +msgstr "Размер моноширинного шрифта" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "Чувствительность мыши" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "Множитель чувствительности мыши." #: src/settings_translation_file.cpp msgid "" @@ -2903,26 +3016,33 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Name of map generator to be used when creating a new world.\n" "Creating a world in the main menu will override this." msgstr "" +"Название генератора карты, используемого при создании мира.\n" +"Создание мира из главного меню переопределит это." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Name of the player.\n" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"Имя игрока.\n" +"На сервере клиент с этим именем будет админом.\n" +"Будет переопределено при запуске из главного меню." #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." -msgstr "" +msgstr "Имя сервера, отображаемое при входе и в списке серверов." #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "Сеть" #: src/settings_translation_file.cpp msgid "" @@ -2931,20 +3051,24 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "New style water" -msgstr "" +msgstr "Новый стиль воды" #: src/settings_translation_file.cpp +#, fuzzy msgid "New users need to input this password." -msgstr "" +msgstr "Новым пользователям нужно вводить этот пароль." #: src/settings_translation_file.cpp +#, fuzzy msgid "Noclip" -msgstr "" +msgstr "Отключить столкновения" #: src/settings_translation_file.cpp +#, fuzzy msgid "Noclip key" -msgstr "" +msgstr "Клавиша отключения столкновений" #: src/settings_translation_file.cpp msgid "Node highlighting" @@ -3028,21 +3152,25 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "Путь для сохранения скриншотов." #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." msgstr "" +"Путь до каталога с текстурами. Все текстуры в первую очередь берутся от сюда." #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "Физика" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the \"fly\" privilege on the server." msgstr "" +"Игрок может летать без влияния гравитации.\n" +"Это требует привилегии fly на сервере." #: src/settings_translation_file.cpp msgid "Player name" @@ -3054,7 +3182,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "PvP" #: src/settings_translation_file.cpp msgid "" @@ -3098,8 +3226,9 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Random input" -msgstr "" +msgstr "Случайный ввод" #: src/settings_translation_file.cpp msgid "Range select key" @@ -3111,19 +3240,21 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "Удаленный порт" #: src/settings_translation_file.cpp +#, fuzzy msgid "Replaces the default main menu with a custom one." -msgstr "" +msgstr "Заменять главное меню на пользовательское." #: src/settings_translation_file.cpp msgid "Right key" msgstr "Правая клавиша меню" #: src/settings_translation_file.cpp +#, fuzzy msgid "Rightclick repetition interval" -msgstr "" +msgstr "Интервал повторного клика правой кнопкой." #: src/settings_translation_file.cpp msgid "Rollback recording" @@ -3152,11 +3283,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "Высота экрана" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "Ширина экрана" #: src/settings_translation_file.cpp msgid "Screenshot" @@ -3164,27 +3295,31 @@ msgstr "Cкриншот" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "Каталог со скриншотами" #: src/settings_translation_file.cpp +#, fuzzy msgid "Security" -msgstr "" +msgstr "Безопасность" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" +msgstr "Смотрите http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp +#, fuzzy msgid "Selection box border color (R,G,B)." -msgstr "" +msgstr "Цвет рамки выделения (R, G, B)." #: src/settings_translation_file.cpp +#, fuzzy msgid "Selection box color" -msgstr "" +msgstr "Цвет выделения" #: src/settings_translation_file.cpp +#, fuzzy msgid "Selection box width" -msgstr "" +msgstr "Ширина рамки выделения" #: src/settings_translation_file.cpp msgid "Server / Singleplayer" @@ -3220,57 +3355,78 @@ msgid "Serverlist file" msgstr "Список публичных серверов" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" +"Установка языка. Оставьте пустым для использования системного языка.\n" +"Требует перезапуска после установки." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"Установка в true включает покачивание листвы.\n" +"Это требует включение шейдеров." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" +"Установка в true включает покачивание растений.\n" +"Это требует включение шейдеров." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" +"Установка в true включает волны на воде.\n" +"Это требует включение шейдеров." #: src/settings_translation_file.cpp msgid "Shaders" msgstr "Шейдеры" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Shaders allow advanced visul effects and may increase performance on some " "video cards.\n" "Thy only work with the OpenGL video backend." msgstr "" +"Шейдеры позволяют использовать дополнительные визуальные эффекты и могут " +"увеличить производительность на некоторых видеокартах.\n" +"Они работают только с видео серверной OpenGL." #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Show debug info" -msgstr "" +msgstr "Показывать отладочную информацию." #: src/settings_translation_file.cpp +#, fuzzy msgid "Shutdown message" -msgstr "" +msgstr "Сообщение о выключении" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" +"Размер чанка, генерируемого за один раз, установленный в мапблоках (16 " +"кубиков)." #: src/settings_translation_file.cpp #, fuzzy @@ -3278,18 +3434,23 @@ msgid "Smooth lighting" msgstr "Мягкое освещение" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" +"Сглаживать движения камеры при ходьбе и поворотах.\n" +"Это может быть полезно при записи видео." #: src/settings_translation_file.cpp +#, fuzzy msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "" +msgstr "Плавное вращение камеры в кинематографическом режиме. 0 для отключения." #: src/settings_translation_file.cpp +#, fuzzy msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "Плавное вращение камеры. 0 для отключения." #: src/settings_translation_file.cpp #, fuzzy @@ -3297,8 +3458,9 @@ msgid "Sneak key" msgstr "Красться" #: src/settings_translation_file.cpp +#, fuzzy msgid "Sound" -msgstr "" +msgstr "Звук" #: src/settings_translation_file.cpp msgid "" @@ -3309,8 +3471,9 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Static spawnpoint" -msgstr "" +msgstr "Постоянное место спавна" #: src/settings_translation_file.cpp #, fuzzy @@ -3346,10 +3509,13 @@ msgid "The network interface that the server listens on." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" +"Привилегии, автоматически получаемые новым пользователем.\n" +"Смотрите /privs для получения полного списка привилегий." #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." @@ -3371,32 +3537,41 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." -msgstr "" +msgstr "Задержка в секундах между кликами при зажатой правой кнопке мыши." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"Время жизни выброшенных предметов.\n" +"Установите в -1 для отключения этой функции." #: src/settings_translation_file.cpp +#, fuzzy msgid "Time send interval" -msgstr "" +msgstr "Интервал отправки" #: src/settings_translation_file.cpp +#, fuzzy msgid "Time speed" -msgstr "" +msgstr "Скорость хода времени" #: src/settings_translation_file.cpp +#, fuzzy msgid "Timeout for client to remove unused map data from memory." msgstr "" +"Время, после которого клиент удаляет из памяти неиспользуемую информацию о " +"карте." #: src/settings_translation_file.cpp msgid "" @@ -3407,12 +3582,14 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Toggle camera mode key" -msgstr "" +msgstr "Клавиша переключения режима камеры." #: src/settings_translation_file.cpp +#, fuzzy msgid "Tooltip delay" -msgstr "" +msgstr "Задержка подсказки." #: src/settings_translation_file.cpp #, fuzzy @@ -3420,15 +3597,20 @@ msgid "Trilinear filtering" msgstr "Трилинейная фильтрация" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "True = 256\n" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"True = 256\n" +"False = 128\n" +"Полезно для плавной миникарты на медленных машинах." #: src/settings_translation_file.cpp +#, fuzzy msgid "Trusted mods" -msgstr "" +msgstr "Доверенные моды" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." @@ -3439,24 +3621,29 @@ msgid "Unlimited player transfer distance" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Unload unused server data" -msgstr "" +msgstr "Выгружать неиспользуемые сервером данные" #: src/settings_translation_file.cpp +#, fuzzy msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "Объемные облака вместо плоских." #: src/settings_translation_file.cpp +#, fuzzy msgid "Use a cloud animation for the main menu background." -msgstr "" +msgstr "Анимированные облака в главном меню." #: src/settings_translation_file.cpp +#, fuzzy msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" +msgstr "Использовать анизатропную фильтрацию про взгляде под углом." #: src/settings_translation_file.cpp +#, fuzzy msgid "Use bilinear filtering when scaling textures." -msgstr "" +msgstr "Использовать билинейную фильтрацию для масштабирования текстур." #: src/settings_translation_file.cpp #, fuzzy @@ -3464,12 +3651,16 @@ msgid "Use key" msgstr "нажмите клавишу" #: src/settings_translation_file.cpp +#, fuzzy msgid "Use mip mapping to scale textures. May slightly increase performance." msgstr "" +"Использовать мип-маппинг для масштабирования текстур. Может немного " +"увеличить производительность." #: src/settings_translation_file.cpp +#, fuzzy msgid "Use trilinear filtering when scaling textures." -msgstr "" +msgstr "Использовать трилинейную фильтрацию для масштабировании текстур." #: src/settings_translation_file.cpp #, fuzzy @@ -3477,44 +3668,51 @@ msgid "Useful for mod developers." msgstr "Разработчики в отставке" #: src/settings_translation_file.cpp +#, fuzzy msgid "V-Sync" -msgstr "" +msgstr "V-Sync" #: src/settings_translation_file.cpp msgid "Vertical initial window size." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Vertical screen synchronization." -msgstr "" +msgstr "Вертикальная синхронизация." #: src/settings_translation_file.cpp msgid "Vertical spawn range" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Video driver" -msgstr "" +msgstr "Видео драйвер." #: src/settings_translation_file.cpp msgid "View bobbing" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "View range decrease key" -msgstr "" +msgstr "Клавиша уменьшения видимого диапазона." #: src/settings_translation_file.cpp +#, fuzzy msgid "View range increase key" -msgstr "" +msgstr "Клавиша увеличения видимого диапазона." #: src/settings_translation_file.cpp +#, fuzzy msgid "Viewing range maximum" -msgstr "" +msgstr "Максимальная граница дальности отрисовки." #: src/settings_translation_file.cpp +#, fuzzy msgid "Viewing range minimum" -msgstr "" +msgstr "Минимальная граница дальности отрисовки." #: src/settings_translation_file.cpp #, fuzzy @@ -3526,8 +3724,9 @@ msgid "Walking speed" msgstr "Скорость ходьбы" #: src/settings_translation_file.cpp +#, fuzzy msgid "Wanted FPS" -msgstr "" +msgstr "Ожидаемый FPS" #: src/settings_translation_file.cpp msgid "Water level" @@ -3553,7 +3752,6 @@ msgid "Waving plants" msgstr "Покачивание растений" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" msgstr "Волны на воде" @@ -3563,7 +3761,7 @@ msgstr "Высота волн на воде" #: src/settings_translation_file.cpp msgid "Waving water length" -msgstr "Длина волны на воде" +msgstr "Длина волн на воде" #: src/settings_translation_file.cpp msgid "Waving water speed" @@ -3621,27 +3819,34 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Whether to allow players to damage and kill each other." -msgstr "" +msgstr "Разрешить игрокам сражаться друг с другом." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"Опрашивать клиентов для переподключения после падения.\n" +"Установите это если ваш сервер настроен на автоматический перезапуск." #: src/settings_translation_file.cpp +#, fuzzy msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "Туман на границе видимого пространства." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" +msgstr "Показывать данные отладки (аналогично нажатию F5)." #: src/settings_translation_file.cpp +#, fuzzy msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "Ширина обводки выбранных блоков." #: src/settings_translation_file.cpp msgid "" @@ -3650,8 +3855,9 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "cURL file download timeout" -msgstr "" +msgstr "cURL тайм-аут загрузки файла" #: src/settings_translation_file.cpp msgid "cURL parallel limit" From e81753b69c42ddacc9e892f3fa283059914edc73 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 27 Feb 2016 05:26:58 +0100 Subject: [PATCH 309/531] Don't generate trailing spaces in minetest.conf.example If the default value of a setting was empty, it previously generated a trailing space. --- builtin/mainmenu/dlg_settings_advanced.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua index 35883f05..cab9f169 100644 --- a/builtin/mainmenu/dlg_settings_advanced.lua +++ b/builtin/mainmenu/dlg_settings_advanced.lua @@ -706,7 +706,11 @@ local function create_minetest_conf_example() result = result .. " possible values: " .. entry.possible:gsub(",", ", ") end result = result .. "\n" - result = result .. "# " .. entry.name .. " = ".. entry.default .. "\n\n" + local append = "" + if entry.default ~= "" then + append = " " .. entry.default + end + result = result .. "# " .. entry.name .. " =" .. append .. "\n\n" end end return result From 158bd76e8796c70f94e67bc3be44c88101dcf9b2 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 27 Feb 2016 05:50:42 +0100 Subject: [PATCH 310/531] Update po files, minetest.conf.example and settings_translation_file.cpp --- minetest.conf.example | 174 +- po/be/minetest.po | 712 +++- po/ca/minetest.po | 5785 +++++++++++++++-------------- po/cs/minetest.po | 999 +++-- po/da/minetest.po | 936 +++-- po/de/minetest.po | 1382 ++++--- po/eo/minetest.po | 893 +++-- po/es/minetest.po | 902 +++-- po/et/minetest.po | 1019 +++-- po/fr/minetest.po | 1382 ++++--- po/he/minetest.po | 735 +++- po/hu/minetest.po | 1245 ++++--- po/id/minetest.po | 934 +++-- po/it/minetest.po | 979 +++-- po/ja/minetest.po | 933 +++-- po/jbo/minetest.po | 797 ++-- po/ko/minetest.po | 712 +++- po/ky/minetest.po | 904 +++-- po/lt/minetest.po | 904 +++-- po/minetest.pot | 650 +++- po/nb/minetest.po | 771 ++-- po/nl/minetest.po | 1490 +++++--- po/pl/minetest.po | 1076 ++++-- po/pt/minetest.po | 1071 ++++-- po/pt_BR/minetest.po | 1226 ++++-- po/ro/minetest.po | 970 +++-- po/ru/minetest.po | 1236 +++--- po/tr/minetest.po | 909 +++-- po/uk/minetest.po | 990 +++-- po/zh_CN/minetest.po | 1043 ++++-- po/zh_TW/minetest.po | 910 +++-- src/settings_translation_file.cpp | 88 +- 32 files changed, 22994 insertions(+), 11763 deletions(-) diff --git a/minetest.conf.example b/minetest.conf.example index 5cf43aca..e4193a77 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -197,7 +197,7 @@ # Key for toggling the camrea update. Only used for development # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key -# keymap_toggle_update_camera = +# keymap_toggle_update_camera = # Key for toggling the display of debug info. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 @@ -235,7 +235,7 @@ # Leave this blank to start a local server. # Note that the address field in the main menu overrides this setting. # type: string -# address = +# address = # Port to connect to (UDP). # Note that the port field in the main menu overrides this setting. @@ -266,6 +266,10 @@ #### Basic +# Enable VBO +# type: bool +# enable_vbo = true + # Whether to fog out the end of the visible area. # type: bool # enable_fog = true @@ -294,6 +298,10 @@ # type: bool # enable_3d_clouds = true +# Method used to highlight selected object. +# type: enum values: box, halo +# node_highlighting = box + #### Filtering # Use mip mapping to scale textures. May slightly increase performance. @@ -341,9 +349,9 @@ # type: bool # enable_shaders = true -##### Tone mapping -# Enables filmic tone mapping. -# Requires shaders to be enabled. +##### Tone Mapping + +# Enables filmic tone mapping # type: bool # tone_mapping = false @@ -434,8 +442,8 @@ # type: int # pause_fps_max = 20 -# View range in nodes. -# Min = 20. +# View distance in nodes. +# Min = 20 # type: int # viewing_range = 100 @@ -470,7 +478,7 @@ # Path to texture directory. All textures are first searched from here. # type: path -# texture_path = +# texture_path = # The rendering back-end for Irrlicht. # type: enum values: null, software, burningsvideo, direct3d8, direct3d9, opengl @@ -539,10 +547,6 @@ # type: float # hud_hotbar_max_width = 1.0 -# Selection highlighting method (box or halo) -# type: string -# node_highlighting = box - # Enables caching of facedir rotated meshes. # type: bool # enable_mesh_cache = false @@ -572,7 +576,8 @@ # type: float min: 0.25 max: 4 # ambient_occlusion_gamma = 2.2 -# Enable animation of inventory items. +# Enables animation of inventory items. +# type: bool # inventory_items_animations = false ### Menus @@ -646,7 +651,7 @@ # Path to save screenshots at. # type: path -# screenshot_path = +# screenshot_path = ### Advanced @@ -715,7 +720,7 @@ # The network interface that the server listens on. # type: string -# bind_address = +# bind_address = # Enable to disallow old clients from connecting. # Older clients are compatible in the sense that they will not crash when connecting @@ -728,7 +733,7 @@ # (obviously, remote_media should end with a slash). # Files that are not present will be fetched the usual way. # type: string -# remote_media = +# remote_media = # Enable/disable running an IPv6 server. An IPv6 server may be restricted # to IPv6 clients, depending on system configuration. @@ -766,7 +771,7 @@ # Message of the day displayed to players connecting. # type: string -# motd = +# motd = # Maximum number of players that can connect simultaneously. # type: int @@ -775,7 +780,7 @@ # World directory (everything in the world is stored here). # Not needed if starting from the main menu. # type: path -# map-dir = +# map-dir = # Time in seconds for item entity (dropped items) to live. # Setting it to -1 disables the feature. @@ -789,11 +794,11 @@ # A chosen map seed for a new map, leave empty for random. # Will be overridden when creating a new world in the main menu. # type: string -# fixed_map_seed = +# fixed_map_seed = # New users need to input this password. # type: string -# default_password = +# default_password = # The privileges that new users automatically get. # See /privs in game for a full list on your server and mod configuration. @@ -815,7 +820,7 @@ # If this is set, players will always (re)spawn at the given position. # type: string -# static_spawnpoint = +# static_spawnpoint = # If enabled, new players cannot join with an empty password. # type: bool @@ -1168,7 +1173,7 @@ # Flags that are not specified in the flag string are not modified from the default. # Flags starting with "no" are used to explicitly disable them. # type: flags possible values: lakes, hills, , nolakes, nohills -# mgflat_spflags = +# mgflat_spflags = # Y of flat ground. # type: int @@ -1295,41 +1300,87 @@ #### Mapgen Valleys -#mg_valleys_spflags = altitude_chill,humid_rivers +##### General + +# Map generation attributes specific to Mapgen Valleys. +# Flags that are not specified in the flag string are not modified from the default. +# Flags starting with "no" are used to explicitly disable them. # "altitude_chill" makes higher elevations colder, which may cause biome issues. # "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes. -# -#mg_valleys_altitude_chill = 90 # the altitude at which temperature drops by 20C -#mg_valleys_large_cave_depth = -33 # Depth below which you'll find large caves. -#mg_valleys_lava_features = 0 # Creates unpredictable lava features in caves. These can make mining difficult. Zero disables them. (0-10) -#mg_valleys_massive_cave_depth = -256 # Depth below which you'll find massive caves. -#mg_valleys_river_depth = 4 # how deep to make rivers -#mg_valleys_river_size = 5 # how wide to make rivers -#mg_valleys_water_features = 0 # Creates unpredictable water features in caves. These can make mining difficult. Zero disables them. (0-10) -# -#mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 -# -# River noise -- rivers occur close to zero -#mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 -# -# Caves and tunnels form at the intersection of the two noises -#mg_valleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 -#mg_valleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 -# -#mg_valleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2 # Massive caves form here. -# -# Base terrain height -#mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 -# -# Raises terrain to make valleys around the rivers -#mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 -# -# Slope and fill work together to modify the heights -#mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 -#mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 -# -# Amplifies the valleys -#mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 +# type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers +# mg_valleys_spflags = altitude_chill,humid_rivers + +# The altitude at which temperature drops by 20C +# type: int +# mg_valleys_altitude_chill = 90 + +# Depth below which you'll find large caves. +# type: int +# mg_valleys_large_cave_depth = -33 + +# Creates unpredictable lava features in caves. +# These can make mining difficult. Zero disables them. (0-10) +# type: int +# mg_valleys_lava_features = 0 + +# Depth below which you'll find massive caves. +# type: int +# mg_valleys_massive_cave_depth = -256 + +# How deep to make rivers +# type: int +# mg_valleys_river_depth = 4 + +# How wide to make rivers +# type: int +# mg_valleys_river_size = 5 + +# Creates unpredictable water features in caves. +# These can make mining difficult. Zero disables them. (0-10) +# type: int +# mg_valleys_water_features = 0 + +##### Noises + +# Caves and tunnels form at the intersection of the two noises +# type: noise_params +# mg_valleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 + +# Caves and tunnels form at the intersection of the two noises +# type: noise_params +# mg_valleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 + +# The depth of dirt or other filler +# type: noise_params +# mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 + +# Massive caves form here. +# type: noise_params +# mg_valleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0 + +# River noise -- rivers occur close to zero +# type: noise_params +# mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 + +# Base terrain height +# type: noise_params +# mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 + +# Raises terrain to make valleys around the rivers +# type: noise_params +# mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 + +# Slope and fill work together to modify the heights +# type: noise_params +# mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 + +# Amplifies the valleys +# type: noise_params +# mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 + +# Slope and fill work together to modify the heights +# type: noise_params +# mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 ## Security @@ -1340,7 +1391,12 @@ # Comma-separated list of trusted mods that are allowed to access insecure # functions even when mod security is on (via request_insecure_environment()). # type: string -# secure.trusted_mods = +# secure.trusted_mods = + +# Comma-seperated list of mods that are allowed to access HTTP APIs, which +# allow them to upload and download data to/from the internet. +# type: string +# secure.http_mods = # # Client and Server @@ -1350,12 +1406,12 @@ # When running a server, clients connecting with this name are admins. # When starting from the main menu, this is overridden. # type: string -# name = +# name = # Set the language. Leave empty to use the system language. # A restart is required after changing this. # type: enum values: , be, cs, da, de, eo, es, et, fr, hu, id, it, ja, jbo, ko, ky, lt, nb, nl, pl, pt, pt_BR, ro, ru, tr, uk, zh_CN, zh_TW -# language = +# language = # Level of logging to be written to debug.txt: # - (no logging) @@ -1397,7 +1453,7 @@ # Replaces the default main menu with a custom one. # type: string -# main_menu_script = +# main_menu_script = # type: int # main_menu_game_mgr = 0 diff --git a/po/be/minetest.po b/po/be/minetest.po index 65942421..dbd2e2ea 100644 --- a/po/be/minetest.po +++ b/po/be/minetest.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2013-11-23 17:37+0100\n" "Last-Translator: Selat \n" "Language-Team: Belarusian\n" @@ -68,8 +68,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "" @@ -107,8 +108,8 @@ msgstr "" msgid "Mod:" msgstr "" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "" @@ -181,6 +182,7 @@ msgid "No of course not!" msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "" @@ -200,6 +202,92 @@ msgstr "" msgid "Rename Modpack:" msgstr "" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -290,10 +378,6 @@ msgstr "" msgid "Mod information:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "" @@ -406,15 +490,39 @@ msgid "Start Game" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +msgid "3D Clouds" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Advanced Settings" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Bilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -422,73 +530,103 @@ msgid "Change keys" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" +msgid "Connected Glass" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +msgid "Enable Particles" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" +msgid "Fancy Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Games" +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "No Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." +msgid "No Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." +msgid "No!!!" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." +msgid "Node Highlighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " +msgid "Opaque Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "Opaque Water" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "Simple Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Smooth Lighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Trilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Plants" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Water" msgstr "" #: builtin/mainmenu/tab_simple_main.lua @@ -515,10 +653,6 @@ msgstr "" msgid "No information available" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "" @@ -543,10 +677,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "" - #: src/client.cpp msgid "Loading textures..." msgstr "" @@ -1116,6 +1246,15 @@ msgstr "" msgid "Zoom" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1138,7 +1277,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1194,6 +1334,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1202,6 +1346,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1217,6 +1365,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1229,6 +1381,10 @@ msgstr "" msgid "Backward key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1249,10 +1405,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1265,6 +1417,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "" @@ -1273,6 +1437,29 @@ msgstr "" msgid "Chat toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1327,6 +1514,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "" @@ -1380,10 +1573,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1470,6 +1683,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1492,6 +1713,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "" @@ -1521,11 +1749,7 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." +msgid "Enable VBO" msgstr "" #: src/settings_translation_file.cpp @@ -1540,10 +1764,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1574,6 +1794,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1586,6 +1810,10 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "" @@ -1672,6 +1900,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1780,6 +2016,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1787,10 +2027,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1801,6 +2042,10 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +msgid "HTTP Mods" +msgstr "" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1813,6 +2058,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1826,7 +2075,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1851,6 +2100,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1943,6 +2196,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "" @@ -1961,47 +2218,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2015,7 +2261,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2029,7 +2275,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2226,6 +2472,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2326,36 +2580,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2396,6 +2640,10 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen Valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2416,6 +2664,54 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2433,23 +2729,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2469,25 +2753,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2632,6 +2912,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2660,14 +2952,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2759,6 +3043,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2775,13 +3063,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "" @@ -2858,10 +3139,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2882,6 +3159,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2922,10 +3203,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -2990,18 +3267,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3025,6 +3290,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3053,6 +3322,22 @@ msgstr "" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3170,10 +3455,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3199,6 +3480,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "" @@ -3254,14 +3539,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3333,6 +3637,10 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3401,17 +3709,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3420,6 +3744,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3429,23 +3759,27 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" +msgid "Water Features" msgstr "" #: src/settings_translation_file.cpp @@ -3554,6 +3888,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3564,6 +3902,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 759562c5..6064e4e0 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-02-06 01:25+0000\n" "Last-Translator: Joan Ciprià Moreno \n" -"Language-Team: Catalan " -"\n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,18 +19,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.5-dev\n" -#: builtin/fstk/ui.lua -msgid "The server has requested a reconnect:" -msgstr "El servidor ha sol·licitat una reconnexió:" - -#: builtin/fstk/ui.lua -msgid "Main menu" -msgstr "Menú principal" - -#: builtin/fstk/ui.lua -msgid "Reconnect" -msgstr "Torneu a connectar" - #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" msgstr "S'ha produït un error en un script Lua, com per exemple un mod :" @@ -39,14 +27,39 @@ msgstr "S'ha produït un error en un script Lua, com per exemple un mod :" msgid "An error occured:" msgstr "Ha ocorregut un error:" +#: builtin/fstk/ui.lua +msgid "Main menu" +msgstr "Menú principal" + #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" msgstr "D'acord" +#: builtin/fstk/ui.lua +msgid "Reconnect" +msgstr "Torneu a connectar" + +#: builtin/fstk/ui.lua +msgid "The server has requested a reconnect:" +msgstr "El servidor ha sol·licitat una reconnexió:" + #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." msgstr "Carregant ..." +#: builtin/mainmenu/common.lua +msgid "Protocol version mismatch. " +msgstr "Desajust de la versió del protocol. " + +#: builtin/mainmenu/common.lua +msgid "Server enforces protocol version $1. " +msgstr "El servidor fa complir la versió $1 del protocol. " + +#: builtin/mainmenu/common.lua +msgid "Server supports protocol versions between $1 and $2. " +msgstr "" +"El servidor es compatible amb les versions de protocol entre $ 1 i $ 2 . " + #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" @@ -54,68 +67,31 @@ msgstr "" "connexió a Internet ." #: builtin/mainmenu/common.lua -msgid "Server supports protocol versions between $1 and $2. " -msgstr "" -"El servidor es compatible amb les versions de protocol entre $ 1 i $ 2 . " - -#: builtin/mainmenu/common.lua -msgid "Server enforces protocol version $1. " -msgstr "El servidor fa complir la versió $1 del protocol. " +msgid "We only support protocol version $1." +msgstr "Nosaltres sols suportem la versió $1 del protocol." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." msgstr "Nosaltres suportem versions del protocol entre la versió $1 i la $2." -#: builtin/mainmenu/common.lua -msgid "We only support protocol version $1." -msgstr "Nosaltres sols suportem la versió $1 del protocol." - -#: builtin/mainmenu/common.lua -msgid "Protocol version mismatch. " -msgstr "Desajust de la versió del protocol. " - -#: builtin/mainmenu/dlg_config_world.lua -msgid "World:" -msgstr "Món:" - -#: builtin/mainmenu/dlg_config_world.lua -msgid "Hide Game" -msgstr "Ocultar Joc" - -#: builtin/mainmenu/dlg_config_world.lua -msgid "Hide mp content" -msgstr "Ocultar contingut MP" - -#: builtin/mainmenu/dlg_config_world.lua -msgid "Mod:" -msgstr "Mod:" +#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp +msgid "Cancel" +msgstr "Cancel·lar" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua msgid "Depends:" msgstr "Dependències:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp -msgid "Save" -msgstr "Guardar" - -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp -msgid "Cancel" -msgstr "Cancel·lar" - -#: builtin/mainmenu/dlg_config_world.lua -msgid "Enable MP" -msgstr "Activar MP" - #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" msgstr "Desactivar MP" #: builtin/mainmenu/dlg_config_world.lua -msgid "enabled" -msgstr "Activat" +msgid "Enable MP" +msgstr "Activar MP" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" @@ -129,34 +105,64 @@ msgstr "" "Error al habilitar el mod \"$1\" perquè conté caràcters no permesos. Només " "estan permesos els caràcters [a-z0-9_]." -#: builtin/mainmenu/dlg_create_world.lua -msgid "World name" -msgstr "Nom del món" +#: builtin/mainmenu/dlg_config_world.lua +msgid "Hide Game" +msgstr "Ocultar Joc" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Hide mp content" +msgstr "Ocultar contingut MP" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "Mod:" +msgstr "Mod:" + +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +msgid "Save" +msgstr "Guardar" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "World:" +msgstr "Món:" + +#: builtin/mainmenu/dlg_config_world.lua +msgid "enabled" +msgstr "Activat" #: builtin/mainmenu/dlg_create_world.lua -msgid "Seed" -msgstr "Llavor" - -#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp -msgid "Mapgen" -msgstr "Generador de mapes" - -#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp -msgid "Game" -msgstr "Joc" +msgid "A world named \"$1\" already exists" +msgstr "Ja existeix un món anomenat \"$1\"" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" msgstr "Crear" #: builtin/mainmenu/dlg_create_world.lua -msgid "You have no subgames installed." -msgstr "No tens subjocs instal·lats." +msgid "Download a subgame, such as minetest_game, from minetest.net" +msgstr "" +"Descarrega un subjoc, com per exemple minetest_game, des de minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" msgstr "Descarrega'n alguns des de minetest.net" +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Game" +msgstr "Joc" + +#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp +msgid "Mapgen" +msgstr "Generador de mapes" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "No worldname given or no game selected" +msgstr "No s'ha donat un nom al món o no s'ha seleccionat ningun" + +#: builtin/mainmenu/dlg_create_world.lua +msgid "Seed" +msgstr "Llavor" + #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." msgstr "" @@ -164,30 +170,17 @@ msgstr "" "desenvolupadors." #: builtin/mainmenu/dlg_create_world.lua -msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" -"Descarrega un subjoc, com per exemple minetest_game, des de minetest.net" +msgid "World name" +msgstr "Nom del món" #: builtin/mainmenu/dlg_create_world.lua -msgid "A world named \"$1\" already exists" -msgstr "Ja existeix un món anomenat \"$1\"" - -#: builtin/mainmenu/dlg_create_world.lua -msgid "No worldname given or no game selected" -msgstr "No s'ha donat un nom al món o no s'ha seleccionat ningun" +msgid "You have no subgames installed." +msgstr "No tens subjocs instal·lats." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" msgstr "Realment desitja esborrar \"$1\"?" -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -msgid "Yes" -msgstr "Sí" - -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "No, per descomptat que no!" - #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: Error al esborrar \"$1\"" @@ -196,6 +189,15 @@ msgstr "Modmgr: Error al esborrar \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: Ruta del mod \"$1\" invàlida" +#: builtin/mainmenu/dlg_delete_mod.lua +msgid "No of course not!" +msgstr "No, per descomptat que no!" + +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Sí" + #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Eliminar el món \"$1\"?" @@ -204,17 +206,100 @@ msgstr "Eliminar el món \"$1\"?" msgid "No" msgstr "No" -#: builtin/mainmenu/dlg_rename_modpack.lua -msgid "Rename Modpack:" -msgstr "Reanomenar el paquet de mods:" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Acceptar" -#: builtin/mainmenu/modmgr.lua -msgid "Install Mod: file: \"$1\"" -msgstr "Instal·lar mod: Arxiu: \"$1\"" +#: builtin/mainmenu/dlg_rename_modpack.lua +msgid "Rename Modpack:" +msgstr "Reanomenar el paquet de mods:" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" no és un indicador vàlid." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Cap descripció d'ajustament donada)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Navegar" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Desactivat" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Editar" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Activat" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" +"El format és 3 números separats per comes i aquests dins de parèntesis." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Jocs" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mods" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Si us plau, introduïu una llista d'indicadors separada per comes." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Si us plau, introduïu un enter vàlid." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Si us plau, introduïu un nombre vàlid." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Els possibles valors són: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Restablir per defecte" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Seleccioneu la ruta" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Mostrar els noms tècnics" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "El valor ha de ser major que $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "El valor ha de ser menor que $1." #: builtin/mainmenu/modmgr.lua msgid "" @@ -229,123 +314,114 @@ msgid "Failed to install $1 to $2" msgstr "Error al instal·lar $1 en $2" #: builtin/mainmenu/modmgr.lua -msgid "Install Mod: unable to find suitable foldername for modpack $1" -msgstr "" -"Instal·lar mod: Impossible de trobar el nom de la carpeta adequat per al " -"paquet de mods $1" +msgid "Install Mod: file: \"$1\"" +msgstr "Instal·lar mod: Arxiu: \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" msgstr "Instal·lar mod: Impossible trobar el nom real del mod per a: $1" -#: builtin/mainmenu/store.lua -msgid "Unsorted" -msgstr "Sense ordenar" - -#: builtin/mainmenu/store.lua -msgid "Search" -msgstr "Buscar" - -#: builtin/mainmenu/store.lua -msgid "Downloading $1, please wait..." -msgstr "Descarregant $1, si us plau esperi ..." - -#: builtin/mainmenu/store.lua -msgid "Successfully installed:" -msgstr "Instal·lat amb èxit:" - -#: builtin/mainmenu/store.lua -msgid "Shortname:" -msgstr "Nom curt:" - -#: builtin/mainmenu/store.lua -msgid "Rating" -msgstr "Classificació" - -#: builtin/mainmenu/store.lua -msgid "re-Install" -msgstr "Reinstal·lar" - -#: builtin/mainmenu/store.lua -msgid "Install" -msgstr "Instal·lar" +#: builtin/mainmenu/modmgr.lua +msgid "Install Mod: unable to find suitable foldername for modpack $1" +msgstr "" +"Instal·lar mod: Impossible de trobar el nom de la carpeta adequat per al " +"paquet de mods $1" #: builtin/mainmenu/store.lua msgid "Close store" msgstr "Tancar repositori" +#: builtin/mainmenu/store.lua +msgid "Downloading $1, please wait..." +msgstr "Descarregant $1, si us plau esperi ..." + +#: builtin/mainmenu/store.lua +msgid "Install" +msgstr "Instal·lar" + #: builtin/mainmenu/store.lua msgid "Page $1 of $2" msgstr "Pàgina $1 de $2" -#: builtin/mainmenu/tab_credits.lua -msgid "Credits" -msgstr "Crèdits" +#: builtin/mainmenu/store.lua +msgid "Rating" +msgstr "Classificació" -#: builtin/mainmenu/tab_credits.lua -msgid "Core Developers" -msgstr "Desenvolupadors del nucli" +#: builtin/mainmenu/store.lua +msgid "Search" +msgstr "Buscar" + +#: builtin/mainmenu/store.lua +msgid "Shortname:" +msgstr "Nom curt:" + +#: builtin/mainmenu/store.lua +msgid "Successfully installed:" +msgstr "Instal·lat amb èxit:" + +#: builtin/mainmenu/store.lua +msgid "Unsorted" +msgstr "Sense ordenar" + +#: builtin/mainmenu/store.lua +msgid "re-Install" +msgstr "Reinstal·lar" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" msgstr "Col·laboradors Actius" #: builtin/mainmenu/tab_credits.lua -msgid "Previous Core Developers" -msgstr "Antics Desenvolupadors del nucli" +msgid "Core Developers" +msgstr "Desenvolupadors del nucli" + +#: builtin/mainmenu/tab_credits.lua +msgid "Credits" +msgstr "Crèdits" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" msgstr "Antics Col·laboradors" +#: builtin/mainmenu/tab_credits.lua +msgid "Previous Core Developers" +msgstr "Antics Desenvolupadors del nucli" + #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" msgstr "Mods Instal·lats:" -#: builtin/mainmenu/tab_mods.lua -msgid "No mod description available" -msgstr "Cap descripció del mod disponible" - #: builtin/mainmenu/tab_mods.lua msgid "Mod information:" msgstr "Informació del mod:" +#: builtin/mainmenu/tab_mods.lua +msgid "No mod description available" +msgstr "Cap descripció del mod disponible" + #: builtin/mainmenu/tab_mods.lua msgid "Rename" msgstr "Reanomenar" #: builtin/mainmenu/tab_mods.lua -msgid "Uninstall selected modpack" -msgstr "Desinstal·lar el paquet de mods seleccionat" +msgid "Select Mod File:" +msgstr "Selecciona el fitxer del mod:" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" msgstr "Desinstal·lar el mod seleccionat" #: builtin/mainmenu/tab_mods.lua -msgid "Select Mod File:" -msgstr "Selecciona el fitxer del mod:" - -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mods" +msgid "Uninstall selected modpack" +msgstr "Desinstal·lar el paquet de mods seleccionat" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" msgstr "Adreça / Port:" -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nom / Contrasenya:" - -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Llista de servidors públics" - -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Esborrar" +#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp +msgid "Client" +msgstr "Client" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" @@ -359,30 +435,31 @@ msgstr "Mode creatiu" msgid "Damage enabled" msgstr "Dany activat" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua +#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp +msgid "Delete" +msgstr "Esborrar" + +#: builtin/mainmenu/tab_multiplayer.lua +msgid "Name / Password :" +msgstr "Nom / Contrasenya:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Public Serverlist" +msgstr "Llista de servidors públics" + #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" msgstr "PvP activat" -#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp -msgid "Client" -msgstr "Client" - -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -msgid "New" -msgstr "Nou" +#: builtin/mainmenu/tab_server.lua +msgid "Bind Address" +msgstr "Adreça BIND" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" msgstr "Configurar" -#: builtin/mainmenu/tab_server.lua -msgid "Start Game" -msgstr "Començar Joc" - -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -msgid "Select World:" -msgstr "Seleccionar un món:" - #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Creative Mode" @@ -393,123 +470,184 @@ msgstr "Mode Creatiu" msgid "Enable Damage" msgstr "Permetre Danys" -#: builtin/mainmenu/tab_server.lua -msgid "Public" -msgstr "Públic" - #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua msgid "Name/Password" msgstr "Nom/Contrasenya" -#: builtin/mainmenu/tab_server.lua -msgid "Bind Address" -msgstr "Adreça BIND" - -#: builtin/mainmenu/tab_server.lua -msgid "Port" -msgstr "Port" - -#: builtin/mainmenu/tab_server.lua -msgid "Server Port" -msgstr "Port del Servidor" +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "New" +msgstr "Nou" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" msgstr "No s'ha creat ningun món o no s'ha seleccionat!" +#: builtin/mainmenu/tab_server.lua +msgid "Port" +msgstr "Port" + +#: builtin/mainmenu/tab_server.lua +msgid "Public" +msgstr "Públic" + +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +msgid "Select World:" +msgstr "Seleccionar un món:" + #: builtin/mainmenu/tab_server.lua msgid "Server" msgstr "Servidor" -#: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Jocs" +#: builtin/mainmenu/tab_server.lua +msgid "Server Port" +msgstr "Port del Servidor" + +#: builtin/mainmenu/tab_server.lua +msgid "Start Game" +msgstr "Començar Joc" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Cap descripció d'ajustament donada)" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Si us plau, introduïu una llista d'indicadors separada per comes." - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Els possibles valors són: " - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "3D Clouds" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "El format és 3 números separats per comes i aquests dins de parèntesis." +msgid "4x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Desactivat" +msgid "8x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Activat" +#, fuzzy +msgid "Advanced Settings" +msgstr "Configuració" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Navegar" +msgid "Antialiasing:" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Si us plau, introduïu un enter vàlid." +msgid "Are you sure to reset your singleplayer world?" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "El valor ha de ser major que $1." +msgid "Bilinear Filter" +msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "El valor ha de ser menor que $1." - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Si us plau, introduïu un nombre vàlid." - -#: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" no és un indicador vàlid." - -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Seleccioneu la ruta" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Configurar controls" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Editar" +#, fuzzy +msgid "Connected Glass" +msgstr "Connectar" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Restablir per defecte" +#, fuzzy +msgid "Enable Particles" +msgstr "Activar tot" #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Mostrar els noms tècnics" +msgid "Fancy Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Generate Normalmaps" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Mipmap" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Mipmap + Aniso. Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "No Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "No Mipmap" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Node Highlighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Ningun" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Configuració" -#: builtin/mainmenu/tab_simple_main.lua -msgid "Start Singleplayer" -msgstr "Començar Un Jugador" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Simple Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Smooth Lighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Trilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Plants" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Water" +msgstr "" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -519,6 +657,10 @@ msgstr "Configurar mods" msgid "Main" msgstr "Principal" +#: builtin/mainmenu/tab_simple_main.lua +msgid "Start Singleplayer" +msgstr "Començar Un Jugador" + #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" msgstr "Jugar" @@ -528,17 +670,13 @@ msgid "Singleplayer" msgstr "Un jugador" #: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Ningun" +msgid "No information available" +msgstr "Sense informació disponible" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selecciona un paquet de textures:" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "No information available" -msgstr "Sense informació disponible" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" msgstr "Textures" @@ -547,6 +685,18 @@ msgstr "Textures" msgid "Connection timed out." msgstr "Temps d'espera de la connexió esgotat." +#: src/client.cpp +msgid "Done!" +msgstr "Completat!" + +#: src/client.cpp +msgid "Initializing nodes" +msgstr "Inicialitzant nodes" + +#: src/client.cpp +msgid "Initializing nodes..." +msgstr "Inicialitzant nodes ..." + #: src/client.cpp msgid "Loading textures..." msgstr "Carregant textures ..." @@ -555,42 +705,10 @@ msgstr "Carregant textures ..." msgid "Rebuilding shaders..." msgstr "Reconstruint ombreig ..." -#: src/client.cpp -msgid "Initializing nodes..." -msgstr "Inicialitzant nodes ..." - -#: src/client.cpp -msgid "Initializing nodes" -msgstr "Inicialitzant nodes" - -#: src/client.cpp -msgid "Item textures..." -msgstr "Textures de objectes ..." - -#: src/client.cpp -msgid "Done!" -msgstr "Completat!" - -#: src/client/clientlauncher.cpp -msgid "Main Menu" -msgstr "Menú principal" - -#: src/client/clientlauncher.cpp -msgid "Player name too long." -msgstr "Nom del jugador massa llarg." - #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" msgstr "Error de connexió (¿temps esgotat?)" -#: src/client/clientlauncher.cpp -msgid "No world selected and no address provided. Nothing to do." -msgstr "Cap món seleccionat i cap adreça facilitada. Res a fer." - -#: src/client/clientlauncher.cpp -msgid "Provided world path doesn't exist: " -msgstr "La ruta del món especificat no existeix: " - #: src/client/clientlauncher.cpp msgid "Could not find or load game \"" msgstr "No es pot trobar o carregar el joc \"" @@ -599,21 +717,83 @@ msgstr "No es pot trobar o carregar el joc \"" msgid "Invalid gamespec." msgstr "" +#: src/client/clientlauncher.cpp +msgid "Main Menu" +msgstr "Menú principal" + +#: src/client/clientlauncher.cpp +msgid "No world selected and no address provided. Nothing to do." +msgstr "Cap món seleccionat i cap adreça facilitada. Res a fer." + +#: src/client/clientlauncher.cpp +msgid "Player name too long." +msgstr "Nom del jugador massa llarg." + +#: src/client/clientlauncher.cpp +msgid "Provided world path doesn't exist: " +msgstr "La ruta del món especificat no existeix: " + #: src/fontengine.cpp msgid "needs_fallback_font" msgstr "no" -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" +#: src/game.cpp +msgid "" +"\n" +"Check debug.txt for details." +msgstr "" +"\n" +"Comprovi debug.txt per a detalls." + +#: src/game.cpp +msgid "Change Keys" +msgstr "Configurar Controls" + +#: src/game.cpp +msgid "Change Password" +msgstr "Canviar contrasenya" + +#: src/game.cpp +msgid "Connecting to server..." +msgstr "Connectant al servidor ..." + +#: src/game.cpp +msgid "Continue" msgstr "Continuar" #: src/game.cpp -msgid "You died." -msgstr "Has mort." +msgid "Creating client..." +msgstr "Creant client ..." #: src/game.cpp -msgid "Respawn" -msgstr "Reaparèixer" +msgid "Creating server..." +msgstr "Creant servidor ..." + +#: src/game.cpp +msgid "" +"Default Controls:\n" +"- WASD: move\n" +"- Space: jump/climb\n" +"- Shift: sneak/go down\n" +"- Q: drop item\n" +"- I: inventory\n" +"- Mouse: turn/look\n" +"- Mouse left: dig/punch\n" +"- Mouse right: place/use\n" +"- Mouse wheel: select item\n" +"- T: chat\n" +msgstr "" +"Controls predeterminats:\n" +"- WASD: moure\n" +"- Espai: botar / pujar\n" +"- Maj .: puntetes / baixar\n" +"- Q: deixar anar objecte\n" +"- I: inventari\n" +"- Ratolí: girar / mirar\n" +"- Ratolí esq .: excavar / colpejar\n" +"- Ratolí dre .: col·locar / utilitzar\n" +"- Roda ratolí: triar objecte\n" +"- T: xat\n" #: src/game.cpp msgid "" @@ -643,48 +823,6 @@ msgstr "" "- Toc i arrossegar, toc amb 2 dits:\n" " -> col·locar només un objecte\n" -#: src/game.cpp -msgid "" -"Default Controls:\n" -"- WASD: move\n" -"- Space: jump/climb\n" -"- Shift: sneak/go down\n" -"- Q: drop item\n" -"- I: inventory\n" -"- Mouse: turn/look\n" -"- Mouse left: dig/punch\n" -"- Mouse right: place/use\n" -"- Mouse wheel: select item\n" -"- T: chat\n" -msgstr "" -"Controls predeterminats:\n" -"- WASD: moure\n" -"- Espai: botar / pujar\n" -"- Maj .: puntetes / baixar\n" -"- Q: deixar anar objecte\n" -"- I: inventari\n" -"- Ratolí: girar / mirar\n" -"- Ratolí esq .: excavar / colpejar\n" -"- Ratolí dre .: col·locar / utilitzar\n" -"- Roda ratolí: triar objecte\n" -"- T: xat\n" - -#: src/game.cpp -msgid "Continue" -msgstr "Continuar" - -#: src/game.cpp -msgid "Change Password" -msgstr "Canviar contrasenya" - -#: src/game.cpp -msgid "Sound Volume" -msgstr "Volum del so" - -#: src/game.cpp -msgid "Change Keys" -msgstr "Configurar Controls" - #: src/game.cpp msgid "Exit to Menu" msgstr "Eixir al menú" @@ -693,53 +831,49 @@ msgstr "Eixir al menú" msgid "Exit to OS" msgstr "Eixir al S.O" -#: src/game.cpp -msgid "Shutting down..." -msgstr "Tancant ..." - -#: src/game.cpp -msgid "Creating server..." -msgstr "Creant servidor ..." - -#: src/game.cpp -msgid "Creating client..." -msgstr "Creant client ..." - -#: src/game.cpp -msgid "Resolving address..." -msgstr "Resolent adreça ..." - -#: src/game.cpp -msgid "Connecting to server..." -msgstr "Connectant al servidor ..." - #: src/game.cpp msgid "Item definitions..." msgstr "Definicions d'objectes ..." -#: src/game.cpp -msgid "Node definitions..." -msgstr "Definicions dels nodes ..." - -#: src/game.cpp -msgid "Media..." -msgstr "Media ..." - #: src/game.cpp msgid "KiB/s" msgstr "KiB/s" +#: src/game.cpp +msgid "Media..." +msgstr "Media ..." + #: src/game.cpp msgid "MiB/s" msgstr "MiB/s" #: src/game.cpp -msgid "" -"\n" -"Check debug.txt for details." -msgstr "" -"\n" -"Comprovi debug.txt per a detalls." +msgid "Node definitions..." +msgstr "Definicions dels nodes ..." + +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "Proceed" +msgstr "Continuar" + +#: src/game.cpp +msgid "Resolving address..." +msgstr "Resolent adreça ..." + +#: src/game.cpp +msgid "Respawn" +msgstr "Reaparèixer" + +#: src/game.cpp +msgid "Shutting down..." +msgstr "Tancant ..." + +#: src/game.cpp +msgid "Sound Volume" +msgstr "Volum del so" + +#: src/game.cpp +msgid "You died." +msgstr "Has mort." #: src/guiFormSpecMenu.cpp msgid "Enter " @@ -749,64 +883,14 @@ msgstr "Introdueix " msgid "ok" msgstr "Acceptar" -#: src/guiKeyChangeMenu.cpp -msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "" -"Combinacions de tecles. (Si aquest menú espatlla, esborrar coses de " -"minetest.conf)" - #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" msgstr "\"Utilitzar\" = Descendir" -#: src/guiKeyChangeMenu.cpp -msgid "Double tap \"jump\" to toggle fly" -msgstr "Dos tocs \"botar\" per volar" - -#: src/guiKeyChangeMenu.cpp -msgid "Key already in use" -msgstr "La tecla s'està utilitzant" - -#: src/guiKeyChangeMenu.cpp -msgid "press key" -msgstr "Premsa una tecla" - -#: src/guiKeyChangeMenu.cpp -msgid "Forward" -msgstr "Avant" - #: src/guiKeyChangeMenu.cpp msgid "Backward" msgstr "Arrere" -#: src/guiKeyChangeMenu.cpp src/keycode.cpp -msgid "Left" -msgstr "Esquerra" - -#: src/guiKeyChangeMenu.cpp src/keycode.cpp -msgid "Right" -msgstr "Dreta" - -#: src/guiKeyChangeMenu.cpp -msgid "Use" -msgstr "Utilitzar" - -#: src/guiKeyChangeMenu.cpp -msgid "Jump" -msgstr "Botar" - -#: src/guiKeyChangeMenu.cpp -msgid "Sneak" -msgstr "Discreció" - -#: src/guiKeyChangeMenu.cpp -msgid "Drop" -msgstr "Amollar" - -#: src/guiKeyChangeMenu.cpp -msgid "Inventory" -msgstr "Inventari" - #: src/guiKeyChangeMenu.cpp msgid "Chat" msgstr "Xat" @@ -820,151 +904,230 @@ msgid "Console" msgstr "Consola" #: src/guiKeyChangeMenu.cpp -msgid "Toggle fly" -msgstr "Activar volar" +msgid "Double tap \"jump\" to toggle fly" +msgstr "Dos tocs \"botar\" per volar" #: src/guiKeyChangeMenu.cpp -msgid "Toggle fast" -msgstr "Activar ràpid" +msgid "Drop" +msgstr "Amollar" + +#: src/guiKeyChangeMenu.cpp +msgid "Forward" +msgstr "Avant" + +#: src/guiKeyChangeMenu.cpp +msgid "Inventory" +msgstr "Inventari" + +#: src/guiKeyChangeMenu.cpp +msgid "Jump" +msgstr "Botar" + +#: src/guiKeyChangeMenu.cpp +msgid "Key already in use" +msgstr "La tecla s'està utilitzant" + +#: src/guiKeyChangeMenu.cpp +msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" +msgstr "" +"Combinacions de tecles. (Si aquest menú espatlla, esborrar coses de minetest." +"conf)" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Left" +msgstr "Esquerra" + +#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp +msgid "Print stacks" +msgstr "Imprimir piles" + +#: src/guiKeyChangeMenu.cpp +msgid "Range select" +msgstr "Seleccionar distancia" + +#: src/guiKeyChangeMenu.cpp src/keycode.cpp +msgid "Right" +msgstr "Dreta" + +#: src/guiKeyChangeMenu.cpp +msgid "Sneak" +msgstr "Discreció" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" msgstr "Activar Cinematogràfic" +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fast" +msgstr "Activar ràpid" + +#: src/guiKeyChangeMenu.cpp +msgid "Toggle fly" +msgstr "Activar volar" + #: src/guiKeyChangeMenu.cpp msgid "Toggle noclip" msgstr "Activar noclip" #: src/guiKeyChangeMenu.cpp -msgid "Range select" -msgstr "Seleccionar distancia" +msgid "Use" +msgstr "Utilitzar" -#: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp -msgid "Print stacks" -msgstr "Imprimir piles" - -#: src/guiPasswordChange.cpp -msgid "Old Password" -msgstr "Contrasenya vella" - -#: src/guiPasswordChange.cpp -msgid "New Password" -msgstr "Nova contrasenya" - -#: src/guiPasswordChange.cpp -msgid "Confirm Password" -msgstr "Confirma contrasenya" +#: src/guiKeyChangeMenu.cpp +msgid "press key" +msgstr "Premsa una tecla" #: src/guiPasswordChange.cpp msgid "Change" msgstr "Canviar" +#: src/guiPasswordChange.cpp +msgid "Confirm Password" +msgstr "Confirma contrasenya" + +#: src/guiPasswordChange.cpp +msgid "New Password" +msgstr "Nova contrasenya" + +#: src/guiPasswordChange.cpp +msgid "Old Password" +msgstr "Contrasenya vella" + #: src/guiPasswordChange.cpp msgid "Passwords do not match!" msgstr "Les contrasenyes no coincideixen!" -#: src/guiVolumeChange.cpp -msgid "Sound Volume: " -msgstr "Volum de so: " - #: src/guiVolumeChange.cpp msgid "Exit" msgstr "Tancar" -#: src/keycode.cpp -msgid "Left Button" -msgstr "Botó esquerre" +#: src/guiVolumeChange.cpp +msgid "Sound Volume: " +msgstr "Volum de so: " #: src/keycode.cpp -msgid "Middle Button" -msgstr "Botó del mig" +msgid "Apps" +msgstr "Aplicacions" #: src/keycode.cpp -msgid "Right Button" -msgstr "Botó dret" - -#: src/keycode.cpp -msgid "X Button 1" -msgstr "X Botó 1" +msgid "Attn" +msgstr "Atentament" #: src/keycode.cpp msgid "Back" msgstr "Enrere" +#: src/keycode.cpp +msgid "Capital" +msgstr "Bloq Maj" + #: src/keycode.cpp msgid "Clear" msgstr "Netejar" #: src/keycode.cpp -msgid "Return" -msgstr "Tornar" - -#: src/keycode.cpp -msgid "Tab" -msgstr "Tabulador" - -#: src/keycode.cpp -msgid "X Button 2" -msgstr "X Botó 2" - -#: src/keycode.cpp -msgid "Capital" -msgstr "Bloq Maj" +msgid "Comma" +msgstr "Coma" #: src/keycode.cpp msgid "Control" msgstr "Control" -#: src/keycode.cpp -#, fuzzy -msgid "Kana" -msgstr "Kana" - -#: src/keycode.cpp -msgid "Menu" -msgstr "Menú" - -#: src/keycode.cpp -msgid "Pause" -msgstr "Pausa" - -#: src/keycode.cpp -msgid "Shift" -msgstr "Shift" - #: src/keycode.cpp msgid "Convert" msgstr "Convertir" +#: src/keycode.cpp +#, fuzzy +msgid "CrSel" +msgstr "CrSel" + +#: src/keycode.cpp +msgid "Down" +msgstr "Avall" + +#: src/keycode.cpp +msgid "End" +msgstr "Fi" + +#: src/keycode.cpp +msgid "Erase OEF" +msgstr "Esborrar OEF" + #: src/keycode.cpp msgid "Escape" msgstr "Esc" +#: src/keycode.cpp +msgid "ExSel" +msgstr "ExSel" + +#: src/keycode.cpp +msgid "Execute" +msgstr "Executar" + #: src/keycode.cpp msgid "Final" msgstr "Fi" +#: src/keycode.cpp +msgid "Help" +msgstr "Ajuda" + +#: src/keycode.cpp +msgid "Home" +msgstr "Inici" + +#: src/keycode.cpp +msgid "Insert" +msgstr "Introduir" + #: src/keycode.cpp #, fuzzy msgid "Junja" msgstr "Junja" +#: src/keycode.cpp +#, fuzzy +msgid "Kana" +msgstr "Kana" + #: src/keycode.cpp #, fuzzy msgid "Kanji" msgstr "Kanji" #: src/keycode.cpp -msgid "Nonconvert" -msgstr "" +msgid "Left Button" +msgstr "Botó esquerre" #: src/keycode.cpp -msgid "End" -msgstr "Fi" +msgid "Left Control" +msgstr "Control esq" #: src/keycode.cpp -msgid "Home" -msgstr "Inici" +msgid "Left Menu" +msgstr "Menú esq" + +#: src/keycode.cpp +msgid "Left Shift" +msgstr "Shift esq" + +#: src/keycode.cpp +msgid "Left Windows" +msgstr "Windows esquerre" + +#: src/keycode.cpp +msgid "Menu" +msgstr "Menú" + +#: src/keycode.cpp +msgid "Middle Button" +msgstr "Botó del mig" + +#: src/keycode.cpp +msgid "Minus" +msgstr "Menys" #: src/keycode.cpp msgid "Mode Change" @@ -975,52 +1138,28 @@ msgid "Next" msgstr "Següent" #: src/keycode.cpp -msgid "Prior" -msgstr "Anterior" +msgid "Nonconvert" +msgstr "" #: src/keycode.cpp -msgid "Space" -msgstr "Espai" +msgid "Num Lock" +msgstr "Bloq Num" #: src/keycode.cpp -msgid "Down" -msgstr "Avall" +msgid "Numpad *" +msgstr "Teclat Num. *" #: src/keycode.cpp -msgid "Execute" -msgstr "Executar" +msgid "Numpad +" +msgstr "Teclat Num. +" #: src/keycode.cpp -msgid "Print" -msgstr "Imprimir" +msgid "Numpad -" +msgstr "Teclat Num. -" #: src/keycode.cpp -msgid "Select" -msgstr "Seleccionar" - -#: src/keycode.cpp -msgid "Up" -msgstr "Amunt" - -#: src/keycode.cpp -msgid "Help" -msgstr "Ajuda" - -#: src/keycode.cpp -msgid "Insert" -msgstr "Introduir" - -#: src/keycode.cpp -msgid "Snapshot" -msgstr "Captura de pantalla" - -#: src/keycode.cpp -msgid "Left Windows" -msgstr "Windows esquerre" - -#: src/keycode.cpp -msgid "Apps" -msgstr "Aplicacions" +msgid "Numpad /" +msgstr "Teclat Num. /" #: src/keycode.cpp msgid "Numpad 0" @@ -1030,14 +1169,6 @@ msgstr "Teclat Num. 0" msgid "Numpad 1" msgstr "Teclat Num. 1" -#: src/keycode.cpp -msgid "Right Windows" -msgstr "Windows dret" - -#: src/keycode.cpp -msgid "Sleep" -msgstr "Dormir" - #: src/keycode.cpp msgid "Numpad 2" msgstr "Teclat Num. 2" @@ -1062,22 +1193,6 @@ msgstr "Teclat Num. 6" msgid "Numpad 7" msgstr "Teclat Num. 7" -#: src/keycode.cpp -msgid "Numpad *" -msgstr "Teclat Num. *" - -#: src/keycode.cpp -msgid "Numpad +" -msgstr "Teclat Num. +" - -#: src/keycode.cpp -msgid "Numpad -" -msgstr "Teclat Num. -" - -#: src/keycode.cpp -msgid "Numpad /" -msgstr "Teclat Num. /" - #: src/keycode.cpp msgid "Numpad 8" msgstr "Teclat Num. 8" @@ -1086,71 +1201,6 @@ msgstr "Teclat Num. 8" msgid "Numpad 9" msgstr "Teclat Num. 9" -#: src/keycode.cpp -msgid "Num Lock" -msgstr "Bloq Num" - -#: src/keycode.cpp -msgid "Scroll Lock" -msgstr "Bloq Despl" - -#: src/keycode.cpp -msgid "Left Shift" -msgstr "Shift esq" - -#: src/keycode.cpp -msgid "Right Shift" -msgstr "Shift Dta" - -#: src/keycode.cpp -msgid "Left Control" -msgstr "Control esq" - -#: src/keycode.cpp -msgid "Left Menu" -msgstr "Menú esq" - -#: src/keycode.cpp -msgid "Right Control" -msgstr "Control dta" - -#: src/keycode.cpp -msgid "Right Menu" -msgstr "Menú dta" - -#: src/keycode.cpp -msgid "Comma" -msgstr "Coma" - -#: src/keycode.cpp -msgid "Minus" -msgstr "Menys" - -#: src/keycode.cpp -msgid "Period" -msgstr "Període" - -#: src/keycode.cpp -msgid "Plus" -msgstr "Més" - -#: src/keycode.cpp -msgid "Attn" -msgstr "Atentament" - -#: src/keycode.cpp -#, fuzzy -msgid "CrSel" -msgstr "CrSel" - -#: src/keycode.cpp -msgid "Erase OEF" -msgstr "Esborrar OEF" - -#: src/keycode.cpp -msgid "ExSel" -msgstr "ExSel" - #: src/keycode.cpp msgid "OEM Clear" msgstr "Netejar OEM" @@ -1160,34 +1210,724 @@ msgstr "Netejar OEM" msgid "PA1" msgstr "PA1" +#: src/keycode.cpp +msgid "Pause" +msgstr "Pausa" + +#: src/keycode.cpp +msgid "Period" +msgstr "Període" + +#: src/keycode.cpp +msgid "Plus" +msgstr "Més" + +#: src/keycode.cpp +msgid "Print" +msgstr "Imprimir" + +#: src/keycode.cpp +msgid "Prior" +msgstr "Anterior" + +#: src/keycode.cpp +msgid "Return" +msgstr "Tornar" + +#: src/keycode.cpp +msgid "Right Button" +msgstr "Botó dret" + +#: src/keycode.cpp +msgid "Right Control" +msgstr "Control dta" + +#: src/keycode.cpp +msgid "Right Menu" +msgstr "Menú dta" + +#: src/keycode.cpp +msgid "Right Shift" +msgstr "Shift Dta" + +#: src/keycode.cpp +msgid "Right Windows" +msgstr "Windows dret" + +#: src/keycode.cpp +msgid "Scroll Lock" +msgstr "Bloq Despl" + +#: src/keycode.cpp +msgid "Select" +msgstr "Seleccionar" + +#: src/keycode.cpp +msgid "Shift" +msgstr "Shift" + +#: src/keycode.cpp +msgid "Sleep" +msgstr "Dormir" + +#: src/keycode.cpp +msgid "Snapshot" +msgstr "Captura de pantalla" + +#: src/keycode.cpp +msgid "Space" +msgstr "Espai" + +#: src/keycode.cpp +msgid "Tab" +msgstr "Tabulador" + +#: src/keycode.cpp +msgid "Up" +msgstr "Amunt" + +#: src/keycode.cpp +msgid "X Button 1" +msgstr "X Botó 1" + +#: src/keycode.cpp +msgid "X Button 2" +msgstr "X Botó 2" + #: src/keycode.cpp #, fuzzy msgid "Zoom" msgstr "Zoom" #: src/settings_translation_file.cpp -msgid "Controls" -msgstr "Controls" +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"0 = parallax occlusion with slope information (faster).\n" +"1 = relief mapping (slower, more accurate)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "3D clouds" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "3D mode" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"3D support.\n" +"Currently supported:\n" +"- none: no 3d output.\n" +"- anaglyph: cyan/magenta color 3d.\n" +"- interlaced: odd/even line based polarisation screen support.\n" +"- topbottom: split screen top/bottom.\n" +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"A chosen map seed for a new map, leave empty for random.\n" +"Will be overridden when creating a new world in the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "A message to be displayed to all clients when the server crashes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "A message to be displayed to all clients when the server shuts down." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Absolute limit of emerge queues" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Acceleration in air" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active block range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active object send range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Address to connect to.\n" +"Leave this blank to start a local server.\n" +"Note that the address field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " +"screens." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" +"This setting is for the client only and is ignored by the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Advanced" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Always fly and fast" +msgstr "Sempre volar y ràpid" + +#: src/settings_translation_file.cpp +msgid "Ambient occlusion gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Anisotropic filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Announce server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Announce to this serverlist.\n" +"If you want to announce your ipv6 address, use serverlist_url = v6.servers." +"minetest.net." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ask to reconnect after crash" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Automaticaly report to the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Backward key" +msgstr "Tecla de retrocés" + +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Basic" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bind address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Bits per pixel (aka color depth) in fullscreen mode." +msgstr "" #: src/settings_translation_file.cpp msgid "Build inside player" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"If enabled, you can place blocks at the position (feet + eye level) where " -"you stand.\n" -"This is helpful when working with nodeboxes in small areas." +msgid "Camera smoothing" +msgstr "Suavitzat de la càmera" + +#: src/settings_translation_file.cpp +msgid "Camera smoothing in cinematic mode" +msgstr "Suavitzat de la càmera en mode cinematogràfic" + +#: src/settings_translation_file.cpp +msgid "Camera update toggle key" msgstr "" #: src/settings_translation_file.cpp -msgid "Flying" +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chat toggle key" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Player is able to fly without being affected by gravity.\n" -"This requires the \"fly\" privilege on the server." +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Chunk size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode" +msgstr "Mode cinematogràfic" + +#: src/settings_translation_file.cpp +msgid "Cinematic mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clean transparent textures" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Client and Server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Climbing speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cloud radius" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds are a client side effect." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Clouds in menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Colored fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Comma-separated list of trusted mods that are allowed to access insecure\n" +"functions even when mod security is on (via request_insecure_environment())." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Command key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect glass" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connect to external media server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Connects glass if supported by node." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Console key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Continuous forward" +msgstr "Avanç continu" + +#: src/settings_translation_file.cpp +msgid "Continuous forward movement (only used for testing)." +msgstr "Avanç continu (sols utilitzat per a testing)." + +#: src/settings_translation_file.cpp +msgid "Controls" +msgstr "Controls" + +#: src/settings_translation_file.cpp +msgid "" +"Controls length of day/night cycle.\n" +"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " +"unchanged." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Controls size of deserts and beaches in Mapgen v6.\n" +"When snowbiomes are enabled 'mgv6_freq_desert' is ignored." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crash message" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crosshair color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Crouch speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "DPI" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Damage" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Debug info toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Debug log level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Dedicated server step" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default acceleration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default game" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Default game when creating a new world.\n" +"This will be overridden when creating a world from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default password" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Default privileges" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Default timeout for cURL, stated in milliseconds.\n" +"Only has an effect if compiled with cURL." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Defines sampling step of texture.\n" +"A higher value results in smoother normal maps." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Delay showing tooltips, stated in milliseconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Deprecated Lua API handling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Descending speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Description of server, to be displayed when players join and in the " +"serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Desynchronize block animation" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profile data. Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Detailed mod profiling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Disable anticheat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Disallow empty passwords" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Domain name of server, to be displayed in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Double tap jump for fly" +msgstr "Polsar dues vegades \"botar\" per volar" + +#: src/settings_translation_file.cpp +msgid "Double-tapping the jump key toggles fly mode." +msgstr "Polsar dues vegades \"botar\" per alternar el mode de vol." + +#: src/settings_translation_file.cpp +msgid "Drop item key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Dump the mapgen debug infos." +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enable VBO" +msgstr "Activar MP" + +#: src/settings_translation_file.cpp +msgid "Enable mod security" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable players getting damage and dying." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable random user input (only used for testing)." +msgstr "Habilitar l'entrada aleatòria d'usuari (només utilitzat per testing)." + +#: src/settings_translation_file.cpp +msgid "" +"Enable smooth lighting with simple ambient occlusion.\n" +"Disable for speed or for different looks." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable to disallow old clients from connecting.\n" +"Older clients are compatible in the sense that they will not crash when " +"connecting\n" +"to new servers, but they may not support all new features that you are " +"expecting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable usage of remote media server (if provided by server).\n" +"Remote servers offer a significantly faster way to download media (e.g. " +"textures)\n" +"when connecting to the server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enable/disable running an IPv6 server. An IPv6 server may be restricted\n" +"to IPv6 clients, depending on system configuration.\n" +"Ignored if bind_address is set." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables bumpmapping for textures. Normalmaps need to be supplied by the " +"texture pack\n" +"or need to be auto-generated.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables caching of facedir rotated meshes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables filmic tone mapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables minimap." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables on the fly normalmap generation (Emboss effect).\n" +"Requires bumpmapping to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Enables parallax occlusion mapping.\n" +"Requires shaders to be enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Experimental option, might cause visible spaces between blocks\n" +"when set to higher number than 0." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FPS in pause menu" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "FSAA" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fall bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fallback font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode acceleration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fast mode speed" msgstr "" #: src/settings_translation_file.cpp @@ -1203,7 +1943,246 @@ msgstr "" "Això requereix el \"privilegi\" ràpid en el servidor." #: src/settings_translation_file.cpp -msgid "Noclip" +msgid "Field of view" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Field of view in degrees." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"File in client/serverlist/ that contains your favorite servers displayed in " +"the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Filtered textures can blend RGB values with fully-transparent neighbors,\n" +"which PNG optimizers usually discard, sometimes resulting in a dark or\n" +"light edge to transparent textures. Apply this filter to clean that up\n" +"at texture load time." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fixed map seed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fly key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Flying" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fog toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font shadow offset, if 0 then shadow will not be drawn." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Forward key" +msgstr "Tecla Avançar" + +#: src/settings_translation_file.cpp +msgid "Freetype fonts" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far blocks are generated for clients, stated in mapblocks (16 " +"nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far blocks are sent to clients, stated in mapblocks (16 nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"From how far clients know about objects, stated in mapblocks (16 nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Full screen" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Full screen BPP" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Fullscreen mode." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "GUI scaling filter txr2img" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Gamma" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Generate normalmaps" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Graphics" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Gravity" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mods" + +#: src/settings_translation_file.cpp +msgid "HUD toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Handling for deprecated lua api calls:\n" +"- legacy: (try to) mimic old behaviour (default for release).\n" +"- log: mimic and log backtrace of deprecated call (default for debug).\n" +"- error: abort on usage of deprecated call (suggested for mod developers)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Height on which clouds are appearing." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "High-precision FPU" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Homepage of server, to be displayed in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How deep to make rivers" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How large area of blocks are subject to the active block stuff, stated in " +"mapblocks (16 nodes).\n" +"In active blocks objects are loaded and ABMs run." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How many blocks are flying in the wire simultaneously for the whole server." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How many blocks are flying in the wire simultaneously per client." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"How much the server will wait before unloading unused mapblocks.\n" +"Higher value is smoother, but will use more RAM." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6 server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "IPv6 support." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If FPS would go higher than this, limit it by sleeping\n" +"to not waste CPU power for no benefit." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If disabled \"use\" key is used to fly fast if both fly and fast mode are " +"enabled." msgstr "" #: src/settings_translation_file.cpp @@ -1214,33 +2193,73 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Cinematic mode" -msgstr "Mode cinematogràfic" +msgid "" +"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " +"and descending." +msgstr "" #: src/settings_translation_file.cpp msgid "" -"Smooths camera when moving and looking around.\n" -"Useful for recording videos." +"If enabled, actions are recorded for rollback.\n" +"This option is only read when server starts." msgstr "" -"Suavitza la càmera quan estiga movent-se i mirant al seu voltant.\n" -"Útil per a la gravació de vídeos." #: src/settings_translation_file.cpp -msgid "Camera smoothing" -msgstr "Suavitzat de la càmera" - -#: src/settings_translation_file.cpp -msgid "Smooths rotation of camera. 0 to disable." -msgstr "Suavitza la rotació de la càmera. 0 per deshabilitar." - -#: src/settings_translation_file.cpp -msgid "Camera smoothing in cinematic mode" -msgstr "Suavitzat de la càmera en mode cinematogràfic" - -#: src/settings_translation_file.cpp -msgid "Smooths rotation of camera in cinematic mode. 0 to disable." +msgid "If enabled, disable cheat prevention in multiplayer." msgstr "" -"Suavitza la rotació de la càmera en mode cinematogràfic. 0 per deshabilitar." + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, invalid world data won't cause the server to shut down.\n" +"Only enable this if you know what you are doing." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If enabled, new players cannot join with an empty password." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"If enabled, you can place blocks at the position (feet + eye level) where " +"you stand.\n" +"This is helpful when working with nodeboxes in small areas." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "If this is set, players will always (re)spawn at the given position." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Ignore world errors" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-Game" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "In-game chat console background color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of saving important changes in the world, stated in seconds." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Interval of sending time of day to clients." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Inventory key" +msgstr "Tecla Inventari" #: src/settings_translation_file.cpp msgid "Invert mouse" @@ -1251,129 +2270,81 @@ msgid "Invert vertical mouse movement." msgstr "Invertir moviment vertical del ratolí." #: src/settings_translation_file.cpp -msgid "Mouse sensitivity" -msgstr "Sensibilitat del ratolí" - -#: src/settings_translation_file.cpp -msgid "Mouse sensitivity multiplier." -msgstr "Multiplicador de sensibilitat del ratolí." - -#: src/settings_translation_file.cpp -msgid "Key use for climbing/descending" -msgstr "Utilitzar la tecla \"utilitzar\" per escalar/descendir" - -#: src/settings_translation_file.cpp -msgid "" -"If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " -"and descending." +msgid "Item entity TTL" msgstr "" -#: src/settings_translation_file.cpp -msgid "Double tap jump for fly" -msgstr "Polsar dues vegades \"botar\" per volar" - -#: src/settings_translation_file.cpp -msgid "Double-tapping the jump key toggles fly mode." -msgstr "Polsar dues vegades \"botar\" per alternar el mode de vol." - -#: src/settings_translation_file.cpp -msgid "Always fly and fast" -msgstr "Sempre volar y ràpid" - #: src/settings_translation_file.cpp msgid "" -"If disabled \"use\" key is used to fly fast if both fly and fast mode are " -"enabled." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp -msgid "Rightclick repetition interval" -msgstr "Interval de repetició del click dret" +msgid "" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" #: src/settings_translation_file.cpp msgid "" -"The time in seconds it takes between repeated right clicks when holding the " -"right mouse button." +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" +"Range roughly -2 to 2." msgstr "" -"El temps en segons que es pren entre la repetició de clicks drets quan " -"s'està mantenint el botó dret del ratolí." - -#: src/settings_translation_file.cpp -msgid "Random input" -msgstr "Entrada aleatòria" - -#: src/settings_translation_file.cpp -msgid "Enable random user input (only used for testing)." -msgstr "Habilitar l'entrada aleatòria d'usuari (només utilitzat per testing)." - -#: src/settings_translation_file.cpp -msgid "Continuous forward" -msgstr "Avanç continu" - -#: src/settings_translation_file.cpp -msgid "Continuous forward movement (only used for testing)." -msgstr "Avanç continu (sols utilitzat per a testing)." - -#: src/settings_translation_file.cpp -msgid "Forward key" -msgstr "Tecla Avançar" #: src/settings_translation_file.cpp msgid "" -"Key for moving the player forward.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" +"Range roughly -2 to 2." msgstr "" -"Tecla per moure avant al jugador.\n" -"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" - -#: src/settings_translation_file.cpp -msgid "Backward key" -msgstr "Tecla de retrocés" #: src/settings_translation_file.cpp msgid "" -"Key for moving the player backward.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" +"Range roughly -2 to 2." msgstr "" -"Tecla per moure el jugador cap arrere.\n" -"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" - -#: src/settings_translation_file.cpp -msgid "Left key" -msgstr "Tecla esquerra" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving the player left.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" -"Tecla per moure el jugador cap a l'esquerra.\n" -"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" - -#: src/settings_translation_file.cpp -msgid "Right key" -msgstr "Tecla dreta" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving the player right.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" -"Tecla per moure el jugador cap a la dreta.\n" -"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Jump key" msgstr "Tecla botar" +#: src/settings_translation_file.cpp +msgid "Jumping speed" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Key for decreasing the viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" +"Tecla per obrir el inventari.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" + +#: src/settings_translation_file.cpp +msgid "" +"Key for dropping the currently selected item.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Key for increasing the viewing range.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" +"Tecla per obrir el inventari.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" + #: src/settings_translation_file.cpp msgid "" "Key for jumping.\n" @@ -1381,12 +2352,93 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla per botar.\n" -"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp -msgid "Sneak key" -msgstr "Tecla sigil" +msgid "" +"Key for moving fast in fast mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player backward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" +"Tecla per moure el jugador cap arrere.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player forward.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" +"Tecla per moure avant al jugador.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player left.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" +"Tecla per moure el jugador cap a l'esquerra.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" + +#: src/settings_translation_file.cpp +msgid "" +"Key for moving the player right.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" +"Tecla per moure el jugador cap a la dreta.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat console.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window to type commands.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the chat window.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for opening the inventory.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" +"Tecla per obrir el inventari.\n" +"Veure http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" + +#: src/settings_translation_file.cpp +msgid "" +"Key for printing debug stacks. Used for development.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1397,133 +2449,12 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -#: src/settings_translation_file.cpp -msgid "Inventory key" -msgstr "Tecla Inventari" - #: src/settings_translation_file.cpp msgid "" -"Key for opening the inventory.\n" +"Key for switching between first- and third-person camera.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tecla per obrir el inventari.\n" -"Veure http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" - -#: src/settings_translation_file.cpp -msgid "Use key" -msgstr "Utilitza la tecla" - -#: src/settings_translation_file.cpp -msgid "" -"Key for moving fast in fast mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Chat key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for opening the chat window.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Command key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for opening the chat window to type commands.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Console key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for opening the chat console.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Range select key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling unlimited view range.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fly key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling flying.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fast key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling fast mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Noclip key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling noclip mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Cinematic mode key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling cinematic mode.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimap key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for toggling display of minimap.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screenshot" -msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1532,52 +2463,39 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -#: src/settings_translation_file.cpp -msgid "Drop item key" -msgstr "" - #: src/settings_translation_file.cpp msgid "" -"Key for dropping the currently selected item.\n" +"Key for toggling cinematic mode.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -#: src/settings_translation_file.cpp -msgid "HUD toggle key" -msgstr "" - #: src/settings_translation_file.cpp msgid "" -"Key for toggling the display of the HUD.\n" +"Key for toggling display of minimap.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -#: src/settings_translation_file.cpp -msgid "Chat toggle key" -msgstr "" - #: src/settings_translation_file.cpp msgid "" -"Key for toggling the display of the chat.\n" +"Key for toggling fast mode.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -#: src/settings_translation_file.cpp -msgid "Fog toggle key" -msgstr "" - #: src/settings_translation_file.cpp msgid "" -"Key for toggling the display of the fog.\n" +"Key for toggling flying.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" #: src/settings_translation_file.cpp -msgid "Camera update toggle key" +msgid "" +"Key for toggling noclip mode.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" #: src/settings_translation_file.cpp @@ -1587,10 +2505,6 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -#: src/settings_translation_file.cpp -msgid "Debug info toggle key" -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Key for toggling the display of debug info.\n" @@ -1599,7 +2513,24 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Profiler toggle key" +msgid "" +"Key for toggling the display of the HUD.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the chat.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Key for toggling the display of the fog.\n" +"See http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" #: src/settings_translation_file.cpp @@ -1609,139 +2540,27 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -#: src/settings_translation_file.cpp -msgid "Toggle camera mode key" -msgstr "" - #: src/settings_translation_file.cpp msgid "" -"Key for switching between first- and third-person camera.\n" +"Key for toggling unlimited view range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" #: src/settings_translation_file.cpp -msgid "View range increase key" +msgid "Key use for climbing/descending" +msgstr "Utilitzar la tecla \"utilitzar\" per escalar/descendir" + +#: src/settings_translation_file.cpp +msgid "Language" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +msgid "Large cave depth" msgstr "" #: src/settings_translation_file.cpp -msgid "View range decrease key" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Key for printing debug stacks. Used for development.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Network" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server address" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Address to connect to.\n" -"Leave this blank to start a local server.\n" -"Note that the address field in the main menu overrides this setting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Remote port" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Port to connect to (UDP).\n" -"Note that the port field in the main menu overrides this setting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Saving map received from server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Save the map received by the client on disk." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Connect to external media server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable usage of remote media server (if provided by server).\n" -"Remote servers offer a significantly faster way to download media (e.g. " -"textures)\n" -"when connecting to the server." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Serverlist URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Serverlist file" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"File in client/serverlist/ that contains your favorite servers displayed in " -"the Multiplayer Tab." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Graphics" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "In-Game" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Basic" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fog" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Whether to fog out the end of the visible area." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." +msgid "Lava Features" msgstr "" #: src/settings_translation_file.cpp @@ -1757,1179 +2576,42 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Connect glass" -msgstr "" +msgid "Left key" +msgstr "Tecla esquerra" #: src/settings_translation_file.cpp -msgid "Connects glass if supported by node." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Smooth lighting" +msgid "" +"Length of a server tick and the interval at which objects are generally " +"updated over network." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Enable smooth lighting with simple ambient occlusion.\n" -"Disable for speed or for different looks." +"Level of logging to be written to debug.txt:\n" +"- (no logging)\n" +"- none (messages with no level)\n" +"- error\n" +"- warning\n" +"- action\n" +"- info\n" +"- verbose" msgstr "" #: src/settings_translation_file.cpp -msgid "Clouds" +msgid "Limit of emerge queues on disk" msgstr "" #: src/settings_translation_file.cpp -msgid "Clouds are a client side effect." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "3D clouds" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use 3D cloud look instead of flat." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mipmapping" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use mip mapping to scale textures. May slightly increase performance." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Anisotropic filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bilinear filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use bilinear filtering when scaling textures." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Trilinear filtering" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use trilinear filtering when scaling textures." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Clean transparent textures" +msgid "Limit of emerge queues to generate" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Filtered textures can blend RGB values with fully-transparent neighbors,\n" -"which PNG optimizers usually discard, sometimes resulting in a dark or\n" -"light edge to transparent textures. Apply this filter to clean that up\n" -"at texture load time." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimum texture size for filters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" -"can be blurred, so automatically upscale them with nearest-neighbor\n" -"interpolation to preserve crisp pixels. This sets the minimum texture size\n" -"for the upscaled textures; higher values look sharper, but require more\n" -"memory. Powers of 2 are recommended. Setting this higher than 1 may not\n" -"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" -"enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "FSAA" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Experimental option, might cause visible spaces between blocks\n" -"when set to higher number than 0." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Shaders allow advanced visul effects and may increase performance on some " -"video cards.\n" -"Thy only work with the OpenGL video backend." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enables bumpmapping for textures. Normalmaps need to be supplied by the " -"texture pack\n" -"or need to be auto-generated.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Generate normalmaps" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enables on the fly normalmap generation (Emboss effect).\n" -"Requires bumpmapping to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Normalmaps strength" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Strength of generated normalmaps." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Normalmaps sampling" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Defines sampling step of texture.\n" -"A higher value results in smoother normal maps." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enables parallax occlusion mapping.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion mode" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"0 = parallax occlusion with slope information (faster).\n" -"1 = relief mapping (slower, more accurate)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion strength" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Strength of parallax." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Number of parallax occlusion iterations." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion Scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Overall scale of parallax occlusion effect." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Parallax occlusion bias" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Overall bias of parallax occlusion effect, usually scale/2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving Nodes" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Set to true enables waving water.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water length" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving water speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving leaves" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Set to true enables waving leaves.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Waving plants" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Set to true enables waving plants.\n" -"Requires shaders to be enabled." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Advanced" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum FPS" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"If FPS would go higher than this, limit it by sleeping\n" -"to not waste CPU power for no benefit." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "FPS in pause menu" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum FPS when game is paused." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screen width" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Vertical initial window size." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screen height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Horizontal initial window size." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Full screen" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fullscreen mode." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Full screen BPP" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "V-Sync" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Vertical screen synchronization." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Field of view" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Field of view in degrees." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Gamma" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" -"This setting is for the client only and is ignored by the server." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Texture path" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Path to texture directory. All textures are first searched from here." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Video driver" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "The rendering back-end for Irrlicht." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Cloud height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Height on which clouds are appearing." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Cloud radius" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Radius of cloud area stated in number of 64 node cloud squares.\n" -"Values larger than 26 will start to produce sharp cutoffs at cloud area " -"corners." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "View bobbing" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Multiplier for view bobbing.\n" -"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fall bobbing" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Multiplier for fall bobbing.\n" -"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "3D mode" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"3D support.\n" -"Currently supported:\n" -"- none: no 3d output.\n" -"- anaglyph: cyan/magenta color 3d.\n" -"- interlaced: odd/even line based polarisation screen support.\n" -"- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Console color" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "In-game chat console background color (R,G,B)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Console alpha" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Selection box color" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Selection box border color (R,G,B)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Selection box width" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Width of the selectionbox's lines around nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Crosshair color" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Crosshair color (R,G,B)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Crosshair alpha" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Desynchronize block animation" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum hotbar width" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum proportion of current window to be used for hotbar.\n" -"Useful if there's something to be displayed right or left of hotbar." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Node highlighting" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mesh cache" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enables caching of facedir rotated meshes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimap" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enables minimap." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Round minimap" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Minimap scan height" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"True = 256\n" -"False = 128\n" -"Useable to make minimap smoother on slower machines." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Colored fog" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Make fog and sky colors depend on daytime (dawn/sunset) and view direction." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Ambient occlusion gamma" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"The strength (darkness) of node ambient-occlusion shading.\n" -"Lower is darker, Higher is lighter. The valid range of values for this\n" -"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" -"set to the nearest valid value." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Menus" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Clouds in menu" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Use a cloud animation for the main menu background." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "GUI scaling" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Scale gui by a user specified value.\n" -"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" -"This will smooth over some of the rough edges, and blend\n" -"pixels when scaling down, at the cost of blurring some\n" -"edge pixels when images are scaled by non-integer sizes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "GUI scaling filter" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"When gui_scaling_filter is true, all GUI images need to be\n" -"filtered in software, but some images are generated directly\n" -"to hardware (e.g. render-to-texture for nodes in inventory)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "GUI scaling filter txr2img" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"When gui_scaling_filter_txr2img is true, copy those images\n" -"from hardware to software for scaling. When false, fall back\n" -"to the old scaling method, for video drivers that don't\n" -"propery support downloading textures back from hardware." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Tooltip delay" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Freetype fonts" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font path" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Path to TrueTypeFont or bitmap." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font size" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow alpha" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Monospace font path" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Monospace font size" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "This font will be used for certain languages." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font size" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font shadow" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fallback font shadow alpha" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Screenshot folder" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Path to save screenshots at." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "DPI" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " -"screens." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Sound" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Volume" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapblock unload timeout" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Timeout for client to remove unused map data from memory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapblock limit" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum number of mapblocks for client to be kept in memory.\n" -"Set to -1 for unlimited amount." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Show debug info" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server / Singleplayer" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server name" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Name of the server, to be displayed when players join and in the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server description" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Description of server, to be displayed when players join and in the " -"serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Announce server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Automaticaly report to the serverlist." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Announce to this serverlist.\n" -"If you want to announce your ipv6 address, use serverlist_url = v6.servers." -"minetest.net." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Server port" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Network port to listen (UDP).\n" -"This value will be overridden when starting from the main menu." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Bind address" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "The network interface that the server listens on." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Strict protocol checking" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable to disallow old clients from connecting.\n" -"Older clients are compatible in the sense that they will not crash when " -"connecting\n" -"to new servers, but they may not support all new features that you are " -"expecting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Remote media" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Specifies URL from which client fetches media instead of using UDP.\n" -"$filename should be accessible from $remote_media$filename via cURL\n" -"(obviously, remote_media should end with a slash).\n" -"Files that are not present will be fetched the usual way." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "IPv6 server" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable/disable running an IPv6 server. An IPv6 server may be restricted\n" -"to IPv6 clients, depending on system configuration.\n" -"Ignored if bind_address is set." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum simultaneously blocks send per client" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "How many blocks are flying in the wire simultaneously per client." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum simultaneously bocks send total" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"How many blocks are flying in the wire simultaneously for the whole server." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"To reduce lag, block transfers are slowed down when a player is building " -"something.\n" -"This determines how long they are slowed down after placing or removing a " -"node." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Max. packets per iteration" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum number of packets sent per send step, if you have a slow connection\n" -"try reducing it, but don't reduce it to a number below double of targeted\n" -"client number." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Default game" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Default game when creating a new world.\n" -"This will be overridden when creating a world from the main menu." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Message of the day" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Message of the day displayed to players connecting." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum users" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum number of players that can connect simultaneously." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Map directory" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"World directory (everything in the world is stored here).\n" -"Not needed if starting from the main menu." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Item entity TTL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Time in seconds for item entity (dropped items) to live.\n" -"Setting it to -1 disables the feature." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Damage" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable players getting damage and dying." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fixed map seed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"A chosen map seed for a new map, leave empty for random.\n" -"Will be overridden when creating a new world in the main menu." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Default password" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "New users need to input this password." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Default privileges" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"The privileges that new users automatically get.\n" -"See /privs in game for a full list on your server and mod configuration." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Unlimited player transfer distance" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Whether players are shown to clients without any range limit.\n" -"Deprecated, use the setting player_transfer_distance instead." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Player transfer distance" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Player versus Player" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Whether to allow players to damage and kill each other." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Static spawnpoint" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "If this is set, players will always (re)spawn at the given position." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Disallow empty passwords" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "If enabled, new players cannot join with an empty password." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Disable anticheat" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Rollback recording" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"If enabled, actions are recorded for rollback.\n" -"This option is only read when server starts." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Shutdown message" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Crash message" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "A message to be displayed to all clients when the server crashes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Ask to reconnect after crash" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Whether to ask clients to reconnect after a (Lua) crash.\n" -"Set this to true if your server is set up to restart automatically." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Active object send range" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"From how far clients know about objects, stated in mapblocks (16 nodes)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Active block range" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"How large area of blocks are subject to the active block stuff, stated in " -"mapblocks (16 nodes).\n" -"In active blocks objects are loaded and ABMs run." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Max block send distance" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"From how far blocks are sent to clients, stated in mapblocks (16 nodes)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum forceloaded blocks" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum number of forceloaded mapblocks." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Time send interval" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Interval of sending time of day to clients." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Time speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Controls length of day/night cycle.\n" -"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " -"unchanged." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Map save interval" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Interval of saving important changes in the world, stated in seconds." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Physics" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Default acceleration" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Acceleration in air" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fast mode acceleration" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Walking speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Crouch speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Fast mode speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Climbing speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Jumping speed" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Descending speed" +"Limits number of parallel HTTP requests. Affects:\n" +"- Media fetch if server uses remote_media setting.\n" +"- Serverlist download and server announcement.\n" +"- Downloads performed by main menu (e.g. mod manager).\n" +"Only has an effect if compiled with cURL." msgstr "" #: src/settings_translation_file.cpp @@ -2940,128 +2622,16 @@ msgstr "" msgid "Liquid fluidity smoothing" msgstr "" -#: src/settings_translation_file.cpp -msgid "Liquid sink" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Gravity" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Deprecated Lua API handling" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Handling for deprecated lua api calls:\n" -"- legacy: (try to) mimic old behaviour (default for release).\n" -"- log: mimic and log backtrace of deprecated call (default for debug).\n" -"- error: abort on usage of deprecated call (suggested for mod developers)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mod profiling" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Useful for mod developers." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Detailed mod profiling" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Profiling print interval" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Profiler data print interval. 0 = disable. Useful for developers." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Max. clearobjects extra blocks" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Number of extra blocks that can be loaded by /clearobjects at once.\n" -"This is a trade-off between sqlite transaction overhead and\n" -"memory consumption (4096=100MB, as a rule of thumb)." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Unload unused server data" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"How much the server will wait before unloading unused mapblocks.\n" -"Higher value is smoother, but will use more RAM." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maxmimum objects per block" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Maximum number of statically stored objects in a block." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Synchronous SQLite" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Dedicated server step" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Length of a server tick and the interval at which objects are generally " -"updated over network." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Ignore world errors" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"If enabled, invalid world data won't cause the server to shut down.\n" -"Only enable this if you know what you are doing." -msgstr "" - #: src/settings_translation_file.cpp msgid "Liquid loop max" msgstr "" -#: src/settings_translation_file.cpp -msgid "Max liquids processed per step." -msgstr "" - #: src/settings_translation_file.cpp msgid "Liquid queue purge time" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"The time (in seconds) that the liquids queue may grow beyond processing\n" -"capacity until an attempt is made to decrease its size by dumping old queue\n" -"items. A value of 0 disables the functionality." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Liquid update tick" +msgid "Liquid sink" msgstr "" #: src/settings_translation_file.cpp @@ -3069,31 +2639,72 @@ msgid "Liquid update interval in seconds." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen name" +msgid "Liquid update tick" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu game manager" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Main menu mod manager" +msgstr "Menú principal del gestor de mods" + +#: src/settings_translation_file.cpp +msgid "Main menu script" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Name of map generator to be used when creating a new world.\n" -"Creating a world in the main menu will override this." +"Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" #: src/settings_translation_file.cpp -msgid "Water level" +msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" #: src/settings_translation_file.cpp -msgid "Water surface level of the world." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Max block generate distance" +msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"From how far blocks are generated for clients, stated in mapblocks (16 " -"nodes)." +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen v7.\n" +"'ridges' are the rivers.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3101,36 +2712,32 @@ msgid "Map generation limit" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Where the map generator stops.\n" -"Please note:\n" -"- Limited to 31000 (setting above has no effect)\n" -"- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n" -"- Those groups have an offset of -32, -32 nodes from the origin.\n" -"- Only groups which are within the map_generation_limit are generated" +msgid "Map save interval" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen flags" +msgid "Mapblock limit" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Global map generation attributes.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -msgid "Chunk size" +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Generador de mapes" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome heat noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " -"nodes)." +msgid "Mapgen biome humidity blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp @@ -3138,11 +2745,304 @@ msgid "Mapgen debug" msgstr "" #: src/settings_translation_file.cpp -msgid "Dump the mapgen debug infos." +msgid "Mapgen flags" msgstr "" #: src/settings_translation_file.cpp -msgid "Absolute limit of emerge queues" +#, fuzzy +msgid "Mapgen flat" +msgstr "Generador de mapes" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal iterations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia x" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia y" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal julia z" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal offset" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal seabed noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen heat blend noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 factor noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v5 height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 apple trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 beach noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 biome noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 cave noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 desert frequency" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 humidity noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 mud noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 steepness noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v6 trees noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 height select noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mount height noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 mountain noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 ridge water noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain altitude noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain base noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 terrain persistation noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block generate distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max block send distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max liquids processed per step." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. clearobjects extra blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Max. packets per iteration" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum FPS when game is paused." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum forceloaded blocks" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum hotbar width" msgstr "" #: src/settings_translation_file.cpp @@ -3150,7 +3050,9 @@ msgid "Maximum number of blocks that can be queued for loading." msgstr "" #: src/settings_translation_file.cpp -msgid "Limit of emerge queues on disk" +msgid "" +"Maximum number of blocks to be queued that are to be generated.\n" +"Set to blank for an appropriate amount to be chosen automatically." msgstr "" #: src/settings_translation_file.cpp @@ -3160,13 +3062,198 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Limit of emerge queues to generate" +msgid "Maximum number of forceloaded mapblocks." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Maximum number of blocks to be queued that are to be generated.\n" -"Set to blank for an appropriate amount to be chosen automatically." +"Maximum number of mapblocks for client to be kept in memory.\n" +"Set to -1 for unlimited amount." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum number of packets sent per send step, if you have a slow connection\n" +"try reducing it, but don't reduce it to a number below double of targeted\n" +"client number." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of players that can connect simultaneously." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum number of statically stored objects in a block." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Maximum proportion of current window to be used for hotbar.\n" +"Useful if there's something to be displayed right or left of hotbar." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously blocks send per client" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum simultaneously bocks send total" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum time in ms a file download (e.g. a mod download) may take." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maximum users" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Maxmimum objects per block" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Menus" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mesh cache" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Message of the day displayed to players connecting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimap scan height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Minimum texture size for filters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mipmapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mod profiling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore details URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore download URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Modstore mods list URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Monospace font size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity" +msgstr "Sensibilitat del ratolí" + +#: src/settings_translation_file.cpp +msgid "Mouse sensitivity multiplier." +msgstr "Multiplicador de sensibilitat del ratolí." + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for fall bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Multiplier for view bobbing.\n" +"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of map generator to be used when creating a new world.\n" +"Creating a world in the main menu will override this." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the player.\n" +"When running a server, clients connecting with this name are admins.\n" +"When starting from the main menu, this is overridden." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Name of the server, to be displayed when players join and in the serverlist." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Network" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Network port to listen (UDP).\n" +"This value will be overridden when starting from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "New users need to input this password." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noclip key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Node highlighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noise parameters for biome API temperature, humidity and biome blend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps sampling" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Normalmaps strength" msgstr "" #: src/settings_translation_file.cpp @@ -3183,359 +3270,68 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen biome heat noise parameters" +msgid "" +"Number of extra blocks that can be loaded by /clearobjects at once.\n" +"This is a trade-off between sqlite transaction overhead and\n" +"memory consumption (4096=100MB, as a rule of thumb)." msgstr "" #: src/settings_translation_file.cpp -msgid "Noise parameters for biome API temperature, humidity and biome blend." +msgid "Number of parallax occlusion iterations." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen heat blend noise parameters" +msgid "Overall bias of parallax occlusion effect, usually scale/2." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen biome humidity noise parameters" +msgid "Overall scale of parallax occlusion effect." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen biome humidity blend noise parameters" +msgid "Parallax occlusion" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5" +msgid "Parallax occlusion Scale" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 filler depth noise parameters" +msgid "Parallax occlusion bias" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 factor noise parameters" +msgid "Parallax occlusion iterations" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 height noise parameters" +msgid "Parallax occlusion mode" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 cave1 noise parameters" +msgid "Parallax occlusion strength" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v5 cave2 noise parameters" +msgid "Path to TrueTypeFont or bitmap." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v6" +msgid "Path to save screenshots at." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen v6 flags" +msgid "Path to texture directory. All textures are first searched from here." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Physics" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 desert frequency" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Controls size of deserts and beaches in Mapgen v6.\n" -"When snowbiomes are enabled 'mgv6_freq_desert' is ignored." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 beach frequency" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 terrain base noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 steepness noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 height select noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 mud noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 beach noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 biome noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 cave noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 humidity noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 trees noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v6 apple trees noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 flags" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 terrain base noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 height select noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 filler depth noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 mount height noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 ridge water noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 mountain noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 ridge noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 cave1 noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen v7 cave2 noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia x" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: X value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia y" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia z" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia w" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal seabed noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal filler depth noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal cave1 noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal cave2 noise parameters" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Security" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable mod security" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Prevent mods from doing insecure things like running shell commands." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Trusted mods" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Comma-separated list of trusted mods that are allowed to access insecure\n" -"functions even when mod security is on (via request_insecure_environment())." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Client and Server" +"Player is able to fly without being affected by gravity.\n" +"This requires the \"fly\" privilege on the server." msgstr "" #: src/settings_translation_file.cpp @@ -3543,14 +3339,181 @@ msgid "Player name" msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Name of the player.\n" -"When running a server, clients connecting with this name are admins.\n" -"When starting from the main menu, this is overridden." +msgid "Player transfer distance" msgstr "" #: src/settings_translation_file.cpp -msgid "Language" +msgid "Player versus Player" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Port to connect to (UDP).\n" +"Note that the port field in the main menu overrides this setting." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Prevent mods from doing insecure things like running shell commands." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler data print interval. 0 = disable. Useful for developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiler toggle key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Profiling print interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Radius of cloud area stated in number of 64 node cloud squares.\n" +"Values larger than 26 will start to produce sharp cutoffs at cloud area " +"corners." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Random input" +msgstr "Entrada aleatòria" + +#: src/settings_translation_file.cpp +msgid "Range select key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote media" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Remote port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Replaces the default main menu with a custom one." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Right key" +msgstr "Tecla dreta" + +#: src/settings_translation_file.cpp +msgid "Rightclick repetition interval" +msgstr "Interval de repetició del click dret" + +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Rollback recording" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Round minimap" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Save the map received by the client on disk." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Saving map received from server" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Scale gui by a user specified value.\n" +"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" +"This will smooth over some of the rough edges, and blend\n" +"pixels when scaling down, at the cost of blurring some\n" +"edge pixels when images are scaled by non-integer sizes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screen width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot folder" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Security" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box border color (R,G,B)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box color" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Selection box width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server / Singleplayer" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server address" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server description" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server name" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Server port" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist URL" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Serverlist file" msgstr "" #: src/settings_translation_file.cpp @@ -3560,50 +3523,482 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Debug log level" +msgid "" +"Set to true enables waving leaves.\n" +"Requires shaders to be enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Level of logging to be written to debug.txt:\n" -"- (no logging)\n" -"- none (messages with no level)\n" -"- error\n" -"- warning\n" -"- action\n" -"- info\n" -"- verbose" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "IPv6" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "IPv6 support." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "cURL timeout" +"Set to true enables waving plants.\n" +"Requires shaders to be enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Default timeout for cURL, stated in milliseconds.\n" -"Only has an effect if compiled with cURL." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "cURL parallel limit" +"Set to true enables waving water.\n" +"Requires shaders to be enabled." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Limits number of parallel HTTP requests. Affects:\n" -"- Media fetch if server uses remote_media setting.\n" -"- Serverlist download and server announcement.\n" -"- Downloads performed by main menu (e.g. mod manager).\n" -"Only has an effect if compiled with cURL." +"Shaders allow advanced visul effects and may increase performance on some " +"video cards.\n" +"Thy only work with the OpenGL video backend." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shape of the minimap. Enabled = round, disabled = square." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Show debug info" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Shutdown message" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " +"nodes)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Smooth lighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Smooths camera when moving and looking around.\n" +"Useful for recording videos." +msgstr "" +"Suavitza la càmera quan estiga movent-se i mirant al seu voltant.\n" +"Útil per a la gravació de vídeos." + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera in cinematic mode. 0 to disable." +msgstr "" +"Suavitza la rotació de la càmera en mode cinematogràfic. 0 per deshabilitar." + +#: src/settings_translation_file.cpp +msgid "Smooths rotation of camera. 0 to disable." +msgstr "Suavitza la rotació de la càmera. 0 per deshabilitar." + +#: src/settings_translation_file.cpp +msgid "Sneak key" +msgstr "Tecla sigil" + +#: src/settings_translation_file.cpp +msgid "Sound" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Specifies URL from which client fetches media instead of using UDP.\n" +"$filename should be accessible from $remote_media$filename via cURL\n" +"(obviously, remote_media should end with a slash).\n" +"Files that are not present will be fetched the usual way." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Static spawnpoint" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of generated normalmaps." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strength of parallax." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Strict protocol checking" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Synchronous SQLite" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The network interface that the server listens on." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The privileges that new users automatically get.\n" +"See /privs in game for a full list on your server and mod configuration." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The rendering back-end for Irrlicht." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The strength (darkness) of node ambient-occlusion shading.\n" +"Lower is darker, Higher is lighter. The valid range of values for this\n" +"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" +"set to the nearest valid value." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time (in seconds) that the liquids queue may grow beyond processing\n" +"capacity until an attempt is made to decrease its size by dumping old queue\n" +"items. A value of 0 disables the functionality." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"The time in seconds it takes between repeated right clicks when holding the " +"right mouse button." +msgstr "" +"El temps en segons que es pren entre la repetició de clicks drets quan " +"s'està mantenint el botó dret del ratolí." + +#: src/settings_translation_file.cpp +msgid "This font will be used for certain languages." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Time in seconds for item entity (dropped items) to live.\n" +"Setting it to -1 disables the feature." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time send interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Timeout for client to remove unused map data from memory." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"To reduce lag, block transfers are slowed down when a player is building " +"something.\n" +"This determines how long they are slowed down after placing or removing a " +"node." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Toggle camera mode key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Tooltip delay" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trilinear filtering" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"True = 256\n" +"False = 128\n" +"Useable to make minimap smoother on slower machines." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Trusted mods" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "URL to the server list displayed in the Multiplayer Tab." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unlimited player transfer distance" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Unload unused server data" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use 3D cloud look instead of flat." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use a cloud animation for the main menu background." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use anisotropic filtering when viewing at textures from an angle." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use bilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use key" +msgstr "Utilitza la tecla" + +#: src/settings_translation_file.cpp +msgid "Use mip mapping to scale textures. May slightly increase performance." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Use trilinear filtering when scaling textures." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Useful for mod developers." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "V-Sync" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Vertical screen synchronization." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Video driver" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View bobbing" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range decrease key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "View range increase key" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Viewing range" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Volume" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Walking speed" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Water Features" +msgstr "Textures de objectes ..." + +#: src/settings_translation_file.cpp +msgid "Water level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water surface level of the world." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving Nodes" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving leaves" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving plants" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water length" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Waving water speed" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter is true, all GUI images need to be\n" +"filtered in software, but some images are generated directly\n" +"to hardware (e.g. render-to-texture for nodes in inventory)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When gui_scaling_filter_txr2img is true, copy those images\n" +"from hardware to software for scaling. When false, fall back\n" +"to the old scaling method, for video drivers that don't\n" +"propery support downloading textures back from hardware." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n" +"can be blurred, so automatically upscale them with nearest-neighbor\n" +"interpolation to preserve crisp pixels. This sets the minimum texture size\n" +"for the upscaled textures; higher values look sharper, but require more\n" +"memory. Powers of 2 are recommended. Setting this higher than 1 may not\n" +"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" +"enabled." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Where the map generator stops.\n" +"Please note:\n" +"- Limited to 31000 (setting above has no effect)\n" +"- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n" +"- Those groups have an offset of -32, -32 nodes from the origin.\n" +"- Only groups which are within the map_generation_limit are generated" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether freetype fonts are used, requires freetype support to be compiled in." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether node texture animations should be desynchronized per mapblock." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether players are shown to clients without any range limit.\n" +"Deprecated, use the setting player_transfer_distance instead." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to allow players to damage and kill each other." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to ask clients to reconnect after a (Lua) crash.\n" +"Set this to true if your server is set up to restart automatically." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Whether to fog out the end of the visible area." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to show the client debug info (has the same effect as hitting F5)." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Width of the selectionbox's lines around nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"World directory (everything in the world is stored here).\n" +"Not needed if starting from the main menu." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." msgstr "" #: src/settings_translation_file.cpp @@ -3611,41 +4006,9 @@ msgid "cURL file download timeout" msgstr "" #: src/settings_translation_file.cpp -msgid "Maximum time in ms a file download (e.g. a mod download) may take." +msgid "cURL parallel limit" msgstr "" #: src/settings_translation_file.cpp -msgid "High-precision FPU" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Main menu script" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Replaces the default main menu with a custom one." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Main menu game manager" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Main menu mod manager" -msgstr "Menú principal del gestor de mods" - -#: src/settings_translation_file.cpp -msgid "Modstore download URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Modstore mods list URL" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Modstore details URL" +msgid "cURL timeout" msgstr "" diff --git a/po/cs/minetest.po b/po/cs/minetest.po index e00ad59a..af3b87e0 100644 --- a/po/cs/minetest.po +++ b/po/cs/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-12-10 15:36+0000\n" "Last-Translator: Jakub Vaněk \n" -"Language-Team: Czech " -"\n" +"Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Podporujeme verze protokolů mezi $1 a $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Zrušit" @@ -115,8 +116,8 @@ msgstr "Skrýt obsahy balíčků" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Uložit" @@ -189,6 +190,7 @@ msgid "No of course not!" msgstr "Jistě že ne!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Ano" @@ -208,6 +210,94 @@ msgstr "Přijmout" msgid "Rename Modpack:" msgstr "Přejmenovat balíček modů:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" není platný příznak." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Nebyl zadán popis nastavení)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Procházet" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Zakázáno" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Upravit" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Povoleno" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "Formát jsou tři čísla uvnitř závorek oddělená čárkami." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Formát: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Hry" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mody" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "Lakunarita může být specifikována spolu s předcházející čárkou." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Prosím zadejte čárkami oddělený seznam vlajek." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Prosím zadejte platné celé číslo." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Zadejte prosím platné číslo." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Možné hodnoty jsou: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Obnovit výchozí" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Vyberte cestu" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Zobrazit technické názvy" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Hodnota musí být větší než $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Hodnota musí být nižší než $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -301,10 +391,6 @@ msgstr "Nainstalované mody:" msgid "Mod information:" msgstr "Informace o modu:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mody" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Popis modu není dostupný" @@ -417,92 +503,157 @@ msgid "Start Game" msgstr "Spustit hru" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" není platný příznak." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Nebyl zadán popis nastavení)" +#, fuzzy +msgid "3D Clouds" +msgstr "3D mraky" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Procházet" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Nastavení" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Jste si jisti, že chcete resetovat místní svět?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bilineární filtrování" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bump mapování" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Změnit nastavení kláves" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Zakázáno" +#, fuzzy +msgid "Connected Glass" +msgstr "Propojené sklo" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Upravit" +#, fuzzy +msgid "Enable Particles" +msgstr "Povolit vše" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Povoleno" +msgid "Fancy Leaves" +msgstr "Vícevrstevné listí" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Formát jsou tři čísla uvnitř závorek oddělená čárkami." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Generovat normálové mapy" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Formát: , , (, , ), , " -", " +msgid "Mipmap" +msgstr "Mipmapa" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Hry" +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmapa + Anizo. filtr" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "Lakunarita může být specifikována spolu s předcházející čárkou." +#, fuzzy +msgid "No Filter" +msgstr "Filtrování" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Prosím zadejte čárkami oddělený seznam vlajek." +msgid "No Mipmap" +msgstr "Žádné Mipmapy" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Prosím zadejte platné celé číslo." +msgid "No!!!" +msgstr "Ne!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Zadejte prosím platné číslo." +#, fuzzy +msgid "Node Highlighting" +msgstr "Zvýraznění označených bloků" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Žádný" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Možné hodnoty jsou: " +msgid "Opaque Leaves" +msgstr "Neprůhledné listí" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Obnovit výchozí" +msgid "Opaque Water" +msgstr "Neprůhledná voda" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Vyberte cestu" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Parallax Occlusion" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Nastavení" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Zobrazit technické názvy" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shadery" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Hodnota musí být větší než $1." +msgid "Simple Leaves" +msgstr "Jednoduché listí" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Hodnota musí být nižší než $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Plynulé osvětlení" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Texturování:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Pro povolení shaderů musíte používat OpenGL ovladač." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "Dosah dotyku (px)" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Trilineární filtrování" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Vlnění listů" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Vlnění rostlin" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Vlnění vody" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -528,10 +679,6 @@ msgstr "Místní hra" msgid "No information available" msgstr "Informace nejsou dostupné" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Žádný" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Vyberte balíček textur:" @@ -556,10 +703,6 @@ msgstr "Inicializuji bloky" msgid "Initializing nodes..." msgstr "Vytvářím bloky..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Textury věcí..." - #: src/client.cpp msgid "Loading textures..." msgstr "Načítám textury..." @@ -1157,6 +1300,15 @@ msgstr "X Tlačítko 2" msgid "Zoom" msgstr "Přiblížení" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1174,6 +1326,7 @@ msgid "3D mode" msgstr "Režim 3D zobrazení" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1181,7 +1334,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "Podpora 3D zobrazení.\n" "V současné době podporovány:\n" @@ -1196,8 +1350,8 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Zvolený seed pro novou mapu, nechte prázdné pro vygenerování náhodného seedu." -"\n" +"Zvolený seed pro novou mapu, nechte prázdné pro vygenerování náhodného " +"seedu.\n" "Toto bude přepsáno při vytváření nové mapy přes hlavní menu." #: src/settings_translation_file.cpp @@ -1252,6 +1406,10 @@ msgstr "" msgid "Advanced" msgstr "Pokročilé" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Vždy mít zapnuté létání a turbo" @@ -1260,6 +1418,10 @@ msgstr "Vždy mít zapnuté létání a turbo" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Anizotropní filtrování" @@ -1275,6 +1437,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Zeptat se na znovupřipojení po havárii" @@ -1287,6 +1453,11 @@ msgstr "Automaticky hlásit seznamu serverů." msgid "Backward key" msgstr "Vzad" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Výška vodních vln" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Základní" @@ -1307,10 +1478,6 @@ msgstr "Bitová hloubka (bity na pixel) v celoobrazovkovém režimu." msgid "Build inside player" msgstr "Stavění uvnitř hráče" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Bump mapování" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1323,6 +1490,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "Klávesa pro přepínání aktualizace pohledu" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Klávesa chatu" @@ -1331,6 +1510,29 @@ msgstr "Klávesa chatu" msgid "Chat toggle key" msgstr "Klávesa zobrazení chatu" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1389,6 +1591,12 @@ msgstr "" "funkce ve chvílích, kdy je zapnuto zabezpečení modů (pomocí " "request_insecure_environment())." +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Příkazová klávesa" @@ -1445,10 +1653,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Zpráva o havárii" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1537,6 +1765,14 @@ msgstr "Prodleva před zobrazením bublinové nápovědy, uvádějte v milisekun msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "Rychlost slézání" @@ -1561,6 +1797,13 @@ msgstr "Detailní profilovací data modů. Užitečné pro vývojáře modů." msgid "Detailed mod profiling" msgstr "Detailní profilování modů" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Zakázat anticheat" @@ -1590,12 +1833,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Povolit balíček" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1609,10 +1849,6 @@ msgstr "Povolit zranění a úmrtí hráčů." msgid "Enable random user input (only used for testing)." msgstr "Povolit náhodný uživatelský vstup (pouze pro testování)." -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1650,6 +1886,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1662,6 +1902,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Povolit minimapu." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Povolit minimapu." @@ -1750,6 +1995,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1858,6 +2111,10 @@ msgstr "Filtr měřítka GUI txr2img" msgid "Gamma" msgstr "Gamma" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Generovat normálové mapy" @@ -1865,10 +2122,11 @@ msgstr "Generovat normálové mapy" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1879,6 +2137,11 @@ msgstr "Grafika" msgid "Gravity" msgstr "Gravitace" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mody" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "Klávesa pro přepnutí HUD (Head-Up Display)" @@ -1891,6 +2154,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1904,7 +2171,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1929,6 +2196,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "IPv6" @@ -2021,6 +2292,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Klávesa inventáře" @@ -2039,47 +2314,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2093,7 +2357,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2107,7 +2371,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2304,6 +2568,14 @@ msgstr "" msgid "Language" msgstr "Jazyk" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2404,36 +2676,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2474,6 +2736,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Jméno generátoru mapy" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2494,6 +2761,55 @@ msgstr "Ladění generátoru mapy" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Jméno generátoru mapy" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2511,23 +2827,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2547,25 +2851,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2710,6 +3010,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2738,14 +3050,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2837,6 +3141,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2853,13 +3161,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "Mip-mapování" @@ -2936,10 +3237,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2960,6 +3257,10 @@ msgstr "Zvýraznění označených bloků" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3000,10 +3301,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Parallax Occlusion" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "Paralaxní okluze" @@ -3069,18 +3366,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Přednačíst inventářové textury" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3104,6 +3389,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "Náhodný vstup" @@ -3132,6 +3421,22 @@ msgstr "Klávesa doprava" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3249,10 +3554,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shadery" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3278,6 +3579,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Plynulé osvětlení" @@ -3332,15 +3637,34 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Cesta k texturám" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3412,6 +3736,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-mapování" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3480,17 +3809,33 @@ msgid "V-Sync" msgstr "Vertikální synchronizace" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Ovladač grafiky" @@ -3499,6 +3844,12 @@ msgstr "Ovladač grafiky" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3508,24 +3859,29 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "Hlasitost" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Rychlost chůze" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Textury věcí..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3633,6 +3989,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3643,6 +4003,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3655,138 +4023,105 @@ msgstr "cURL limit paralelních stahování" msgid "cURL timeout" msgstr "cURL timeout" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Jste si jisti, že chcete resetovat místní svět?" +#~ msgid "\"" +#~ msgstr "\"" -#~ msgid "Fancy Leaves" -#~ msgstr "Vícevrstevné listí" +#~ msgid "If disabled " +#~ msgstr "Je-li zakázáno " -#~ msgid "Mipmap" -#~ msgstr "Mipmapa" +#~ msgid "If enabled, " +#~ msgstr "Je-li povoleno, " -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmapa + Anizo. filtr" +#~ msgid "Rendering:" +#~ msgstr "Renderování:" -#~ msgid "No Mipmap" -#~ msgstr "Žádné Mipmapy" - -#~ msgid "No!!!" -#~ msgstr "Ne!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Neprůhledné listí" - -#~ msgid "Opaque Water" -#~ msgstr "Neprůhledná voda" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Reset místního světa" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Měřítko aplikované na prvky menu: " - -#~ msgid "Simple Leaves" -#~ msgstr "Jednoduché listí" - -#~ msgid "Texturing:" -#~ msgstr "Texturování:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Pro povolení shaderů musíte používat OpenGL ovladač." - -#~ msgid "Touch free target" -#~ msgstr "Středový kurzor" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Dosah dotyku (px)" - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid "Downloading" -#~ msgstr "Stahuji" - -#~ msgid "Game Name" -#~ msgstr "Název hry" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "HRY" - -#~ msgid "Mods:" -#~ msgstr "Mody:" - -#~ msgid "new game" -#~ msgstr "nová hra" - -#~ msgid "EDIT GAME" -#~ msgstr "UPRAVIT HRU" - -#~ msgid "Remove selected mod" -#~ msgstr "Odstranit vybraný mod" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Přidat mod" - -#~ msgid "CLIENT" -#~ msgstr "KLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Oblíbené:" - -#~ msgid "START SERVER" -#~ msgstr "MÍSTNÍ SERVER" - -#~ msgid "Name" -#~ msgstr "Jméno" - -#~ msgid "Password" -#~ msgstr "Heslo" - -#~ msgid "SETTINGS" -#~ msgstr "NASTAVENÍ" - -#~ msgid "Preload item visuals" -#~ msgstr "Přednačíst textury předmětů" - -#~ msgid "Finite Liquid" -#~ msgstr "Konečná voda" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "HRA JEDNOHO HRÁČE" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "BALÍČKY TEXTUR" - -#~ msgid "MODS" -#~ msgstr "MODY" - -#~ msgid "Add mod:" -#~ msgstr "Přidat mod:" - -#~ msgid "Local install" -#~ msgstr "Místní instalace" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest" #~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" #~ "Levý klik: Přesunout všechny předměty, Pravý klik: Přesunout jeden předmět" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest" +#~ msgid "Local install" +#~ msgstr "Místní instalace" -#~ msgid "Rendering:" -#~ msgstr "Renderování:" +#~ msgid "Add mod:" +#~ msgstr "Přidat mod:" -#~ msgid "If enabled, " -#~ msgstr "Je-li povoleno, " +#~ msgid "MODS" +#~ msgstr "MODY" -#~ msgid "If disabled " -#~ msgstr "Je-li zakázáno " +#~ msgid "TEXTURE PACKS" +#~ msgstr "BALÍČKY TEXTUR" -#~ msgid "\"" -#~ msgstr "\"" +#~ msgid "SINGLE PLAYER" +#~ msgstr "HRA JEDNOHO HRÁČE" + +#~ msgid "Finite Liquid" +#~ msgstr "Konečná voda" + +#~ msgid "Preload item visuals" +#~ msgstr "Přednačíst textury předmětů" + +#~ msgid "SETTINGS" +#~ msgstr "NASTAVENÍ" + +#~ msgid "Password" +#~ msgstr "Heslo" + +#~ msgid "Name" +#~ msgstr "Jméno" + +#~ msgid "START SERVER" +#~ msgstr "MÍSTNÍ SERVER" + +#~ msgid "Favorites:" +#~ msgstr "Oblíbené:" + +#~ msgid "CLIENT" +#~ msgstr "KLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Přidat mod" + +#~ msgid "Remove selected mod" +#~ msgstr "Odstranit vybraný mod" + +#~ msgid "EDIT GAME" +#~ msgstr "UPRAVIT HRU" + +#~ msgid "new game" +#~ msgstr "nová hra" + +#~ msgid "Mods:" +#~ msgstr "Mody:" + +#~ msgid "GAMES" +#~ msgstr "HRY" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Název hry" + +#~ msgid "Downloading" +#~ msgstr "Stahuji" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid "Touch free target" +#~ msgstr "Středový kurzor" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Měřítko aplikované na prvky menu: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Reset místního světa" + +#~ msgid "Preload inventory textures" +#~ msgstr "Přednačíst inventářové textury" diff --git a/po/da/minetest.po b/po/da/minetest.po index ed3b0d66..9dddf07c 100644 --- a/po/da/minetest.po +++ b/po/da/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-13 09:23+0000\n" "Last-Translator: Peter Mikkelsen \n" -"Language-Team: Danish " -"\n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Vi understøtter protokol versioner mellem $1 og $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Anuller" @@ -115,8 +116,8 @@ msgstr "Skjul mp indhold" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Gem" @@ -189,6 +190,7 @@ msgid "No of course not!" msgstr "Nej selvfølgelig ikke!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Ja" @@ -208,6 +210,92 @@ msgstr "Accepter" msgid "Rename Modpack:" msgstr "Omdøb Modpack:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" er ikke en gyldig indstilling." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Der er ikke nogen beskrivelse af denne indstilling)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Deaktiveret" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Rediger" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "aktiveret" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "Formatet er 3 tal, adskilt af kommaer, og omgivet af parenteser." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Spil" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mods" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Indtast venligst en liste af indstillinger som er adskilt med kommaer." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Indtast venligst et gyldigt heltal." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Indtast venligt et gyldigt nummer." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Mulige værdier er: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Gendan standard" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Vælg sti" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Vis tekniske navne" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Værdien skal være større end $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Værdien skal være mindre end $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -301,10 +389,6 @@ msgstr "Installerede mods:" msgid "Mod information:" msgstr "Information om mod:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mods" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Der er ikke nogen beskrivelse af tilgængelig af det valgte mod" @@ -417,90 +501,165 @@ msgid "Start Game" msgstr "Start spil / Forbind" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" er ikke en gyldig indstilling." - -#: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Der er ikke nogen beskrivelse af denne indstilling)" - -#: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "2x" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "3D Clouds" +msgstr "3D skyer" + +#: builtin/mainmenu/tab_settings.lua +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Indstillinger" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Enligspiller" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bi-lineær filtréring" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip-mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Skift bindinger" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Deaktiveret" +#, fuzzy +msgid "Connected Glass" +msgstr "Forbind" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Rediger" +#, fuzzy +msgid "Enable Particles" +msgstr "Aktivér alle" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "aktiveret" +#, fuzzy +msgid "Fancy Leaves" +msgstr "Opakt (uigennemsigtigt) vand" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Formatet er 3 tal, adskilt af kommaer, og omgivet af parenteser." - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Spil" +#, fuzzy +msgid "Mipmap" +msgstr "Mip-mapping" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Indtast venligst en liste af indstillinger som er adskilt med kommaer." +#, fuzzy +msgid "No Filter" +msgstr "Anisotropisk filtréring" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Indtast venligst et gyldigt heltal." +#, fuzzy +msgid "No Mipmap" +msgstr "Mip-mapping" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Indtast venligt et gyldigt nummer." +msgid "No!!!" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Mulige værdier er: " +#, fuzzy +msgid "Node Highlighting" +msgstr "Glat belysning" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +#, fuzzy +msgid "None" +msgstr "Ingen" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Gendan standard" +#, fuzzy +msgid "Opaque Leaves" +msgstr "Opakt (uigennemsigtigt) vand" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Vælg sti" +#, fuzzy +msgid "Opaque Water" +msgstr "Opakt (uigennemsigtigt) vand" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Indstillinger" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Vis tekniske navne" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shadere" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Værdien skal være større end $1." +#, fuzzy +msgid "Simple Leaves" +msgstr "Opakt (uigennemsigtigt) vand" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Værdien skal være mindre end $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Glat belysning" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Tri-lineær filtréring" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "\"Smarte\" træer" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "\"Smarte\" træer" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "\"Smarte\" træer" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -527,17 +686,10 @@ msgid "No information available" msgstr "Der er ikke nogen information tilgængelig" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy -msgid "None" -msgstr "Ingen" - -#: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Select texture pack:" msgstr "" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Texturepacks" msgstr "" @@ -557,10 +709,6 @@ msgstr "Initialiserer noder" msgid "Initializing nodes..." msgstr "Initialiserer noder..." -#: src/client.cpp -msgid "Item textures..." -msgstr "" - #: src/client.cpp msgid "Loading textures..." msgstr "" @@ -587,7 +735,8 @@ msgstr "Hovedmenu" #: src/client/clientlauncher.cpp msgid "No world selected and no address provided. Nothing to do." -msgstr "Ingen verden valgt og ingen adresse angivet. Der er ikke noget at gøre." +msgstr "" +"Ingen verden valgt og ingen adresse angivet. Der er ikke noget at gøre." #: src/client/clientlauncher.cpp msgid "Player name too long." @@ -1140,6 +1289,15 @@ msgstr "X knap 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1163,7 +1321,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1219,6 +1378,10 @@ msgstr "" msgid "Advanced" msgstr "Avanceret" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1227,6 +1390,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1243,6 +1410,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1256,6 +1427,10 @@ msgstr "" msgid "Backward key" msgstr "Baglæns" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1278,11 +1453,6 @@ msgstr "" msgid "Build inside player" msgstr "Flerspiller" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "Mip-mapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1295,6 +1465,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1305,6 +1487,29 @@ msgstr "Skift bindinger" msgid "Chat toggle key" msgstr "Skift bindinger" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1362,6 +1567,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1421,10 +1632,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1513,6 +1744,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1535,6 +1774,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1571,12 +1817,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Aktivér MP" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1590,10 +1833,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1624,6 +1863,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1636,6 +1879,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Aktivér skade" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1723,6 +1971,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1833,6 +2089,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1840,10 +2100,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1854,6 +2115,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mods" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1866,6 +2132,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1879,7 +2149,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1904,6 +2174,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1997,6 +2271,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2016,47 +2294,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2071,7 +2338,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2085,7 +2352,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2282,6 +2549,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2385,36 +2660,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2455,6 +2720,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2475,6 +2745,55 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2492,23 +2811,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2528,25 +2835,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2691,6 +2994,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2719,14 +3034,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2819,6 +3126,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2835,13 +3146,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2919,10 +3223,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2943,6 +3243,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2983,10 +3287,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3051,18 +3351,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3086,6 +3374,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3116,6 +3408,22 @@ msgstr "Højre Menu" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3235,10 +3543,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shadere" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3264,6 +3568,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3321,14 +3629,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3400,6 +3727,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3470,17 +3802,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3489,6 +3837,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3498,23 +3852,27 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" +msgid "Water Features" msgstr "" #: src/settings_translation_file.cpp @@ -3624,6 +3982,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3634,6 +3996,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3647,65 +4017,44 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Opakt (uigennemsigtigt) vand" +#~ msgid "If disabled " +#~ msgstr "Deaktivér alle" #, fuzzy -#~ msgid "Opaque Water" -#~ msgstr "Opakt (uigennemsigtigt) vand" +#~ msgid "If enabled, " +#~ msgstr "aktiveret" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Enligspiller" +#~ msgid "Game Name" +#~ msgstr "Spil" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ned" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed" - -#~ msgid "is required by:" -#~ msgstr "er påkrævet af:" - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguration gemt. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende. " - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver" - -#~ msgid "Show Public" -#~ msgstr "Vis offentlig" - -#~ msgid "Show Favorites" +#~ msgid "Favorites:" #~ msgstr "Vis favoritter" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server." +#, fuzzy +#~ msgid "Password" +#~ msgstr "Gammelt kodeord" -#~ msgid "Create world" -#~ msgstr "Skab verden" +#~ msgid "Preload item visuals" +#~ msgstr "For-indlæs elementernes grafik" -#~ msgid "Address required." -#~ msgstr "Adresse påkrævet." +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n" +#~ "De vil blive aktiveret som standard når du gemmer konfigurationen. " -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kan ikke slette verden: ingenting valgt" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n" +#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen. " -#~ msgid "Files to be deleted" -#~ msgstr "Filer som slettes" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kan ikke skabe verden: ingen spil fundet" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kan ikke konfigurere verden: ingenting valgt" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Mislykkedes i at slette alle verdenens filer" +#~ msgid "Delete map" +#~ msgstr "Slet mappen" #~ msgid "" #~ "Default Controls:\n" @@ -3732,42 +4081,51 @@ msgstr "" #~ "- ESC: denne menu\n" #~ "- T: snak\n" -#~ msgid "Delete map" -#~ msgstr "Slet mappen" +#~ msgid "Failed to delete all world files" +#~ msgstr "Mislykkedes i at slette alle verdenens filer" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n" -#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen. " +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kan ikke konfigurere verden: ingenting valgt" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n" -#~ "De vil blive aktiveret som standard når du gemmer konfigurationen. " +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kan ikke skabe verden: ingen spil fundet" -#~ msgid "Preload item visuals" -#~ msgstr "For-indlæs elementernes grafik" +#~ msgid "Files to be deleted" +#~ msgstr "Filer som slettes" -#, fuzzy -#~ msgid "Password" -#~ msgstr "Gammelt kodeord" +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kan ikke slette verden: ingenting valgt" -#, fuzzy -#~ msgid "Favorites:" +#~ msgid "Address required." +#~ msgstr "Adresse påkrævet." + +#~ msgid "Create world" +#~ msgstr "Skab verden" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server." + +#~ msgid "Show Favorites" #~ msgstr "Vis favoritter" -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Spil" +#~ msgid "Show Public" +#~ msgstr "Vis offentlig" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende. " + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguration gemt. " + +#~ msgid "is required by:" +#~ msgstr "er påkrævet af:" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed" #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "aktiveret" - -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Deaktivér alle" +#~ msgid "Downloading" +#~ msgstr "Ned" diff --git a/po/de/minetest.po b/po/de/minetest.po index e7ff472e..d4952c27 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-11-12 18:10+0000\n" "Last-Translator: Wuzzy \n" -"Language-Team: German " -"\n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Wir unterstützen Protokollversionen zwischen $1 und $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Abbrechen" @@ -115,8 +116,8 @@ msgstr "Modpacks verstecken" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Speichern" @@ -191,6 +192,7 @@ msgid "No of course not!" msgstr "Nein, natürlich nicht!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Ja" @@ -210,6 +212,101 @@ msgstr "Annehmen" msgid "Rename Modpack:" msgstr "Modpack umbenennen:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "„$1“ ist kein gültiger Bitschalter." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Keine Beschreibung vorhanden)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Durchsuchen" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Deaktiviert" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Ändern" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Aktiviert" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" +"Das Format besteht aus 3 mit Komma getrennten Zahlen, die sich\n" +"in Klammern befinden." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Format: , , (, , " +"), ,\n" +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Spiele" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mods" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" +"Optional kann die Lacunarity, mit einem weiteren Komma abgetrennt, angehängt " +"werden." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" +"Bitte geben Sie eine mit Kommata getrennte Liste von\n" +"Bitschaltern an." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Bitte geben Sie eine gültige ganze Zahl ein." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Bitte geben Sie eine gültige Zahl ein." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Mögliche Werte sind: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Standardwert" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Pfad auswählen" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Technische Namen zeigen" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Der Wert muss größer als $1 sein." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Der Wert muss kleiner als $1 sein." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -304,10 +401,6 @@ msgstr "Installierte Mods:" msgid "Mod information:" msgstr "Modinformation:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mods" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Keine Modbeschreibung verfügbar" @@ -420,99 +513,157 @@ msgid "Start Game" msgstr "Spiel starten" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "„$1“ ist kein gültiger Bitschalter." +msgid "2x" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Keine Beschreibung vorhanden)" +#, fuzzy +msgid "3D Clouds" +msgstr "3D-Wolken" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Durchsuchen" +msgid "4x" +msgstr "4x" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "8x" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Einstellungen" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "Kantenglättung:" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bilinearer Filter" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Tasten ändern" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Deaktiviert" +#, fuzzy +msgid "Connected Glass" +msgstr "Verbundenes Glas" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Ändern" +#, fuzzy +msgid "Enable Particles" +msgstr "Alle an" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Aktiviert" +msgid "Fancy Leaves" +msgstr "Schöne Blätter" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" -"Das Format besteht aus 3 mit Komma getrennten Zahlen, die sich\n" -"in Klammern befinden." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Normalmaps generieren" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Format: , , (, , " -"), ,\n" -", " +msgid "Mipmap" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Spiele" +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmap u. Aniso. Filter" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" -"Optional kann die Lacunarity, mit einem weiteren Komma abgetrennt, angehängt " -"werden." +#, fuzzy +msgid "No Filter" +msgstr "Filter" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" -"Bitte geben Sie eine mit Kommata getrennte Liste von\n" -"Bitschaltern an." +msgid "No Mipmap" +msgstr "Keine Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Bitte geben Sie eine gültige ganze Zahl ein." +msgid "No!!!" +msgstr "Nein!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Bitte geben Sie eine gültige Zahl ein." +#, fuzzy +msgid "Node Highlighting" +msgstr "Blöcke hervorheben" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Keines" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Mögliche Werte sind: " +msgid "Opaque Leaves" +msgstr "Undurchs. Blätter" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Standardwert" +msgid "Opaque Water" +msgstr "Undurchs. Wasser" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Pfad auswählen" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Parallax-Occlusion" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Einstellungen" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Technische Namen zeigen" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shader" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Der Wert muss größer als $1 sein." +msgid "Simple Leaves" +msgstr "Einfache Blätter" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Der Wert muss kleiner als $1 sein." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Geglättetes Licht" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Texturierung:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Um Shader zu benutzen, muss der OpenGL-Treiber benutzt werden." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "Berührungsempfindlichkeit (px)" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Trilinearer Filter" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Wehende Blätter" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Wehende Pflanzen" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Wasserwellen" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -538,10 +689,6 @@ msgstr "Einzelspieler" msgid "No information available" msgstr "Keine Informationen vorhanden" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Keines" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Texturenpaket auswählen:" @@ -566,10 +713,6 @@ msgstr "Initialisiere Blöcke" msgid "Initializing nodes..." msgstr "Initialisiere Blöcke..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Inventarbilder ..." - #: src/client.cpp msgid "Loading textures..." msgstr "Lade Texturen..." @@ -1166,6 +1309,15 @@ msgstr "X-Knopf 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1183,6 +1335,7 @@ msgid "3D mode" msgstr "3D-Modus" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1190,7 +1343,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "3D-Unterstützung.\n" "Aktuell verfügbar:\n" @@ -1265,6 +1419,10 @@ msgstr "" msgid "Advanced" msgstr "Erweitert" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Immer schnell fliegen" @@ -1273,6 +1431,10 @@ msgstr "Immer schnell fliegen" msgid "Ambient occlusion gamma" msgstr "Umgebungsverdeckungs-Gamma" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Anisotroper Filter" @@ -1291,6 +1453,11 @@ msgstr "" "Wenn ein IPv6-Server angemeldet werden soll, muss serverlist_url auf\n" "v6.servers.minetest.net gesetzt werden." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Nodes." + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Zum Neuverbinden nach Absturz auffordern" @@ -1303,6 +1470,11 @@ msgstr "Automatisch bei der Serverliste melden." msgid "Backward key" msgstr "Rückwärtstaste" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Wasserwellenhöhe" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Grundlegend" @@ -1323,10 +1495,6 @@ msgstr "Bits pro Pixel (Farbtiefe) im Vollbildmodus." msgid "Build inside player" msgstr "Innerhalb des Spielers bauen" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Bumpmapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Kameraglättung" @@ -1339,6 +1507,18 @@ msgstr "Kameraglättung im Filmmodus" msgid "Camera update toggle key" msgstr "Taste zum Umschalten der Kameraaktualisierung" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Chattaste" @@ -1347,6 +1527,29 @@ msgstr "Chattaste" msgid "Chat toggle key" msgstr "Taste zum Umschalten des Chatprotokolls" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Chunk-Größe" @@ -1406,6 +1609,12 @@ msgstr "" "eingeschaltet ist\n" "(mit request_insecure_environment())." +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Befehlstaste" @@ -1465,10 +1674,30 @@ msgstr "" "Kartengenerator v6. Wenn Schneebiome aktiviert sind, wird\n" "diese Einstellung ignoriert." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Absturzmeldung" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "Fadenkreuzundurchsichtigkeit" @@ -1564,6 +1793,14 @@ msgstr "Verzögerung beim Zeigen von Tooltipps, in Millisekunden." msgid "Deprecated Lua API handling" msgstr "Veraltete Lua-API-Handhabung" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "Abstiegsgeschwindigkeit" @@ -1588,6 +1825,13 @@ msgstr "Detaillierte Mod-Profildaten. Nützlich für Mod-Entwickler." msgid "Detailed mod profiling" msgstr "Detailliertes Mod-Profiling" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Anti-Cheat deaktivieren" @@ -1617,16 +1861,9 @@ msgid "Dump the mapgen debug infos." msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben." #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" -"Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n" -"nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n" -"optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n" -"nicht mit dieser Einstellung funktioniert." +#, fuzzy +msgid "Enable VBO" +msgstr "MP aktivieren" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1640,10 +1877,6 @@ msgstr "Spielerschaden und -tod aktivieren." msgid "Enable random user input (only used for testing)." msgstr "Schaltet zufällige Steuerung ein (nur zum Testen verwendet)." -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)." - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1690,6 +1923,10 @@ msgstr "" "abhängig von der Systemkonfiguration, auf IPv6-Klienten eingeschränkt sein.\n" "Wird ignoriert, wenn bind_address gesetzt ist." +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1709,6 +1946,11 @@ msgstr "" "Aktiviert das Zwischenspeichern von 3D-Modellen, die mittels facedir rotiert " "werden." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Aktiviert die Übersichtskarte." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Aktiviert die Übersichtskarte." @@ -1805,6 +2047,14 @@ msgstr "" "Datei in client/serverlist/, die Ihre Serverfavoriten aus dem " "Mehrspielermenü beinhaltet." +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1927,25 +2177,31 @@ msgstr "GUI-Skalierungsfilter txr2img" msgid "Gamma" msgstr "Gamma" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Globale Kartengenerierungsattribute.\n" -"Bitschalter, welche nicht in der Bitschalterzeichenkette festgelegt sind, " -"werden\n" -"nicht von der Standardeinstellung abweichen.\n" -"Bitschalter, die mit „no“ beginnen, werden benutzt, um sie explizit zu " -"deaktivieren.\n" -"Die Bitschalter „trees“ und „flat“ haben nur mit mgv6 eine Wirkung." +"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" +"Falls Schneebiome aktiviert sind, werden Dschungel aktiviert und der\n" +"„jungles“-Bitschalter wird ignoriert.\n" +"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"werden von der Standardeinstellung unverändert gelassen.\n" +"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"zu deaktivieren." #: src/settings_translation_file.cpp msgid "Graphics" @@ -1955,6 +2211,11 @@ msgstr "Grafik" msgid "Gravity" msgstr "Gravitation" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mods" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "Taste zum Umschalten des HUD" @@ -1974,6 +2235,11 @@ msgstr "" "- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen " "(empfohlen für Mod-Entwickler)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Height component of the initial window size." +msgstr "Anfängliche Fensterbreite." + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "Höhe, in der Wolken auftauchen." @@ -1987,8 +2253,8 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "Homepage des Servers. Wird in der Serverliste angezeigt." #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." -msgstr "Anfängliche Fensterbreite." +msgid "How deep to make rivers" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2022,6 +2288,10 @@ msgstr "" "entladen werden. Ein höher Wert führt zu besserer Performanz, aber auch\n" "zur Benutzung von mehr Arbeitsspeicher." +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "IPv6" @@ -2048,8 +2318,8 @@ msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" -"Falls deaktiviert, wird die „Benutzen“-Taste benutzt, um schnell zu fliegen," -"\n" +"Falls deaktiviert, wird die „Benutzen“-Taste benutzt, um schnell zu " +"fliegen,\n" "wenn sowohl der Flug- als auch der Schnellmodus aktiviert ist." #: src/settings_translation_file.cpp @@ -2144,6 +2414,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "Zeitintervall, in dem die Tageszeit an Klienten gesendet wird." +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Inventartaste" @@ -2161,61 +2435,47 @@ msgid "Item entity TTL" msgstr "Item-Entity-TTL" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" -"Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" -"Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n" -"Nodes multipliziert." - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Nodes." - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" "Julia-Menge: Iterationen der rekursiven Funktion.\n" "Steuert die Skalierung mit einem sehr hohem Detailgrad." #: src/settings_translation_file.cpp msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" -"Die Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: W value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" -"Julia-Menge: W-Wert, der die 4D-Form festlegt.\n" -"Weite liegt grob zwischen -2 und 2." - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Julia-Menge: X-Wert, der die 4D-Form festlegt.\n" "Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: Y value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Julia-Menge: Y-Wert, der die 4D-Form festlegt.\n" "Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Julia-Menge: Z-Wert, der die 4D-Form festlegt.\n" @@ -2230,14 +2490,15 @@ msgid "Jumping speed" msgstr "Sprunggeschwindigkeit" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n" +"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2250,14 +2511,15 @@ msgstr "" "html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n" +"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2530,6 +2792,14 @@ msgstr "„Benutzen“-Taste zum Runterklettern" msgid "Language" msgstr "Sprache" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "Blätterstil" @@ -2657,51 +2927,41 @@ msgstr "" "DirectX mit LuaJIT zusammenarbeiten lassen. Deaktivieren Sie dies,\n" "falls es Probleme verursacht." -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" -"Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" -"Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n" -"Versätze in Nodes multipliziert." - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes." - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" -"Mandelbrotmenge: Iterationen der rekursiven Funktion.\n" -"Steuert die Skalierung mit einem sehr hohem Detailgrad." - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" -"Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" -"Die Weite liegt grob zwischen -2 und 2." - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Weltordner" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" +"Globale Kartengenerierungsattribute.\n" +"Bitschalter, welche nicht in der Bitschalterzeichenkette festgelegt sind, " +"werden\n" +"nicht von der Standardeinstellung abweichen.\n" +"Bitschalter, die mit „no“ beginnen, werden benutzt, um sie explizit zu " +"deaktivieren.\n" +"Die Bitschalter „trees“ und „flat“ haben nur mit mgv6 eine Wirkung." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute, die speziell für den Fraktale-\n" -"Kartenerzeuger sind.\n" -"„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n" -"Mandelbrotmenge aus.\n" +"Kartengenerierungsattribute speziell für Kartengenerator v7.\n" +"„ridges“ sind die Flüsse.\n" "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" @@ -2755,6 +3015,11 @@ msgstr "Kartenblock-Grenze" msgid "Mapblock unload timeout" msgstr "Timeout zum Entladen von Kartenblöcken" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Kartengeneratorname" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "Biomhitzen-Rauschparameter" @@ -2775,6 +3040,64 @@ msgstr "Kartengenerator-Debugging" msgid "Mapgen flags" msgstr "Kartenerzeuger-Bitschalter" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Kartenerzeuger-Bitschalter" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave1 noise parameters" +msgstr "cave1-Rauschparameter für Fraktale-Kartenerzeuger" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave2 noise parameters" +msgstr "cave2-Rauschparameter für Fraktale-Kartenerzeuger" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat filler depth noise parameters" +msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Bitschalter für Fraktale-Kartenerzeuger" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Kartenerzeuger-Bitschalter" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat large cave depth" +msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat terrain noise parameters" +msgstr "Basisgelände-Rauschparameter" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "Fraktale-Kartenerzeuger" @@ -2792,25 +3115,15 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +#, fuzzy +msgid "Mapgen fractal fractal" msgstr "Bitschalter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" +#, fuzzy +msgid "Mapgen fractal iterations" msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "Julia-Versatz für Fraktale-Kartenerzeuger" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "w-Ausschnitt für Fraktale-Kartenerzeuger" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "w-Parameter für Fraktale-Kartenerzeuger" @@ -2828,25 +3141,24 @@ msgid "Mapgen fractal julia z" msgstr "z-Parameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Julia-Versatz für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "Meeresgrundrauschparameter für Fraktale-Kartenerzeuger" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "w-Ausschnitt für Fraktale-Kartenerzeuger" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "Hitzenübergangs-Rauschparameter" @@ -2991,6 +3303,18 @@ msgstr "Basisgelände-Rauschparameter" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "Geländepersistenz-Rauschparameter" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "Max. Distanz für Kartenblockerzeugung" @@ -3019,20 +3343,6 @@ msgstr "Maximale Bildwiederholrate" msgid "Maximum FPS when game is paused." msgstr "Maximale Bildwiederholrate, wenn das Spiel pausiert ist." -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" -"Höchstabstand über dem Meeresspiegel für den Spieler-\n" -"startpunkt. Größere Werte führen zu Startpunkten näher an\n" -"(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n" -"brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n" -"Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n" -"eingegraben ist." - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "Maximal zwangsgeladene Kartenblöcke" @@ -3072,8 +3382,8 @@ msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" -"Maximale Anzahl der Kartenblöcke, die der Client im Speicher vorhalten soll." -"\n" +"Maximale Anzahl der Kartenblöcke, die der Client im Speicher vorhalten " +"soll.\n" "Auf -1 setzen, um keine Obergrenze zu verwenden." #: src/settings_translation_file.cpp @@ -3148,6 +3458,10 @@ msgstr "" "soll.\n" "Auf Englisch bekannt als „message of the day“ oder „MOTD“." +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "Übersichtskarte" @@ -3164,17 +3478,6 @@ msgstr "Abtasthöhe der Übersichtskarte" msgid "Minimum texture size for filters" msgstr "Minimale Texturengröße für Filter" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" -"Minimal gewünschte Bildwiederholrate.\n" -"Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch " -"angepasst; auch\n" -"die minimale und maximale Sichtweite werden angepasst." - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "Mip-Mapping" @@ -3270,10 +3573,6 @@ msgstr "" "Dieser Wert wird überschrieben, wenn vom Hauptmenü\n" "aus gestartet wird." -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "Wasser im neuen Stil" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "Neue Benutzer müssen dieses Passwort eingeben." @@ -3296,6 +3595,10 @@ msgstr "" "Rauschparameter für Temperatur-, Luftfeuchtigkeits- und Biomübergänge\n" "in der Biom-API." +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "Normalmaps-Sampling" @@ -3346,10 +3649,6 @@ msgstr "Startwert des Parallax-Occlusion-Effektes, üblicherweise Skalierung/2." msgid "Overall scale of parallax occlusion effect." msgstr "Gesamtskalierung des Parallax-Occlusion-Effektes." -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Parallax-Occlusion" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "Parallax-Occlusion" @@ -3420,24 +3719,6 @@ msgstr "" "Beachten Sie, dass das Port-Feld im Hauptmenü diese Einstellung\n" "überschreibt." -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" -"Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n" -"Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel " -"führen.\n" -"Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte im " -"Inventar\n" -"verursachen kann." - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Texturen vorgenerieren" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3467,6 +3748,10 @@ msgstr "" "Werte größer als 26 werden scharfe Schnittkanten an den Ecken des Wolken-\n" "bereichs erzeugen." +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "Zufällige Steuerung" @@ -3495,6 +3780,22 @@ msgstr "Rechtstaste" msgid "Rightclick repetition interval" msgstr "Rechtsklick-Wiederholungsrate" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "Rollback-Aufzeichnung" @@ -3626,10 +3927,6 @@ msgstr "" "Auf „wahr“ setzen, um Wasserwogen zu aktivieren.\n" "Dafür müssen Shader aktiviert sein." -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shader" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3661,6 +3958,10 @@ msgstr "" "Größe der Stücke, die gleichzeitig vom Kartengenerator erzeugt werden,\n" "in Kartenblöcken (16×16×16 Blöcke)." +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Geglättetes Licht" @@ -3724,21 +4025,35 @@ msgstr "Strikte Protokollversionsprüfung" msgid "Synchronous SQLite" msgstr "Synchrones SQLite" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Texturpfad" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" -"Die erlaubte Anpassungsreichweite für die automatische Render-" -"Reichweitenanpassung.\n" -"Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um " -"den automatischen\n" -"Anpassungsalgorithmus zu deaktivieren." #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." @@ -3836,6 +4151,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Kameraauswahltaste" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Tooltip-Verzögerung" @@ -3913,17 +4233,33 @@ msgid "V-Sync" msgstr "Vertikale Synchronisation" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." -msgstr "Anfängliche Fensterhöhe." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" +msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "Vertikale Bildschirmsynchronisation." -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "Vertikaler Startpunktbereich" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Grafiktreiber" @@ -3932,6 +4268,12 @@ msgstr "Grafiktreiber" msgid "View bobbing" msgstr "Auf- und Abbewegung der Ansicht" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "Taste „Sichtweite reduzieren“" @@ -3941,24 +4283,33 @@ msgid "View range increase key" msgstr "Taste „Sichtweite erhöhen“" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" +#, fuzzy +msgid "Viewing range" msgstr "Maximale Sichtweite" -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" -msgstr "Minimale Sichtweite" - #: src/settings_translation_file.cpp msgid "Volume" msgstr "Tonlautstärke" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" +"Julia-Menge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" +"Die Weite liegt grob zwischen -2 und 2." + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Gehgeschwindigkeit" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "Gewünschte Bildwiederholrate" +#, fuzzy +msgid "Water Features" +msgstr "Meeresspiegel" #: src/settings_translation_file.cpp msgid "Water level" @@ -4104,6 +4455,11 @@ msgstr "" "Ob der Klienten Debug-Informationen zeigen soll (hat die selbe Wirkung\n" "wie das Drücken von F5)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Width component of the initial window size." +msgstr "Anfängliche Fensterbreite." + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "Breite der Linien der Auswahlbox um Blöcke." @@ -4116,6 +4472,14 @@ msgstr "" "Weltverzeichnis (alles in der Welt wird hier gespeichert).\n" "Nicht benötigt, wenn vom Hauptmenü aus gestartet wird." +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "cURL-Dateidownload-Zeitüberschreitung" @@ -4128,152 +4492,72 @@ msgstr "cURL-Parallel-Begrenzung" msgid "cURL timeout" msgstr "cURL-Zeitüberschreitung" -#~ msgid "2x" -#~ msgstr "2x" +#, fuzzy +#~ msgid "\"" +#~ msgstr "”" -#~ msgid "4x" -#~ msgstr "4x" +#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht " -#~ msgid "8x" -#~ msgstr "8x" +#~ msgid "If disabled " +#~ msgstr "Wenn deaktiviert " -#~ msgid "Antialiasing:" -#~ msgstr "Kantenglättung:" +#~ msgid "If enabled, " +#~ msgstr "Wenn aktiviert, " -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" +#~ msgid "Rendering:" +#~ msgstr "Rendering:" -#~ msgid "Fancy Leaves" -#~ msgstr "Schöne Blätter" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Neustart nach Ändern des Treibers erforderlich" -#~ msgid "Mipmap" -#~ msgstr "Mipmap" +#~ msgid "Downloading" +#~ msgstr "Lade herunter" -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap u. Aniso. Filter" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen" -#~ msgid "No Mipmap" -#~ msgstr "Keine Mipmap" +#~ msgid "is required by:" +#~ msgstr "wird benötigt von:" -#~ msgid "No!!!" -#~ msgstr "Nein!!!" +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguration gespeichert. " -#~ msgid "Opaque Leaves" -#~ msgstr "Undurchs. Blätter" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Warnung: Konfiguration nicht konsistent. " -#~ msgid "Opaque Water" -#~ msgstr "Undurchs. Wasser" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen" -#~ msgid "Reset singleplayer world" -#~ msgstr "Einzelspielerwelt zurücksetzen" +#~ msgid "Show Public" +#~ msgstr "Zeige öffentliche" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: " +#~ msgid "Show Favorites" +#~ msgstr "Zeige Favoriten" -#~ msgid "Simple Leaves" -#~ msgstr "Einfache Blätter" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten." -#~ msgid "Texturing:" -#~ msgstr "Texturierung:" +#~ msgid "Create world" +#~ msgstr "Welt erstellen" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Um Shader zu benutzen, muss der OpenGL-Treiber benutzt werden." +#~ msgid "Address required." +#~ msgstr "Adresse benötigt." -#~ msgid "Touch free target" -#~ msgstr "Berührungsfreies Ziel" +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt" -#~ msgid "Touchthreshold (px)" -#~ msgstr "Berührungsempfindlichkeit (px)" +#~ msgid "Files to be deleted" +#~ msgstr "Zu löschende Dateien" -#~ msgid " KB/s" -#~ msgstr " KB/s" +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden" -#~ msgid " MB/s" -#~ msgstr " MB/s" +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt" -#~ msgid "Game Name" -#~ msgstr "Spielname" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren" - -#~ msgid "GAMES" -#~ msgstr "SPIELE" - -#~ msgid "Mods:" -#~ msgstr "Mods:" - -#~ msgid "new game" -#~ msgstr "neues Spiel" - -#~ msgid "EDIT GAME" -#~ msgstr "SPIEL ÄNDERN" - -#~ msgid "Remove selected mod" -#~ msgstr "Ausgewählte Mod löschen" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Mod hinzufügen" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Favoriten:" - -#~ msgid "START SERVER" -#~ msgstr "SERVER STARTEN" - -#~ msgid "Name" -#~ msgstr "Name" - -#~ msgid "Password" -#~ msgstr "Passwort" - -#~ msgid "SETTINGS" -#~ msgstr "EINSTELLUNGEN" - -#~ msgid "Preload item visuals" -#~ msgstr "Lade Inventarbilder vor" - -#~ msgid "Finite Liquid" -#~ msgstr "Endliches Wasser" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "EINZELSPIELER" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTUREN PAKETE" - -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "Add mod:" -#~ msgstr "Modifikation hinzufügen:" - -#~ msgid "Local install" -#~ msgstr "Lokale Install." - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n" -#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird. " - -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Warnung: Einige konfigurierte Mods fehlen.\n" -#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert " -#~ "wird. " - -#~ msgid "KEYBINDINGS" -#~ msgstr "TASTEN EINST." - -#~ msgid "Delete map" -#~ msgstr "Karte löschen" +#~ msgid "Failed to delete all world files" +#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden" #~ msgid "" #~ "Default Controls:\n" @@ -4299,69 +4583,273 @@ msgstr "cURL-Zeitüberschreitung" #~ "- I: Inventar\n" #~ "- T: Chat\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden" +#~ msgid "Delete map" +#~ msgstr "Karte löschen" -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt" +#~ msgid "KEYBINDINGS" +#~ msgstr "TASTEN EINST." -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Warnung: Einige konfigurierte Mods fehlen.\n" +#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert " +#~ "wird. " -#~ msgid "Files to be deleted" -#~ msgstr "Zu löschende Dateien" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n" +#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird. " -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt" +#~ msgid "Local install" +#~ msgstr "Lokale Install." -#~ msgid "Address required." -#~ msgstr "Adresse benötigt." +#~ msgid "Add mod:" +#~ msgstr "Modifikation hinzufügen:" -#~ msgid "Create world" -#~ msgstr "Welt erstellen" +#~ msgid "MODS" +#~ msgstr "MODS" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten." +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTUREN PAKETE" -#~ msgid "Show Favorites" -#~ msgstr "Zeige Favoriten" +#~ msgid "SINGLE PLAYER" +#~ msgstr "EINZELSPIELER" -#~ msgid "Show Public" -#~ msgstr "Zeige öffentliche" +#~ msgid "Finite Liquid" +#~ msgstr "Endliches Wasser" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen" +#~ msgid "Preload item visuals" +#~ msgstr "Lade Inventarbilder vor" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Warnung: Konfiguration nicht konsistent. " +#~ msgid "SETTINGS" +#~ msgstr "EINSTELLUNGEN" -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguration gespeichert. " +#~ msgid "Password" +#~ msgstr "Passwort" -#~ msgid "is required by:" -#~ msgstr "wird benötigt von:" +#~ msgid "Name" +#~ msgstr "Name" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen" +#~ msgid "START SERVER" +#~ msgstr "SERVER STARTEN" -#~ msgid "Downloading" -#~ msgstr "Lade herunter" +#~ msgid "Favorites:" +#~ msgstr "Favoriten:" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Neustart nach Ändern des Treibers erforderlich" +#~ msgid "CLIENT" +#~ msgstr "CLIENT" -#~ msgid "Rendering:" -#~ msgstr "Rendering:" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Mod hinzufügen" -#~ msgid "If enabled, " -#~ msgstr "Wenn aktiviert, " +#~ msgid "Remove selected mod" +#~ msgstr "Ausgewählte Mod löschen" -#~ msgid "If disabled " -#~ msgstr "Wenn deaktiviert " +#~ msgid "EDIT GAME" +#~ msgstr "SPIEL ÄNDERN" -#~ msgid "Enable a bit lower water surface, so it doesn't " -#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht " +#~ msgid "new game" +#~ msgstr "neues Spiel" -#, fuzzy -#~ msgid "\"" -#~ msgstr "”" +#~ msgid "Mods:" +#~ msgstr "Mods:" + +#~ msgid "GAMES" +#~ msgstr "SPIELE" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren" + +#~ msgid "Game Name" +#~ msgstr "Spielname" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid "Touch free target" +#~ msgstr "Berührungsfreies Ziel" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Einzelspielerwelt zurücksetzen" + +#~ msgid "Wanted FPS" +#~ msgstr "Gewünschte Bildwiederholrate" + +#~ msgid "Viewing range minimum" +#~ msgstr "Minimale Sichtweite" + +#~ msgid "Vertical spawn range" +#~ msgstr "Vertikaler Startpunktbereich" + +#~ msgid "Vertical initial window size." +#~ msgstr "Anfängliche Fensterhöhe." + +#~ msgid "" +#~ "The allowed adjustment range for the automatic rendering range " +#~ "adjustment.\n" +#~ "Set this to be equal to viewing range minimum to disable the auto-" +#~ "adjustment algorithm." +#~ msgstr "" +#~ "Die erlaubte Anpassungsreichweite für die automatische Render-" +#~ "Reichweitenanpassung.\n" +#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um " +#~ "den automatischen\n" +#~ "Anpassungsalgorithmus zu deaktivieren." + +#~ msgid "Preload inventory textures" +#~ msgstr "Texturen vorgenerieren" + +#~ msgid "" +#~ "Pre-generate all item visuals used in the inventory.\n" +#~ "This increases startup time, but runs smoother in-game.\n" +#~ "The generated textures can easily exceed your VRAM, causing artifacts in " +#~ "the inventory." +#~ msgstr "" +#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n" +#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel " +#~ "führen.\n" +#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte " +#~ "im Inventar\n" +#~ "verursachen kann." + +#~ msgid "New style water" +#~ msgstr "Wasser im neuen Stil" + +#~ msgid "" +#~ "Minimum wanted FPS.\n" +#~ "The amount of rendered stuff is dynamically set according to this. and " +#~ "viewing range min and max." +#~ msgstr "" +#~ "Minimal gewünschte Bildwiederholrate.\n" +#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch " +#~ "angepasst; auch\n" +#~ "die minimale und maximale Sichtweite werden angepasst." + +#~ msgid "" +#~ "Maximum distance above water level for player spawn.\n" +#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" +#~ "Smaller values may result in a suitable spawn point not being found,\n" +#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." +#~ msgstr "" +#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n" +#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n" +#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n" +#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n" +#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n" +#~ "eingegraben ist." + +#~ msgid "Mapgen fractal mandelbrot slice w" +#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger" + +#~ msgid "Mapgen fractal mandelbrot scale" +#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger" + +#~ msgid "Mapgen fractal mandelbrot offset" +#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger" + +#~ msgid "Mapgen fractal mandelbrot iterations" +#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger" + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen fractal.\n" +#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." +#~ msgstr "" +#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n" +#~ "Kartenerzeuger sind.\n" +#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n" +#~ "Mandelbrotmenge aus.\n" +#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +#~ "werden von der Standardeinstellung unverändert gelassen.\n" +#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +#~ "zu deaktivieren." + +#~ msgid "" +#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-" +#~ "Form.\n" +#~ "Die Weite liegt grob zwischen -2 und 2." + +#~ msgid "" +#~ "Mandelbrot set: Iterations of the recursive function.\n" +#~ "Controls scale of finest detail." +#~ msgstr "" +#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n" +#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad." + +#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes." + +#~ msgid "" +#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +#~ msgstr "" +#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" +#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n" +#~ "Versätze in Nodes multipliziert." + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n" +#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n" +#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Julia set: W value determining the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n" +#~ "Weite liegt grob zwischen -2 und 2." + +#~ msgid "" +#~ "Julia set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +#~ msgstr "" +#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" +#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n" +#~ "Nodes multipliziert." + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)." + +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n" +#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n" +#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n" +#~ "nicht mit dieser Einstellung funktioniert." + +#~ msgid "Item textures..." +#~ msgstr "Inventarbilder ..." diff --git a/po/eo/minetest.po b/po/eo/minetest.po index bcbbea98..79e0f568 100644 --- a/po/eo/minetest.po +++ b/po/eo/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-09-13 12:36+0200\n" "Last-Translator: Tim \n" "Language-Team: Esperanto , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Games" +msgstr "Ludo" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Modifoj" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Select path" +msgstr "Selekto" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -300,10 +392,6 @@ msgstr "Instalantaj modifoj:" msgid "Mod information:" msgstr "Modifaj informoj:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Modifoj" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Neniu modifa priskribo disponeblas" @@ -416,16 +504,43 @@ msgid "Start Game" msgstr "Startigi ludon" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "" +msgid "2x" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "" +#, fuzzy +msgid "3D Clouds" +msgstr "3D nuboj" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "" +msgid "4x" +msgstr "4x" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "8x" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Agordoj" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "Glatigo:" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Ĉu vi certas, ke vi volas nuligi vian solludantan mondon?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bilineara filtrilo" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Protuberancmapado" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -433,77 +548,113 @@ msgstr "Ŝanĝi klavojn" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "Malŝaltu modifaron" - -#: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "" +msgid "Connected Glass" +msgstr "Ligata glaco" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "ŝaltita" +msgid "Enable Particles" +msgstr "Ŝaltu ĉiujn" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" +msgid "Fancy Leaves" +msgstr "Ŝikaj foliaĵoj" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Games" -msgstr "Ludo" +msgid "Generate Normalmaps" +msgstr "Generi Normalmapojn" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgid "Mipmap" +msgstr "Mipmapo" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "" +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmapo + Malizotropa filtrilo" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Select path" -msgstr "Selekto" +msgid "No Filter" +msgstr "Neniu filtrilo" + +#: builtin/mainmenu/tab_settings.lua +msgid "No Mipmap" +msgstr "Neniu Mipmapo" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" +msgstr "Ne!!!" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Node Highlighting" +msgstr "Marki nodaĵojn" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Leaves" +msgstr "Opakaj foliaĵoj" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "Opaka akvo" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Paralaksa Okludo" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Agordoj" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Ombrigiloj" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "" +msgid "Simple Leaves" +msgstr "Simplaj foliaĵoj" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "" +#, fuzzy +msgid "Smooth Lighting" +msgstr "Glatiga lumo" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Teksturado:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Por uzi ombrigilojn, OpenGL-a pelilo estas necesa." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "Tuŝa sojlo (px)" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Triineara filtrilo" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Ondantaj foliaĵoj" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Ondantaj plantoj" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Ondanta akvo" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -529,10 +680,6 @@ msgstr "Solludanto" msgid "No information available" msgstr "Neniu informoj disponeblas" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selekti teksturaron:" @@ -557,10 +704,6 @@ msgstr "Pravalorizi nodaĵojn" msgid "Initializing nodes..." msgstr "Pravalorizi nodaĵojn…" -#: src/client.cpp -msgid "Item textures..." -msgstr "Aĵaj teksturoj…" - #: src/client.cpp msgid "Loading textures..." msgstr "Ŝargi teksturojn…" @@ -1156,6 +1299,15 @@ msgstr "X-Butono 2" msgid "Zoom" msgstr "Zomo" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1179,7 +1331,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1235,6 +1388,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1243,6 +1400,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1258,6 +1419,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1271,6 +1436,11 @@ msgstr "" msgid "Backward key" msgstr "Malantaŭen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Ondanta akvo" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1293,10 +1463,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Protuberancmapado" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1309,6 +1475,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1319,6 +1497,29 @@ msgstr "Ŝanĝi klavojn" msgid "Chat toggle key" msgstr "Ŝanĝi klavojn" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1377,6 +1578,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1437,10 +1644,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1529,6 +1756,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1551,6 +1786,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1583,12 +1825,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Ŝaltu modifaron" #: src/settings_translation_file.cpp #, fuzzy @@ -1603,10 +1842,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1637,6 +1872,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1649,6 +1888,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Ŝalti damaĝon" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1737,6 +1981,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1848,6 +2100,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Generate normalmaps" @@ -1856,10 +2112,11 @@ msgstr "Generi Normalmapojn" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1870,6 +2127,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Modifoj" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1882,6 +2144,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1895,7 +2161,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1920,6 +2186,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2013,6 +2283,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2032,47 +2306,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2087,7 +2350,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2101,7 +2364,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2298,6 +2561,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2401,36 +2672,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2471,6 +2732,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Mondogenerilo" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2493,6 +2759,59 @@ msgstr "Mondogenerilo" msgid "Mapgen flags" msgstr "Mondogenerilo" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Mondogenerilo" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Mondogenerilo" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Mondogenerilo" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Paralaksa Okludo" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Mondogenerilo" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2512,26 +2831,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Mondogenerilo" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "Paralaksa Okludo" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2549,25 +2856,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Mondogenerilo" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Mondogenerilo" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Mondogenerilo" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2716,6 +3022,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2744,14 +3062,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2844,6 +3154,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2860,13 +3174,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2944,10 +3251,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2969,6 +3272,10 @@ msgstr "Marki nodaĵojn" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3009,10 +3316,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Paralaksa Okludo" - #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion" @@ -3084,19 +3387,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Ŝargi teksturojn…" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3120,6 +3410,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3150,6 +3444,22 @@ msgstr "Dekstra Menuo" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3276,10 +3586,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Ombrigiloj" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3305,6 +3611,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3362,16 +3672,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Teksturaroj" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3443,6 +3772,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Protuberancmapado" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3514,17 +3848,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3533,6 +3883,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3542,11 +3898,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3554,14 +3906,23 @@ msgstr "" msgid "Volume" msgstr "Sonintenso" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Walking speed" msgstr "Ondantaj foliaĵoj" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Aĵaj teksturoj…" #: src/settings_translation_file.cpp msgid "Water level" @@ -3676,6 +4037,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3686,6 +4051,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3698,73 +4071,29 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "2x" -#~ msgstr "2x" - -#~ msgid "4x" -#~ msgstr "4x" - -#~ msgid "8x" -#~ msgstr "8x" - -#~ msgid "Antialiasing:" -#~ msgstr "Glatigo:" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Ĉu vi certas, ke vi volas nuligi vian solludantan mondon?" - -#~ msgid "Fancy Leaves" -#~ msgstr "Ŝikaj foliaĵoj" - -#~ msgid "Mipmap" -#~ msgstr "Mipmapo" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmapo + Malizotropa filtrilo" - -#~ msgid "No Mipmap" -#~ msgstr "Neniu Mipmapo" - -#~ msgid "No!!!" -#~ msgstr "Ne!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Opakaj foliaĵoj" - -#~ msgid "Opaque Water" -#~ msgstr "Opaka akvo" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Nuligi solludantan mondon" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Skala faktoro por menuoj " - -#~ msgid "Simple Leaves" -#~ msgstr "Simplaj foliaĵoj" - -#~ msgid "Texturing:" -#~ msgstr "Teksturado:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Por uzi ombrigilojn, OpenGL-a pelilo estas necesa." - -#~ msgid "Touch free target" -#~ msgstr "Sentuŝa celo" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Tuŝa sojlo (px)" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon" - -#~ msgid "Rendering:" -#~ msgstr "Bildigo:" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Malŝaltu modifaron" #, fuzzy #~ msgid "If enabled, " #~ msgstr "ŝaltita" +#~ msgid "Rendering:" +#~ msgstr "Bildigo:" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Restartigu Minetest-on por efikigi pelilan ŝanĝon" + +#~ msgid "Touch free target" +#~ msgstr "Sentuŝa celo" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Skala faktoro por menuoj " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Nuligi solludantan mondon" + #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Malŝaltu modifaron" +#~ msgid "Preload inventory textures" +#~ msgstr "Ŝargi teksturojn…" diff --git a/po/es/minetest.po b/po/es/minetest.po index ed408679..39ce439b 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-02-20 00:31+0000\n" "Last-Translator: Miguel Isaac \n" -"Language-Team: Spanish " -"\n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Cancelar" @@ -115,8 +116,8 @@ msgstr "Ocultar contenido" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Guardar" @@ -191,6 +192,7 @@ msgid "No of course not!" msgstr "¡No, porque no!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Sí" @@ -210,6 +212,96 @@ msgstr "Aceptar" msgid "Rename Modpack:" msgstr "Renombrar paquete de mod:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$ 1\" no es un indicador válido." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Ninguna descripción de ajuste dada)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Navegar" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Desactivado" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Editar" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Activado" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" +"El formato es 3 números separados por comas y éstos dentro de paréntesis." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Formato: (, Y, ), " +", , " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Juegos" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mods" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" +"Opcionalmente, la lagunaridad puede ser agregada con una coma anterior." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Por favor, introduzca una lista separada por comas de indicadores." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Por favor, introduzca un entero válido." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Por favor, introduzca un número válido." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Los posibles valores son: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Restablecer por defecto" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Seleccionar ruta" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Mostrar los nombres técnicos" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "El valor debe ser mayor que $ 1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "El valor debe ser menor que $ 1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -305,10 +397,6 @@ msgstr "Mods instalados:" msgid "Mod information:" msgstr "Información del mod:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mods" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "La descripción del mod no está disponible" @@ -423,93 +511,157 @@ msgid "Start Game" msgstr "Iniciar juego" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$ 1\" no es un indicador válido." +msgid "2x" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Ninguna descripción de ajuste dada)" +#, fuzzy +msgid "3D Clouds" +msgstr "Nubes en 3D" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Navegar" +msgid "4x" +msgstr "4x" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "8x" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Configuración" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "Suavizado:" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Filtrado bilineal" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Mapeado de relieve" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Configurar teclas" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Desactivado" +#, fuzzy +msgid "Connected Glass" +msgstr "Vidrios conectados" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Editar" +#, fuzzy +msgid "Enable Particles" +msgstr "Activar todos" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Activado" +msgid "Fancy Leaves" +msgstr "Hojas elegantes" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" -"El formato es 3 números separados por comas y éstos dentro de paréntesis." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Generar mapas normales" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Formato: (, Y, ), " -", , " +msgid "Mipmap" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Juegos" +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmap + Filtro aniso." #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "Opcionalmente, la lagunaridad puede ser agregada con una coma anterior." +#, fuzzy +msgid "No Filter" +msgstr "Filtrado" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Por favor, introduzca una lista separada por comas de indicadores." +msgid "No Mipmap" +msgstr "Sin Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Por favor, introduzca un entero válido." +msgid "No!!!" +msgstr "¡¡¡No!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Por favor, introduzca un número válido." +#, fuzzy +msgid "Node Highlighting" +msgstr "Resaltado de los nodos" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Ninguno" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Los posibles valores son: " +msgid "Opaque Leaves" +msgstr "Hojas opacas" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Restablecer por defecto" +msgid "Opaque Water" +msgstr "Agua opaca" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Seleccionar ruta" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Oclusión de paralaje" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Configuración" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Mostrar los nombres técnicos" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Sombreadores" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "El valor debe ser mayor que $ 1." +msgid "Simple Leaves" +msgstr "Hojas simples" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "El valor debe ser menor que $ 1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Iluminación suave" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Texturizado:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Para habilitar los sombreadores debe utilizar el controlador OpenGL." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "Umbral táctil (px)" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Filtrado trilineal" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Movimiento de hojas" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Movimiento de plantas" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Oleaje en el agua" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -535,10 +687,6 @@ msgstr "Un jugador" msgid "No information available" msgstr "Sin información disponible" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Ninguno" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Seleccione un paquete de texturas:" @@ -564,10 +712,6 @@ msgstr "Inicializando nodos" msgid "Initializing nodes..." msgstr "Inicializando nodos..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Texturas de objetos..." - #: src/client.cpp msgid "Loading textures..." msgstr "Cargando texturas..." @@ -1167,6 +1311,15 @@ msgstr "X Botón 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "" @@ -1185,6 +1338,7 @@ msgid "3D mode" msgstr "Modo 3D" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1192,7 +1346,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "Soporte 3D.\n" "Soportado Actualmente:\n" @@ -1208,8 +1363,8 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Una semilla de mapa para un mapa nuevo, deja vacio para una semilla al azar." -"\n" +"Una semilla de mapa para un mapa nuevo, deja vacio para una semilla al " +"azar.\n" "Sera borrado creando un nuevo mundo en el menu principal." #: src/settings_translation_file.cpp @@ -1271,6 +1426,10 @@ msgstr "" msgid "Advanced" msgstr "Avanzado" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Siempre volar y rápido" @@ -1279,6 +1438,10 @@ msgstr "Siempre volar y rápido" msgid "Ambient occlusion gamma" msgstr "Gamma de oclusión de ambiente" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Filtrado anisotrópico" @@ -1294,6 +1457,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Preguntar para volver a conectar despues de una caída" @@ -1306,6 +1473,11 @@ msgstr "Automáticamente informar a la lista del servidor." msgid "Backward key" msgstr "Tecla retroceso" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Oleaje en el agua" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Básico" @@ -1328,10 +1500,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Mapeado de relieve" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Suavizado de cámara" @@ -1344,6 +1512,18 @@ msgstr "Suavizado de cámara en modo cinematográfico" msgid "Camera update toggle key" msgstr "Tecla alternativa para la actualización de la cámara" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Tecla del Chat" @@ -1352,6 +1532,29 @@ msgstr "Tecla del Chat" msgid "Chat toggle key" msgstr "Tecla alternativa para el chat" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Tamaño del chunk" @@ -1406,6 +1609,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Tecla comando" @@ -1461,10 +1670,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Mensaje de error" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1551,6 +1780,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1573,6 +1810,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Desactivar Anticheat" @@ -1602,12 +1846,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Activar paquete" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1621,10 +1862,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1655,6 +1892,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1667,6 +1908,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Activar mini-mapa." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Activar mini-mapa." @@ -1754,6 +2000,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1863,6 +2117,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Generar mapas normales" @@ -1870,10 +2128,11 @@ msgstr "Generar mapas normales" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1884,6 +2143,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mods" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1896,6 +2160,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1909,7 +2177,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1934,6 +2202,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2027,6 +2299,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Tecla Inventario" @@ -2045,47 +2321,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2099,7 +2364,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2113,7 +2378,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2310,6 +2575,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2410,36 +2683,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2480,6 +2743,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Generador de mapas" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2501,6 +2769,59 @@ msgstr "Depuración del generador de mapas" msgid "Mapgen flags" msgstr "Generador de mapas" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Generador de mapas" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Generador de mapas" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Generador de mapas" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Oclusión de paralaje" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Generador de mapas" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2520,26 +2841,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Generador de mapas" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "Oclusión de paralaje" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2557,25 +2866,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Generador de mapas" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Generador de mapas" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Generador de mapas" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2724,6 +3032,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2752,14 +3072,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2851,6 +3163,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2867,13 +3183,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2951,10 +3260,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2975,6 +3280,10 @@ msgstr "Resaltado de los nodos" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3015,10 +3324,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Oclusión de paralaje" - #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion" @@ -3089,18 +3394,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Precarga de las texturas del inventario" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3124,6 +3417,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3152,6 +3449,22 @@ msgstr "Tecla derecha" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3269,10 +3582,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Sombreadores" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3298,6 +3607,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Iluminación suave" @@ -3353,16 +3666,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + # No cabe "Paquetes de texturas". #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Ruta de la textura" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3434,6 +3766,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mapeado de relieve" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3502,17 +3839,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3521,6 +3874,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3530,24 +3889,29 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "Volumen" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Velocidad del caminar" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Texturas de objetos..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3658,6 +4022,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3668,6 +4036,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3680,81 +4056,35 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "2x" -#~ msgstr "2x" - -#~ msgid "4x" -#~ msgstr "4x" - -#~ msgid "8x" -#~ msgstr "8x" - -#~ msgid "Antialiasing:" -#~ msgstr "Suavizado:" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?" - -#~ msgid "Fancy Leaves" -#~ msgstr "Hojas elegantes" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap + Filtro aniso." - -#~ msgid "No Mipmap" -#~ msgstr "Sin Mipmap" - -#~ msgid "No!!!" -#~ msgstr "¡¡¡No!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Hojas opacas" - -#~ msgid "Opaque Water" -#~ msgstr "Agua opaca" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Reiniciar mundo de un jugador" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Factor de escala aplicado a los elementos del menú: " - -#~ msgid "Simple Leaves" -#~ msgstr "Hojas simples" - -#~ msgid "Texturing:" -#~ msgstr "Texturizado:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "" -#~ "Para habilitar los sombreadores debe utilizar el controlador OpenGL." - -#~ msgid "Touch free target" -#~ msgstr "Tocar para interactuar" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Umbral táctil (px)" - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "" -#~ "Reinicia minetest para que los cambios en el controlador tengan efecto" - -#~ msgid "Rendering:" -#~ msgstr "Renderizado:" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Desactivar paquete" #, fuzzy #~ msgid "If enabled, " #~ msgstr "Activado" -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Desactivar paquete" +#~ msgid "Rendering:" +#~ msgstr "Renderizado:" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "" +#~ "Reinicia minetest para que los cambios en el controlador tengan efecto" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid "Touch free target" +#~ msgstr "Tocar para interactuar" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Factor de escala aplicado a los elementos del menú: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Reiniciar mundo de un jugador" + +#~ msgid "Preload inventory textures" +#~ msgstr "Precarga de las texturas del inventario" diff --git a/po/et/minetest.po b/po/et/minetest.po index ed6e69a4..36aa83d5 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-11-19 16:52+0000\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian " -"\n" +"Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Meie toetame protokolli versioone $1 kuni $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Tühista" @@ -115,8 +116,8 @@ msgstr "Peida mod. pakkide sisu" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Salvesta" @@ -189,6 +190,7 @@ msgid "No of course not!" msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Jah" @@ -208,6 +210,95 @@ msgstr "Nõustu" msgid "Rename Modpack:" msgstr "" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Disabled" +msgstr "Lülita kõik välja" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Enabled" +msgstr "Sisse lülitatud" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Mängud" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Select path" +msgstr "Vali" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -298,10 +389,6 @@ msgstr "" msgid "Mod information:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "" @@ -416,93 +503,164 @@ msgid "Start Game" msgstr "Alusta mängu" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +#, fuzzy +msgid "3D Clouds" +msgstr "3D pilved" + +#: builtin/mainmenu/tab_settings.lua +msgid "4x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "8x" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Sätted" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Üksikmäng" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bi-lineaarsed Filtreerimine" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Väga hea kvaliteet" + #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Vaheta nuppe" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "Lülita kõik välja" +msgid "Connected Glass" +msgstr "Liitu" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +#, fuzzy +msgid "Enable Particles" +msgstr "Luba kõik" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Fancy Leaves" +msgstr "Läbipaistmatu vesi" + +#: builtin/mainmenu/tab_settings.lua +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "Sisse lülitatud" +msgid "Mipmap" +msgstr "Väga hea kvaliteet" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Mängud" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Select path" -msgstr "Vali" +msgid "No Filter" +msgstr "Anisotroopne Filtreerimine" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "No Mipmap" +msgstr "Väga hea kvaliteet" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Node Highlighting" +msgstr "Ilus valgustus" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Opaque Leaves" +msgstr "Läbipaistmatu vesi" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Opaque Water" +msgstr "Läbipaistmatu vesi" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Sätted" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Varjutajad" + #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#, fuzzy +msgid "Simple Leaves" +msgstr "Läbipaistmatu vesi" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Smooth Lighting" +msgstr "Ilus valgustus" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Aktiveerimiseks varjud, nad vajavad OpenGL draiver." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "" +#, fuzzy +msgid "Trilinear Filter" +msgstr "Tri-Linear Filtreerimine" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Uhked puud" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Uhked puud" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Uhked puud" #: builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -531,10 +689,6 @@ msgstr "Üksikmäng" msgid "No information available" msgstr "Informatsioon ei ole kättesaadav" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Vali graafika:" @@ -561,10 +715,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "" - #: src/client.cpp msgid "Loading textures..." msgstr "" @@ -1140,6 +1290,15 @@ msgstr "X Nupp 2" msgid "Zoom" msgstr "Suumi" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1163,7 +1322,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1219,6 +1379,10 @@ msgstr "" msgid "Advanced" msgstr "Arenenud sätted" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1227,6 +1391,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1243,6 +1411,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1256,6 +1428,10 @@ msgstr "" msgid "Backward key" msgstr "Tagasi" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1278,11 +1454,6 @@ msgstr "" msgid "Build inside player" msgstr "Mitmikmäng" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "Väga hea kvaliteet" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1295,6 +1466,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1305,6 +1488,29 @@ msgstr "Vaheta nuppe" msgid "Chat toggle key" msgstr "Vaheta nuppe" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1363,6 +1569,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1422,10 +1634,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1515,6 +1747,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1537,6 +1777,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1569,12 +1816,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Luba MP" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1588,10 +1832,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1622,6 +1862,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1634,6 +1878,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Lülita valu sisse" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1721,6 +1970,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1831,6 +2088,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1838,10 +2099,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1852,6 +2114,10 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +msgid "HTTP Mods" +msgstr "" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1864,6 +2130,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1877,7 +2147,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1902,6 +2172,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1995,6 +2269,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2014,47 +2292,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2069,7 +2336,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2083,7 +2350,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2280,6 +2547,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2383,36 +2658,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2453,6 +2718,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Põlvkonna kaardid" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2475,6 +2745,59 @@ msgstr "Põlvkonna kaardid" msgid "Mapgen flags" msgstr "Põlvkonna kaardid" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Põlvkonna kaardid" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Põlvkonna kaardid" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Põlvkonna kaardid" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Põlvkonna kaardid" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Põlvkonna kaardid" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2494,24 +2817,13 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Põlvkonna kaardid" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal iterations" +msgstr "Põlvkonna kaardid" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -2530,25 +2842,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Põlvkonna kaardid" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Põlvkonna kaardid" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Põlvkonna kaardid" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2697,6 +3008,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2725,14 +3048,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2825,6 +3140,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2841,13 +3160,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2925,10 +3237,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2949,6 +3257,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2989,10 +3301,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3057,18 +3365,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3092,6 +3388,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3122,6 +3422,22 @@ msgstr "Parem Menüü" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3243,10 +3559,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Varjutajad" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3272,6 +3584,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3328,16 +3644,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Vali graafika:" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3409,6 +3744,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Väga hea kvaliteet" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3480,17 +3820,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3499,6 +3855,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3508,11 +3870,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3520,12 +3878,20 @@ msgstr "" msgid "Volume" msgstr "Hääle volüüm" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" +msgid "Water Features" msgstr "" #: src/settings_translation_file.cpp @@ -3635,6 +4001,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3645,6 +4015,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3658,70 +4036,66 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Läbipaistmatu vesi" +#~ msgid "If disabled " +#~ msgstr "Lülita kõik välja" #, fuzzy -#~ msgid "Opaque Water" -#~ msgstr "Läbipaistmatu vesi" +#~ msgid "If enabled, " +#~ msgstr "Sisse lülitatud" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Üksikmäng" +#~ msgid "Game Name" +#~ msgstr "Mäng" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Aktiveerimiseks varjud, nad vajavad OpenGL draiver." +#~ msgid "GAMES" +#~ msgstr "MÄNGUD" + +#~ msgid "new game" +#~ msgstr "uus mängu" + +#~ msgid "EDIT GAME" +#~ msgstr "MUUDA MÄNGU" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Alla" +#~ msgid "Remove selected mod" +#~ msgstr "Eemalda valitud muutus" -#~ msgid "Left click: Move all items, Right click: Move single item" +#, fuzzy +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Lisama muutus" + +#~ msgid "Favorites:" +#~ msgstr "Lemmikud:" + +#~ msgid "Name" +#~ msgstr "Nimi" + +#~ msgid "Password" +#~ msgstr "Parool" + +#~ msgid "SETTINGS" +#~ msgstr "Seaded" + +#~ msgid "Preload item visuals" +#~ msgstr "Lae asjade visuaale" + +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Löppev vedelik" + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " #~ msgstr "" -#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut " -#~ "asja" +#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n" +#~ "Need lülitatakse sisse kohe pärast sätete salvestamist." -#~ msgid "is required by:" -#~ msgstr "Seda vajavad:" - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguratsioon salvestatud. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Hoiatus: Konfiguratsioon pole kindel." - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" - -#~ msgid "Show Public" -#~ msgstr "Näita avalikke" - -#~ msgid "Show Favorites" -#~ msgstr "Näita lemmikuid" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." - -#~ msgid "Create world" -#~ msgstr "Loo maailm" - -#~ msgid "Address required." -#~ msgstr "IP on vajalkik." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" - -#~ msgid "Files to be deleted" -#~ msgstr "Failid mida kustutada" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n" +#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon." #~ msgid "" #~ "Default Controls:\n" @@ -3748,64 +4122,53 @@ msgstr "" #~ "- ESC: Menüü\n" #~ "- T: Jututupa\n" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ msgid "Failed to delete all world files" +#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" + +#~ msgid "Files to be deleted" +#~ msgstr "Failid mida kustutada" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" + +#~ msgid "Address required." +#~ msgstr "IP on vajalkik." + +#~ msgid "Create world" +#~ msgstr "Loo maailm" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." + +#~ msgid "Show Favorites" +#~ msgstr "Näita lemmikuid" + +#~ msgid "Show Public" +#~ msgstr "Näita avalikke" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Hoiatus: Konfiguratsioon pole kindel." + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguratsioon salvestatud. " + +#~ msgid "is required by:" +#~ msgstr "Seda vajavad:" + +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n" -#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon." - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n" -#~ "Need lülitatakse sisse kohe pärast sätete salvestamist." +#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut " +#~ "asja" #, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Löppev vedelik" - -#~ msgid "Preload item visuals" -#~ msgstr "Lae asjade visuaale" - -#~ msgid "SETTINGS" -#~ msgstr "Seaded" - -#~ msgid "Password" -#~ msgstr "Parool" - -#~ msgid "Name" -#~ msgstr "Nimi" - -#~ msgid "Favorites:" -#~ msgstr "Lemmikud:" - -#, fuzzy -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Lisama muutus" - -#, fuzzy -#~ msgid "Remove selected mod" -#~ msgstr "Eemalda valitud muutus" - -#~ msgid "EDIT GAME" -#~ msgstr "MUUDA MÄNGU" - -#~ msgid "new game" -#~ msgstr "uus mängu" - -#~ msgid "GAMES" -#~ msgstr "MÄNGUD" - -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Mäng" - -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "Sisse lülitatud" - -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Lülita kõik välja" +#~ msgid "Downloading" +#~ msgstr "Alla" diff --git a/po/fr/minetest.po b/po/fr/minetest.po index c8739d4e..edf55b88 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-11-08 22:26+0000\n" "Last-Translator: Jean-Patrick G. \n" -"Language-Team: French " -"\n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,8 +73,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nous supportons seulement les versions du protocole entre $1 et $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Annuler" @@ -115,8 +116,8 @@ msgstr "Cacher le pack de mods" msgid "Mod:" msgstr "Mod :" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Enregistrer" @@ -189,6 +190,7 @@ msgid "No of course not!" msgstr "Non, bien sûr que non !" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Oui" @@ -208,6 +210,97 @@ msgstr "Accepter" msgid "Rename Modpack:" msgstr "Renommer le pack de mods :" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" n'est pas un drapeau valide." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Aucune description donnée de l'option)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Naviguer" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Désactivé" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Modifier" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Activé" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" +"Le format est 3 nombres séparés par des virgules et entre les parenthèses." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Format : , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Jeux" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mods" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" +"Éventuellement, l'option \"lacunarity\" peut être jointe par une virgule " +"d'en-tête." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Veuillez séparer les drapeaux par des virgules dans la liste." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Veuillez entrer un nombre entier valide." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Veuillez entrer un nombre valide." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Les valeurs possibles sont : " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Réinitialiser" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Sélectionner un chemin" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Montrer les noms techniques" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "La valeur doit être supérieure à $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "La valeur doit être inférieure à $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -304,10 +397,6 @@ msgstr "Mods installés :" msgid "Mod information:" msgstr "Informations du mod :" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mods" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Pas de description disponible" @@ -420,95 +509,157 @@ msgid "Start Game" msgstr "Démarrer" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" n'est pas un drapeau valide." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Aucune description donnée de l'option)" +#, fuzzy +msgid "3D Clouds" +msgstr "Nuages 3D" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Naviguer" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Réglages" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Filtrage bilinéaire" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bump mapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Changer les touches" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Désactivé" +#, fuzzy +msgid "Connected Glass" +msgstr "Verre unifié" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Modifier" +#, fuzzy +msgid "Enable Particles" +msgstr "Tout activer" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Activé" +msgid "Fancy Leaves" +msgstr "Arbres détaillés" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" -"Le format est 3 nombres séparés par des virgules et entre les parenthèses." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Normal mapping" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Format : , , (, , ), , " -", " +msgid "Mipmap" +msgstr "MIP mapping" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Jeux" +msgid "Mipmap + Aniso. Filter" +msgstr "MIP map + anisotropie" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" -"Éventuellement, l'option \"lacunarity\" peut être jointe par une virgule " -"d'en-tête." +#, fuzzy +msgid "No Filter" +msgstr "Filtrage" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Veuillez séparer les drapeaux par des virgules dans la liste." +msgid "No Mipmap" +msgstr "Sans MIP map" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Veuillez entrer un nombre entier valide." +msgid "No!!!" +msgstr "Non !" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Veuillez entrer un nombre valide." +#, fuzzy +msgid "Node Highlighting" +msgstr "Eclairage des blocs" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Aucun" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Les valeurs possibles sont : " +msgid "Opaque Leaves" +msgstr "Arbres minimaux" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Réinitialiser" +msgid "Opaque Water" +msgstr "Eau opaque" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Sélectionner un chemin" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Occlusion parallaxe" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Réglages" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Montrer les noms techniques" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shaders" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "La valeur doit être supérieure à $1." +msgid "Simple Leaves" +msgstr "Arbres simples" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "La valeur doit être inférieure à $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Lumière douce" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Textures :" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Filtrage trilinéaire" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Feuilles d'arbres mouvantes" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Plantes mouvantes" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Liquides mouvants" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -534,10 +685,6 @@ msgstr "Solo" msgid "No information available" msgstr "Pas d'information disponible" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Aucun" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Sélectionner un pack de textures :" @@ -562,10 +709,6 @@ msgstr "Initialisation des blocs" msgid "Initializing nodes..." msgstr "Initialisation des blocs..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Textures d'items..." - #: src/client.cpp msgid "Loading textures..." msgstr "Chargement des textures..." @@ -1157,6 +1300,15 @@ msgstr "Bouton X 2" msgid "Zoom" msgstr "Zoomer" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1174,6 +1326,7 @@ msgid "3D mode" msgstr "Mode écran 3D" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1181,7 +1334,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "Support 3D.\n" "Options :\n" @@ -1254,6 +1408,10 @@ msgstr "" msgid "Advanced" msgstr "Avancé" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Toujours voler et être rapide" @@ -1262,6 +1420,10 @@ msgstr "Toujours voler et être rapide" msgid "Ambient occlusion gamma" msgstr "Occlusion gamma ambiente" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Filtrage anisotrope" @@ -1280,6 +1442,11 @@ msgstr "" "Si vous voulez annoncer votre adresse IPv6, utilisez serverlist_url = v6." "servers.minetest.net." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "Série Julia : échelles (X,Y,Z) en blocs." + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Demander de se reconnecter après une coupure de connexion" @@ -1293,6 +1460,11 @@ msgstr "" msgid "Backward key" msgstr "Reculer" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Hauteur des liquides mouvants" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Principal" @@ -1313,10 +1485,6 @@ msgstr "Bits par pixel (profondeur de couleur) en mode plein-écran." msgid "Build inside player" msgstr "Placement de bloc à la position du joueur" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Bump mapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Lissage du mouvement de la caméra" @@ -1329,6 +1497,18 @@ msgstr "Lissage du mouvement de la caméra en mode cinématique" msgid "Camera update toggle key" msgstr "Touche de mise à jour de la caméra" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Chatter" @@ -1337,6 +1517,29 @@ msgstr "Chatter" msgid "Chat toggle key" msgstr "Afficher le chat" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Taille des chunks" @@ -1394,6 +1597,12 @@ msgstr "" "de fonctions même lorsque l'option de sécurisation des mods est activée (via " "request_insecure_environment())." +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Commande" @@ -1453,10 +1662,30 @@ msgstr "" "Quand les environnements neigeux sont activés, le paramètre de fréquence des " "déserts dans Mapgen V6 est ignoré." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Message d'interruption du serveur" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "Opacité du réticule" @@ -1551,6 +1780,14 @@ msgstr "Latence d'apparition des infobulles, établie en millisecondes." msgid "Deprecated Lua API handling" msgstr "Traitement d'API Lua obsolète(s)" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "Vitesse de descente du joueur" @@ -1574,6 +1811,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "Profil détaillé des mods" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Désactiver l'anti-triche" @@ -1603,18 +1847,9 @@ msgid "Dump the mapgen debug infos." msgstr "Afficher les infos de débogage de la génération de terrain." #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" -"Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne " -"submerge pas\n" -"entièrement le bloc voisin.\n" -"Cette fonctionnalité est encore expérimentale et la lumière douce n’apparaît " -"pas à la\n" -"surface de l'eau." +#, fuzzy +msgid "Enable VBO" +msgstr "Activer le pack de mods" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1629,12 +1864,6 @@ msgid "Enable random user input (only used for testing)." msgstr "" "Active l'entrée aléatoire du joueur (seulement utilisé pour des tests)." -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" -"Active l'éclairage des blocs pointés (et supprime les bordures noires de " -"sélection)." - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1680,6 +1909,10 @@ msgstr "" "aux clients IPv6, selon leur configuration système.\n" "Ignoré si bind_address est paramétré." +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1697,6 +1930,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "Active la mise en cache des meshnodes." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Active la mini-carte." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Active la mini-carte." @@ -1793,6 +2031,14 @@ msgstr "" "Fichier localisé dans /client/serverlist contenant vos serveurs favoris dans " "l'onglet multijoueur." +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1914,21 +2160,30 @@ msgstr "Filtrage txr2img du GUI" msgid "Gamma" msgstr "Gamma" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Normal mapping" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Attributs généraux de la génération de terrain.\n" -"Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent leurs " -"valeurs par défaut." +"Attributs spécifiques à Mapgen V6.\n" +"Quand les terrains neigeux sont activés, les jungles sont activés et les " +"drapeaux jungle est ignoré.\n" +"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " +"défaut.\n" +"Les drapeaux commençant par \"non\" sont désactivés." #: src/settings_translation_file.cpp msgid "Graphics" @@ -1938,6 +2193,11 @@ msgstr "Options graphiques" msgid "Gravity" msgstr "Gravité" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mods" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "HUD" @@ -1955,6 +2215,11 @@ msgstr "" "- error : interruption à l'usage d'un appel obsolète (recommandé pour les " "développeurs de mods)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Height component of the initial window size." +msgstr "Résolution verticale de la fenêtre de jeu." + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "Hauteur des nuages dans le jeu." @@ -1968,8 +2233,8 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "Adresse web du serveur affichée sur la liste des serveurs." #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." -msgstr "Résolution verticale de la fenêtre de jeu." +msgid "How deep to make rivers" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2000,6 +2265,10 @@ msgstr "" "Une valeur plus grande est plus confortable, mais utilise davantage de " "mémoire." +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "IPv6" @@ -2026,8 +2295,8 @@ msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" -"Si désactivé la touche \"Utiliser\" est utilisée pour voler + mode rapide (" -"si ceux-ci sont activés)." +"Si désactivé la touche \"Utiliser\" est utilisée pour voler + mode rapide " +"(si ceux-ci sont activés)." #: src/settings_translation_file.cpp msgid "" @@ -2043,8 +2312,8 @@ msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" -"Si activé, la touche \"Utiliser\" est utilisée à la place de la touche \"" -"Sneak\" pour monter ou descendre." +"Si activé, la touche \"Utiliser\" est utilisée à la place de la touche " +"\"Sneak\" pour monter ou descendre." #: src/settings_translation_file.cpp msgid "" @@ -2113,6 +2382,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "Intervalle d'envoi de l'heure de jeu aux clients." +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Inventaire" @@ -2130,61 +2403,47 @@ msgid "Item entity TTL" msgstr "Durée de vie des items abandonnés" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" -"Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n" -"La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler en " -"nombre de blocs." - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "Série Julia : échelles (X,Y,Z) en blocs." - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" "Série Julia : itérations de la fonction récursive.\n" "Contrôle l'échelle du détail le plus subtil." #: src/settings_translation_file.cpp msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" -"Série Julia : coordonnée W de la couche 3D de la forme 4D.\n" -"La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: W value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" -"Série Julia : valeur W déterminant la forme 4D.\n" -"La portée est environ entre -2 et 2." - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Série Julia : valeur X déterminant la forme 4D.\n" "La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: Y value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Série Julia : valeur Y déterminant la forme 4D.\n" "La portée est environ entre -2 et 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Série Julia : valeur Z déterminant la forme 4D.\n" @@ -2199,13 +2458,13 @@ msgid "Jumping speed" msgstr "Vitesse de saut du joueur" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche pour réduire la distance de vue. Modifie la distance de vue " -"minimale.\n" +"Touche pour activer/désactiver la distance de vue illimitée.\n" "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" @@ -2220,13 +2479,13 @@ msgstr "" "html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Touche pour augmenter la distance de vue. Modifie la distance de vue " -"minimale.\n" +"Touche pour activer/désactiver la distance de vue illimitée.\n" "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" @@ -2503,6 +2762,14 @@ msgstr "Touche \"utiliser\" pour monter/descendre" msgid "Language" msgstr "Langue" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "Apparence des feuilles d'arbres" @@ -2624,43 +2891,31 @@ msgstr "" "Rendre DirectX compatible avec LuaJIT. Désactiver si cela cause des " "problèmes." -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" -"Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n" -"La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler en " -"nombre de blocs." - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs." - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" -"Série Mandelbrot : itérations de la fonction récursive.\n" -"Contrôle l'échelle du détail le plus subtil." - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" -"Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n" -"La portée est environ entre -2 et 2." - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Chemin du monde" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" +"Attributs généraux de la génération de terrain.\n" +"Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent leurs " +"valeurs par défaut." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2717,6 +2972,11 @@ msgstr "Limite des mapblocks" msgid "Mapblock unload timeout" msgstr "Délais d'interruption du déchargement des mapblocks" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Nom du générateur de carte" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "Mapgen : paramètres de bruit de la température" @@ -2737,6 +2997,64 @@ msgstr "Débogage de la génération du terrain" msgid "Mapgen flags" msgstr "Drapeaux de génération de terrain" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Drapeaux de génération de terrain" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave1 noise parameters" +msgstr "Mapgen V5 : paramètres de bruit cave1" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave2 noise parameters" +msgstr "Mapgen V5 : paramètre de bruit cave2" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat filler depth noise parameters" +msgstr "Mapgen V5 : paramètres de bruit sur la profondeur" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Drapeaux des fractales de la génération de terrain" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Drapeaux de génération de terrain" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Mapgen Julia : itérations fractales" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Mapgen Julia : échelles fractales" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat large cave depth" +msgstr "Mapgen Julia : échelles fractales" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat terrain noise parameters" +msgstr "Mapgen V6 : paramètres de bruit du terrain de base" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "Fractales de la génération de terrain" @@ -2754,25 +3072,15 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "Mapgen V5 : paramètres de bruit sur la profondeur" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +#, fuzzy +msgid "Mapgen fractal fractal" msgstr "Drapeaux des fractales de la génération de terrain" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" +#, fuzzy +msgid "Mapgen fractal iterations" msgstr "Mapgen Julia : itérations fractales" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "Mapgen Julia : décalages fractals" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "Mapgen Julia : échelles fractales" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "Mapgen Julia : couche fractale W" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "Mapgen Julia : fractale W" @@ -2790,25 +3098,24 @@ msgid "Mapgen fractal julia z" msgstr "Mapgen Julia : fractale Z" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "Mapgen Mandelbrot : itérations fractales" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Mapgen Julia : décalages fractals" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "Mapgen Mandelbrot : décalages fractals" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "Mapgen Mandelbrot : échelles fractales" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "Mapgen Mandelbrot : couche fractale W" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Mapgen Julia : échelles fractales" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "Mapgen : paramètres de bruit du fond de l'eau" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Mapgen Julia : couche fractale W" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "Mapgen : paramètres de mélange de la température" @@ -2953,6 +3260,18 @@ msgstr "Mapgen V7 : paramètres du bruit du terrain de base" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "Mapgen V7 : paramètres du bruit de la persistance du terrain" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "Distance maximale de génération des mapblocks" @@ -2981,20 +3300,6 @@ msgstr "FPS maximum" msgid "Maximum FPS when game is paused." msgstr "FPS maximum quand le jeu est en pause." -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" -"Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n" -"Des valeurs plus grandes aboutissent à des locations plus proches de (x = 0, " -"z = 0).\n" -"Des valeurs plus petites peut résulter à une location de spawn non-trouvée, " -"résultant\n" -"à une location située à (0, 0, 0) probablement enterrée sous le sol." - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "Mapblocks maximum chargés de force" @@ -3102,6 +3407,10 @@ msgstr "Message du jour" msgid "Message of the day displayed to players connecting." msgstr "Message du jour affiché aux joueurs lors de la connexion." +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "Mini-carte" @@ -3118,16 +3427,6 @@ msgstr "Hauteur de scannage de la mini-carte" msgid "Minimum texture size for filters" msgstr "Taille minimum des textures à filtrer" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" -"Images par seconde (FPS) minimum.\n" -"Le niveau de rendu est dynamiquement adapté selon ce paramètre et la " -"distance de vue (minimale et maximale)." - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "Mip-mapping" @@ -3218,10 +3517,6 @@ msgstr "" "Port du réseau à écouter (UDP).\n" "Cette valeur est annulée en commençant depuis le menu." -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "Nouveau style de liquide" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "Les nouveaux joueurs ont besoin d'entrer ce mot de passe." @@ -3243,6 +3538,10 @@ msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" "Paramètres de mélange pour la température, humidité et mélange de biomes." +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "Échantillonnage de normalmaps" @@ -3294,10 +3593,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "Echelle générale de l'occlusion parallaxe." -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Occlusion parallaxe" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "Occlusion parallaxe" @@ -3368,23 +3663,6 @@ msgstr "" "Port où se connecter (UDP).\n" "Le champ de port dans le menu va annuler ce paramètre." -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" -"Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n" -"Cela augmente le temps de démarrage, mais rend les inventaires plus " -"fluides.\n" -"Les textures générées peuvent facilement déborder votre VRAM, causant des " -"bugs dans votre inventaire." - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Pré-chargement des textures d'inventaire" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3416,6 +3694,10 @@ msgstr "" "Les valeurs plus grandes que 26 entraînent une \"coupure\" nette des nuages " "aux coins de l'aire." +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "Entrée aléatoire" @@ -3444,6 +3726,22 @@ msgstr "Droite" msgid "Rightclick repetition interval" msgstr "Intervalle de répétition du clic droit" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "Enregistrement des actions" @@ -3575,10 +3873,6 @@ msgstr "" "Mettre sur \"true\" active les liquides mouvants.\n" "Nécessite les shaders pour être activé." -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shaders" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3607,6 +3901,10 @@ msgid "" "nodes)." msgstr "Taille des chunks à générer, établie en mapblocks (16^3 blocs)." +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Lumière douce" @@ -3669,19 +3967,35 @@ msgstr "Vérification stricte du protocole" msgid "Synchronous SQLite" msgstr "SQLite synchronisé" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Chemin des textures" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" -"Distance d'affichage maximum.\n" -"Définir cette valeur égale à la distance de vue minimum pour désactiver\n" -"l'auto-ajustement dynamique de la distance d'affichage." #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." @@ -3776,6 +4090,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Changer de caméra" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Délais d'apparition des infobulles" @@ -3848,17 +4167,33 @@ msgid "V-Sync" msgstr "Synchronisation verticale" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." -msgstr "Largeur initiale de la fenêtre de jeu." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" +msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "Synchronisation verticale de la fenêtre de jeu." -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "Portée verticale du spawn" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Pilote vidéo" @@ -3867,6 +4202,12 @@ msgstr "Pilote vidéo" msgid "View bobbing" msgstr "Mouvement du bras" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "Réduire la distance d'affichage" @@ -3876,24 +4217,33 @@ msgid "View range increase key" msgstr "Augmenter la distance d'affichage" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" +#, fuzzy +msgid "Viewing range" msgstr "Distance de vue maximum" -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" -msgstr "Distance de vue minimum" - #: src/settings_translation_file.cpp msgid "Volume" msgstr "Volume du son" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" +"Série Julia : coordonnée W de la couche 3D de la forme 4D.\n" +"La portée est environ entre -2 et 2." + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Vitesse de marche" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "FPS minimum" +#, fuzzy +msgid "Water Features" +msgstr "Niveau de l'eau" #: src/settings_translation_file.cpp msgid "Water level" @@ -4039,6 +4389,11 @@ msgstr "" "Détermine la visibilité des infos de débogage du client (même effet que " "taper F5)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Width component of the initial window size." +msgstr "Résolution verticale de la fenêtre de jeu." + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "Épaisseur des bordures de sélection autour des blocs." @@ -4051,6 +4406,14 @@ msgstr "" "Chemin du monde (tout ce qui relatif au monde est enregistré ici).\n" "Inutile si démarré depuis le menu." +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "Délais d'interruption de cURL lors d'un téléchargement de fichier" @@ -4063,100 +4426,107 @@ msgstr "Limite parallèle de cURL" msgid "cURL timeout" msgstr "Délais d'interruption de cURL" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?" +#~ msgid "\"" +#~ msgstr "\"" -#~ msgid "Fancy Leaves" -#~ msgstr "Arbres détaillés" - -#~ msgid "Mipmap" -#~ msgstr "MIP mapping" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "MIP map + anisotropie" - -#~ msgid "No Mipmap" -#~ msgstr "Sans MIP map" - -#~ msgid "No!!!" -#~ msgstr "Non !" - -#~ msgid "Opaque Leaves" -#~ msgstr "Arbres minimaux" - -#~ msgid "Opaque Water" -#~ msgstr "Eau opaque" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Réinitialiser le monde" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Taille appliquée aux menus : " - -#~ msgid "Simple Leaves" -#~ msgstr "Arbres simples" - -#~ msgid "Texturing:" -#~ msgstr "Textures :" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé." - -#~ msgid "Downloading" -#~ msgstr "Téléchargement" - -#~ msgid " KB/s" -#~ msgstr " Ko/s" - -#~ msgid " MB/s" -#~ msgstr " Mo/s" - -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "Enable a bit lower water surface, so it doesn't " #~ msgstr "" -#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet" +#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas " +#~ "le bloc complètement.\n" +#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux " +#~ "ne fonctionne pas dessus. " -#~ msgid "is required by:" -#~ msgstr "est requis par :" +#~ msgid "If disabled " +#~ msgstr "Si désactivé " -#~ msgid "Configuration saved. " -#~ msgstr "Configuration enregistrée. " +#~ msgid "If enabled, " +#~ msgstr "Si activé, " -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Attention : configuration incorrecte. " +#~ msgid "Rendering:" +#~ msgstr "Affichage :" -#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet" + +#~ msgid "Game Name" +#~ msgstr "Nom du jeu" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\"" + +#~ msgid "GAMES" +#~ msgstr "JEUX" + +#~ msgid "Mods:" +#~ msgstr "Mods :" + +#~ msgid "new game" +#~ msgstr "nouveau jeu" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFIER LE JEU" + +#~ msgid "Remove selected mod" +#~ msgstr "Supprimer le mod sélectionné" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Ajouter un mod" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "Favorites:" +#~ msgstr "Favoris :" + +#~ msgid "START SERVER" +#~ msgstr "DÉMARRER LE SERVEUR" + +#~ msgid "Name" +#~ msgstr "Nom" + +#~ msgid "Password" +#~ msgstr "Mot de passe" + +#~ msgid "SETTINGS" +#~ msgstr "PARAMÈTRES" + +#~ msgid "Preload item visuals" +#~ msgstr "Précharger les objets" + +#~ msgid "Finite Liquid" +#~ msgstr "Liquides limités" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "PARTIE SOLO" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACKS DE TEXTURES" + +#~ msgid "MODS" +#~ msgstr "MODS" + +#~ msgid "Add mod:" +#~ msgstr "Ajouter un mod :" + +#~ msgid "Local install" +#~ msgstr "Installation locale" + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " #~ msgstr "" -#~ "Impossible de créer le monde : le nom contient des caractères invalides" +#~ "Attention : certains mods ne sont pas encore configurés.\n" +#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. " -#~ msgid "Show Public" -#~ msgstr "Voir les serveurs publics" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Attention : certains mods configurés sont introuvables.\n" +#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. " -#~ msgid "Show Favorites" -#~ msgstr "Voir les serveurs favoris" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Laisser l'adresse vide pour lancer un serveur local." - -#~ msgid "Create world" -#~ msgstr "Créer un monde" - -#~ msgid "Address required." -#~ msgstr "Adresse requise." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné" - -#~ msgid "Files to be deleted" -#~ msgstr "Fichiers à supprimer" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Impossible de configurer ce monde : aucune sélection active" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés" +#~ msgid "Delete map" +#~ msgstr "Supprimer la carte" #~ msgid "" #~ "Default Controls:\n" @@ -4183,104 +4553,234 @@ msgstr "Délais d'interruption de cURL" #~ "- Échap : ce menu\n" #~ "- T : discuter\n" -#~ msgid "Delete map" -#~ msgstr "Supprimer la carte" +#~ msgid "Failed to delete all world files" +#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Impossible de configurer ce monde : aucune sélection active" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent" + +#~ msgid "Files to be deleted" +#~ msgstr "Fichiers à supprimer" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné" + +#~ msgid "Address required." +#~ msgstr "Adresse requise." + +#~ msgid "Create world" +#~ msgstr "Créer un monde" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Laisser l'adresse vide pour lancer un serveur local." + +#~ msgid "Show Favorites" +#~ msgstr "Voir les serveurs favoris" + +#~ msgid "Show Public" +#~ msgstr "Voir les serveurs publics" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "" +#~ "Impossible de créer le monde : le nom contient des caractères invalides" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Attention : configuration incorrecte. " + +#~ msgid "Configuration saved. " +#~ msgstr "Configuration enregistrée. " + +#~ msgid "is required by:" +#~ msgstr "est requis par :" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "" +#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet" + +#~ msgid " MB/s" +#~ msgstr " Mo/s" + +#~ msgid " KB/s" +#~ msgstr " Ko/s" + +#~ msgid "Downloading" +#~ msgstr "Téléchargement" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Taille appliquée aux menus : " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Réinitialiser le monde" + +#~ msgid "Wanted FPS" +#~ msgstr "FPS minimum" + +#~ msgid "Viewing range minimum" +#~ msgstr "Distance de vue minimum" + +#~ msgid "Vertical spawn range" +#~ msgstr "Portée verticale du spawn" + +#~ msgid "Vertical initial window size." +#~ msgstr "Largeur initiale de la fenêtre de jeu." #~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ "The allowed adjustment range for the automatic rendering range " +#~ "adjustment.\n" +#~ "Set this to be equal to viewing range minimum to disable the auto-" +#~ "adjustment algorithm." #~ msgstr "" -#~ "Attention : certains mods configurés sont introuvables.\n" -#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. " +#~ "Distance d'affichage maximum.\n" +#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n" +#~ "l'auto-ajustement dynamique de la distance d'affichage." + +#~ msgid "Preload inventory textures" +#~ msgstr "Pré-chargement des textures d'inventaire" #~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ "Pre-generate all item visuals used in the inventory.\n" +#~ "This increases startup time, but runs smoother in-game.\n" +#~ "The generated textures can easily exceed your VRAM, causing artifacts in " +#~ "the inventory." #~ msgstr "" -#~ "Attention : certains mods ne sont pas encore configurés.\n" -#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. " +#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n" +#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus " +#~ "fluides.\n" +#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des " +#~ "bugs dans votre inventaire." -#~ msgid "Local install" -#~ msgstr "Installation locale" +#~ msgid "New style water" +#~ msgstr "Nouveau style de liquide" -#~ msgid "Add mod:" -#~ msgstr "Ajouter un mod :" - -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACKS DE TEXTURES" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "PARTIE SOLO" - -#~ msgid "Finite Liquid" -#~ msgstr "Liquides limités" - -#~ msgid "Preload item visuals" -#~ msgstr "Précharger les objets" - -#~ msgid "SETTINGS" -#~ msgstr "PARAMÈTRES" - -#~ msgid "Password" -#~ msgstr "Mot de passe" - -#~ msgid "Name" -#~ msgstr "Nom" - -#~ msgid "START SERVER" -#~ msgstr "DÉMARRER LE SERVEUR" - -#~ msgid "Favorites:" -#~ msgstr "Favoris :" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Ajouter un mod" - -#~ msgid "Remove selected mod" -#~ msgstr "Supprimer le mod sélectionné" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFIER LE JEU" - -#~ msgid "new game" -#~ msgstr "nouveau jeu" - -#~ msgid "Mods:" -#~ msgstr "Mods :" - -#~ msgid "GAMES" -#~ msgstr "JEUX" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Nom du jeu" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet" - -#~ msgid "Rendering:" -#~ msgstr "Affichage :" - -#~ msgid "If enabled, " -#~ msgstr "Si activé, " - -#~ msgid "If disabled " -#~ msgstr "Si désactivé " - -#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgid "" +#~ "Minimum wanted FPS.\n" +#~ "The amount of rendered stuff is dynamically set according to this. and " +#~ "viewing range min and max." #~ msgstr "" -#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas " -#~ "le bloc complètement.\n" -#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux " -#~ "ne fonctionne pas dessus. " +#~ "Images par seconde (FPS) minimum.\n" +#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la " +#~ "distance de vue (minimale et maximale)." -#~ msgid "\"" -#~ msgstr "\"" +#~ msgid "" +#~ "Maximum distance above water level for player spawn.\n" +#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" +#~ "Smaller values may result in a suitable spawn point not being found,\n" +#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." +#~ msgstr "" +#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n" +#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = " +#~ "0, z = 0).\n" +#~ "Des valeurs plus petites peut résulter à une location de spawn non-" +#~ "trouvée, résultant\n" +#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol." + +#~ msgid "Mapgen fractal mandelbrot slice w" +#~ msgstr "Mapgen Mandelbrot : couche fractale W" + +#~ msgid "Mapgen fractal mandelbrot scale" +#~ msgstr "Mapgen Mandelbrot : échelles fractales" + +#~ msgid "Mapgen fractal mandelbrot offset" +#~ msgstr "Mapgen Mandelbrot : décalages fractals" + +#~ msgid "Mapgen fractal mandelbrot iterations" +#~ msgstr "Mapgen Mandelbrot : itérations fractales" + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen fractal.\n" +#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." +#~ msgstr "" +#~ "Attributs de terrain spécifiques à Mapgen V7.\n" +#~ "'ridges' sont les rivières.\n" +#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs " +#~ "par défaut.\n" +#~ "Les drapeaux commençant par \"non\" sont désactivés." + +#~ msgid "" +#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n" +#~ "La portée est environ entre -2 et 2." + +#~ msgid "" +#~ "Mandelbrot set: Iterations of the recursive function.\n" +#~ "Controls scale of finest detail." +#~ msgstr "" +#~ "Série Mandelbrot : itérations de la fonction récursive.\n" +#~ "Contrôle l'échelle du détail le plus subtil." + +#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs." + +#~ msgid "" +#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +#~ msgstr "" +#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n" +#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler " +#~ "en nombre de blocs." + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue " +#~ "minimale.\n" +#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Touche pour réduire la distance de vue. Modifie la distance de vue " +#~ "minimale.\n" +#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Julia set: W value determining the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Série Julia : valeur W déterminant la forme 4D.\n" +#~ "La portée est environ entre -2 et 2." + +#~ msgid "" +#~ "Julia set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +#~ msgstr "" +#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n" +#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler " +#~ "en nombre de blocs." + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "" +#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de " +#~ "sélection)." + +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne " +#~ "submerge pas\n" +#~ "entièrement le bloc voisin.\n" +#~ "Cette fonctionnalité est encore expérimentale et la lumière douce " +#~ "n’apparaît pas à la\n" +#~ "surface de l'eau." + +#~ msgid "Item textures..." +#~ msgstr "Textures d'items..." diff --git a/po/he/minetest.po b/po/he/minetest.po index 036978fe..bfb7cd7d 100644 --- a/po/he/minetest.po +++ b/po/he/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-10-26 16:22+0200\n" "Last-Translator: ChaosWormz \n" -"Language-Team: Hebrew " -"\n" +"Language-Team: Hebrew \n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,8 +72,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "ביטול" @@ -111,8 +112,8 @@ msgstr "" msgid "Mod:" msgstr "מוד:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "שמור" @@ -185,6 +186,7 @@ msgid "No of course not!" msgstr "לא ברור שלא!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "כן" @@ -204,6 +206,92 @@ msgstr "קבל" msgid "Rename Modpack:" msgstr "" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "משחקים" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "מודים" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -294,10 +382,6 @@ msgstr "" msgid "Mod information:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "מודים" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "" @@ -410,15 +494,40 @@ msgid "Start Game" msgstr "התחל משחק" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +msgid "3D Clouds" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "הגדרות" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Bilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -426,73 +535,105 @@ msgid "Change keys" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" +#, fuzzy +msgid "Connected Glass" +msgstr "התחבר" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Enable Particles" +msgstr "אפשר בכל" + +#: builtin/mainmenu/tab_settings.lua +msgid "Fancy Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" +msgid "Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "No Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "משחקים" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "No Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." +msgid "No!!!" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." +msgid "Node Highlighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." +msgid "Opaque Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " +msgid "Opaque Water" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "הגדרות" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "Simple Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Smooth Lighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Trilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Plants" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Water" msgstr "" #: builtin/mainmenu/tab_simple_main.lua @@ -519,10 +660,6 @@ msgstr "שחקן יחיד" msgid "No information available" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "" @@ -547,10 +684,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "" - #: src/client.cpp msgid "Loading textures..." msgstr "" @@ -1120,6 +1253,15 @@ msgstr "" msgid "Zoom" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1142,7 +1284,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1198,6 +1341,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1206,6 +1353,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1221,6 +1372,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1233,6 +1388,10 @@ msgstr "" msgid "Backward key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1253,10 +1412,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1269,6 +1424,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "" @@ -1277,6 +1444,29 @@ msgstr "" msgid "Chat toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1331,6 +1521,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "" @@ -1384,10 +1580,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1474,6 +1690,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1496,6 +1720,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "" @@ -1525,12 +1756,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "אפשר בכל" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1544,10 +1772,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1578,6 +1802,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1590,6 +1818,10 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "" @@ -1676,6 +1908,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1784,6 +2024,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1791,10 +2035,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1805,6 +2050,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "מודים" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1817,6 +2067,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1830,7 +2084,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1855,6 +2109,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1947,6 +2205,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "" @@ -1965,47 +2227,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2019,7 +2270,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2033,7 +2284,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2230,6 +2481,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2330,36 +2589,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2400,6 +2649,10 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen Valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2420,6 +2673,54 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2437,23 +2738,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2473,25 +2762,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2636,6 +2921,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2664,14 +2961,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2763,6 +3052,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2779,13 +3072,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "" @@ -2862,10 +3148,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2886,6 +3168,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2926,10 +3212,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -2994,18 +3276,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3029,6 +3299,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3057,6 +3331,22 @@ msgstr "" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3174,10 +3464,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3203,6 +3489,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "" @@ -3258,14 +3548,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3337,6 +3646,10 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3405,17 +3718,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3424,6 +3753,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3433,23 +3768,27 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" +msgid "Water Features" msgstr "" #: src/settings_translation_file.cpp @@ -3558,6 +3897,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3568,6 +3911,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" diff --git a/po/hu/minetest.po b/po/hu/minetest.po index f437d78a..e4dacffe 100644 --- a/po/hu/minetest.po +++ b/po/hu/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-02-07 12:19+0000\n" "Last-Translator: Kisbenedek Márton \n" -"Language-Team: Hungarian " -"\n" +"Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "$1 és $2 közötti protokoll verziókat támogatunk." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Mégse" @@ -115,8 +116,8 @@ msgstr "Modpakk tartalom elrejtés" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Mentés" @@ -190,6 +191,7 @@ msgid "No of course not!" msgstr "Persze, hogy nem!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Igen" @@ -209,6 +211,92 @@ msgstr "Elfogad" msgid "Rename Modpack:" msgstr "Modpakk átnevezés:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Keres" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Letiltva" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Szerkeszt" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Engedélyezve" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "A formátum 3 szám vesszőkkel elválasztva zárójelek között." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Játékok" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Modok" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Írj be egy érvényes egész számot." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Írj be egy érvényes számot." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Lehetséges értékek: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Alapértelmezett visszaállítás" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Útvonal kiválasztás" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Technikai nevek mutatása" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Az értéknek nagyobbnak kell lennie ennél: $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Az értéknek kisebbnek kell lennie ennél: $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -302,10 +390,6 @@ msgstr "Telepített modok:" msgid "Mod information:" msgstr "Mod ismertető:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Modok" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Nincs elérhető mod leírás" @@ -418,90 +502,163 @@ msgid "Start Game" msgstr "Játék indítása" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "" +msgid "2x" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "" +#, fuzzy +msgid "3D Clouds" +msgstr "3D felhők" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Keres" +msgid "4x" +msgstr "4x" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "8x" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Beállítások" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "Élsimítás:" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Biztosan visszaállítod az egyjátékos világod?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bilineáris szűrés" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Gombok változtatása" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Letiltva" +#, fuzzy +msgid "Connected Glass" +msgstr "Üveg csatlakozása" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Szerkeszt" +#, fuzzy +msgid "Enable Particles" +msgstr "Mind engedélyez" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Engedélyezve" +msgid "Fancy Leaves" +msgstr "Szép levelek" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "A formátum 3 szám vesszőkkel elválasztva zárójelek között." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Normálfelületek generálása" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" +#, fuzzy +msgid "Mipmap" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Játékok" +#, fuzzy +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmap + Aniso. Filter" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +#, fuzzy +msgid "No Filter" +msgstr "Szűrés" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" +#, fuzzy +msgid "No Mipmap" +msgstr "No Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Írj be egy érvényes egész számot." +msgid "No!!!" +msgstr "Nem!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Írj be egy érvényes számot." +#, fuzzy +msgid "Node Highlighting" +msgstr "Blokk kiemelés" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Semmi" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Lehetséges értékek: " +msgid "Opaque Leaves" +msgstr "Áttetsző levelek" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Alapértelmezett visszaállítás" +msgid "Opaque Water" +msgstr "Áttetsző víz" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Útvonal kiválasztás" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Parallax Occlusion" +msgstr "Parallax Occlusion" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Beállítások" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Technikai nevek mutatása" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shaderek" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Az értéknek nagyobbnak kell lennie ennél: $1." +msgid "Simple Leaves" +msgstr "Egyszerű levelek" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Az értéknek kisebbnek kell lennie ennél: $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Simított megvilágítás" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Textúrázás:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "A shaderek engedélyezéséhez OpenGL driver használata szükséges." + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Touchthreshold (px)" +msgstr "Touchthreshold (px)" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Tri-lineáris szűrés" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Hullámzó levelek" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Hullámzó növények" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Hullámzó víz" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -527,10 +684,6 @@ msgstr "Egyjátékos" msgid "No information available" msgstr "Nincs elérhető információ" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Semmi" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Textúrapakk kiválasztása:" @@ -556,10 +709,6 @@ msgstr "Csomópontok inicializálása" msgid "Initializing nodes..." msgstr "Csomópontok inicializálása..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Elem textúrák..." - #: src/client.cpp msgid "Loading textures..." msgstr "Textúrák betöltése..." @@ -1166,6 +1315,15 @@ msgstr "X Gomb 2" msgid "Zoom" msgstr "Nagyítás" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "" @@ -1193,7 +1351,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "3D támogatás.\n" "Jelenleg támogatott:\n" @@ -1265,6 +1424,10 @@ msgstr "" msgid "Advanced" msgstr "Haladó" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Repülés és gyorsaság mindig" @@ -1273,6 +1436,10 @@ msgstr "Repülés és gyorsaság mindig" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Anizotrópikus szűrés" @@ -1288,8 +1455,12 @@ msgid "" "minetest.net." msgstr "" "Bejelentés a szerverlistára.\n" -"Ha be akarod jelenteni az ipv6 címedet, használd ezt: serverlist_url = " -"v6.servers.minetest.net." +"Ha be akarod jelenteni az ipv6 címedet, használd ezt: serverlist_url = v6." +"servers.minetest.net." + +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1303,6 +1474,11 @@ msgstr "Automatikus bejelentés a szerverlistára." msgid "Backward key" msgstr "Vissza gomb" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Hullámzó víz magassága" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Alap" @@ -1325,11 +1501,6 @@ msgstr "Bit/pixel (vagyis színmélység) teljes képernyős módban." msgid "Build inside player" msgstr "Építés játékosba" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "Bumpmapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Kamera simítás" @@ -1342,6 +1513,18 @@ msgstr "Kamera simítás \"cinematic\" módban" msgid "Camera update toggle key" msgstr "Kamera frissítés váltás gomb" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Csevegés gomb" @@ -1350,6 +1533,29 @@ msgstr "Csevegés gomb" msgid "Chat toggle key" msgstr "Csevegés váltás gomb" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Térképdarab (chunk) mérete" @@ -1410,6 +1616,12 @@ msgstr "" "funkcióik még a mod biztonság bekapcsolása esetén is " "(request_insecure_environment())." +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Parancs gomb" @@ -1469,10 +1681,30 @@ msgstr "" "Amikor a havas területek engedélyezve vannak, 'mgv6_freq_desert' figyelmen " "kívül hagyva." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Üzenet összeomláskor" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "Célkereszt alfa" @@ -1561,6 +1793,14 @@ msgstr "Eszköztippek megjelenítésének késleltetése, miliszekundumban." msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "Ereszkedés sebessége" @@ -1585,6 +1825,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Csalás elleni védelem letiltása" @@ -1614,16 +1861,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" -"Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg teljesen " -"a blokkot.\n" -"Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n" -"így nem működik a víz felszínén." +#, fuzzy +msgid "Enable VBO" +msgstr "Modpakk engedélyez" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1637,12 +1877,6 @@ msgstr "Játékosok sérülésének és halálának engedélyezése." msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" -"Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a " -"kijelölődobozt)." - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1681,6 +1915,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1693,6 +1931,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Minitérkép engedélyezése." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Minitérkép engedélyezése." @@ -1785,6 +2028,14 @@ msgstr "" "A client/serverlist/ mappában lévő fájl, ami tartalmazza a kedvenc " "szervereket, amik a Többjátékos fül alatt jelennek meg." +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1893,6 +2144,10 @@ msgstr "Felhasználói felület méretarány szűrő txr2img" msgid "Gamma" msgstr "Gamma" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Generate normalmaps" @@ -1901,10 +2156,11 @@ msgstr "Normálfelületek generálása" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1915,6 +2171,11 @@ msgstr "Grafika" msgid "Gravity" msgstr "Gravitáció" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Modok" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "HUD váltás gomb" @@ -1927,6 +2188,11 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Height component of the initial window size." +msgstr "Kezdeti vízszintes ablak méret." + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "A felhők megjelenésének magassága." @@ -1940,8 +2206,8 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "A szerver honlapja, ami a szerverlistában megjelenik." #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." -msgstr "Kezdeti vízszintes ablak méret." +msgid "How deep to make rivers" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1965,6 +2231,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2006,8 +2276,8 @@ msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" -"Ha engedélyezve van, a \"használat\" (use) gomb lesz használatban a \"" -"lopakodás\" (sneak) helyett lefelé mászáskor, vagy ereszkedéskor." +"Ha engedélyezve van, a \"használat\" (use) gomb lesz használatban a " +"\"lopakodás\" (sneak) helyett lefelé mászáskor, vagy ereszkedéskor." #: src/settings_translation_file.cpp msgid "" @@ -2025,8 +2295,8 @@ msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" -"Ha engedélyezve van, érvénytelen világ adat nem okozza a szerver leállítását." -"\n" +"Ha engedélyezve van, érvénytelen világ adat nem okozza a szerver " +"leállítását.\n" "Csak akkor engedélyezd, ha tudod, hogy mit csinálsz." #: src/settings_translation_file.cpp @@ -2076,6 +2346,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Eszköztár gomb" @@ -2094,47 +2368,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2147,14 +2410,15 @@ msgid "Jumping speed" msgstr "Ugrás sebessége" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Gomb a végtelen látóterület bekapcsolásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2163,18 +2427,19 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb az éppen kijelölt tárgy eldobásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Gomb a végtelen látóterület bekapcsolásához.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2183,8 +2448,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Ugrás gombja.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2193,8 +2458,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a gyors mozgáshoz gyors (fast) módban.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2203,8 +2468,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a játékos hátrafelé mozgásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2213,8 +2478,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a játékos előre mozgásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901" -"735e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2223,8 +2488,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a játékos balra mozgatásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2233,8 +2498,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a játékos jobbra mozgatásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2243,8 +2508,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a csevegő konzol megnyitásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2253,8 +2518,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a csevegő ablak megnyitásához, parancsok beírásához.\n" -"Lásd: //irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3d" -"a1b0edf72eb3" +"Lásd: //irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2263,8 +2528,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a csevegő ablak megnyitásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2273,8 +2538,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb az Eszköztár megnyitásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2294,8 +2559,8 @@ msgstr "" "Gomb a lopakodáshoz (sneak).\n" "A lefelé mászáshoz és vízben történő ereszkedéshez is használt, ha a " "aux1_descends le van tiltva.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2304,8 +2569,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a belső és külső nézetű kamera váltáshoz.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2314,8 +2579,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb képernyőfelvétel készítéshez.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2324,8 +2589,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a \"cinematic\" mód (filmkészítés) bekapcsolásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2334,8 +2599,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a minitérkép megjelenítéséhez.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2344,8 +2609,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a gyors (fast) módra váltáshoz.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2354,8 +2619,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a repülés (fly) módra váltáshoz.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2364,8 +2629,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a noclip módra váltáshoz.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2374,8 +2639,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a kamerafrissítés bekapcsolásához. Csak fejlesztők számára.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2384,8 +2649,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a hibakeresési infók megjelenítéséhez.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2394,8 +2659,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a HUD megjelenítéséhez/kikapcsolásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2404,8 +2669,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a csevegő megjelenítéséhez.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2414,8 +2679,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a köd megjelenítésének ki/bekapcsolásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2431,8 +2696,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a végtelen látóterület bekapcsolásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2442,6 +2707,14 @@ msgstr "Gomb használat a mászás/ereszkedéshez" msgid "Language" msgstr "Nyelv" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "Levelek stílusa" @@ -2548,36 +2821,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Térkép mappája" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2618,6 +2881,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Térkép generátor neve" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2639,6 +2907,59 @@ msgstr "Térkép generátor hibakereső" msgid "Mapgen flags" msgstr "Térkép generátor" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Térkép generátor" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Térkép generátor" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Térkép generátor" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Parallax Occlusion" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Térkép generátor" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2658,26 +2979,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Térkép generátor" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "Parallax Occlusion" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2695,25 +3004,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Térkép generátor" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Térkép generátor" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Térkép generátor" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2858,6 +3166,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2886,20 +3206,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "Maximum FPS a játék szüneteltetésekor." -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" -"Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/" -"megjelenhetnek csatlakozáskor (spawn).\n" -"Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n" -"Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a " -"feléledéshez,\n" -"(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz." - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2991,6 +3297,10 @@ msgstr "Napi üzenet" msgid "Message of the day displayed to players connecting." msgstr "Napi üzenet a csatlakozó játékosoknak." +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "Minitérkép" @@ -3007,17 +3317,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" -"Minimum kívánt FPS.\n" -"A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a " -"látórerület min és max)." - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -3102,10 +3401,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "Új stílusú víz" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "Az új felhasználóknak ezt a jelszót kell megadniuk." @@ -3126,6 +3421,10 @@ msgstr "Blokk kiemelés" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3166,11 +3465,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Parallax Occlusion" -msgstr "Parallax Occlusion" - #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion" @@ -3245,18 +3539,6 @@ msgstr "" "Port a csatlakozáshoz (UDP).\n" "A főmenü port mezője ezt a beállítást felülírja." -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Eszköztár textúráinak előtöltése" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3282,6 +3564,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3310,6 +3596,22 @@ msgstr "Jobb gomb" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3441,10 +3743,6 @@ msgstr "" "A \"true\" beállítás esetén hullámzó víz.\n" "A shaderek engedélyezése szükséges hozzá." -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shaderek" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3472,6 +3770,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Simított megvilágítás" @@ -3529,15 +3831,34 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Textúrák útvonala" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3618,6 +3939,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Kamera mód váltó gomb" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Eszköztipp késleltetés" @@ -3689,17 +4015,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." -msgstr "Függőleges kezdeti ablak méret." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" +msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "Függőleges képernyő szinkronizálás." -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "Az (újra)éledés függőleges irányú területe" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3708,6 +4050,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "Látóterület csökkentés gomb" @@ -3717,24 +4065,30 @@ msgid "View range increase key" msgstr "Látóterület növelés gomb" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" +#, fuzzy +msgid "Viewing range" msgstr "Maximum látóterület" -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" -msgstr "Minimum látóterület" - #: src/settings_translation_file.cpp msgid "Volume" msgstr "Hangerő" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Járás sebessége" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "Kívánt FPS" +#, fuzzy +msgid "Water Features" +msgstr "Vízszint" #: src/settings_translation_file.cpp msgid "Water level" @@ -3852,6 +4206,11 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "A hibakereső infó mutatása (ugyanaz a hatás, ha F5-öt nyomunk)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Width component of the initial window size." +msgstr "Kezdeti vízszintes ablak méret." + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "A kijelölődoboz vonalainak szélessége a blokkok körül." @@ -3864,6 +4223,14 @@ msgstr "" "Világ (world) mappa (minden itt tárolódik ami a világban van).\n" "Ez nem szükséges, ha a főmenüből indítunk." +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3876,145 +4243,173 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "2x" -#~ msgstr "2x" - -#~ msgid "4x" -#~ msgstr "4x" - -#~ msgid "8x" -#~ msgstr "8x" - -#~ msgid "Antialiasing:" -#~ msgstr "Élsimítás:" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Biztosan visszaállítod az egyjátékos világod?" - -#~ msgid "Fancy Leaves" -#~ msgstr "Szép levelek" - #, fuzzy -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#, fuzzy -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap + Aniso. Filter" - -#, fuzzy -#~ msgid "No Mipmap" -#~ msgstr "No Mipmap" - -#~ msgid "No!!!" -#~ msgstr "Nem!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Áttetsző levelek" - -#~ msgid "Opaque Water" -#~ msgstr "Áttetsző víz" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Egyjátékos világ visszaállítása" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "A méretarány alkalmazva a menü elemekre: " - -#~ msgid "Simple Leaves" -#~ msgstr "Egyszerű levelek" - -#~ msgid "Texturing:" -#~ msgstr "Textúrázás:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "A shaderek engedélyezéséhez OpenGL driver használata szükséges." - -#, fuzzy -#~ msgid "Touch free target" -#~ msgstr "Touch free target" - -#, fuzzy -#~ msgid "Touchthreshold (px)" -#~ msgstr "Touchthreshold (px)" - -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Le" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat" - -#~ msgid "is required by:" -#~ msgstr "kell neki:" - -#~ msgid "Configuration saved. " -#~ msgstr "Beállítások mentve. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Figyelem: A beállítások nem egyformák. " - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak" - -#~ msgid "Show Public" -#~ msgstr "Publikus mutatása" - -#~ msgid "Show Favorites" -#~ msgstr "Kedvencek mutatása" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts." - -#~ msgid "Create world" -#~ msgstr "Világ létrehozása" - -#~ msgid "Address required." -#~ msgstr "Cím szükséges." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Nem törölhető a világ: Nincs kiválasztva" - -#~ msgid "Files to be deleted" -#~ msgstr "A fájl törölve lett" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Hiba az összes világ törlése közben" - -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Végtelen folyadék" - -#~ msgid "Preload item visuals" -#~ msgstr "Előretöltött tárgy láthatóság" - -#, fuzzy -#~ msgid "Password" -#~ msgstr "Régi jelszó" - -#~ msgid "Favorites:" -#~ msgstr "Kedvencek:" - -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Játék" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet" - -#~ msgid "Rendering:" -#~ msgstr "Renderelés:" +#~ msgid "If disabled " +#~ msgstr "Csomag letiltás" #, fuzzy #~ msgid "If enabled, " #~ msgstr "Engedélyez" +#~ msgid "Rendering:" +#~ msgstr "Renderelés:" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet" + #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Csomag letiltás" +#~ msgid "Game Name" +#~ msgstr "Játék" + +#~ msgid "Favorites:" +#~ msgstr "Kedvencek:" + +#, fuzzy +#~ msgid "Password" +#~ msgstr "Régi jelszó" + +#~ msgid "Preload item visuals" +#~ msgstr "Előretöltött tárgy láthatóság" + +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Végtelen folyadék" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Hiba az összes világ törlése közben" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék" + +#~ msgid "Files to be deleted" +#~ msgstr "A fájl törölve lett" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Nem törölhető a világ: Nincs kiválasztva" + +#~ msgid "Address required." +#~ msgstr "Cím szükséges." + +#~ msgid "Create world" +#~ msgstr "Világ létrehozása" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts." + +#~ msgid "Show Favorites" +#~ msgstr "Kedvencek mutatása" + +#~ msgid "Show Public" +#~ msgstr "Publikus mutatása" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Figyelem: A beállítások nem egyformák. " + +#~ msgid "Configuration saved. " +#~ msgstr "Beállítások mentve. " + +#~ msgid "is required by:" +#~ msgstr "kell neki:" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Le" + +#, fuzzy +#~ msgid "Touch free target" +#~ msgstr "Touch free target" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "A méretarány alkalmazva a menü elemekre: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Egyjátékos világ visszaállítása" + +#~ msgid "Wanted FPS" +#~ msgstr "Kívánt FPS" + +#~ msgid "Viewing range minimum" +#~ msgstr "Minimum látóterület" + +#~ msgid "Vertical spawn range" +#~ msgstr "Az (újra)éledés függőleges irányú területe" + +#~ msgid "Vertical initial window size." +#~ msgstr "Függőleges kezdeti ablak méret." + +#~ msgid "Preload inventory textures" +#~ msgstr "Eszköztár textúráinak előtöltése" + +#~ msgid "New style water" +#~ msgstr "Új stílusú víz" + +#, fuzzy +#~ msgid "" +#~ "Minimum wanted FPS.\n" +#~ "The amount of rendered stuff is dynamically set according to this. and " +#~ "viewing range min and max." +#~ msgstr "" +#~ "Minimum kívánt FPS.\n" +#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a " +#~ "látórerület min és max)." + +#~ msgid "" +#~ "Maximum distance above water level for player spawn.\n" +#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" +#~ "Smaller values may result in a suitable spawn point not being found,\n" +#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." +#~ msgstr "" +#~ "Maximum távolság a vízszinttől, ahol a játékosok újraéledhetnek/" +#~ "megjelenhetnek csatlakozáskor (spawn).\n" +#~ "Magasabb értékek közelebb visznek az (x = 0, z = 0)-hoz.\n" +#~ "Alacsonyabb értékek azt eredményezhetik, hogy nem lesz megfelelő pont a " +#~ "feléledéshez,\n" +#~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz." + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n" +#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n" +#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "" +#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a " +#~ "kijelölődobozt)." + +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg " +#~ "teljesen a blokkot.\n" +#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n" +#~ "így nem működik a víz felszínén." + +#~ msgid "Item textures..." +#~ msgstr "Elem textúrák..." diff --git a/po/id/minetest.po b/po/id/minetest.po index 7cb82141..071d6e2e 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-26 16:32+0000\n" "Last-Translator: Muhammad Rifqi Priyo Susanto " "\n" -"Language-Team: Indonesian " -"\n" +"Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,8 +75,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Kami mendukung protokol antara versi $1 dan versi $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Batal" @@ -120,8 +121,8 @@ msgstr "" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Simpan" @@ -194,6 +195,7 @@ msgid "No of course not!" msgstr "Tentu tidak!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Ya" @@ -213,6 +215,96 @@ msgstr "Setuju" msgid "Rename Modpack:" msgstr "Ganti Nama Paket Mod:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" bukan sebuah flag yang sah." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Tidak ada keterangan dari pengaturan yang diberikan)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Jelajahi" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Nonaktif" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Sunting" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Diaktifkan" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" +"Format adalah 3 angka yang dipisahkan oleh koma dan di dalam tanda kurung." + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Format: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Permainan" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mod" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Silakan masukan daftar flag yang dipisahkan dengan tanda koma." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Mohon masukkan sebuah bilangan bulat yang sah." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Mohon masukkan sebuah angka yang sah." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Nilai yang mungkin adalah: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Kembalikan ke Bawaan" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Pilih jalur" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Tampilkan nama teknis" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Nilai harus lebih besar dari $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Nilai harus lebih kecil dari $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -307,10 +399,6 @@ msgstr "Mod Terpasang:" msgid "Mod information:" msgstr "Informasi mod:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mod" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Tidak ada deskripsi mod tersedia" @@ -423,94 +511,157 @@ msgid "Start Game" msgstr "Mulai Permainan" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" bukan sebuah flag yang sah." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Tidak ada keterangan dari pengaturan yang diberikan)" +#, fuzzy +msgid "3D Clouds" +msgstr "Awan 3D" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Jelajahi" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Pengaturan" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Yakin ingin mengaturulang dunia anda?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bilinear filtering" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Ubah tombol" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Nonaktif" - -#: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Sunting" - -#: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Diaktifkan" - -#: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" -"Format adalah 3 angka yang dipisahkan oleh koma dan di dalam tanda kurung." +#, fuzzy +msgid "Connected Glass" +msgstr "Sambungkan kaca" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Format: , , (, , ), , " -", " +msgid "Enable Particles" +msgstr "Aktifkan semua" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Permainan" +msgid "Fancy Leaves" +msgstr "Daun Megah" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Gunakan Normalmaps" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Silakan masukan daftar flag yang dipisahkan dengan tanda koma." +msgid "Mipmap" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Mohon masukkan sebuah bilangan bulat yang sah." +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmap + Aniso. Filter" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Mohon masukkan sebuah angka yang sah." +#, fuzzy +msgid "No Filter" +msgstr "Tanpa Filter" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Nilai yang mungkin adalah: " +msgid "No Mipmap" +msgstr "Tanpa Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Kembalikan ke Bawaan" +msgid "No!!!" +msgstr "Tidak!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Pilih jalur" +#, fuzzy +msgid "Node Highlighting" +msgstr "Pencahayaan Halus" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Tidak ada" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Leaves" +msgstr "Daun Opak" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "Air Buram" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Parallax Occlusion" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Pengaturan" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Tampilkan nama teknis" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shaders" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Nilai harus lebih besar dari $1." +msgid "Simple Leaves" +msgstr "Daun Sederhana" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Nilai harus lebih kecil dari $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Pencahayaan Halus" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Penteksturan:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Untuk mengaktifkan shaders OpenGL driver harus digunakan." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "Batas sentuhan (px)" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Trilinear Filter" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Daun Melambai" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Tanaman Berayun" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Air Berombak" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -536,10 +687,6 @@ msgstr "Pemain Tunggal" msgid "No information available" msgstr "Tidak ada informasi tersedia" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Tidak ada" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Pilih paket tekstur:" @@ -564,10 +711,6 @@ msgstr "Menginisialisasi node" msgid "Initializing nodes..." msgstr "Menginisialisasi node..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Tekstur barang..." - #: src/client.cpp msgid "Loading textures..." msgstr "Memuat tekstur..." @@ -1167,6 +1310,15 @@ msgstr "Tombol X 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1184,6 +1336,7 @@ msgid "3D mode" msgstr "Mode 3D" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1191,7 +1344,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "Dukungan 3D.\n" "Didukung saat ini:\n" @@ -1266,6 +1420,10 @@ msgstr "" msgid "Advanced" msgstr "Lanjutan" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Selalu terbang dan bergerak cepat" @@ -1275,6 +1433,10 @@ msgstr "Selalu terbang dan bergerak cepat" msgid "Ambient occlusion gamma" msgstr "Ambient occlusion gamma" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1294,6 +1456,10 @@ msgstr "" "Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6." "servers.minetest.net." +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Minta untuk menyambung ulang setelah crash" @@ -1307,6 +1473,11 @@ msgstr "Secara otomatis melaporkan ke daftar server." msgid "Backward key" msgstr "Mundur" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Air Berombak" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Dasar" @@ -1328,10 +1499,6 @@ msgstr "Bit per piksel (alias kedalaman warna) dalam mode layar penuh." msgid "Build inside player" msgstr "Bangun di dalam pemain" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Bumpmapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Penghalusan kamera" @@ -1344,6 +1511,18 @@ msgstr "Penghalusan kamera dalam mode sinema" msgid "Camera update toggle key" msgstr "Tombol beralih pembaruan kamera" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Tombol obrolan" @@ -1352,6 +1531,29 @@ msgstr "Tombol obrolan" msgid "Chat toggle key" msgstr "Tombol beralih obrolan" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Besar chunk" @@ -1409,6 +1611,12 @@ msgstr "" "untuk mengakses fungsi yang tidak aman bahkan ketika mod security aktif\n" "(melalui request_insecure_environment())." +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Tombol perintah" @@ -1468,10 +1676,30 @@ msgstr "" "Mengatur ukuran padang gurun dan pantai dalam Mapgen v6.\n" "Jika snowbiomes di aktifkan 'mgv6_freq_desert' akan dihiraukan." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1560,6 +1788,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1582,6 +1818,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1618,12 +1861,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Aktifkan PM" #: src/settings_translation_file.cpp #, fuzzy @@ -1638,10 +1878,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1672,6 +1908,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1684,6 +1924,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Aktifkan Kerusakan" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1772,6 +2017,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1882,6 +2135,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Generate normalmaps" @@ -1890,10 +2147,11 @@ msgstr "Gunakan Normalmaps" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1904,6 +2162,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mod" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1916,6 +2179,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1929,7 +2196,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1954,6 +2221,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1986,8 +2257,8 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" -"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat." -"\n" +"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node " +"padat.\n" "Hal ini memerlukan hak istimewa \"noclip\" pada server." #: src/settings_translation_file.cpp @@ -2052,6 +2323,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2071,47 +2346,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2125,11 +2389,15 @@ msgid "Jumping speed" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk bergerak cepat dalam mode cepat.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2139,11 +2407,15 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk bergerak cepat dalam mode cepat.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2159,8 +2431,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk bergerak cepat dalam mode cepat.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2255,8 +2527,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode sinema.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2272,8 +2544,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode cepat.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2290,8 +2562,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode tembus blok.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2350,6 +2622,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2453,36 +2733,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2523,6 +2793,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Generator peta" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2545,6 +2820,59 @@ msgstr "Generator peta" msgid "Mapgen flags" msgstr "Generator peta" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Generator peta" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Generator peta" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Generator peta" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Parallax Occlusion" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Generator peta" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2564,26 +2892,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Generator peta" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "Parallax Occlusion" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2601,25 +2917,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Generator peta" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Generator peta" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Generator peta" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2768,6 +3083,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2796,14 +3123,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2896,6 +3215,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2912,13 +3235,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2996,10 +3312,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -3020,6 +3332,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3060,10 +3376,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Parallax Occlusion" - #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion" @@ -3134,19 +3446,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Memuat tekstur..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3170,6 +3469,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3200,6 +3503,22 @@ msgstr "Right Menu" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3326,10 +3645,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shaders" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3355,6 +3670,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3412,16 +3731,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Paket Tekstur" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3493,6 +3831,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Tombol beralih mode kamera" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3564,17 +3907,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3583,6 +3942,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3592,11 +3957,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3604,14 +3965,23 @@ msgstr "" msgid "Volume" msgstr "Volume Suara" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Walking speed" msgstr "Daun Melambai" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Tekstur barang..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3726,6 +4096,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3736,6 +4110,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3748,73 +4130,41 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Yakin ingin mengaturulang dunia anda?" - -#~ msgid "Fancy Leaves" -#~ msgstr "Daun Megah" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap + Aniso. Filter" - -#~ msgid "No Mipmap" -#~ msgstr "Tanpa Mipmap" - -#~ msgid "No!!!" -#~ msgstr "Tidak!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Daun Opak" - -#~ msgid "Opaque Water" -#~ msgstr "Air Buram" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Atur ulang dunia pemain tunggal" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Faktor skala yang diatur untuk elemen menu: " - -#~ msgid "Simple Leaves" -#~ msgstr "Daun Sederhana" - -#~ msgid "Texturing:" -#~ msgstr "Penteksturan:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Untuk mengaktifkan shaders OpenGL driver harus digunakan." - -#~ msgid "Touch free target" -#~ msgstr "Bebas sentuhan" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Batas sentuhan (px)" - -#~ msgid "Downloading" -#~ msgstr "Mengunduh" - -#~ msgid " KB/s" -#~ msgstr " KB/detik" - -#~ msgid " MB/s" -#~ msgstr " MB/detik" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih" - -#~ msgid "Rendering:" -#~ msgstr "Rendering:" - -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "diaktifkan" +#~ msgid "\"" +#~ msgstr "\"" #, fuzzy #~ msgid "If disabled " #~ msgstr "Nonaktifkan PM" -#~ msgid "\"" -#~ msgstr "\"" +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "diaktifkan" + +#~ msgid "Rendering:" +#~ msgstr "Rendering:" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih" + +#~ msgid " MB/s" +#~ msgstr " MB/detik" + +#~ msgid " KB/s" +#~ msgstr " KB/detik" + +#~ msgid "Downloading" +#~ msgstr "Mengunduh" + +#~ msgid "Touch free target" +#~ msgstr "Bebas sentuhan" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Faktor skala yang diatur untuk elemen menu: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Atur ulang dunia pemain tunggal" + +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "Memuat tekstur..." diff --git a/po/it/minetest.po b/po/it/minetest.po index cde084ea..08603e9c 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-25 18:13+0000\n" "Last-Translator: Paolo DGZ \n" -"Language-Team: Italian " -"\n" +"Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,8 +75,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Supportiamo soltanto versioni del protocollo comprese tra $1 e $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Annulla" @@ -116,8 +117,8 @@ msgstr "Nasc. cont. pacchetti" msgid "Mod:" msgstr "Mod.:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Salva" @@ -193,6 +194,7 @@ msgid "No of course not!" msgstr "No, certo che no!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Sì" @@ -212,6 +214,94 @@ msgstr "Accettare" msgid "Rename Modpack:" msgstr "Rinominare il pacchetto moduli:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" non è una bandiera valida." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Non è disponibile nessuna descrizione dell'impostazione)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Naviga" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Disabilitato" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Modifica" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Attivato" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "Il formato è da 3 numeri separati da virgole e dentro parentesi." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Formato: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Giochi" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Moduli" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Inserire una lista di impostazioni separate da virgola." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Inserire un intero valido." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Inserire un numero valido." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "I valori possibili sono: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Ripristina predefiniti" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Selezionare il percorso" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Mostra nomi tecnici" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Il valore deve essere maggiore di $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Il valore deve essere minore di $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -307,10 +397,6 @@ msgstr "Moduli installati:" msgid "Mod information:" msgstr "Informazioni sul modulo:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Moduli" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Nessuna descrizione disponibile per il modulo" @@ -423,92 +509,160 @@ msgid "Start Game" msgstr "Avviare il gioco" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" non è una bandiera valida." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Non è disponibile nessuna descrizione dell'impostazione)" +#, fuzzy +msgid "3D Clouds" +msgstr "Nuvole 3D" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Naviga" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Impostazioni" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Giocatore singolo" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Filtro bilineare" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Cambiare i tasti" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Disabilitato" +#, fuzzy +msgid "Connected Glass" +msgstr "Vetro connesso" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Modifica" +#, fuzzy +msgid "Enable Particles" +msgstr "Attivali tutti" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Attivato" +#, fuzzy +msgid "Fancy Leaves" +msgstr "Foglie opache" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Il formato è da 3 numeri separati da virgole e dentro parentesi." - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Formato: , , (, , ), , " -", " - -#: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Giochi" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Inserire una lista di impostazioni separate da virgola." +#, fuzzy +msgid "Mipmap" +msgstr "Mip-Mapping" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Inserire un intero valido." +msgid "Mipmap + Aniso. Filter" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Inserire un numero valido." +#, fuzzy +msgid "No Filter" +msgstr "Filtraggio" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "I valori possibili sono: " +#, fuzzy +msgid "No Mipmap" +msgstr "Mip-Mapping" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Ripristina predefiniti" +msgid "No!!!" +msgstr "No!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Selezionare il percorso" +#, fuzzy +msgid "Node Highlighting" +msgstr "Evidenziamento Nodi" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Niente" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Leaves" +msgstr "Foglie opache" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "Acqua opaca" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Impostazioni" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Mostra nomi tecnici" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shader" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Il valore deve essere maggiore di $1." +msgid "Simple Leaves" +msgstr "Foglie semplici" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Il valore deve essere minore di $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Raffinatezza ombreggiature" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "E' necessario usare i driver OpenGL per abilitare gli shader." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Filtro trilineare" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Foglie ondeggianti" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Piante ondeggianti" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Acqua ondeggiante" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -535,10 +689,6 @@ msgstr "Giocatore singolo" msgid "No information available" msgstr "Nessuna informazione disponibile" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Niente" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selezionare un pacchetto di immagini:" @@ -563,10 +713,6 @@ msgstr "Inizializzazione nodi" msgid "Initializing nodes..." msgstr "Inizializzazione nodi..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Immagini degli oggetti..." - #: src/client.cpp msgid "Loading textures..." msgstr "Caricamento delle texture..." @@ -1167,6 +1313,15 @@ msgstr "Pulsante X 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1182,6 +1337,7 @@ msgid "3D mode" msgstr "Modalità 3D" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1189,7 +1345,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "Supporto 3D.\n" "Supportati attualmente:\n" @@ -1263,6 +1420,10 @@ msgstr "" msgid "Advanced" msgstr "Avanzato" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Volo veloce permanentemente abilitato" @@ -1272,6 +1433,10 @@ msgstr "Volo veloce permanentemente abilitato" msgid "Ambient occlusion gamma" msgstr "Ambient occlusion gamma" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Filtro anisotropico" @@ -1287,6 +1452,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Chiedi se riconnettersi dopo un errore" @@ -1299,6 +1468,11 @@ msgstr "Rapporto automatico alla lista di server." msgid "Backward key" msgstr "Tasto Indietro" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Altezza delle onde dell'acqua" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Base" @@ -1320,10 +1494,6 @@ msgstr "Bit per pixel (profondita del colore) in schermo intero." msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Bumpmapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Ammorbidisci la visuale" @@ -1336,6 +1506,18 @@ msgstr "Ammorbidisci la visuale in modalità cinematica" msgid "Camera update toggle key" msgstr "Tasto Attiva/Disattiva aggiornamento della camera" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Tasto Chat" @@ -1344,6 +1526,29 @@ msgstr "Tasto Chat" msgid "Chat toggle key" msgstr "Tasto mostra/nascondi chat" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "dimensione del blocco" @@ -1398,6 +1603,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Tasto del comando" @@ -1457,10 +1668,30 @@ msgstr "" "Definisce la dimensione di deserti e spiagge nel generatoe delle mappe v6.\n" "Quando i biomi innevati sono abilitati 'mgv6_freq_desert' viene ignorato." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Messaggio di errore" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "Alfa del mirino" @@ -1547,6 +1778,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1569,6 +1808,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Disattiva l'anticheat" @@ -1599,12 +1845,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Attiva modpack" #: src/settings_translation_file.cpp #, fuzzy @@ -1619,10 +1862,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1653,6 +1892,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1665,6 +1908,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Abilita la minimap." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Abilita la minimap." @@ -1751,6 +1999,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1859,6 +2115,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1866,10 +2126,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1880,6 +2141,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Moduli" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1892,6 +2158,11 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Height component of the initial window size." +msgstr "Dimensione iniziale verticale della finestra." + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1905,7 +2176,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1930,6 +2201,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2022,6 +2297,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Inventario" @@ -2040,47 +2319,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2094,7 +2362,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2108,7 +2376,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2305,6 +2573,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2405,36 +2681,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2475,6 +2741,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Nome del genratore delle mappe" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2495,6 +2766,59 @@ msgstr "Debug del generatore delle mappe" msgid "Mapgen flags" msgstr "flags del generatore delle mappe" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "flags del generatore delle mappe" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Generat. mappe" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "flags del generatore delle mappe" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Generat. mappe" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Generat. mappe" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2514,24 +2838,13 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Generat. mappe" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal iterations" +msgstr "Generat. mappe" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -2550,25 +2863,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Generat. mappe" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Generat. mappe" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Generat. mappe" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2713,6 +3025,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2741,14 +3065,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2841,6 +3157,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2857,13 +3177,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "Mip-Mapping" @@ -2940,10 +3253,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2964,6 +3273,10 @@ msgstr "Evidenziamento Nodi" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3009,10 +3322,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3077,18 +3386,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Precaricamento delle textures dell'inventario" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3112,6 +3409,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3140,6 +3441,22 @@ msgstr "Destra" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3257,10 +3574,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shader" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3286,6 +3599,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Raffinatezza ombreggiature" @@ -3340,15 +3657,34 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Trama delle texture" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3428,6 +3764,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Tasto per variare la visuale" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3501,17 +3842,33 @@ msgid "V-Sync" msgstr "Sincronia verticale" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." -msgstr "Dimensione iniziale verticale della finestra." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" +msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "Dimensione iniziale orizzontale della finestra." -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Driver del video" @@ -3520,6 +3877,12 @@ msgstr "Driver del video" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "Tasto per decrementare la visibilità" @@ -3529,24 +3892,30 @@ msgid "View range increase key" msgstr "Tasto per incrementare la visibilità" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" +#, fuzzy +msgid "Viewing range" msgstr "Distanza massima di visibilità" -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" -msgstr "Distanza minima di visibilità" - #: src/settings_translation_file.cpp msgid "Volume" msgstr "Volume del suono" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Velocità di movimento" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "FPS desiderati" +#, fuzzy +msgid "Water Features" +msgstr "Livello dell'acqua" #: src/settings_translation_file.cpp msgid "Water level" @@ -3681,6 +4050,11 @@ msgstr "" "Se mostrare al client le informazioni di debug (ha lo stesso effetto di " "premere F5)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Width component of the initial window size." +msgstr "Dimensione iniziale verticale della finestra." + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "Larghezza dei riquadri attorno ai nodi." @@ -3693,6 +4067,14 @@ msgstr "" "Cartella del mondo (tutto il mondo si trova qui).\n" "Non è necessario se si inizia dal menù principale." +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3705,96 +4087,89 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "No!!!" -#~ msgstr "No!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Foglie opache" - -#~ msgid "Opaque Water" -#~ msgstr "Acqua opaca" - #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Giocatore singolo" - -#~ msgid "Simple Leaves" -#~ msgstr "Foglie semplici" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "E' necessario usare i driver OpenGL per abilitare gli shader." - -#~ msgid "Local install" -#~ msgstr "Installazione locale" - -#~ msgid "Add mod:" -#~ msgstr "Aggiungere un modulo:" - -#~ msgid "MODS" -#~ msgstr "MODULI" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACCH. DI IMM." - -#~ msgid "SINGLE PLAYER" -#~ msgstr "GIOC. SING." - -#~ msgid "Finite Liquid" -#~ msgstr "Liquido limitato" - -#~ msgid "Preload item visuals" -#~ msgstr "Precaricare le immagini" - -#~ msgid "SETTINGS" -#~ msgstr "IMPOSTAZIONI" - -#~ msgid "Password" -#~ msgstr "Password" - -#~ msgid "Name" -#~ msgstr "Nome" - -#~ msgid "START SERVER" -#~ msgstr "AVVIO SERVER" - -#~ msgid "Favorites:" -#~ msgstr "Preferiti:" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Aggiungere il modulo" - -#~ msgid "Remove selected mod" -#~ msgstr "Rimuovere il modulo selezionato" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFICARE IL GIOCO" - -#~ msgid "new game" -#~ msgstr "nuovo gioco" - -#~ msgid "Mods:" -#~ msgstr "Moduli:" - -#~ msgid "GAMES" -#~ msgstr "GIOCHI" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Nome del gioco" - -#, fuzzy -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Riavviare minetest per rendere effettive le modifiche" +#~ msgid "If disabled " +#~ msgstr "Disatt. pacch." #, fuzzy #~ msgid "If enabled, " #~ msgstr "attivata" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Disatt. pacch." +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Riavviare minetest per rendere effettive le modifiche" + +#~ msgid "Game Name" +#~ msgstr "Nome del gioco" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\"" + +#~ msgid "GAMES" +#~ msgstr "GIOCHI" + +#~ msgid "Mods:" +#~ msgstr "Moduli:" + +#~ msgid "new game" +#~ msgstr "nuovo gioco" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFICARE IL GIOCO" + +#~ msgid "Remove selected mod" +#~ msgstr "Rimuovere il modulo selezionato" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Aggiungere il modulo" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "Favorites:" +#~ msgstr "Preferiti:" + +#~ msgid "START SERVER" +#~ msgstr "AVVIO SERVER" + +#~ msgid "Name" +#~ msgstr "Nome" + +#~ msgid "Password" +#~ msgstr "Password" + +#~ msgid "SETTINGS" +#~ msgstr "IMPOSTAZIONI" + +#~ msgid "Preload item visuals" +#~ msgstr "Precaricare le immagini" + +#~ msgid "Finite Liquid" +#~ msgstr "Liquido limitato" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "GIOC. SING." + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACCH. DI IMM." + +#~ msgid "MODS" +#~ msgstr "MODULI" + +#~ msgid "Add mod:" +#~ msgstr "Aggiungere un modulo:" + +#~ msgid "Local install" +#~ msgstr "Installazione locale" + +#~ msgid "Wanted FPS" +#~ msgstr "FPS desiderati" + +#~ msgid "Viewing range minimum" +#~ msgstr "Distanza minima di visibilità" + +#~ msgid "Preload inventory textures" +#~ msgstr "Precaricamento delle textures dell'inventario" + +#~ msgid "Item textures..." +#~ msgstr "Immagini degli oggetti..." diff --git a/po/ja/minetest.po b/po/ja/minetest.po index e3d9eab7..238f09df 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -2,11 +2,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-14 08:53+0000\n" "Last-Translator: Rui \n" -"Language-Team: Japanese " -"\n" +"Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,8 +67,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "プロトコルバージョンは$1から$2までをサポートしています。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "キャンセル" @@ -108,8 +109,8 @@ msgstr "Modパックを非表示" msgid "Mod:" msgstr "Mod名:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "保存" @@ -131,7 +132,8 @@ msgstr "作成" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "minetest.netからminetest_gameなどのサブゲームをダウンロードしてください" +msgstr "" +"minetest.netからminetest_gameなどのサブゲームをダウンロードしてください" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -182,6 +184,7 @@ msgid "No of course not!" msgstr "いいえ！" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "はい" @@ -201,6 +204,95 @@ msgstr "決定" msgid "Rename Modpack:" msgstr "Modパック名を変更:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\"は有効なフラグではありません。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(設定の説明はありません)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "参照" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "無効" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "編集" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "有効" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "括弧内に3つの数字をカンマで区切って入力してください。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"書式: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "ゲーム" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mod" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "空隙性の値には、任意でカンマを付けて読みやすくすることができます。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "フラグはカンマで区切られた一覧で入力してください。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "有効な整数を入力してください。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "有効な数字を入力してください。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "使用可能な値: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "初期設定に戻す" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "ファイルの場所を選択" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "パラメータ名を表示" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "$1より大きい値でなければいけません。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "$1より小さい値でなければいけません。" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -295,10 +387,6 @@ msgstr "インストール済みのMod:" msgid "Mod information:" msgstr "Modの情報:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mod" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Modの説明がありません" @@ -411,93 +499,157 @@ msgid "Start Game" msgstr "ゲームスタート" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\"は有効なフラグではありません。" +msgid "2x" +msgstr "2倍" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(設定の説明はありません)" +#, fuzzy +msgid "3D Clouds" +msgstr "立体な雲" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "参照" +msgid "4x" +msgstr "4倍" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "8倍" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "設定" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "アンチエイリアス:" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "シングルプレイヤーのワールドをリセットしてよろしいですか？" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "バイリニアフィルタリング" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "バンプマッピング" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "操作変更" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "無効" - -#: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "編集" - -#: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "有効" - -#: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "括弧内に3つの数字をカンマで区切って入力してください。" +#, fuzzy +msgid "Connected Glass" +msgstr "ガラスを繋げる" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"書式: , , (, , ), , , " -"" +msgid "Enable Particles" +msgstr "全て有効化" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "ゲーム" +msgid "Fancy Leaves" +msgstr "綺麗な葉" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "空隙性の値には、任意でカンマを付けて読みやすくすることができます。" +#, fuzzy +msgid "Generate Normalmaps" +msgstr "ノーマルマップの生成" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "フラグはカンマで区切られた一覧で入力してください。" +msgid "Mipmap" +msgstr "ミップマップ" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "有効な整数を入力してください。" +msgid "Mipmap + Aniso. Filter" +msgstr "異方性フィルタ" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "有効な数字を入力してください。" +#, fuzzy +msgid "No Filter" +msgstr "フィルタリング" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "使用可能な値: " +msgid "No Mipmap" +msgstr "ミップマップ無し" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "初期設定に戻す" +msgid "No!!!" +msgstr "いいえ！！！" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "ファイルの場所を選択" +#, fuzzy +msgid "Node Highlighting" +msgstr "ノードをハイライト" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "無し" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Leaves" +msgstr "不透明な葉" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "不透明な水" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "視差遮蔽マッピング" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "設定" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "パラメータ名を表示" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "シェーダー" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "$1より大きい値でなければいけません。" +msgid "Simple Leaves" +msgstr "シンプルな葉" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "$1より小さい値でなければいけません。" +#, fuzzy +msgid "Smooth Lighting" +msgstr "滑らかな照明" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "テクスチャリング:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "シェーダーを有効にするにはOpenGLを使用する必要があります。" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "タッチのしきい値（ピクセル）" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "トリリニアフィルタリング" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "揺れる葉" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "揺れる草花" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "揺れる水" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -523,10 +675,6 @@ msgstr "シングルプレイヤー" msgid "No information available" msgstr "情報がありません" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "無し" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "テクスチャパックを選択:" @@ -551,10 +699,6 @@ msgstr "ノードを初期化中" msgid "Initializing nodes..." msgstr "ノードを初期化中..." -#: src/client.cpp -msgid "Item textures..." -msgstr "テクスチャを設定中..." - #: src/client.cpp msgid "Loading textures..." msgstr "テクスチャを読み込み中..." @@ -787,7 +931,9 @@ msgstr "キーが重複しています" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してください)" +msgstr "" +"操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してく" +"ださい)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -1149,6 +1295,15 @@ msgstr "Xボタン2" msgid "Zoom" msgstr "ズーム" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1166,6 +1321,7 @@ msgid "3D mode" msgstr "3Dモード" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1173,13 +1329,15 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "3Dサポート\n" "サポートしている出力:\n" "- none: 3D出力を行いません。\n" "- anaglyph: 赤/青の色による3Dです。\n" -"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応しています。\n" +"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応していま" +"す。\n" "- topbottom: 画面を上下で分割します。\n" "- sidebyside: 画面を左右で分割します。" @@ -1189,7 +1347,8 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"新規マップを作成する際の初期シード値です。空にするとランダムに設定されます。\n" +"新規マップを作成する際の初期シード値です。空にするとランダムに設定されま" +"す。\n" "メインメニューから新規ワールドを作成する際に上書きされることがあります。" #: src/settings_translation_file.cpp @@ -1243,6 +1402,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1251,6 +1414,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1266,6 +1433,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1278,6 +1449,11 @@ msgstr "" msgid "Backward key" msgstr "後キー" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "水が揺れる高さ" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1299,10 +1475,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "バンプマッピング" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1315,6 +1487,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "チャットキー" @@ -1323,6 +1507,29 @@ msgstr "チャットキー" msgid "Chat toggle key" msgstr "チャットトグルキー" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1379,6 +1586,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "コマンドキー" @@ -1434,10 +1647,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1524,6 +1757,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1546,6 +1787,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "対チート機関無効化" @@ -1576,12 +1824,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "有効化" #: src/settings_translation_file.cpp #, fuzzy @@ -1596,10 +1841,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1630,6 +1871,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1642,6 +1887,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "ミニマップを有効にする。" + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "ミニマップを有効にする。" @@ -1728,6 +1978,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1837,6 +2095,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "ノーマルマップの生成" @@ -1844,10 +2106,11 @@ msgstr "ノーマルマップの生成" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1858,6 +2121,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mod" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1870,6 +2138,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1883,7 +2155,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1909,6 +2181,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2002,6 +2278,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "インベントリキー" @@ -2020,47 +2300,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2074,7 +2343,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2088,7 +2357,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2285,6 +2554,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2386,36 +2663,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2456,6 +2723,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "マップ生成名" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2476,6 +2748,59 @@ msgstr "マップ生成のデバグ" msgid "Mapgen flags" msgstr "マップ生成フラグ" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "マップ生成フラグ" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "マップ生成フラグ" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "マップ生成フラグ" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "視差遮蔽マッピング" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "マップ生成フラグ" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2495,26 +2820,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "視差遮蔽マッピング" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2532,25 +2845,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "マップ生成フラグ" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2698,6 +3010,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2726,14 +3050,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2825,6 +3141,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2841,13 +3161,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "ミップマッピング" @@ -2924,10 +3237,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2948,6 +3257,10 @@ msgstr "ノードをハイライト" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2988,10 +3301,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "視差遮蔽マッピング" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "視差遮蔽マッピング" @@ -3060,19 +3369,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "テクスチャ読み込み中..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3096,6 +3392,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3125,6 +3425,22 @@ msgstr "右キー" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3243,10 +3559,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "シェーダー" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3272,6 +3584,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "滑らかな照明" @@ -3327,15 +3643,34 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "テクスチャパス" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3407,6 +3742,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "ミップマッピング" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3475,17 +3815,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3494,6 +3850,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3503,24 +3865,29 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "音量" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "歩く速度" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "テクスチャを設定中..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3597,19 +3964,24 @@ msgstr "" "どこでマップ生成を停止するかの設定です。\n" "注意:\n" "- 最大で31000です(これ以上に設定しても効果はありません)。\n" -"- マップ生成は80x80x80ノードのグループで動作します (5x5x5マップブロック)。\n" +"- マップ生成は80x80x80ノードのグループで動作します (5x5x5マップブロッ" +"ク)。\n" "- このグループは原点から-32、-32ノードのオフセットがあります。\n" "- グループはmap_generation_limit内で生成されたものに限ります。" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドである必要があります。" +msgstr "" +"Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドで" +"ある必要があります。" #: src/settings_translation_file.cpp #, fuzzy msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうかの設定です。" +msgstr "" +"ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうか" +"の設定です。" #: src/settings_translation_file.cpp msgid "" @@ -3629,7 +4001,8 @@ msgid "" "Set this to true if your server is set up to restart automatically." msgstr "" "(Luaが)クラッシュした際にクライアントに再接続を要求するかどうかの設定です。\n" -"サーバーが自動で再起動されるように設定されているならばtrueに設定してください。" +"サーバーが自動で再起動されるように設定されているならばtrueに設定してくださ" +"い。" #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." @@ -3638,7 +4011,13 @@ msgstr "可視領域の端に霧を表示するかどうかの設定です。" #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効果)。" +msgstr "" +"クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効" +"果)。" + +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." @@ -3653,6 +4032,14 @@ msgstr "" "ワールドを保存するディレクトリです(全てのワールドはここに保存されます)。\n" "メインメニューから開始する場合必要ありません。" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "cURL file download timeout" @@ -3667,77 +4054,33 @@ msgstr "cURLパラレル制限" msgid "cURL timeout" msgstr "cURLタイムアウト" -#~ msgid "2x" -#~ msgstr "2倍" - -#~ msgid "4x" -#~ msgstr "4倍" - -#~ msgid "8x" -#~ msgstr "8倍" - -#~ msgid "Antialiasing:" -#~ msgstr "アンチエイリアス:" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "シングルプレイヤーのワールドをリセットしてよろしいですか？" - -#~ msgid "Fancy Leaves" -#~ msgstr "綺麗な葉" - -#~ msgid "Mipmap" -#~ msgstr "ミップマップ" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "異方性フィルタ" - -#~ msgid "No Mipmap" -#~ msgstr "ミップマップ無し" - -#~ msgid "No!!!" -#~ msgstr "いいえ！！！" - -#~ msgid "Opaque Leaves" -#~ msgstr "不透明な葉" - -#~ msgid "Opaque Water" -#~ msgstr "不透明な水" - -#~ msgid "Reset singleplayer world" -#~ msgstr "シングルプレイヤーのワールドをリセット" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "メニューの大きさとして設定されている数値: " - -#~ msgid "Simple Leaves" -#~ msgstr "シンプルな葉" - -#~ msgid "Texturing:" -#~ msgstr "テクスチャリング:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "シェーダーを有効にするにはOpenGLを使用する必要があります。" - -#~ msgid "Touch free target" -#~ msgstr "タッチ位置を自由にする" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "タッチのしきい値（ピクセル）" - -#~ msgid " KB/s" -#~ msgstr " KB/秒" - -#~ msgid " MB/s" -#~ msgstr " MB/秒" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "ドライバーを変更するためMinetestを再起動します" - -#~ msgid "Rendering:" -#~ msgstr "レンダリング:" +#~ msgid "If disabled " +#~ msgstr "無効化の場合 " #~ msgid "If enabled, " #~ msgstr "有効化の場合 " -#~ msgid "If disabled " -#~ msgstr "無効化の場合 " +#~ msgid "Rendering:" +#~ msgstr "レンダリング:" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "ドライバーを変更するためMinetestを再起動します" + +#~ msgid " MB/s" +#~ msgstr " MB/秒" + +#~ msgid " KB/s" +#~ msgstr " KB/秒" + +#~ msgid "Touch free target" +#~ msgstr "タッチ位置を自由にする" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "メニューの大きさとして設定されている数値: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "シングルプレイヤーのワールドをリセット" + +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "テクスチャ読み込み中..." diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po index b851a61f..5bf51cce 100644 --- a/po/jbo/minetest.po +++ b/po/jbo/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-11-22 06:05+0000\n" "Last-Translator: senpi \n" -"Language-Team: Lojban " -"\n" +"Language-Team: Lojban \n" "Language: jbo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "fitytoltu'i" @@ -114,8 +115,8 @@ msgstr "" msgid "Mod:" msgstr "" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "rejgau" @@ -188,6 +189,7 @@ msgid "No of course not!" msgstr "nasai go'i" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "go'i" @@ -207,6 +209,94 @@ msgstr "fitytu'i" msgid "Rename Modpack:" msgstr "" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Disabled" +msgstr "selpli" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Enabled" +msgstr "selpli" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -298,10 +388,6 @@ msgstr "" msgid "Mod information:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "" @@ -415,15 +501,41 @@ msgid "Start Game" msgstr "cfari fa lo nu kelci" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +#, fuzzy +msgid "3D Clouds" +msgstr "le bliku dilnu" + +#: builtin/mainmenu/tab_settings.lua +msgid "4x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Advanced Settings" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr ".i xu do je'u djica lo nu kraga'igau le do za'e pavykelci munje" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "lo puvyrelyli'iju'e" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -432,76 +544,115 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "selpli" +msgid "Connected Glass" +msgstr "lo jorne blaci" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +#, fuzzy +msgid "Enable Particles" +msgstr "lo kantu" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Fancy Leaves" +msgstr "lo tolkli pezli" + +#: builtin/mainmenu/tab_settings.lua +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "selpli" +msgid "Mipmap" +msgstr "lo puvrmipmepi" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." +msgid "Mipmap + Aniso. Filter" +msgstr "lo puvrmipmepi .e lo puvytolmanfyju'e" + +#: builtin/mainmenu/tab_settings.lua +msgid "No Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +#, fuzzy +msgid "No Mipmap" +msgstr "lo puvrmipmepi" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" +msgstr "nasai go'i" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Node Highlighting" +msgstr "lo xutla se gusni" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "" +msgid "Opaque Leaves" +msgstr "lo tolkli pezli" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgid "Opaque Water" +msgstr "lo tolkli djacu" -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "lo ti'orkemsamtci" + #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +msgid "Simple Leaves" +msgstr "lo sampu pezli" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Smooth Lighting" +msgstr "lo xutla se gusni" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Touchthreshold (px)" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "lo puvycibli'iju'e" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "lo melbi pezli" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "lo melbi pezli" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "lo melbi pezli" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "" @@ -526,10 +677,6 @@ msgstr "pa kelci" msgid "No information available" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "" @@ -554,10 +701,6 @@ msgstr ".i ca'o samymo'i lo me la'o gy.node.gy." msgid "Initializing nodes..." msgstr ".i ca'o samymo'i lo me la'o gy.node.gy." -#: src/client.cpp -msgid "Item textures..." -msgstr ".i ca'o samymo'i le dacti ke tengu datnyvei" - #: src/client.cpp msgid "Loading textures..." msgstr ".i ca'o samymo'i le tengu datnyvei" @@ -1130,6 +1273,15 @@ msgstr "la'o gy.X Button 2.gy." msgid "Zoom" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1153,7 +1305,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1209,6 +1362,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1217,6 +1374,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1232,6 +1393,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1245,6 +1410,10 @@ msgstr "" msgid "Backward key" msgstr "za'i ti'a muvdu" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1267,10 +1436,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1283,6 +1448,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1292,6 +1469,29 @@ msgstr "samta'a" msgid "Chat toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1350,6 +1550,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1406,10 +1612,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1497,6 +1723,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1519,6 +1753,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1549,12 +1790,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "selpli" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1568,10 +1806,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1602,6 +1836,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1614,6 +1852,10 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "" @@ -1701,6 +1943,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1810,6 +2060,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1817,10 +2071,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1831,6 +2086,10 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +msgid "HTTP Mods" +msgstr "" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1843,6 +2102,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1856,7 +2119,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1881,6 +2144,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1973,6 +2240,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -1992,47 +2263,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2047,7 +2307,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2061,7 +2321,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2258,6 +2518,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2361,36 +2629,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2431,6 +2689,10 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen Valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2451,6 +2713,54 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2468,23 +2778,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2504,25 +2802,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2667,6 +2961,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2695,14 +3001,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2794,6 +3092,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2810,13 +3112,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2894,10 +3189,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2918,6 +3209,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2958,10 +3253,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3026,19 +3317,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr ".i ca'o samymo'i le tengu datnyvei" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3062,6 +3340,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3092,6 +3374,22 @@ msgstr "za'i ri'u muvdu" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3216,10 +3514,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "lo ti'orkemsamtci" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3245,6 +3539,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3302,14 +3600,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3381,6 +3698,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "lo puvrmipmepi" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3451,17 +3773,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3470,6 +3808,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3479,11 +3823,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3491,13 +3831,22 @@ msgstr "" msgid "Volume" msgstr "lo ni sance " +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr ".i ca'o samymo'i le dacti ke tengu datnyvei" #: src/settings_translation_file.cpp msgid "Water level" @@ -3607,6 +3956,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3617,6 +3970,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3629,27 +3990,13 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr ".i xu do je'u djica lo nu kraga'igau le do za'e pavykelci munje" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "lo puvrmipmepi .e lo puvytolmanfyju'e" - -#~ msgid "No!!!" -#~ msgstr "nasai go'i" - -#~ msgid "Opaque Leaves" -#~ msgstr "lo tolkli pezli" - -#~ msgid "Opaque Water" -#~ msgstr "lo tolkli djacu" +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "selpli" #~ msgid "Reset singleplayer world" #~ msgstr "kraga'igau le za'e pavykelci munje" -#~ msgid "Simple Leaves" -#~ msgstr "lo sampu pezli" - #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "selpli" +#~ msgid "Preload inventory textures" +#~ msgstr ".i ca'o samymo'i le tengu datnyvei" diff --git a/po/ko/minetest.po b/po/ko/minetest.po index 37a606cc..11a055bc 100644 --- a/po/ko/minetest.po +++ b/po/ko/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-07-08 23:30+0200\n" "Last-Translator: Tae Lim Kook \n" "Language-Team: Korean , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -294,10 +382,6 @@ msgstr "" msgid "Mod information:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "" @@ -410,15 +494,39 @@ msgid "Start Game" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +msgid "3D Clouds" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Advanced Settings" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Bilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -426,73 +534,103 @@ msgid "Change keys" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" +msgid "Connected Glass" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +msgid "Enable Particles" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" +msgid "Fancy Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Games" +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "No Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." +msgid "No Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." +msgid "No!!!" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." +msgid "Node Highlighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " +msgid "Opaque Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "Opaque Water" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "Simple Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Smooth Lighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Trilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Plants" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Water" msgstr "" #: builtin/mainmenu/tab_simple_main.lua @@ -519,10 +657,6 @@ msgstr "" msgid "No information available" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "" @@ -547,10 +681,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "" - #: src/client.cpp msgid "Loading textures..." msgstr "" @@ -1120,6 +1250,15 @@ msgstr "" msgid "Zoom" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1142,7 +1281,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1198,6 +1338,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1206,6 +1350,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1221,6 +1369,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1233,6 +1385,10 @@ msgstr "" msgid "Backward key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1253,10 +1409,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1269,6 +1421,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "" @@ -1277,6 +1441,29 @@ msgstr "" msgid "Chat toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1331,6 +1518,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "" @@ -1384,10 +1577,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1474,6 +1687,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1496,6 +1717,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "" @@ -1525,11 +1753,7 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." +msgid "Enable VBO" msgstr "" #: src/settings_translation_file.cpp @@ -1544,10 +1768,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1578,6 +1798,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1590,6 +1814,10 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "" @@ -1677,6 +1905,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1785,6 +2021,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1792,10 +2032,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1806,6 +2047,10 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +msgid "HTTP Mods" +msgstr "" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1818,6 +2063,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1831,7 +2080,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1856,6 +2105,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1948,6 +2201,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "" @@ -1966,47 +2223,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2020,7 +2266,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2034,7 +2280,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2231,6 +2477,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2331,36 +2585,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2401,6 +2645,10 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen Valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2421,6 +2669,54 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2438,23 +2734,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2474,25 +2758,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2637,6 +2917,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2665,14 +2957,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2764,6 +3048,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2780,13 +3068,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "" @@ -2863,10 +3144,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2887,6 +3164,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2927,10 +3208,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -2995,18 +3272,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3030,6 +3295,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3058,6 +3327,22 @@ msgstr "" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3175,10 +3460,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3204,6 +3485,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "" @@ -3259,14 +3544,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3338,6 +3642,10 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3406,17 +3714,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3425,6 +3749,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3434,23 +3764,27 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" +msgid "Water Features" msgstr "" #: src/settings_translation_file.cpp @@ -3559,6 +3893,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3569,6 +3907,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" diff --git a/po/ky/minetest.po b/po/ky/minetest.po index a3a198c7..fe9e6bfa 100644 --- a/po/ky/minetest.po +++ b/po/ky/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2013-06-01 18:09+0200\n" "Last-Translator: Chynggyz Jumaliev \n" "Language-Team: LANGUAGE \n" @@ -73,8 +73,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Жокко чыгаруу" @@ -117,8 +118,8 @@ msgstr "" msgid "Mod:" msgstr "" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Сактоо" @@ -192,6 +193,7 @@ msgid "No of course not!" msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Ооба" @@ -212,6 +214,96 @@ msgstr "Кабыл алуу" msgid "Rename Modpack:" msgstr "" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Disabled" +msgstr "Баарын өчүрүү" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Enabled" +msgstr "күйгүзүлгөн" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Games" +msgstr "Оюн" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Select path" +msgstr "Тандоо" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -304,10 +396,6 @@ msgstr "" msgid "Mod information:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "" @@ -428,95 +516,165 @@ msgid "Start Game" msgstr "Оюнду баштоо/туташуу" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +#, fuzzy +msgid "3D Clouds" +msgstr "3D-булуттар" + +#: builtin/mainmenu/tab_settings.lua +msgid "4x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "8x" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Ырастоолор" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Бир кишилик" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Экисызык чыпкалоосу" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip-текстуралоо" + #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Баскычтарды өзгөртүү" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "Баарын өчүрүү" +msgid "Connected Glass" +msgstr "Туташуу" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +#, fuzzy +msgid "Enable Particles" +msgstr "Баарын күйгүзүү" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Fancy Leaves" +msgstr "Күңүрт суу" + +#: builtin/mainmenu/tab_settings.lua +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "күйгүзүлгөн" +msgid "Mipmap" +msgstr "Mip-текстуралоо" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Games" -msgstr "Оюн" +msgid "No Filter" +msgstr "Анизатропия чыпкалоосу" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +#, fuzzy +msgid "No Mipmap" +msgstr "Mip-текстуралоо" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "No!!!" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Select path" -msgstr "Тандоо" +msgid "Node Highlighting" +msgstr "Тегиз жарык" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Opaque Leaves" +msgstr "Күңүрт суу" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Opaque Water" +msgstr "Күңүрт суу" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Ырастоолор" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Көлөкөлөгүчтөр" + #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#, fuzzy +msgid "Simple Leaves" +msgstr "Күңүрт суу" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Smooth Lighting" +msgstr "Тегиз жарык" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Touchthreshold (px)" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Үчсызык чыпкалоосу" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Кооз бактар" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Кооз бактар" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Кооз бактар" + #: builtin/mainmenu/tab_simple_main.lua #, fuzzy msgid "Config mods" @@ -544,10 +702,6 @@ msgstr "Бир кишилик" msgid "No information available" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "" @@ -573,10 +727,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "Буюм текстуралары..." - #: src/client.cpp #, fuzzy msgid "Loading textures..." @@ -1166,6 +1316,15 @@ msgstr "" msgid "Zoom" msgstr "Масштаб" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1189,7 +1348,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1245,6 +1405,10 @@ msgstr "" msgid "Advanced" msgstr "Кошумча" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1253,6 +1417,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1269,6 +1437,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1282,6 +1454,10 @@ msgstr "" msgid "Backward key" msgstr "Артка" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1305,11 +1481,6 @@ msgstr "" msgid "Build inside player" msgstr "Көп кишилик" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "Mip-текстуралоо" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1322,6 +1493,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1332,6 +1515,29 @@ msgstr "Баскычтарды өзгөртүү" msgid "Chat toggle key" msgstr "Баскычтарды өзгөртүү" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1390,6 +1596,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1450,10 +1662,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1542,6 +1774,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1564,6 +1804,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1594,12 +1841,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Баарын күйгүзүү" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1613,10 +1857,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1647,6 +1887,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1659,6 +1903,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Убалды күйгүзүү" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1746,6 +1995,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1856,6 +2113,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1863,10 +2124,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1877,6 +2139,10 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +msgid "HTTP Mods" +msgstr "" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1889,6 +2155,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1902,7 +2172,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1927,6 +2197,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2020,6 +2294,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2039,47 +2317,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2094,7 +2361,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2108,7 +2375,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2305,6 +2572,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2408,36 +2683,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2478,6 +2743,10 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen Valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2498,6 +2767,54 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2515,23 +2832,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2551,25 +2856,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2714,6 +3015,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2742,14 +3055,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2842,6 +3147,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2858,13 +3167,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2942,10 +3244,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2966,6 +3264,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3006,10 +3308,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3074,19 +3372,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Жүктөлүүдө..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3110,6 +3395,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3139,6 +3428,22 @@ msgstr "Оң меню" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3260,10 +3565,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Көлөкөлөгүчтөр" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3289,6 +3590,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3346,14 +3651,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3425,6 +3749,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-текстуралоо" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3495,17 +3824,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3514,6 +3859,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3523,11 +3874,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3535,13 +3882,22 @@ msgstr "" msgid "Volume" msgstr "Үн көлөмү" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Буюм текстуралары..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3650,6 +4006,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3660,6 +4020,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3673,62 +4041,27 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Күңүрт суу" +#~ msgid "If disabled " +#~ msgstr "Баарын өчүрүү" #, fuzzy -#~ msgid "Opaque Water" -#~ msgstr "Күңүрт суу" +#~ msgid "If enabled, " +#~ msgstr "күйгүзүлгөн" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Бир кишилик" +#~ msgid "Game Name" +#~ msgstr "Оюн" + +#~ msgid "Favorites:" +#~ msgstr "Тандалмалар:" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ылдый" +#~ msgid "Password" +#~ msgstr "Эски сырсөз" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу" - -#~ msgid "is required by:" -#~ msgstr "талап кылынганы:" - -#~ msgid "Configuration saved. " -#~ msgstr "Конфигурация сакталды. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Эскертүү: Туура эмес конфигурация. " - -#~ msgid "Show Public" -#~ msgstr "Жалпылыкты көрсөтүү" - -#~ msgid "Show Favorites" -#~ msgstr "Тандалмаларды көрсөтүү" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз." - -#~ msgid "Create world" -#~ msgstr "Дүйнөнү жаратуу" - -#~ msgid "Address required." -#~ msgstr "Дареги талап кылынат." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок" - -#~ msgid "Files to be deleted" -#~ msgstr "Өчүрүлө турган файлдар" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок" +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Чектүү суюктук" #~ msgid "" #~ "Default Controls:\n" @@ -3755,25 +4088,52 @@ msgstr "" #~ "- ESC: бул меню\n" #~ "- T: маек\n" -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Чектүү суюктук" +#~ msgid "Failed to delete all world files" +#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок" + +#~ msgid "Files to be deleted" +#~ msgstr "Өчүрүлө турган файлдар" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок" + +#~ msgid "Address required." +#~ msgstr "Дареги талап кылынат." + +#~ msgid "Create world" +#~ msgstr "Дүйнөнү жаратуу" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз." + +#~ msgid "Show Favorites" +#~ msgstr "Тандалмаларды көрсөтүү" + +#~ msgid "Show Public" +#~ msgstr "Жалпылыкты көрсөтүү" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Эскертүү: Туура эмес конфигурация. " + +#~ msgid "Configuration saved. " +#~ msgstr "Конфигурация сакталды. " + +#~ msgid "is required by:" +#~ msgstr "талап кылынганы:" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу" #, fuzzy -#~ msgid "Password" -#~ msgstr "Эски сырсөз" - -#~ msgid "Favorites:" -#~ msgstr "Тандалмалар:" +#~ msgid "Downloading" +#~ msgstr "Ылдый" #, fuzzy -#~ msgid "Game Name" -#~ msgstr "Оюн" - -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "күйгүзүлгөн" - -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Баарын өчүрүү" +#~ msgid "Preload inventory textures" +#~ msgstr "Жүктөлүүдө..." diff --git a/po/lt/minetest.po b/po/lt/minetest.po index 64d2e78c..41e640bb 100644 --- a/po/lt/minetest.po +++ b/po/lt/minetest.po @@ -7,17 +7,17 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-11-19 05:14+0000\n" "Last-Translator: Liudas Ališauskas \n" -"Language-Team: Lithuanian " -"\n" +"Language-Team: Lithuanian \n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"(n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua @@ -75,8 +75,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Atsisakyti" @@ -116,8 +117,8 @@ msgstr "Slėpti papild. pakų turinį" msgid "Mod:" msgstr "Papildinys:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Įrašyti" @@ -210,6 +211,94 @@ msgstr "Priimti" msgid "Rename Modpack:" msgstr "Pervadinti papildinių paką:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Disabled" +msgstr "Išjungti papildinį" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Enabled" +msgstr "įjungtas" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Žaidimai" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Papildiniai" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -304,10 +393,6 @@ msgstr "Įdiegti papildiniai:" msgid "Mod information:" msgstr "Papildinio informacija:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Papildiniai" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Papildinio aprašymas nepateiktas" @@ -420,15 +505,42 @@ msgid "Start Game" msgstr "Pradėti žaidimą" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +#, fuzzy +msgid "3D Clouds" +msgstr "Trimačiai debesys" + +#: builtin/mainmenu/tab_settings.lua +msgid "4x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Nustatymai" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Atstatyti vieno žaidėjo pasaulį" + +#: builtin/mainmenu/tab_settings.lua +msgid "Bilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -437,74 +549,109 @@ msgstr "Nustatyti klavišus" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "Išjungti papildinį" +msgid "Connected Glass" +msgstr "Jungtis" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +#, fuzzy +msgid "Enable Particles" +msgstr "Įjungti visus" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Fancy Leaves" +msgstr "Nepermatomi lapai" + +#: builtin/mainmenu/tab_settings.lua +msgid "Generate Normalmaps" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Mipmap" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Mipmap + Aniso. Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "No Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "No Mipmap" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "įjungtas" +msgid "Node Highlighting" +msgstr "Apšvietimo efektai" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Joks" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgid "Opaque Leaves" +msgstr "Nepermatomi lapai" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" +msgid "Opaque Water" +msgstr "Nepermatomas vanduo" -#: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Žaidimai" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Paralaksinė okliuzija" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Nustatymai" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Šešėliavimai" + #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#, fuzzy +msgid "Simple Leaves" +msgstr "Nepermatomi lapai" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Smooth Lighting" +msgstr "Apšvietimo efektai" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Trilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Nepermatomi lapai" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Plants" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Water" msgstr "" #: builtin/mainmenu/tab_simple_main.lua @@ -531,11 +678,6 @@ msgstr "Žaisti vienam" msgid "No information available" msgstr "Nėra pasiekiamos informacijos" -#: builtin/mainmenu/tab_texturepacks.lua -#: builtin/mainmenu/tab_settings.lua -msgid "None" -msgstr "Joks" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Pasirinkite tekstūros paketą:" @@ -560,10 +702,6 @@ msgstr "Inicijuojami mazgai" msgid "Initializing nodes..." msgstr "Inicijuojami mazgai..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Elemento tekstūros..." - #: src/client.cpp msgid "Loading textures..." msgstr "Įkeliamos tekstūros..." @@ -1159,6 +1297,15 @@ msgstr "X mygtukas 2" msgid "Zoom" msgstr "Pritraukti" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1182,7 +1329,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1238,6 +1386,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1246,6 +1398,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1261,6 +1417,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1274,6 +1434,10 @@ msgstr "" msgid "Backward key" msgstr "Atgal" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1295,10 +1459,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1311,6 +1471,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1321,6 +1493,29 @@ msgstr "Nustatyti klavišus" msgid "Chat toggle key" msgstr "Nustatyti klavišus" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1379,6 +1574,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1437,10 +1638,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1530,6 +1751,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1552,6 +1781,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "" @@ -1581,12 +1817,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Įjungti papildinį" #: src/settings_translation_file.cpp #, fuzzy @@ -1601,10 +1834,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1635,6 +1864,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1647,6 +1880,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Leisti sužeidimus" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1734,6 +1972,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1843,6 +2089,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1850,10 +2100,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1864,6 +2115,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Papildiniai" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1876,6 +2132,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1889,7 +2149,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1914,6 +2174,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2007,6 +2271,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2026,47 +2294,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2081,7 +2338,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2095,7 +2352,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2292,6 +2549,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2395,36 +2660,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2465,6 +2720,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Žemėlapių generavimas" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2485,6 +2745,55 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Žemėlapių generavimas" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2502,23 +2811,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2538,25 +2835,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2701,6 +2994,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2729,14 +3034,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2829,6 +3126,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2845,13 +3146,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "" @@ -2928,10 +3222,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2952,6 +3242,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2992,11 +3286,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -#: builtin/mainmenu/tab_settings.lua -msgid "Parallax Occlusion" -msgstr "Paralaksinė okliuzija" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3061,19 +3350,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Įkeliama..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3097,6 +3373,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3126,6 +3406,22 @@ msgstr "Dešinėn" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3251,11 +3547,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -#: builtin/mainmenu/tab_settings.lua -msgid "Shaders" -msgstr "Šešėliavimai" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3281,6 +3572,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3338,14 +3633,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3417,6 +3731,10 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3487,17 +3805,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3506,6 +3840,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3515,24 +3855,29 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Elemento tekstūros..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3640,6 +3985,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3650,6 +3999,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3662,68 +4019,63 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Opaque Leaves" -#~ msgstr "Nepermatomi lapai" - -#~ msgid "Opaque Water" -#~ msgstr "Nepermatomas vanduo" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Atstatyti vieno žaidėjo pasaulį" - -#~ msgid "Add mod:" -#~ msgstr "Pridėti papildinį:" - -#~ msgid "MODS" -#~ msgstr "PAPILDINIAI" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "VIENAS ŽAIDĖJAS" - -#~ msgid "SETTINGS" -#~ msgstr "NUSTATYMAI" - -#~ msgid "Password" -#~ msgstr "Slaptažodis" - -#~ msgid "Name" -#~ msgstr "Vardas" - -#~ msgid "START SERVER" -#~ msgstr "PALEISTI SERVERĮ" - -#~ msgid "Favorites:" -#~ msgstr "Mėgiami:" - -#~ msgid "CLIENT" -#~ msgstr "ŽAISTI TINKLE" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Pridėti papildinį" - -#~ msgid "Remove selected mod" -#~ msgstr "Pašalinti pasirinktą papildinį" - #, fuzzy -#~ msgid "EDIT GAME" -#~ msgstr "KEISTI ŽAIDIMĄ" - -#~ msgid "new game" -#~ msgstr "naujas žaidimas" - -#~ msgid "Mods:" -#~ msgstr "Papildiniai:" - -#~ msgid "GAMES" -#~ msgstr "ŽAIDIMAI" - -#~ msgid "Game Name" -#~ msgstr "Žaidimo pavadinimas" +#~ msgid "If disabled " +#~ msgstr "Išjungti papildinį" #, fuzzy #~ msgid "If enabled, " #~ msgstr "įjungtas" +#~ msgid "Game Name" +#~ msgstr "Žaidimo pavadinimas" + +#~ msgid "GAMES" +#~ msgstr "ŽAIDIMAI" + +#~ msgid "Mods:" +#~ msgstr "Papildiniai:" + +#~ msgid "new game" +#~ msgstr "naujas žaidimas" + #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Išjungti papildinį" +#~ msgid "EDIT GAME" +#~ msgstr "KEISTI ŽAIDIMĄ" + +#~ msgid "Remove selected mod" +#~ msgstr "Pašalinti pasirinktą papildinį" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Pridėti papildinį" + +#~ msgid "CLIENT" +#~ msgstr "ŽAISTI TINKLE" + +#~ msgid "Favorites:" +#~ msgstr "Mėgiami:" + +#~ msgid "START SERVER" +#~ msgstr "PALEISTI SERVERĮ" + +#~ msgid "Name" +#~ msgstr "Vardas" + +#~ msgid "Password" +#~ msgstr "Slaptažodis" + +#~ msgid "SETTINGS" +#~ msgstr "NUSTATYMAI" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "VIENAS ŽAIDĖJAS" + +#~ msgid "MODS" +#~ msgstr "PAPILDINIAI" + +#~ msgid "Add mod:" +#~ msgstr "Pridėti papildinį:" + +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "Įkeliama..." diff --git a/po/minetest.pot b/po/minetest.pot index 4e04d6c0..95a16cdb 100644 --- a/po/minetest.pot +++ b/po/minetest.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,14 +89,15 @@ msgstr "" msgid "Depends:" msgstr "" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "" @@ -171,6 +172,7 @@ msgid "Are you sure you want to delete \"$1\"?" msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "" @@ -202,6 +204,92 @@ msgstr "" msgid "Accept" msgstr "" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" msgstr "" @@ -312,10 +400,6 @@ msgstr "" msgid "Select Mod File:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "" - #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" msgstr "" @@ -408,69 +492,99 @@ msgid "Server" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Games" +msgid "Opaque Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +msgid "Simple Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." +msgid "Fancy Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " +msgid "No Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "Bilinear Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "Trilinear Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." +msgid "No Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" +msgid "Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" +msgid "Mipmap + Aniso. Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." +msgid "4x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "8x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Are you sure to reset your singleplayer world?" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." +msgid "No!!!" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "Smooth Lighting" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" +msgid "Enable Particles" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "3D Clouds" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Connected Glass" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Node Highlighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -478,15 +592,39 @@ msgid "Change keys" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +msgid "Advanced Settings" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +msgid "Generate Normalmaps" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Water" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Plants" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -513,10 +651,6 @@ msgstr "" msgid "Singleplayer" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "" @@ -549,10 +683,6 @@ msgstr "" msgid "Initializing nodes" msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "" - #: src/client.cpp msgid "Done!" msgstr "" @@ -1554,7 +1684,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -1565,7 +1695,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -1652,6 +1782,14 @@ msgstr "" msgid "Basic" msgstr "" +#: src/settings_translation_file.cpp +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enable VBO" +msgstr "" + #: src/settings_translation_file.cpp msgid "Fog" msgstr "" @@ -1660,18 +1798,6 @@ msgstr "" msgid "Whether to fog out the end of the visible area." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" - #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -1718,6 +1844,14 @@ msgstr "" msgid "Use 3D cloud look instead of flat." msgstr "" +#: src/settings_translation_file.cpp +msgid "Node highlighting" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Filtering" msgstr "" @@ -1781,18 +1915,6 @@ msgid "" "enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - #: src/settings_translation_file.cpp msgid "FSAA" msgstr "" @@ -1803,10 +1925,6 @@ msgid "" "when set to higher number than 0." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -1815,7 +1933,15 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -msgid "Bumpmapping" +msgid "Tone Mapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables filmic tone mapping" msgstr "" #: src/settings_translation_file.cpp @@ -1854,10 +1980,6 @@ msgid "" "A higher value results in smoother normal maps." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -1960,17 +2082,6 @@ msgstr "" msgid "Advanced" msgstr "" -#: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum FPS" msgstr "" @@ -1990,18 +2101,13 @@ msgid "Maximum FPS when game is paused." msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +"View distance in nodes.\n" +"Min = 20" msgstr "" #: src/settings_translation_file.cpp @@ -2009,7 +2115,7 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "Width component of the initial window size." msgstr "" #: src/settings_translation_file.cpp @@ -2017,7 +2123,7 @@ msgid "Screen height" msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "Height component of the initial window size." msgstr "" #: src/settings_translation_file.cpp @@ -2129,7 +2235,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -2198,14 +2305,6 @@ msgid "" "Useful if there's something to be displayed right or left of hotbar." msgstr "" -#: src/settings_translation_file.cpp -msgid "Node highlighting" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mesh cache" msgstr "" @@ -2262,6 +2361,14 @@ msgid "" "set to the nearest valid value." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "Menus" msgstr "" @@ -2692,18 +2799,6 @@ msgstr "" msgid "If this is set, players will always (re)spawn at the given position." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Disallow empty passwords" msgstr "" @@ -3045,10 +3140,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3292,95 +3388,170 @@ msgid "Mapgen v7 cave2 noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal" +msgid "Mapgen flat" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen flat flags" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" +msgid "Mapgen flat lake steepness" msgstr "" #: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +msgid "Controls steepness/depth of lake depressions." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" +msgid "Mapgen flat hill threshold" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal scale" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" @@ -3390,7 +3561,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -3400,7 +3572,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -3410,7 +3583,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -3420,7 +3594,9 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" @@ -3440,6 +3616,166 @@ msgstr "" msgid "Mapgen fractal cave2 noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen Valleys" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How deep to make rivers" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Water Features" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3462,6 +3798,16 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "HTTP Mods" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Client and Server" msgstr "" diff --git a/po/nb/minetest.po b/po/nb/minetest.po index 5309d1d3..22c80b8d 100644 --- a/po/nb/minetest.po +++ b/po/nb/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-09-20 17:15+0200\n" "Last-Translator: Christian Haug \n" "Language-Team: Norwegian Bokmål , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Games" +msgstr "Spill" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -301,10 +392,6 @@ msgstr "" msgid "Mod information:" msgstr "" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "" @@ -420,15 +507,39 @@ msgid "Start Game" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +msgid "3D Clouds" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Advanced Settings" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Bilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -436,76 +547,104 @@ msgid "Change keys" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "Disabled" -msgstr "Deaktiver Alle" - -#: builtin/mainmenu/tab_settings.lua -msgid "Edit" +msgid "Connected Glass" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "aktivert" +msgid "Enable Particles" +msgstr "Aktiver Alle" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." +msgid "Fancy Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "Games" -msgstr "Spill" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." +msgid "No Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." +msgid "No Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " +msgid "No!!!" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "Node Highlighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" +msgid "Opaque Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "Simple Leaves" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Smooth Lighting" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Trilinear Filter" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Leaves" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Plants" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Waving Water" msgstr "" #: builtin/mainmenu/tab_simple_main.lua @@ -532,10 +671,6 @@ msgstr "" msgid "No information available" msgstr "" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "" @@ -560,10 +695,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "" - #: src/client.cpp msgid "Loading textures..." msgstr "" @@ -1133,6 +1264,15 @@ msgstr "" msgid "Zoom" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1155,7 +1295,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1211,6 +1352,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1219,6 +1364,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "" @@ -1234,6 +1383,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1246,6 +1399,10 @@ msgstr "" msgid "Backward key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1266,10 +1423,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1282,6 +1435,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "" @@ -1290,6 +1455,29 @@ msgstr "" msgid "Chat toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1346,6 +1534,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "" @@ -1399,10 +1593,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1490,6 +1704,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1512,6 +1734,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "" @@ -1541,12 +1770,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Aktiver Alle" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1560,10 +1786,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1594,6 +1816,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1606,6 +1832,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Aktiver Alle" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1693,6 +1924,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1801,6 +2040,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1808,10 +2051,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1822,6 +2066,10 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +msgid "HTTP Mods" +msgstr "" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1834,6 +2082,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1847,7 +2099,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1872,6 +2124,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -1965,6 +2221,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "" @@ -1983,47 +2243,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2037,7 +2286,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2051,7 +2300,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2248,6 +2497,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2348,36 +2605,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2418,6 +2665,10 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen Valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2438,6 +2689,54 @@ msgstr "" msgid "Mapgen flags" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat flags" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat ground level" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat lake threshold" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "" @@ -2455,23 +2754,11 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" +msgid "Mapgen fractal iterations" msgstr "" #: src/settings_translation_file.cpp @@ -2491,25 +2778,21 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" +msgid "Mapgen fractal offset" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" +msgid "Mapgen fractal scale" msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal slice w" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2654,6 +2937,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2682,14 +2977,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2781,6 +3068,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2797,13 +3088,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "" @@ -2880,10 +3164,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2904,6 +3184,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -2944,10 +3228,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3012,18 +3292,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3047,6 +3315,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3075,6 +3347,22 @@ msgstr "" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3192,10 +3480,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3221,6 +3505,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "" @@ -3276,14 +3564,33 @@ msgid "Synchronous SQLite" msgstr "" #: src/settings_translation_file.cpp -msgid "Texture path" +msgid "Terrain Height" msgstr "" #: src/settings_translation_file.cpp msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Texture path" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3355,6 +3662,10 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3423,17 +3734,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3442,6 +3769,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3451,23 +3784,27 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" +msgid "Water Features" msgstr "" #: src/settings_translation_file.cpp @@ -3576,6 +3913,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3586,6 +3927,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3598,18 +3947,17 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "is required by:" -#~ msgstr "trengs av:" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Deaktiver Alle" -#~ msgid "Configuration saved. " -#~ msgstr "Konfigurasjon lagret. " +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "aktivert" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n" -#~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen." +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Spill" #~ msgid "" #~ "Warning: Some mods are not configured yet.\n" @@ -3618,14 +3966,15 @@ msgstr "" #~ "Advarsel: Noen modifikasjoner er ikke konfigurert enda. \n" #~ "De vil bli aktivert som standard når du lagrer konfigurasjonen." -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Spill" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: Noen konfigurerte modifikasjoner mangler. \n" +#~ "Instillingene deres vil bli fjernet når du lagrer konfigurasjonen." -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "aktivert" +#~ msgid "Configuration saved. " +#~ msgstr "Konfigurasjon lagret. " -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Deaktiver Alle" +#~ msgid "is required by:" +#~ msgstr "trengs av:" diff --git a/po/nl/minetest.po b/po/nl/minetest.po index 8a499085..14beb248 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-23 04:35+0000\n" "Last-Translator: Tobyplowy \n" -"Language-Team: Dutch " -"\n" +"Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,8 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Er is een fout opgetreden in een Lua script (bijvoorbeeld van een mod):" +msgstr "" +"Er is een fout opgetreden in een Lua script (bijvoorbeeld van een mod):" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -73,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Wij ondersteunen protocol versies $1 tot en met $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Annuleer" @@ -114,8 +116,8 @@ msgstr "Verberg MV mods" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Bewaar" @@ -190,6 +192,7 @@ msgid "No of course not!" msgstr "Nee, natuurlijk niet!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Ja" @@ -209,6 +212,99 @@ msgstr "Accepteren" msgid "Rename Modpack:" msgstr "Modverzameling hernoemen:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" is geen geldige vlag." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Er is geen beschrijving van deze instelling beschikbaar)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Bladeren" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Uitgeschakeld" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Aanpassen" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Aangeschakeld" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" +"Formaat moet zijn: 3 getallen, gescheiden door komma's en tussen vierkante " +"haken (bijvoorbeeld: [4,-34,138])." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Formaat: , , (, , ), " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Spellen" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mods" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" +"Optioneel: de lacunaritie (uit de fractal-meetkunde: een maat voor\n" +"hoeveelheid en grootte van 'gaten') kan aan het einde toegevoegd worden,\n" +"voorafgegaan door een komma." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Geef een lijst van vlaggen, door komma's gescheiden." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Voer een geldig geheel getal in." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Voer een geldig getal in." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Mogelijke waarden zijn: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Standaardwaarde herstellen" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Pad selecteren" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Technische namen weergeven" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "De waarde moet groter zijn dan $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "De waarde moet lager zijn dan $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -302,10 +398,6 @@ msgstr "Geïnstalleerde Mods:" msgid "Mod information:" msgstr "Mod-beschrijving:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mods" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Geen mod-beschrijving aanwezig" @@ -418,97 +510,156 @@ msgid "Start Game" msgstr "Start spel" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" is geen geldige vlag." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Er is geen beschrijving van deze instelling beschikbaar)" +#, fuzzy +msgid "3D Clouds" +msgstr "3D wolken" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Bladeren" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Instellingen" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Weet je zeker dat je je wereld wilt resetten?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Bi-Lineaire filtering" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Toetsen aanpassen" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Uitgeschakeld" +#, fuzzy +msgid "Connected Glass" +msgstr "Verbind glas" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Aanpassen" +#, fuzzy +msgid "Enable Particles" +msgstr "Alles aanzetten" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Aangeschakeld" +msgid "Fancy Leaves" +msgstr "Mooie bladeren" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." +msgid "Generate Normalmaps" msgstr "" -"Formaat moet zijn: 3 getallen, gescheiden door komma's en tussen vierkante " -"haken (bijvoorbeeld: [4,-34,138])." #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Formaat: , , (, , " -"), " +msgid "Mipmap" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Spellen" +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmap + Anisotropisch filteren" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" -"Optioneel: de lacunaritie (uit de fractal-meetkunde: een maat voor\n" -"hoeveelheid en grootte van 'gaten') kan aan het einde toegevoegd worden,\n" -"voorafgegaan door een komma." +#, fuzzy +msgid "No Filter" +msgstr "Filters" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Geef een lijst van vlaggen, door komma's gescheiden." +msgid "No Mipmap" +msgstr "Geen Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Voer een geldig geheel getal in." +msgid "No!!!" +msgstr "Nee!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Voer een geldig getal in." +#, fuzzy +msgid "Node Highlighting" +msgstr "Oplichtende node" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Geen" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Mogelijke waarden zijn: " +msgid "Opaque Leaves" +msgstr "Ondoorzichtige bladeren" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Standaardwaarde herstellen" +msgid "Opaque Water" +msgstr "Ondoorzichtig water" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Pad selecteren" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Parallax occlusie" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Instellingen" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Technische namen weergeven" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shaders" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "De waarde moet groter zijn dan $1." +msgid "Simple Leaves" +msgstr "Eenvoudige bladeren" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "De waarde moet lager zijn dan $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Vloeiende verlichting" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Textuur:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Om schaduwen mogelijk te maken moet OpenGL worden gebruikt." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Tri-Lineare Filtering" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Bewegende bladeren" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Bewegende planten" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Golvend water" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -534,10 +685,6 @@ msgstr "Singleplayer" msgid "No information available" msgstr "Geen informatie aanwezig" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Geen" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selecteer textuurverzameling:" @@ -562,10 +709,6 @@ msgstr "Nodes initialiseren" msgid "Initializing nodes..." msgstr "Nodes initialiseren..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Voorwerp-texturen..." - #: src/client.cpp msgid "Loading textures..." msgstr "Bezig met texturen te laaden..." @@ -1163,6 +1306,15 @@ msgstr "X knop 2" msgid "Zoom" msgstr "Zoomen" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1180,6 +1332,7 @@ msgid "3D mode" msgstr "3D modus" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1187,7 +1340,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "3D ondersteuning.\n" "Op dit moment ondersteund:\n" @@ -1266,6 +1420,10 @@ msgstr "" msgid "Advanced" msgstr "Geavanceerd" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Zet 'snel' altijd aan bij 'vliegen'" @@ -1274,6 +1432,10 @@ msgstr "Zet 'snel' altijd aan bij 'vliegen'" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Anisotropische filtering" @@ -1292,6 +1454,11 @@ msgstr "" "Voor het aanmelden van een ipv6 adres bij de minetest serverlijst, gebruik " "'v6.servers.minetest.net'." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "Juliaverzameling: (X,Y,Z) schaal, in nodes (bij benadering)." + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Vraag om de verbinding te herstellen na een server-crash" @@ -1304,6 +1471,11 @@ msgstr "Meldt de server automatisch aan bij de serverlijst." msgid "Backward key" msgstr "Achteruit" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Golfhoogte van water" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Basis" @@ -1324,10 +1496,6 @@ msgstr "Aantal bits per pixel (oftewel: kleurdiepte) in full-screen modus." msgid "Build inside player" msgstr "Bouwen op de plaats van de speler" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Bumpmapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Vloeiender maken van de camerabeweging" @@ -1340,6 +1508,18 @@ msgstr "Vloeiender maken van de camerabeweging (in cinematic modus)" msgid "Camera update toggle key" msgstr "Toets voor cameraverversing aan/uit" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Chat-toets" @@ -1348,6 +1528,29 @@ msgstr "Chat-toets" msgid "Chat toggle key" msgstr "Toets voor tonen/verbergen chat" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Chunk-grootte" @@ -1406,6 +1609,12 @@ msgstr "" "mogen gebruiken,\n" "zelfs wanneer mod-beveiliging aan staat (via request_insecure_environment())." +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Opdracht-toets" @@ -1461,14 +1670,34 @@ msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"Bepaalt de grootte van woestijnen en stranden in de wereld-generator (mapgen)" -" v6.\n" +"Bepaalt de grootte van woestijnen en stranden in de wereld-generator " +"(mapgen) v6.\n" "Als 'snowbiomes' aan staat, wordt deze instelling genegeerd." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Crash boodschap" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "Draadkruis-alphawaarde" @@ -1561,6 +1790,14 @@ msgstr "Vertraging bij het tonen van tooltips, in milliseconden." msgid "Deprecated Lua API handling" msgstr "Gedrag bij gebruik van verouderde Lua API functies" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "Daalsnelheid" @@ -1579,12 +1816,20 @@ msgstr "Textuur-animaties niet synchroniseren" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." -msgstr "Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars." +msgstr "" +"Gedetailleerde profiling-data voor mods. Nuttig voor mod-ontwikkelaars." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" msgstr "Gedetailleerde profiling van mods" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Valsspeelbescherming uitschakelen" @@ -1614,15 +1859,9 @@ msgid "Dump the mapgen debug infos." msgstr "Print wereldgenerator debug informatie." #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" -"Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n" -"Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n" -"wateroppervlakte werkt niet als dit is aangeschakeld." +#, fuzzy +msgid "Enable VBO" +msgstr "MV aanzetten" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1636,10 +1875,6 @@ msgstr "Schakel verwondingen en sterven van spelers aan." msgid "Enable random user input (only used for testing)." msgstr "Schakel willkeurige invoer aan (enkel voor testen)." -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)." - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1669,8 +1904,8 @@ msgid "" msgstr "" "Sta het gebruik van een externe media-server toe (indien opgegeven door de " "server).\n" -"Het gebruik van externe media-servers versnelt het downloaden van media (" -"bijv. texturen) aanzienlijk\n" +"Het gebruik van externe media-servers versnelt het downloaden van media " +"(bijv. texturen) aanzienlijk\n" "bij het maken van een verbinding met een server." #: src/settings_translation_file.cpp @@ -1683,6 +1918,10 @@ msgstr "" "kan dit tot gevolg hebben dat enkel IPv6 cliënten verbinding kunnen maken\n" "Deze instelling wordt genegeerd als een lokaal server-adres ingesteld is." +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1699,6 +1938,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Schakelt de mini-kaart in." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Schakelt de mini-kaart in." @@ -1791,6 +2035,14 @@ msgstr "" "Bestand in de map 'client/serverlist/' met favoriete servers die getoond " "worden in de multiplayer tab." +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1860,8 +2112,8 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" -"Tot welke afstand blokken gegenereerd worden voor cliënten. In mapblokken (" -"16 nodes)." +"Tot welke afstand blokken gegenereerd worden voor cliënten. In mapblokken " +"(16 nodes)." #: src/settings_translation_file.cpp msgid "" @@ -1903,23 +2155,30 @@ msgstr "GUI schalingsfilter: txr2img" msgid "Gamma" msgstr "Gamma" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Algemene wereldgenerator instellingen.\n" +"Wereldgenerator instellingen specified voor generator v6.\n" +"Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt " +"de \"jungles\" vlag genegeerd.\n" "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" "waarde.\n" -"Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n" -"'trees' en 'flat' zijn enkel van toepassing in mgv6." +"Zet \"no\" voor een vlag om hem expliciet uit te zetten." #: src/settings_translation_file.cpp msgid "Graphics" @@ -1929,6 +2188,11 @@ msgstr "Grafisch" msgid "Gravity" msgstr "Zwaartekracht" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mods" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "HUD aan/uitschakelen toets" @@ -1943,10 +2207,15 @@ msgstr "" "Behandeling van verouderde lua api aanroepen:\n" "- legacy: (probeer) het oude gedrag na te bootsen (standaard voor een " "'release' versie).\n" -"- log: boots het oude gedrag na, en log een backtrace van de aanroep (" -"standaard voor een 'debug' versie).\n" -"- error: stop de server bij gebruik van een verouderde aanroep (" -"aanbevolen voor mod ontwikkelaars)." +"- log: boots het oude gedrag na, en log een backtrace van de aanroep " +"(standaard voor een 'debug' versie).\n" +"- error: stop de server bij gebruik van een verouderde aanroep " +"(aanbevolen voor mod ontwikkelaars)." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Height component of the initial window size." +msgstr "Horizontale aanvangsgroote van het window." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -1961,8 +2230,8 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "Home-pagina van de server. Wordt getoond in de serverlijst." #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." -msgstr "Horizontale aanvangsgroote van het window." +msgid "How deep to make rivers" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1970,8 +2239,8 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" -"Tot op welke afstand van actieve spelers blokken 'actief' zijn. In blokken (" -"van 16 nodes).\n" +"Tot op welke afstand van actieve spelers blokken 'actief' zijn. In blokken " +"(van 16 nodes).\n" "In actieve blokken worden objecten geladen (bijv. dieren die rondlopen) en " "ABMs uitgevoerd (bijv. groeien van planten)." @@ -1995,6 +2264,10 @@ msgstr "" "Een hogere waarde zorgt voor een vloeiender spelervaring, maar kost meer " "geheugen." +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "IPv6" @@ -2073,8 +2346,8 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" -"Indien aangeschakeld, kan een speler blokken plaatsen op de eigen positie (" -"het niveau van de voeten en van de ogen).\n" +"Indien aangeschakeld, kan een speler blokken plaatsen op de eigen positie " +"(het niveau van de voeten en van de ogen).\n" "Dit vergemakkelijkt het werken in nauwe ruimtes." #: src/settings_translation_file.cpp @@ -2109,6 +2382,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "Interval voor het sturen van de kloktijd naar cliënten." +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Rugzak toets" @@ -2126,61 +2403,47 @@ msgid "Item entity TTL" msgstr "Bestaansduur van objecten" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" -"Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n" -"Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand in " -"nodes." - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "Juliaverzameling: (X,Y,Z) schaal, in nodes (bij benadering)." - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" "Juliaverzameling: Aantal iteraties van de recursieve functie.\n" "Bepaalt de schaal van de kleinste details." #: src/settings_translation_file.cpp msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" -"Juliaverzameling: W-coördinaat van de 3D doorsnede van de 4D vorm.\n" -"Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: W value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" -"Juliaverzameling: W-waarde van de 4D vorm.\n" -"Bereik is ongeveer -2 tot 2." - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Juliaverzameling: X-waarde van de 4D vorm.\n" "Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: Y value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Juliaverzameling: Y-waarde van de 4D vorm.\n" "Bereik is ongeveer -2 tot 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" "Juliaverzameling: Z-waarde van de 4D-vorm.\n" @@ -2195,15 +2458,15 @@ msgid "Jumping speed" msgstr "Sprinsnelheid" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale " -"zichtafstand.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Toets om oneindige zichtastand aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2212,19 +2475,19 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets voor het weggooien van het geselecteerde object.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Toets voor het vergroten van de zichtafstand. Dit verandert de minimale " -"zichtafstand.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Toets om oneindige zichtastand aan/uit te schakelen.\n" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2233,8 +2496,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets voor springen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2243,8 +2506,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om snel te bewegen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2253,8 +2516,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om de speler achteruit te bewegen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2263,8 +2526,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om de speler vooruit te bewegen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2273,8 +2536,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om de speler naar links te bewegen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2283,8 +2546,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om de speler naar rechts te bewegen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2293,8 +2556,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om de chat-console te openen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2303,8 +2566,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om het chat-window te openen om commando's te typen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2313,8 +2576,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om het chat-window te openen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2323,8 +2586,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om het rugzak-window te openen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2333,8 +2596,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om debug-stapels te printen. Gebruikt voor ontwikkeling.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2347,8 +2610,8 @@ msgstr "" "Toets om te kruipen.\n" "Wordt ook gebruikt om naar beneden te klimmen en te dalen indien " "aux1_descends uitstaat.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2357,8 +2620,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om tussen 1e-persoon camera en 3e-persoon camera te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2367,8 +2630,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om screenshot te maken.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2377,8 +2640,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om cinematic modus aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2387,8 +2650,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om de mini-kaart aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2397,8 +2660,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om snelle modus aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2407,8 +2670,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om vliegen aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2417,8 +2680,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om 'noclip' modus aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2428,8 +2691,8 @@ msgid "" msgstr "" "Toets om camera-verversing aan/uit te schakelen. Enkel gebruikt voor " "ontwikkeling.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2438,8 +2701,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om debug informatie aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2448,8 +2711,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om de HUD aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2458,8 +2721,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om het tonen van chatberichten aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2468,8 +2731,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om mist aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2479,8 +2742,8 @@ msgid "" msgstr "" "Toets om het tonen van de code-profiler aan/uit te schakelen. Gebruikt voor " "ontwikkeling.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2489,8 +2752,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Toets om oneindige zichtastand aan/uit te schakelen.\n" -"Zie http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735" -"e3da1b0edf72eb3" +"Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2500,6 +2763,14 @@ msgstr "Gebruik de 'gebruiken'-toets voor klimmen en dalen" msgid "Language" msgstr "Taal" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "Type van bladeren" @@ -2544,8 +2815,8 @@ msgstr "" "- (geen logging)\n" "- none (enkel berichten zonder gedefiniëerd niveau)\n" "- error (alles van minstens fout-niveau)- warning (alles van minstens " -"waarschuwings-niveau)- action (alles van minstens actie-niveau)- info (" -"alles van minstens informatie-niveau)- verbose (alles)" +"waarschuwings-niveau)- action (alles van minstens actie-niveau)- info " +"(alles van minstens informatie-niveau)- verbose (alles)" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" @@ -2621,48 +2892,39 @@ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" "Maakt dat DirectX werkt met LuaJIT. Schakel dit uit als het problemen geeft." -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" -"Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n" -" Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand in " -"nodes." - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)." - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" -"Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n" -"Bepaalt de schaal van de kleinste details." - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Wereld map" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" +"Algemene wereldgenerator instellingen.\n" +"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" +"waarde.\n" +"Zet \"no\" voor een vlag om hem expliciet uit te zetten.\n" +"'trees' en 'flat' zijn enkel van toepassing in mgv6." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Wereldgeneratie instellingen voor de fractal generator.\n" -"'julia' selecterd een julia-verzameling in plaats van een mandebrot-" -"verzameling.\n" +"Wereldgenerator instellingen specified voor generator v7.\n" +"\"ridges\" zijn rivieren.\n" "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" "waarde.\n" "Zet \"no\" voor een vlag om hem expliciet uit te zetten." @@ -2713,6 +2975,11 @@ msgstr "Max aantal wereldblokken" msgid "Mapblock unload timeout" msgstr "Wereldblok vergeet-tijd" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Wereldgenerator" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "Wereldgenerator landschapstemperatuur ruisparameters" @@ -2733,6 +3000,64 @@ msgstr "Wereldgenerator debug" msgid "Mapgen flags" msgstr "Wereldgenerator vlaggen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Wereldgenerator vlaggen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave1 noise parameters" +msgstr "Fractal wereldgenerator grotten (1) ruisparameters" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave2 noise parameters" +msgstr "Fractal wereldgenerator grotten (2) ruisparameters" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat filler depth noise parameters" +msgstr "Fractal wereldgenerator vuldiepte ruisparameters" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Fractal wereldgenerator vlaggen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Wereldgenerator vlaggen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Fractal wereldgenerator julia iteraties" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Fractal wereldgenerator julia schaal" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat large cave depth" +msgstr "Fractal wereldgenerator julia schaal" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat terrain noise parameters" +msgstr "Wereldgenerator v6 basisterrein ruisparameters" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "Fractal wereldgenerator" @@ -2751,25 +3076,15 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "Fractal wereldgenerator vuldiepte ruisparameters" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +#, fuzzy +msgid "Mapgen fractal fractal" msgstr "Fractal wereldgenerator vlaggen" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" +#, fuzzy +msgid "Mapgen fractal iterations" msgstr "Fractal wereldgenerator julia iteraties" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "Fractal wereldgenerator julia centrum-afstand" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "Fractal wereldgenerator julia schaal" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "Fractal wereldgenerator julia w-doorsnede" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "Fractal wereldgenerator julia w" @@ -2787,25 +3102,24 @@ msgid "Mapgen fractal julia z" msgstr "Fractal wereldgenerator julia z" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "Fractal wereldgenerator mandelbrot iteraties" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Fractal wereldgenerator julia centrum-afstand" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "Fractal wereldgenerator mandelbrot centrum-afstand" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "Fractal wereldgenerator mandelbrot schaal" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "Fractal wereldgenerator mandelbrot w-doorsnede" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Fractal wereldgenerator julia schaal" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "Fractal wereldgenerator zeebodem parameters" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Fractal wereldgenerator julia w-doorsnede" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "Wereldgenerator landschapstemperatuurovergangen ruisparameters" @@ -2953,6 +3267,18 @@ msgstr "Wereldgenerator v7 terrein basis ruisparameters" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "Wereldgenerator v7 terrein-'persist' ruisparameters" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "Maximale afstand van te genereren blokken" @@ -2983,18 +3309,6 @@ msgstr "Maximum FPS" msgid "Maximum FPS when game is paused." msgstr "Maximum FPS als het spel gepauzeerd is." -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" -"Maximum hoogte boven waterniveau waar een speler geboren wordt.\n" -"Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n" -"Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden wordt,\n" -"in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de grond." - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "Maximaal aantal geforceerd geladen blokken" @@ -3105,6 +3419,10 @@ msgstr "Bericht van de dag" msgid "Message of the day displayed to players connecting." msgstr "Toon bericht aan spelers die verbinding maken." +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "Mini-kaart" @@ -3121,16 +3439,6 @@ msgstr "Mini-kaart scan-hoogte" msgid "Minimum texture size for filters" msgstr "Minimale textuur-grootte voor filters" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" -"Minimaal gewenste FPS.\n" -"De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze " -"waarde, en van de min en max zichtafstanden." - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -3225,10 +3533,6 @@ msgstr "" "Netwerkpoort van de server (UDP).\n" "Bij starten vanuit het hoofdmenu kan een andere poort opgegeven worden." -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "Nieuw water" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "Nieuwe spelers dienen dit wachtwoord op te geven." @@ -3251,6 +3555,10 @@ msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" "Ruisparameters voor landschapstemperaturen, -vochtigheid en -overgangen." +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3302,10 +3610,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Parallax occlusie" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "Parallax occlusie" @@ -3377,22 +3681,6 @@ msgstr "" "Netwerk-poort (UDP) waarmee verbinding gemaakt moet worden.In het hoofdmenu " "kan een andere waarde opgegeven worden." -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" -"Genereer beelden van objecten in de rugzak vooraf.\n" -"De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n" -"Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen heeft " -"kan dit resulteren in vreemde effecten." - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Laad rugzak-texturen vooraf" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3421,6 +3709,10 @@ msgstr "" "Straal van wolken, in 64-node eenheden.\n" "Waarden groter dan 26 hebben scherpe wolkenranden tot gevolg." +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "Willekeurige invoer" @@ -3449,6 +3741,22 @@ msgstr "Toets voor rechts" msgid "Rightclick repetition interval" msgstr "Rechts-klik herhalingsinterval" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "Opnemen terugrolgegevens" @@ -3578,10 +3886,6 @@ msgid "" msgstr "" "Golvend water staat aan indien 'true'Dit vereist dat 'shaders' ook aanstaan." -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shaders" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3612,6 +3916,10 @@ msgstr "" "Grootte van chunks die per keer gegenereerd worden door de wereldgenerator " "in mapblokken (16 nodes)." +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Vloeiende verlichting" @@ -3674,15 +3982,34 @@ msgstr "Stricte protocolcontrole" msgid "Synchronous SQLite" msgstr "Sqlite synchrone modus" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Pad van texturen" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3771,6 +4098,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Camera-modus veranderen toets" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Tooltip tijdsduur" @@ -3844,17 +4176,33 @@ msgid "V-Sync" msgstr "V-Sync" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." -msgstr "Aanvangshoogte van het window." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" +msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "Vertikale scherm-synchronisatie." -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "Vertikaal geboortegebied" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "Video driver" @@ -3863,6 +4211,12 @@ msgstr "Video driver" msgid "View bobbing" msgstr "Loopbeweging" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "Toets voor verkleinen zichtafstand" @@ -3872,24 +4226,33 @@ msgid "View range increase key" msgstr "Toets voor vergroten zichtafstand" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" +#, fuzzy +msgid "Viewing range" msgstr "Maximale zichtafstand" -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" -msgstr "Minimale zichtafstand" - #: src/settings_translation_file.cpp msgid "Volume" msgstr "Geluidsniveau" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" +"Juliaverzameling: W-coördinaat van de 3D doorsnede van de 4D vorm.\n" +"Bereik is ongeveer -2 tot 2." + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Loopsnelheid" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "Gewenste FPS" +#, fuzzy +msgid "Water Features" +msgstr "Waterniveau" #: src/settings_translation_file.cpp msgid "Water level" @@ -4014,7 +4377,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "Maak het einde van het zichtbereik mistig, zodat het einde niet opvalt." +msgstr "" +"Maak het einde van het zichtbereik mistig, zodat het einde niet opvalt." #: src/settings_translation_file.cpp msgid "" @@ -4023,6 +4387,11 @@ msgstr "" "Laat debug informatie zien in de cliënt (heeft hetzelfde effect als de F5 " "toets)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Width component of the initial window size." +msgstr "Horizontale aanvangsgroote van het window." + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "Breedte van de lijnen om een geselecteerde node." @@ -4036,6 +4405,14 @@ msgstr "" "Deze instelling is niet nodig als de server vanuit het hoofdmenu wordt " "gestart." +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "timeout voor cURL download" @@ -4048,94 +4425,97 @@ msgstr "Maximaal parallellisme in cURL" msgid "cURL timeout" msgstr "cURL timeout" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Weet je zeker dat je je wereld wilt resetten?" - -#~ msgid "Fancy Leaves" -#~ msgstr "Mooie bladeren" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap + Anisotropisch filteren" - -#~ msgid "No Mipmap" -#~ msgstr "Geen Mipmap" - -#~ msgid "No!!!" -#~ msgstr "Nee!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Ondoorzichtige bladeren" - -#~ msgid "Opaque Water" -#~ msgstr "Ondoorzichtig water" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Reset Singleplayer wereld" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Schaal-factor toegepast op menu elementen: " - -#~ msgid "Simple Leaves" -#~ msgstr "Eenvoudige bladeren" - -#~ msgid "Texturing:" -#~ msgstr "Textuur:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Om schaduwen mogelijk te maken moet OpenGL worden gebruikt." +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "MP uitschakelen" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Downloaden" +#~ msgid "If enabled, " +#~ msgstr "ingeschakeld" -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "Rendering:" +#~ msgstr "Rendering:" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Herstart minetest om de driver te activeren" + +#~ msgid "Game Name" +#~ msgstr "Spel" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren" + +#~ msgid "GAMES" +#~ msgstr "SPELLEN" + +#~ msgid "Mods:" +#~ msgstr "Mods:" + +#~ msgid "new game" +#~ msgstr "nieuw spel" + +#~ msgid "EDIT GAME" +#~ msgstr "SPEL AANPASSEN" + +#~ msgid "Remove selected mod" +#~ msgstr "Geselecteerde mod verwijderen" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Mod toevoegen" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "Favorites:" +#~ msgstr "Favorieten:" + +#~ msgid "START SERVER" +#~ msgstr "START SERVER" + +#~ msgid "Name" +#~ msgstr "Naam" + +#~ msgid "Password" +#~ msgstr "Wachtwoord" + +#~ msgid "SETTINGS" +#~ msgstr "INSTELLINGEN" + +#~ msgid "Preload item visuals" +#~ msgstr "Voorwerpen vooraf laden" + +#~ msgid "Finite Liquid" +#~ msgstr "Eindige vloeistoffen" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "SINGLEPLAYER" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTUREN" + +#~ msgid "MODS" +#~ msgstr "MODS" + +#~ msgid "Add mod:" +#~ msgstr "Mod toevoegen:" + +#~ msgid "Local install" +#~ msgstr "Plaatselijk installeren" + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " #~ msgstr "" -#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item" +#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n" +#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie " +#~ "bewaard. " -#~ msgid "is required by:" -#~ msgstr "is benodigd voor:" - -#~ msgid "Configuration saved. " -#~ msgstr "Instellingen bewaard. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Waarschuwing: Instellingen niet consistent. " - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens" - -#~ msgid "Show Public" -#~ msgstr "Publieke server" - -#~ msgid "Show Favorites" -#~ msgstr "Favourieten" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Laat het adres leeg om een lokale server te starten." - -#~ msgid "Create world" -#~ msgstr "Maak wereld aan" - -#~ msgid "Address required." -#~ msgstr "IP-adres nodig." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd" - -#~ msgid "Files to be deleted" -#~ msgstr "Deze bestanden worden verwijderd" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Niet alle bestanden zijn verwijderd" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "LEt op: Sommige ingestelde mods zijn vermist.\n" +#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. " #~ msgid "" #~ "Default Controls:\n" @@ -4162,94 +4542,206 @@ msgstr "cURL timeout" #~ "- ESC: Menu\n" #~ "- T: Chat\n" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ msgid "Failed to delete all world files" +#~ msgstr "Niet alle bestanden zijn verwijderd" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kan instellingen niet aanpassen: Niets geselecteerd" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kan geen wereld aanmaken: Geen games gevonden" + +#~ msgid "Files to be deleted" +#~ msgstr "Deze bestanden worden verwijderd" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kan niets verwijderen: Geen wereld geselecteerd" + +#~ msgid "Address required." +#~ msgstr "IP-adres nodig." + +#~ msgid "Create world" +#~ msgstr "Maak wereld aan" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Laat het adres leeg om een lokale server te starten." + +#~ msgid "Show Favorites" +#~ msgstr "Favourieten" + +#~ msgid "Show Public" +#~ msgstr "Publieke server" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kan geen nieuwe wereld aanmaken: de naam bevat onjuiste tekens" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Waarschuwing: Instellingen niet consistent. " + +#~ msgid "Configuration saved. " +#~ msgstr "Instellingen bewaard. " + +#~ msgid "is required by:" +#~ msgstr "is benodigd voor:" + +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "LEt op: Sommige ingestelde mods zijn vermist.\n" -#~ "Hun instellingen worden verwijderd als je de configuratie opslaat. " - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Let op: Nog niet alle mods zijn geconfigueerd. \n" -#~ "De mods zullen automatisch worden ingeschakeld als je de configuratie " -#~ "bewaard. " - -#~ msgid "Local install" -#~ msgstr "Plaatselijk installeren" - -#~ msgid "Add mod:" -#~ msgstr "Mod toevoegen:" - -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTUREN" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "SINGLEPLAYER" - -#~ msgid "Finite Liquid" -#~ msgstr "Eindige vloeistoffen" - -#~ msgid "Preload item visuals" -#~ msgstr "Voorwerpen vooraf laden" - -#~ msgid "SETTINGS" -#~ msgstr "INSTELLINGEN" - -#~ msgid "Password" -#~ msgstr "Wachtwoord" - -#~ msgid "Name" -#~ msgstr "Naam" - -#~ msgid "START SERVER" -#~ msgstr "START SERVER" - -#~ msgid "Favorites:" -#~ msgstr "Favorieten:" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Mod toevoegen" - -#~ msgid "Remove selected mod" -#~ msgstr "Geselecteerde mod verwijderen" - -#~ msgid "EDIT GAME" -#~ msgstr "SPEL AANPASSEN" - -#~ msgid "new game" -#~ msgstr "nieuw spel" - -#~ msgid "Mods:" -#~ msgstr "Mods:" - -#~ msgid "GAMES" -#~ msgstr "SPELLEN" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren" - -#~ msgid "Game Name" -#~ msgstr "Spel" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Herstart minetest om de driver te activeren" - -#~ msgid "Rendering:" -#~ msgstr "Rendering:" +#~ "Linkermuisknop: Verplaats alle items. Rechtermuisknop: Verplaats één item" #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "ingeschakeld" +#~ msgid "Downloading" +#~ msgstr "Downloaden" -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "MP uitschakelen" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Schaal-factor toegepast op menu elementen: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Reset Singleplayer wereld" + +#~ msgid "Wanted FPS" +#~ msgstr "Gewenste FPS" + +#~ msgid "Viewing range minimum" +#~ msgstr "Minimale zichtafstand" + +#~ msgid "Vertical spawn range" +#~ msgstr "Vertikaal geboortegebied" + +#~ msgid "Vertical initial window size." +#~ msgstr "Aanvangshoogte van het window." + +#~ msgid "Preload inventory textures" +#~ msgstr "Laad rugzak-texturen vooraf" + +#~ msgid "" +#~ "Pre-generate all item visuals used in the inventory.\n" +#~ "This increases startup time, but runs smoother in-game.\n" +#~ "The generated textures can easily exceed your VRAM, causing artifacts in " +#~ "the inventory." +#~ msgstr "" +#~ "Genereer beelden van objecten in de rugzak vooraf.\n" +#~ "De start-tijd wordt hierdoor langer, maar het spel wordt vloeiender.\n" +#~ "Dit kost veel geheugen op de videokaart. Als die onvoldoende geheugen " +#~ "heeft kan dit resulteren in vreemde effecten." + +#~ msgid "New style water" +#~ msgstr "Nieuw water" + +#~ msgid "" +#~ "Minimum wanted FPS.\n" +#~ "The amount of rendered stuff is dynamically set according to this. and " +#~ "viewing range min and max." +#~ msgstr "" +#~ "Minimaal gewenste FPS.\n" +#~ "De hoeveelheid gerenderd materiaal wordt aangepast afhankelijk van deze " +#~ "waarde, en van de min en max zichtafstanden." + +#~ msgid "" +#~ "Maximum distance above water level for player spawn.\n" +#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" +#~ "Smaller values may result in a suitable spawn point not being found,\n" +#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." +#~ msgstr "" +#~ "Maximum hoogte boven waterniveau waar een speler geboren wordt.\n" +#~ "Bij hogere waarden zullen de plaatsen dichter bij (x = 0, z = 0) liggen.\n" +#~ "Bij lagere waarden kan het zijn dat een geschikte plek niet gevonden " +#~ "wordt,\n" +#~ "in dat geval wordt de speler geboren op (0, 0, 0), mogelijk onder de " +#~ "grond." + +#~ msgid "Mapgen fractal mandelbrot slice w" +#~ msgstr "Fractal wereldgenerator mandelbrot w-doorsnede" + +#~ msgid "Mapgen fractal mandelbrot scale" +#~ msgstr "Fractal wereldgenerator mandelbrot schaal" + +#~ msgid "Mapgen fractal mandelbrot offset" +#~ msgstr "Fractal wereldgenerator mandelbrot centrum-afstand" + +#~ msgid "Mapgen fractal mandelbrot iterations" +#~ msgstr "Fractal wereldgenerator mandelbrot iteraties" + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen fractal.\n" +#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." +#~ msgstr "" +#~ "Wereldgeneratie instellingen voor de fractal generator.\n" +#~ "'julia' selecterd een julia-verzameling in plaats van een mandebrot-" +#~ "verzameling.\n" +#~ "Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-" +#~ "waarde.\n" +#~ "Zet \"no\" voor een vlag om hem expliciet uit te zetten." + +#~ msgid "" +#~ "Mandelbrot set: Iterations of the recursive function.\n" +#~ "Controls scale of finest detail." +#~ msgstr "" +#~ "Mandelbrot verzameling: Aantal iteraties van de recursieve functie.\n" +#~ "Bepaalt de schaal van de kleinste details." + +#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +#~ msgstr "Mandelbrot verzameling: (X,Y,Z) schaal, in nodes (bij benadering)." + +#~ msgid "" +#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +#~ msgstr "" +#~ "Mandelbrot verzameling: (X,Y,Z) afstanden vanaf wereld-centrum.\n" +#~ " Bereik is ongeveer -2 tot 2. Vermenigvuldig met m_scale voor de afstand " +#~ "in nodes." + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Toets voor het vergroten van de zichtafstand. Dit verandert de minimale " +#~ "zichtafstand.\n" +#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Toets voor het verkleinen van de zichtafstand. Dit verandert de minimale " +#~ "zichtafstand.\n" +#~ "Zie http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Julia set: W value determining the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Juliaverzameling: W-waarde van de 4D vorm.\n" +#~ "Bereik is ongeveer -2 tot 2." + +#~ msgid "" +#~ "Julia set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +#~ msgstr "" +#~ "Juliaverzameling: (X,Y,X) afstanden van wereld-centrum.\n" +#~ "Bereik is ongeveer -2 tot 2. Vermenigvuldig met j_scale voor de afstand " +#~ "in nodes." + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "Laat geselecteerde nodes oplichten (schakelt selectie-randen uit)." + +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Maak de wateroppervlakte iets lager, zodat het niet de hele node vult.\n" +#~ "Dit is niet echt geoptimaliseerd, en vloeiende belichting van de\n" +#~ "wateroppervlakte werkt niet als dit is aangeschakeld." + +#~ msgid "Item textures..." +#~ msgstr "Voorwerp-texturen..." diff --git a/po/pl/minetest.po b/po/pl/minetest.po index ef967dfe..275c99d0 100644 --- a/po/pl/minetest.po +++ b/po/pl/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-31 17:19+0000\n" "Last-Translator: Amadeo \n" -"Language-Team: Polish " -"\n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +62,8 @@ msgstr "Serwer wspiera wersje protokołu od $1 do $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." -msgstr "Spróbuj włączyć ponownie publiczną listę serwerów i sprawdź połączenie." +msgstr "" +"Spróbuj włączyć ponownie publiczną listę serwerów i sprawdź połączenie." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." @@ -73,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Wspieramy protokół w wersji od $1 do $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Anuluj" @@ -114,8 +116,8 @@ msgstr "Ukryj zawartość MP" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Zapisz" @@ -188,6 +190,7 @@ msgid "No of course not!" msgstr "Oczywiście, że nie!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Tak" @@ -207,6 +210,94 @@ msgstr "Accept" msgid "Rename Modpack:" msgstr "Zmień nazwe Paczki Modów:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" nie jest poprawną flagą." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Brak opisu ustawienia)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Przeglądaj" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Wyłączone" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Edytuj" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Włączone" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "Składnia to 3 liczby oddzielone przecinkami i w nawiasach." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Składnia: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Gry" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mody" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Wprowadź listę flag oddzielonych przecinkami." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Wprowadź poprawną liczbę całkowitą." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Wprowadź poprawną liczbę." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Możliwe wartości: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Przywróć domyślne" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Wybierz ścieżkę" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Pokaż nazwy ustawień" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Wartość musi być większa od $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Wartość musi być mniejsza od $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -300,10 +391,6 @@ msgstr "Zainstalowane Mody:" msgid "Mod information:" msgstr "Informacje o modzie:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mody" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Brak informacji o modzie" @@ -417,92 +504,163 @@ msgid "Start Game" msgstr "Rozpocznij grę/Połącz" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" nie jest poprawną flagą." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Brak opisu ustawienia)" +#, fuzzy +msgid "3D Clouds" +msgstr "Chmury 3D" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Przeglądaj" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Ustawienia" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Pojedynczy gracz" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Filtrowanie dwuliniowe" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip-Mappowanie" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Zmień klawisze" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Wyłączone" +#, fuzzy +msgid "Connected Glass" +msgstr "Połącz" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Edytuj" +#, fuzzy +msgid "Enable Particles" +msgstr "Włącz wszystkie" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Włączone" +#, fuzzy +msgid "Fancy Leaves" +msgstr "Nieprzeźroczysta woda" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Składnia to 3 liczby oddzielone przecinkami i w nawiasach." - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Składnia: , , (, , ), , " -", " - -#: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Gry" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Wprowadź listę flag oddzielonych przecinkami." +#, fuzzy +msgid "Mipmap" +msgstr "Mip-Mappowanie" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Wprowadź poprawną liczbę całkowitą." +msgid "Mipmap + Aniso. Filter" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Wprowadź poprawną liczbę." +#, fuzzy +msgid "No Filter" +msgstr "Filtrowanie anizotropowe" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Możliwe wartości: " +#, fuzzy +msgid "No Mipmap" +msgstr "Mip-Mappowanie" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Przywróć domyślne" +msgid "No!!!" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Wybierz ścieżkę" +#, fuzzy +msgid "Node Highlighting" +msgstr "Płynne oświetlenie" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Brak" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Opaque Leaves" +msgstr "Nieprzeźroczysta woda" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "Nieprzeźroczysta woda" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Ustawienia" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Pokaż nazwy ustawień" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shadery" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Wartość musi być większa od $1." +#, fuzzy +msgid "Simple Leaves" +msgstr "Nieprzeźroczysta woda" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Wartość musi być mniejsza od $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Płynne oświetlenie" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Filtrowanie trójliniowe" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Ozdobne drzewa" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Ozdobne drzewa" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Ozdobne drzewa" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -528,10 +686,6 @@ msgstr "Pojedynczy gracz" msgid "No information available" msgstr "Brak informacjii" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Brak" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Wybierz paczkę tekstur:" @@ -556,10 +710,6 @@ msgstr "Initializownie nod" msgid "Initializing nodes..." msgstr "Initializowanie nod..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Tekstury przedmiotów..." - #: src/client.cpp msgid "Loading textures..." msgstr "Ładowanie tekstur..." @@ -1156,6 +1306,15 @@ msgstr "X Button 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1178,7 +1337,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1234,6 +1394,10 @@ msgstr "" msgid "Advanced" msgstr "Zaawansowane" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1242,6 +1406,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1258,6 +1426,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1271,6 +1443,10 @@ msgstr "" msgid "Backward key" msgstr "Tył" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1294,11 +1470,6 @@ msgstr "" msgid "Build inside player" msgstr "Gra wieloosobowa" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "Mip-Mappowanie" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1311,6 +1482,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1321,6 +1504,29 @@ msgstr "Zmień klawisze" msgid "Chat toggle key" msgstr "Zmień klawisze" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1379,6 +1585,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1439,10 +1651,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1532,6 +1764,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1554,6 +1794,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1586,12 +1833,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Włącz MP" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1605,10 +1849,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1639,6 +1879,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1651,6 +1895,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Włącz obrażenia" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1738,6 +1987,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1848,6 +2105,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1855,10 +2116,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1869,6 +2131,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mody" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1881,6 +2148,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1894,7 +2165,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1919,6 +2190,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2012,6 +2287,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2031,47 +2310,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2086,7 +2354,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2100,7 +2368,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2297,6 +2565,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2400,36 +2676,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2470,6 +2736,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Generator mapy" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2492,6 +2763,59 @@ msgstr "Generator mapy" msgid "Mapgen flags" msgstr "Generator mapy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Generator mapy" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Generator mapy" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Generator mapy" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Generator mapy" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Generator mapy" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2511,24 +2835,13 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Generator mapy" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal iterations" +msgstr "Generator mapy" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -2547,25 +2860,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Generator mapy" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Generator mapy" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Generator mapy" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2714,6 +3026,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2742,14 +3066,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2842,6 +3158,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2858,13 +3178,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2942,10 +3255,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2966,6 +3275,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3006,10 +3319,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3074,19 +3383,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Ładowanie..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3110,6 +3406,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3140,6 +3440,22 @@ msgstr "Prawy Menu" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3266,10 +3582,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shadery" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3295,6 +3607,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3351,16 +3667,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Paczki tekstur" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3432,6 +3767,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mappowanie" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3503,17 +3843,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3522,6 +3878,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3531,11 +3893,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3543,13 +3901,22 @@ msgstr "" msgid "Volume" msgstr "Głośność" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Tekstury przedmiotów..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3658,6 +4025,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3668,6 +4039,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3682,66 +4061,91 @@ msgid "cURL timeout" msgstr "Limit czasu cURL" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Nieprzeźroczysta woda" - -#~ msgid "Opaque Water" -#~ msgstr "Nieprzeźroczysta woda" +#~ msgid "If disabled " +#~ msgstr "Wyłącz wszystkie" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Pojedynczy gracz" +#~ msgid "If enabled, " +#~ msgstr "włączone" + +#~ msgid "Game Name" +#~ msgstr "Nazwa Gry" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się" + +#~ msgid "GAMES" +#~ msgstr "GRY" + +#~ msgid "Mods:" +#~ msgstr "Mody:" + +#~ msgid "new game" +#~ msgstr "nowa gra" + +#~ msgid "EDIT GAME" +#~ msgstr "EDYTUJ GRĘ" + +#~ msgid "Remove selected mod" +#~ msgstr "Usuń zaznaczony mod" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<--Dodaj mod" + +#~ msgid "CLIENT" +#~ msgstr "KLIENT" + +#~ msgid "Favorites:" +#~ msgstr "Ulubione:" + +#~ msgid "START SERVER" +#~ msgstr "URUCHOM SERWER" + +#~ msgid "Name" +#~ msgstr "Nazwa" + +#~ msgid "Password" +#~ msgstr "Hasło" + +#~ msgid "SETTINGS" +#~ msgstr "USTAWIENIA" + +#~ msgid "Preload item visuals" +#~ msgstr "Ładuj obrazy przedmiotów" + +#~ msgid "Finite Liquid" +#~ msgstr "Realistyczne ciecze" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "TRYB JEDNOOSOBOWY" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACZKI TEKSTUR" + +#~ msgid "MODS" +#~ msgstr "MODY" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ściągnij" +#~ msgid "Add mod:" +#~ msgstr "<<--Dodaj mod" -#~ msgid "Left click: Move all items, Right click: Move single item" +#, fuzzy +#~ msgid "Local install" +#~ msgstr "Instaluj" + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " #~ msgstr "" -#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: " -#~ "przenieś pojedynczy przedmiot" +#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n" +#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację. " -#~ msgid "is required by:" -#~ msgstr "wymagane przez:" - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguracja zapisana. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny. " - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki" - -#~ msgid "Show Public" -#~ msgstr "Pokaż publiczne" - -#~ msgid "Show Favorites" -#~ msgstr "Pokaż ulubione" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny." - -#~ msgid "Create world" -#~ msgstr "Stwórz świat" - -#~ msgid "Address required." -#~ msgstr "Wymagany adres." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Nie można skasować świata: nic nie zaznaczono" - -#~ msgid "Files to be deleted" -#~ msgstr "Pliki do skasowania" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Nie udało się skasować wszystkich plików świata" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n" +#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację. " #~ msgid "" #~ "Default Controls:\n" @@ -3768,89 +4172,57 @@ msgstr "Limit czasu cURL" #~ "- ESC: to menu\n" #~ "- T: czat\n" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ msgid "Failed to delete all world files" +#~ msgstr "Nie udało się skasować wszystkich plików świata" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry" + +#~ msgid "Files to be deleted" +#~ msgstr "Pliki do skasowania" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Nie można skasować świata: nic nie zaznaczono" + +#~ msgid "Address required." +#~ msgstr "Wymagany adres." + +#~ msgid "Create world" +#~ msgstr "Stwórz świat" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny." + +#~ msgid "Show Favorites" +#~ msgstr "Pokaż ulubione" + +#~ msgid "Show Public" +#~ msgstr "Pokaż publiczne" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny. " + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguracja zapisana. " + +#~ msgid "is required by:" +#~ msgstr "wymagane przez:" + +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n" -#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację. " - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n" -#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację. " +#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: " +#~ "przenieś pojedynczy przedmiot" #, fuzzy -#~ msgid "Local install" -#~ msgstr "Instaluj" +#~ msgid "Downloading" +#~ msgstr "Ściągnij" #, fuzzy -#~ msgid "Add mod:" -#~ msgstr "<<--Dodaj mod" - -#~ msgid "MODS" -#~ msgstr "MODY" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACZKI TEKSTUR" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "TRYB JEDNOOSOBOWY" - -#~ msgid "Finite Liquid" -#~ msgstr "Realistyczne ciecze" - -#~ msgid "Preload item visuals" -#~ msgstr "Ładuj obrazy przedmiotów" - -#~ msgid "SETTINGS" -#~ msgstr "USTAWIENIA" - -#~ msgid "Password" -#~ msgstr "Hasło" - -#~ msgid "Name" -#~ msgstr "Nazwa" - -#~ msgid "START SERVER" -#~ msgstr "URUCHOM SERWER" - -#~ msgid "Favorites:" -#~ msgstr "Ulubione:" - -#~ msgid "CLIENT" -#~ msgstr "KLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<--Dodaj mod" - -#~ msgid "Remove selected mod" -#~ msgstr "Usuń zaznaczony mod" - -#~ msgid "EDIT GAME" -#~ msgstr "EDYTUJ GRĘ" - -#~ msgid "new game" -#~ msgstr "nowa gra" - -#~ msgid "Mods:" -#~ msgstr "Mody:" - -#~ msgid "GAMES" -#~ msgstr "GRY" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się" - -#~ msgid "Game Name" -#~ msgstr "Nazwa Gry" - -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "włączone" - -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Wyłącz wszystkie" +#~ msgid "Preload inventory textures" +#~ msgstr "Ładowanie..." diff --git a/po/pt/minetest.po b/po/pt/minetest.po index 646821ae..3341618d 100644 --- a/po/pt/minetest.po +++ b/po/pt/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-14 18:20+0000\n" "Last-Translator: Ian giestas pauli \n" -"Language-Team: Portuguese " -"\n" +"Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,8 +73,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Cancelar" @@ -115,8 +116,8 @@ msgstr "" msgid "Mod:" msgstr "Extra:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Guardar" @@ -189,6 +190,7 @@ msgid "No of course not!" msgstr "Não, é claro que não!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Sim" @@ -208,6 +210,95 @@ msgstr "Aceitar" msgid "Rename Modpack:" msgstr "Renomear Pacote de Extras:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Disabled" +msgstr "Desativar Tudo" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Enabled" +msgstr "ativo" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Jogos" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Extras" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Select path" +msgstr "Seleccionar" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua #, fuzzy msgid "" @@ -304,10 +395,6 @@ msgstr "Extras Instalados:" msgid "Mod information:" msgstr "Sem informação" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Extras" - #: builtin/mainmenu/tab_mods.lua #, fuzzy msgid "No mod description available" @@ -428,94 +515,164 @@ msgid "Start Game" msgstr "Jogar" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +#, fuzzy +msgid "3D Clouds" +msgstr "Nuvens 3D" + +#: builtin/mainmenu/tab_settings.lua +msgid "4x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "8x" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Definições" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Um Jogador" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Filtro Bi-Linear" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip-Mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Mudar teclas" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "Desativar Tudo" +msgid "Connected Glass" +msgstr "Ligar" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +#, fuzzy +msgid "Enable Particles" +msgstr "Ativar Tudo" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Fancy Leaves" +msgstr "Água Opaca" + +#: builtin/mainmenu/tab_settings.lua +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "ativo" +msgid "Mipmap" +msgstr "Mip-Mapping" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Jogos" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Select path" -msgstr "Seleccionar" +msgid "No Filter" +msgstr "Filtro Anisotrópico" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "No Mipmap" +msgstr "Mip-Mapping" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Node Highlighting" +msgstr "Iluminação Suave" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Opaque Leaves" +msgstr "Água Opaca" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "Água Opaca" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Definições" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Sombras" + #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#, fuzzy +msgid "Simple Leaves" +msgstr "Água Opaca" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Smooth Lighting" +msgstr "Iluminação Suave" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." +msgid "Touchthreshold (px)" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Filtro Tri-Linear" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Árvores Melhoradas" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Árvores Melhoradas" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Árvores Melhoradas" + #: builtin/mainmenu/tab_simple_main.lua #, fuzzy msgid "Config mods" @@ -543,10 +700,6 @@ msgstr "Um Jogador" msgid "No information available" msgstr "Sem informação" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selecione um pacote de texturas:" @@ -573,10 +726,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "Texturas dos items..." - #: src/client.cpp #, fuzzy msgid "Loading textures..." @@ -1166,6 +1315,15 @@ msgstr "Botão X 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1189,7 +1347,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1245,6 +1404,10 @@ msgstr "" msgid "Advanced" msgstr "Avançado" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1253,6 +1416,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1269,6 +1436,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1282,6 +1453,10 @@ msgstr "" msgid "Backward key" msgstr "Recuar" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1305,11 +1480,6 @@ msgstr "" msgid "Build inside player" msgstr "Vários jogadores" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "Mip-Mapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1322,6 +1492,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1332,6 +1514,29 @@ msgstr "Mudar teclas" msgid "Chat toggle key" msgstr "Mudar teclas" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1390,6 +1595,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1450,10 +1661,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1543,6 +1774,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1565,6 +1804,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1597,12 +1843,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Ativar Tudo" #: src/settings_translation_file.cpp #, fuzzy @@ -1617,10 +1860,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1651,6 +1890,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1663,6 +1906,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Ativar Dano" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1750,6 +1998,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1860,6 +2116,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1867,10 +2127,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1881,6 +2142,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Extras" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1893,6 +2159,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1906,7 +2176,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1931,6 +2201,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2024,6 +2298,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2043,47 +2321,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2098,7 +2365,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2112,7 +2379,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2309,6 +2576,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2412,36 +2687,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2482,6 +2747,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Geração de Mapa" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2504,6 +2774,59 @@ msgstr "Geração de Mapa" msgid "Mapgen flags" msgstr "Geração de Mapa" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Geração de Mapa" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Geração de Mapa" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Geração de Mapa" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Geração de Mapa" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Geração de Mapa" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2523,24 +2846,13 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Geração de Mapa" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal iterations" +msgstr "Geração de Mapa" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -2559,25 +2871,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Geração de Mapa" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Geração de Mapa" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Geração de Mapa" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2726,6 +3037,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2754,14 +3077,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2854,6 +3169,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2870,13 +3189,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2954,10 +3266,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2978,6 +3286,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3018,10 +3330,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3086,19 +3394,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "A carregar..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3122,6 +3417,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3152,6 +3451,22 @@ msgstr "Menu Direito" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3278,10 +3593,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Sombras" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3307,6 +3618,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3363,16 +3678,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Pacotes de Texturas" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3444,6 +3778,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3515,17 +3854,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3534,6 +3889,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3543,11 +3904,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3555,13 +3912,22 @@ msgstr "" msgid "Volume" msgstr "Volume do som" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Texturas dos items..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3670,6 +4036,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3680,6 +4050,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3693,64 +4071,93 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Água Opaca" - -#~ msgid "Opaque Water" -#~ msgstr "Água Opaca" +#~ msgid "If disabled " +#~ msgstr "Desativar Tudo" #, fuzzy -#~ msgid "Reset singleplayer world" +#~ msgid "If enabled, " +#~ msgstr "ativo" + +#~ msgid "Game Name" +#~ msgstr "Nome do Jogo" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "" +#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo " +#~ "\"$2\"" + +#~ msgid "GAMES" +#~ msgstr "JOGOS" + +#~ msgid "Mods:" +#~ msgstr "Extras:" + +#~ msgid "new game" +#~ msgstr "novo jogo" + +#~ msgid "EDIT GAME" +#~ msgstr "EDITAR JOGO" + +#~ msgid "Remove selected mod" +#~ msgstr "Remover extra selecionado" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adicionar extra" + +#~ msgid "CLIENT" +#~ msgstr "CLIENTE" + +#~ msgid "Favorites:" +#~ msgstr "Favoritos:" + +#~ msgid "START SERVER" +#~ msgstr "INICIAR SERVIDOR" + +#~ msgid "Name" +#~ msgstr "Nome" + +#~ msgid "Password" +#~ msgstr "Senha" + +#~ msgid "SETTINGS" +#~ msgstr "DEFINIÇÕES" + +#~ msgid "Preload item visuals" +#~ msgstr "Pré-carregamento dos itens" + +#~ msgid "Finite Liquid" +#~ msgstr "Líquido Finito" + +#~ msgid "SINGLE PLAYER" #~ msgstr "Um Jogador" +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACOTES DE TEXTURAS" + +#~ msgid "MODS" +#~ msgstr "EXTRAS" + #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Descarregar" +#~ msgid "Add mod:" +#~ msgstr "<<-- Adicionar extra" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Botão esq: Mover todos os itens Botão dir: Mover um item" +#, fuzzy +#~ msgid "Local install" +#~ msgstr "Instalar" -#~ msgid "is required by:" -#~ msgstr "é necessário pelo:" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods ainda não estão configurados.\n" +#~ "Eles vão ser ativados por predefinição quando guardar a configuração. " -#~ msgid "Configuration saved. " -#~ msgstr "Configuração gravada. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Atenção: Configuração não compatível. " - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos" - -#~ msgid "Show Public" -#~ msgstr "Mostrar Públicos" - -#~ msgid "Show Favorites" -#~ msgstr "Mostrar Favoritos" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Deixe endereço em branco para iniciar servidor local." - -#~ msgid "Create world" -#~ msgstr "Criar mundo" - -#~ msgid "Address required." -#~ msgstr "Endereço necessário." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado" - -#~ msgid "Files to be deleted" -#~ msgstr "Ficheiros para eliminar" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Não foi possível configurar mundo: Nada seleccionado" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods configurados estão em falta.\n" +#~ "As suas definições vão ser removidas quando gravar a configuração. " #~ msgid "" #~ "Default Controls:\n" @@ -3777,91 +4184,55 @@ msgstr "" #~ "- ESC: Este menu\n" #~ "- T: Chat\n" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods configurados estão em falta.\n" -#~ "As suas definições vão ser removidas quando gravar a configuração. " +#~ msgid "Failed to delete all world files" +#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods ainda não estão configurados.\n" -#~ "Eles vão ser ativados por predefinição quando guardar a configuração. " +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Não foi possível configurar mundo: Nada seleccionado" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos" + +#~ msgid "Files to be deleted" +#~ msgstr "Ficheiros para eliminar" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado" + +#~ msgid "Address required." +#~ msgstr "Endereço necessário." + +#~ msgid "Create world" +#~ msgstr "Criar mundo" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Deixe endereço em branco para iniciar servidor local." + +#~ msgid "Show Favorites" +#~ msgstr "Mostrar Favoritos" + +#~ msgid "Show Public" +#~ msgstr "Mostrar Públicos" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Atenção: Configuração não compatível. " + +#~ msgid "Configuration saved. " +#~ msgstr "Configuração gravada. " + +#~ msgid "is required by:" +#~ msgstr "é necessário pelo:" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Botão esq: Mover todos os itens Botão dir: Mover um item" #, fuzzy -#~ msgid "Local install" -#~ msgstr "Instalar" +#~ msgid "Downloading" +#~ msgstr "Descarregar" #, fuzzy -#~ msgid "Add mod:" -#~ msgstr "<<-- Adicionar extra" - -#~ msgid "MODS" -#~ msgstr "EXTRAS" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACOTES DE TEXTURAS" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "Um Jogador" - -#~ msgid "Finite Liquid" -#~ msgstr "Líquido Finito" - -#~ msgid "Preload item visuals" -#~ msgstr "Pré-carregamento dos itens" - -#~ msgid "SETTINGS" -#~ msgstr "DEFINIÇÕES" - -#~ msgid "Password" -#~ msgstr "Senha" - -#~ msgid "Name" -#~ msgstr "Nome" - -#~ msgid "START SERVER" -#~ msgstr "INICIAR SERVIDOR" - -#~ msgid "Favorites:" -#~ msgstr "Favoritos:" - -#~ msgid "CLIENT" -#~ msgstr "CLIENTE" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adicionar extra" - -#~ msgid "Remove selected mod" -#~ msgstr "Remover extra selecionado" - -#~ msgid "EDIT GAME" -#~ msgstr "EDITAR JOGO" - -#~ msgid "new game" -#~ msgstr "novo jogo" - -#~ msgid "Mods:" -#~ msgstr "Extras:" - -#~ msgid "GAMES" -#~ msgstr "JOGOS" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "" -#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo " -#~ "\"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Nome do Jogo" - -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "ativo" - -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Desativar Tudo" +#~ msgid "Preload inventory textures" +#~ msgstr "A carregar..." diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index a673c993..79878355 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-02-03 20:31+0000\n" "Last-Translator: Bruno Borges \n" -"Language-Team: Portuguese (Brazil) " -"\n" +"Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nós suportamos entre as versões $1 e $2 do protocolo." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Cancelar" @@ -116,8 +117,8 @@ msgstr "Ocultar conteúdo PMs" msgid "Mod:" msgstr "Mod:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Salvar" @@ -192,6 +193,7 @@ msgid "No of course not!" msgstr "Claro que não!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Sim" @@ -211,6 +213,95 @@ msgstr "Aceitar" msgid "Rename Modpack:" msgstr "Renomear pacote de módulos:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" não é uma flag válida." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Descrição de configuração não fornecida)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Navegar" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Desabilitado" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Editar" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Habilitado" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "O formato é de 3 números separados por vírgulas dentro de colchetes." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Formato: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Jogos" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Módulos" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" +"Opcionalmente essas lacunas podem ser colocados com a vírgula na frente." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Por favor, digite uma lista de flags separadas por vírgulas." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Por favor insira um inteiro válido." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Por favor, insira um número válido." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Os possíveis valores são: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Restaurar para o padrão" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Selecionar diretório" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Mostrar nomes técnicos" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "O valor deve ser maior que $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "O valor deve ser menor que $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -307,10 +398,6 @@ msgstr "Módulos instalados:" msgid "Mod information:" msgstr "Informação do módulo:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Módulos" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Nenhuma descrição disponível do módulo" @@ -423,93 +510,163 @@ msgid "Start Game" msgstr "Iniciar o jogo" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" não é uma flag válida." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Descrição de configuração não fornecida)" +#, fuzzy +msgid "3D Clouds" +msgstr "Nuvens 3D" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Navegar" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Configurações" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Um jogador" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Filtragem bi-linear" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bump mapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Mudar teclas" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Desabilitado" +#, fuzzy +msgid "Connected Glass" +msgstr "Vidro conectado" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Editar" +#, fuzzy +msgid "Enable Particles" +msgstr "Habilitar todos" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Habilitado" +#, fuzzy +msgid "Fancy Leaves" +msgstr "Água opaca" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "O formato é de 3 números separados por vírgulas dentro de colchetes." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Gerar normalmaps" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " +#, fuzzy +msgid "Mipmap" +msgstr "Mipmapping" + +#: builtin/mainmenu/tab_settings.lua +msgid "Mipmap + Aniso. Filter" msgstr "" -"Formato: , , (, , ), , " -", " #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Jogos" +#, fuzzy +msgid "No Filter" +msgstr "Filtragem anisotrópica" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +#, fuzzy +msgid "No Mipmap" +msgstr "Mipmapping" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" msgstr "" -"Opcionalmente essas lacunas podem ser colocados com a vírgula na frente." #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Por favor, digite uma lista de flags separadas por vírgulas." +#, fuzzy +msgid "Node Highlighting" +msgstr "Iluminação suave" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Nenhum" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Por favor insira um inteiro válido." +#, fuzzy +msgid "Opaque Leaves" +msgstr "Água opaca" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Por favor, insira um número válido." +msgid "Opaque Water" +msgstr "Água opaca" -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Os possíveis valores são: " - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Restaurar para o padrão" - -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Selecionar diretório" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Configurações" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Mostrar nomes técnicos" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Sombreadores" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "O valor deve ser maior que $1." +#, fuzzy +msgid "Simple Leaves" +msgstr "Água opaca" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "O valor deve ser menor que $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Iluminação suave" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Para habilitar os sombreadores é necessário usar o driver OpenGL." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Filtragem tri-linear" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Balanço das árvores" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Balanço das árvores" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Balanço das árvores" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -535,10 +692,6 @@ msgstr "Um jogador" msgid "No information available" msgstr "Nenhuma informação disponível" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Nenhum" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selecione o pacote de texturas:" @@ -563,10 +716,6 @@ msgstr "Inicializando nodes" msgid "Initializing nodes..." msgstr "Inicializando nodes..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Texturas dos itens..." - #: src/client.cpp msgid "Loading textures..." msgstr "Carregando texturas..." @@ -1165,6 +1314,15 @@ msgstr "Botão X 2" msgid "Zoom" msgstr "Zoom" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1182,6 +1340,7 @@ msgid "3D mode" msgstr "modo 3D" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1189,7 +1348,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "Suporte 3D.\n" "Modos atualmente suportados:\n" @@ -1266,6 +1426,10 @@ msgstr "" msgid "Advanced" msgstr "Avançado" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Sempre voar e correr" @@ -1274,6 +1438,10 @@ msgstr "Sempre voar e correr" msgid "Ambient occlusion gamma" msgstr "Gama de oclusão de ambiente" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Filtragem anisotrópica" @@ -1289,8 +1457,13 @@ msgid "" "minetest.net." msgstr "" "Anunciar a esta lista de servidores.\n" -"Se você quiser anunciar seu endereço IPv6, use serverlist_url = " -"v6.servers.minetest.net." +"Se você quiser anunciar seu endereço IPv6, use serverlist_url = v6.servers." +"minetest.net." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "Julia definido: Valores aproximados (X, Y, Z) em nós." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1305,6 +1478,10 @@ msgstr "Informar lista de servidores automaticamente." msgid "Backward key" msgstr "Voltar" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Básico" @@ -1328,10 +1505,6 @@ msgstr "" msgid "Build inside player" msgstr "Construir com o jogador dentro do bloco" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Bump mapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Suavização da camera" @@ -1344,6 +1517,18 @@ msgstr "Suavização da câmera no modo cinematográfico" msgid "Camera update toggle key" msgstr "Tecla para alternar atualização da câmera" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Tecla de Chat" @@ -1352,6 +1537,29 @@ msgstr "Tecla de Chat" msgid "Chat toggle key" msgstr "Tecla comutadora de chat" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Tamanho do chunk" @@ -1409,6 +1617,12 @@ msgstr "" "inseguras mesmo quando o a opção de Mod Seguro está ativada (via " "request_insecure_environment())." +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Tecla de Comando" @@ -1468,10 +1682,30 @@ msgstr "" "Quando \"snowbiomes\" (bioma de neve) está habilitado 'mgv6_freq_desert' é " "ignorado." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Mensagem de travamento" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "Alpha do cursor" @@ -1566,6 +1800,14 @@ msgstr "Dicas de ferramenta mostrando atraso. indicado em milissegundos." msgid "Deprecated Lua API handling" msgstr "Tratamento da API Lua rejeitado" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1590,6 +1832,13 @@ msgstr "Dados detalhados do perfil do mod . Útil para desenvolvedores de mods." msgid "Detailed mod profiling" msgstr "Perfilamento detalhado do mod" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Habilitar Anti-Hack" @@ -1619,16 +1868,9 @@ msgid "Dump the mapgen debug infos." msgstr "Mostrar informações de depuração do Mapgen." #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" -"Habilita recurso permitindo que o nível da água seja um pouco menor, " -"portando não preenche todo o espaço disponível para bloco.\n" -"Note que isso não está bem otimizado e que suavização da iluminação na " -"superfície da água não funciona bem com esse recurso." +#, fuzzy +msgid "Enable VBO" +msgstr "Habilitar MP" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1642,12 +1884,6 @@ msgstr "Permitir que os jogadores possam sofrer dano e morrer." msgid "Enable random user input (only used for testing)." msgstr "Habilitar entrada de comandos aleatórios (apenas usado para testes)." -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" -"Habilitar destaque de bloco selecionado (desabilita o modo de destaque " -"selectionbox [Padrão])." - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1694,6 +1930,10 @@ msgstr "" "sistema.\n" "Ignorado se bind_address estiver definido." +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1710,6 +1950,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "Ativar armazenamento em cache de direção de face girada das malhas." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Habilitar minimapa." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Habilitar minimapa." @@ -1808,6 +2053,14 @@ msgstr "" "Arquivo na pasta client/serverlist/ que contém seus servidores favoritos, " "que são mostrados na aba Multiplayer." +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1890,8 +2143,8 @@ msgstr "" msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" -"De quão longe blocos são enviados aos clientes, indicado em mapas de blocos (" -"16 nós)." +"De quão longe blocos são enviados aos clientes, indicado em mapas de blocos " +"(16 nós)." #: src/settings_translation_file.cpp msgid "" @@ -1928,17 +2181,23 @@ msgstr "Filtro txr2img de escala da GUI" msgid "Gamma" msgstr "Gama" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Gerar normalmaps" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" "Atributos geração de mapa global.\n" "Flags que não estão especificadas na string de flags não são modificados a " @@ -1954,6 +2213,11 @@ msgstr "Gráficos" msgid "Gravity" msgstr "Gravidade" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Módulos" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "Tecla de comutação HUD" @@ -1973,6 +2237,11 @@ msgstr "" "- error: abortar no uso da chamada reprovada (sugerido para " "desenvolvedores de mods)." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Height component of the initial window size." +msgstr "Tamanho horizontal inicial da janela." + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "Altura em que as nuvens ficam aparecendo." @@ -1986,8 +2255,8 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "Pagina principal do servidor, a ser exibido na lista de servidores." #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." -msgstr "Tamanho horizontal inicial da janela." +msgid "How deep to make rivers" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2016,6 +2285,10 @@ msgstr "" "Quanto o servidor aguardará antes de descarregar mapblocks não utilizados. " "Um valor mais elevado é mais suave, mas vai usar mais memória RAM." +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "IPv6" @@ -2092,8 +2365,8 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" -"Se habilitado, você pode colocar os blocos na posição (pés + nível dos olhos)" -" onde você está.\n" +"Se habilitado, você pode colocar os blocos na posição (pés + nível dos " +"olhos) onde você está.\n" "Isto é útil quando se trabalha com nodeboxes em pequenas áreas." #: src/settings_translation_file.cpp @@ -2130,6 +2403,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "Intervalo de envio de hora do dia para os clientes." +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Inventário" @@ -2147,53 +2424,40 @@ msgid "Item entity TTL" msgstr "Entidade item TTL" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" -"Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n" -"Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos em " -"nós." - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." -msgstr "Julia definido: Valores aproximados (X, Y, Z) em nós." - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" "Julia Definido: iterações da função recursiva.\n" "Controles escala de pormenor." #: src/settings_translation_file.cpp msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2206,15 +2470,15 @@ msgid "Jumping speed" msgstr "Velocidade de Pulo" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tecla para diminuir o intervalo de visualização. Modifica o intervalo mínimo " -"de visualização.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Tecla para alternar o alcance de visão ilimitado.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2223,19 +2487,19 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para deixar cair o item atualmente selecionado.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tecla para aumentar o intervalo de visualização. Modifica o mínimo intervalo " -"de visualização.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Tecla para alternar o alcance de visão ilimitado.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2244,8 +2508,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para pular.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2254,8 +2518,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para mover-se rápido no modo rápido.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2264,8 +2528,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para mover o jogador para trás.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2274,8 +2538,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para mover o jogador para a frente.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2284,8 +2548,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para mover o jogador à esquerda.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2294,8 +2558,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para mover o jogador para a direita.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2304,8 +2568,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para abrir o console do bate-papo.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2314,8 +2578,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para abrir a janela de bate-papo para digitar comandos.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2324,8 +2588,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para abrir a janela de bate-papo.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2334,8 +2598,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para abrir o inventário.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2344,8 +2608,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para imprimir pilhas de depuração. Usado para o desenvolvimento.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2358,8 +2622,8 @@ msgstr "" "Tecla por esgueirar.\n" "Também usado para descer e descendente na água se aux1_descends está " "desativado.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2368,8 +2632,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para comutação entre câmera de primeira e terceira pessoa.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2378,8 +2642,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para tirar fotos da tela.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2388,8 +2652,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar modo cinematográfico.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2398,8 +2662,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Chave para ativar/desativar a exibição do minimapa.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2408,8 +2672,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar o modo rápido.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2418,8 +2682,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para alternar a voar.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2428,8 +2692,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para alternar modo noclip.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2439,8 +2703,8 @@ msgid "" msgstr "" "Tecla para ativar/desativar a atualização da câmera. Usado somente para " "desenvolvimento\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2449,8 +2713,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar a exibição de informações de depuração.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2459,8 +2723,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar a exibição do HUD.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2469,8 +2733,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar a exibição do bate-papo.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2479,8 +2743,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar a exibição da névoa.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2490,8 +2754,8 @@ msgid "" msgstr "" "Tecla para ativar/desativar a exibição do profiler. Usado para o " "desenvolvimento.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2500,8 +2764,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para alternar o alcance de visão ilimitado.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2511,6 +2775,14 @@ msgstr "Tecla usada para descer/esgueirar" msgid "Language" msgstr "Linguagem" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "Estilo de folhas" @@ -2635,40 +2907,42 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "Faz o DirectX trabalhar com LuaJIT. Desative se causa problemas." -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Diretório do mapa" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" +"Atributos geração de mapa global.\n" +"Flags que não estão especificadas na string de flags não são modificados a " +"partir do padrão.\n" +"Flags começando com \"não\" são usadas para desativá-los explicitamente.\n" +"Flags 'trees' e 'flat' só tem efeito em mgv6." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Atributos geração de mapa global.\n" +"Flags que não estão especificadas na string de flags não são modificados a " +"partir do padrão.\n" +"Flags começando com \"não\" são usadas para desativá-los explicitamente.\n" +"Flags 'trees' e 'flat' só tem efeito em mgv6." #: src/settings_translation_file.cpp msgid "" @@ -2705,6 +2979,11 @@ msgstr "Limite de mapblock" msgid "Mapblock unload timeout" msgstr "Timeout de descarregamento do mapblock" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Nome do mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2725,6 +3004,59 @@ msgstr "Debug do mapgen" msgid "Mapgen flags" msgstr "Flags de mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Flags de mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Flags de mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2744,24 +3076,13 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Mapgen" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal iterations" +msgstr "Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -2780,25 +3101,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Mapgen" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2943,6 +3263,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2971,14 +3303,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -3070,6 +3394,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -3086,13 +3414,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "Mipmapping" @@ -3169,10 +3490,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -3193,6 +3510,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3233,10 +3554,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3301,18 +3618,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "pré-carregando texturas de inventário" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3336,6 +3641,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3366,6 +3675,22 @@ msgstr "Menu dir." msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3485,10 +3810,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Sombreadores" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3514,6 +3835,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "Iluminação suave" @@ -3568,15 +3893,34 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "Pacotes de texturas" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3648,6 +3992,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mipmapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3716,17 +4065,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3735,6 +4100,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3744,11 +4115,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3756,13 +4123,22 @@ msgstr "" msgid "Volume" msgstr "Volume do som" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Texturas dos itens..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3870,6 +4246,11 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Width component of the initial window size." +msgstr "Tamanho horizontal inicial da janela." + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3880,6 +4261,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3893,67 +4282,89 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Água opaca" - -#~ msgid "Opaque Water" -#~ msgstr "Água opaca" +#~ msgid "If disabled " +#~ msgstr "Desabilitar PMs" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Um jogador" +#~ msgid "If enabled, " +#~ msgstr "habilitado" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Para habilitar os sombreadores é necessário usar o driver OpenGL." +#~ msgid "Game Name" +#~ msgstr "Nome do jogo" -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Baixar" +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\"" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item" +#~ msgid "GAMES" +#~ msgstr "JOGOS" -#~ msgid "is required by:" -#~ msgstr "é necessário para:" +#~ msgid "Mods:" +#~ msgstr "Módulos:" -#~ msgid "Configuration saved. " -#~ msgstr "A configuração foi salva. " +#~ msgid "new game" +#~ msgstr "novo jogo" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Atenção: A configuração não está consistente." +#~ msgid "EDIT GAME" +#~ msgstr "EDITAR JOGO" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos" +#~ msgid "Remove selected mod" +#~ msgstr "Remover o módulo selecionado" -#~ msgid "Show Public" -#~ msgstr "Exibir públicos" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adicionar módulo" -#~ msgid "Show Favorites" -#~ msgstr "Exibir favoritos" +#~ msgid "CLIENT" +#~ msgstr "CLIENTE" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Deixe o endereço em branco para iniciar um servidor local." +#~ msgid "Favorites:" +#~ msgstr "Favoritos:" -#~ msgid "Create world" -#~ msgstr "Criar o mundo" +#~ msgid "START SERVER" +#~ msgstr "SERVIDOR" -#~ msgid "Address required." -#~ msgstr "É necessário um endereço." +#~ msgid "Name" +#~ msgstr "Nome" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado" +#~ msgid "Password" +#~ msgstr "Senha" -#~ msgid "Files to be deleted" -#~ msgstr "Arquivos a serem excluídos" +#~ msgid "SETTINGS" +#~ msgstr "CONFIGURAÇÕES" -#~ msgid "Cannot create world: No games found" -#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo" +#~ msgid "Preload item visuals" +#~ msgstr "Precarga de elementos visuais" -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado" +#~ msgid "Finite Liquid" +#~ msgstr "Líquido finito" -#~ msgid "Failed to delete all world files" -#~ msgstr "Não foi possível excluir todos os arquivos do mundo" +#~ msgid "SINGLE PLAYER" +#~ msgstr "UM JOGADOR" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTURAS" + +#~ msgid "MODS" +#~ msgstr "MÓDULOS" + +#~ msgid "Add mod:" +#~ msgstr "Adicionar módulo:" + +#~ msgid "Local install" +#~ msgstr "Instalação local" + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods ainda não foram configurados.\n" +#~ "E eles serão ativados por padrão, quando você salvar a configuração." + +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods configurados não foram encontrados.\n" +#~ "Suas definições serão removidas quando você salvar a configuração." #~ msgid "" #~ "Default Controls:\n" @@ -3980,87 +4391,100 @@ msgstr "" #~ "- ESC: este menu\n" #~ "- T: bate-papo\n" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods configurados não foram encontrados.\n" -#~ "Suas definições serão removidas quando você salvar a configuração." +#~ msgid "Failed to delete all world files" +#~ msgstr "Não foi possível excluir todos os arquivos do mundo" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods ainda não foram configurados.\n" -#~ "E eles serão ativados por padrão, quando você salvar a configuração." +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado" -#~ msgid "Local install" -#~ msgstr "Instalação local" +#~ msgid "Cannot create world: No games found" +#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo" -#~ msgid "Add mod:" -#~ msgstr "Adicionar módulo:" +#~ msgid "Files to be deleted" +#~ msgstr "Arquivos a serem excluídos" -#~ msgid "MODS" -#~ msgstr "MÓDULOS" +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado" -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTURAS" +#~ msgid "Address required." +#~ msgstr "É necessário um endereço." -#~ msgid "SINGLE PLAYER" -#~ msgstr "UM JOGADOR" +#~ msgid "Create world" +#~ msgstr "Criar o mundo" -#~ msgid "Finite Liquid" -#~ msgstr "Líquido finito" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Deixe o endereço em branco para iniciar um servidor local." -#~ msgid "Preload item visuals" -#~ msgstr "Precarga de elementos visuais" +#~ msgid "Show Favorites" +#~ msgstr "Exibir favoritos" -#~ msgid "SETTINGS" -#~ msgstr "CONFIGURAÇÕES" +#~ msgid "Show Public" +#~ msgstr "Exibir públicos" -#~ msgid "Password" -#~ msgstr "Senha" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos" -#~ msgid "Name" -#~ msgstr "Nome" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Atenção: A configuração não está consistente." -#~ msgid "START SERVER" -#~ msgstr "SERVIDOR" +#~ msgid "Configuration saved. " +#~ msgstr "A configuração foi salva. " -#~ msgid "Favorites:" -#~ msgstr "Favoritos:" +#~ msgid "is required by:" +#~ msgstr "é necessário para:" -#~ msgid "CLIENT" -#~ msgstr "CLIENTE" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adicionar módulo" - -#~ msgid "Remove selected mod" -#~ msgstr "Remover o módulo selecionado" - -#~ msgid "EDIT GAME" -#~ msgstr "EDITAR JOGO" - -#~ msgid "new game" -#~ msgstr "novo jogo" - -#~ msgid "Mods:" -#~ msgstr "Módulos:" - -#~ msgid "GAMES" -#~ msgstr "JOGOS" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Nome do jogo" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item" #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "habilitado" +#~ msgid "Downloading" +#~ msgstr "Baixar" -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Desabilitar PMs" +#~ msgid "Preload inventory textures" +#~ msgstr "pré-carregando texturas de inventário" + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo " +#~ "intervalo de visualização.\n" +#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo " +#~ "mínimo de visualização.\n" +#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Julia set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +#~ msgstr "" +#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n" +#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos " +#~ "em nós." + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "" +#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque " +#~ "selectionbox [Padrão])." + +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, " +#~ "portando não preenche todo o espaço disponível para bloco.\n" +#~ "Note que isso não está bem otimizado e que suavização da iluminação na " +#~ "superfície da água não funciona bem com esse recurso." diff --git a/po/ro/minetest.po b/po/ro/minetest.po index 97b60a40..6fc32321 100644 --- a/po/ro/minetest.po +++ b/po/ro/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-10-27 16:46+0200\n" "Last-Translator: PilzAdam \n" "Language-Team: Romanian , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Jocuri" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Moduri" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Select path" +msgstr "Selectează" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua #, fuzzy msgid "" @@ -304,10 +395,6 @@ msgstr "Moduri Instalate:" msgid "Mod information:" msgstr "Informații mod:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Moduri" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Nici o descriere de mod disponibilă" @@ -426,93 +513,163 @@ msgid "Start Game" msgstr "Începe jocul" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" +#, fuzzy +msgid "3D Clouds" +msgstr "Nori 3D" + +#: builtin/mainmenu/tab_settings.lua +msgid "4x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" +msgid "8x" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Setări" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Are you sure to reset your singleplayer world?" +msgstr "Singleplayer" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Filtrare Biliniară" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip Mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Modifică tastele" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "Dezactivează MP" +msgid "Connected Glass" +msgstr "Conectează" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" +#, fuzzy +msgid "Enable Particles" +msgstr "Activează tot" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Fancy Leaves" +msgstr "Apă opacă" + +#: builtin/mainmenu/tab_settings.lua +msgid "Generate Normalmaps" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Enabled" -msgstr "activat" +msgid "Mipmap" +msgstr "Mip Mapping" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Jocuri" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Select path" -msgstr "Selectează" +msgid "No Filter" +msgstr "Filtru Anizotropic" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "No Mipmap" +msgstr "Mip Mapping" + +#: builtin/mainmenu/tab_settings.lua +msgid "No!!!" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Node Highlighting" +msgstr "Lumină mai bună" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Opaque Leaves" +msgstr "Apă opacă" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "Apă opacă" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Setări" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Umbră" + #: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" +#, fuzzy +msgid "Simple Leaves" +msgstr "Apă opacă" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Smooth Lighting" +msgstr "Lumină mai bună" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Pentru a permite shadere OpenGL trebuie să fie folosite." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "" +#, fuzzy +msgid "Trilinear Filter" +msgstr "Filtrare Triliniară" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Copaci fantezici" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Copaci fantezici" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Copaci fantezici" #: builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -541,10 +698,6 @@ msgstr "Singleplayer" msgid "No information available" msgstr "Nici o informație disponibilă" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Selectează pachetul de textură:" @@ -571,10 +724,6 @@ msgstr "" msgid "Initializing nodes..." msgstr "" -#: src/client.cpp -msgid "Item textures..." -msgstr "Texturi..." - #: src/client.cpp #, fuzzy msgid "Loading textures..." @@ -1164,6 +1313,15 @@ msgstr "X Butonul 2" msgid "Zoom" msgstr "Mărire" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1187,7 +1345,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1243,6 +1402,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1251,6 +1414,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1267,6 +1434,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1280,6 +1451,10 @@ msgstr "" msgid "Backward key" msgstr "Înapoi" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1302,11 +1477,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "Mip Mapping" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1319,6 +1489,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1329,6 +1511,29 @@ msgstr "Modifică tastele" msgid "Chat toggle key" msgstr "Modifică tastele" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1387,6 +1592,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1447,10 +1658,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1540,6 +1771,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1562,6 +1801,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1594,12 +1840,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Activează MP" #: src/settings_translation_file.cpp #, fuzzy @@ -1614,10 +1857,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1648,6 +1887,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1660,6 +1903,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Activează Daune" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1748,6 +1996,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1858,6 +2114,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "" @@ -1865,10 +2125,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1879,6 +2140,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Moduri" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1891,6 +2157,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1904,7 +2174,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1929,6 +2199,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2022,6 +2296,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2041,47 +2319,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2096,7 +2363,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2110,7 +2377,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2307,6 +2574,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2410,36 +2685,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2480,6 +2745,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2502,6 +2772,59 @@ msgstr "Mapgen" msgid "Mapgen flags" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2521,24 +2844,13 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Mapgen" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal iterations" +msgstr "Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -2557,25 +2869,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Mapgen" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2724,6 +3035,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2752,14 +3075,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2852,6 +3167,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2868,13 +3187,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2952,10 +3264,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2976,6 +3284,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3016,10 +3328,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "" @@ -3084,19 +3392,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Se încarcă..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3120,6 +3415,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3150,6 +3449,22 @@ msgstr "Meniu Drepata" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3276,10 +3591,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Umbră" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3305,6 +3616,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3361,16 +3676,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Pachete de tetură" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3442,6 +3776,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip Mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3513,17 +3852,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3532,6 +3887,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3541,11 +3902,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3553,13 +3910,22 @@ msgstr "" msgid "Volume" msgstr "Volum Sunet" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Texturi..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3668,6 +4034,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3678,6 +4048,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3691,94 +4069,84 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Apă opacă" - -#~ msgid "Opaque Water" -#~ msgstr "Apă opacă" - -#, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "Singleplayer" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Pentru a permite shadere OpenGL trebuie să fie folosite." - -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Descarcă" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "" -#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect" - -#~ msgid "Local install" -#~ msgstr "Instalare locală" - -#~ msgid "Add mod:" -#~ msgstr "Adăugaţi mod:" - -#~ msgid "MODS" -#~ msgstr "MODURI" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACHETE DE TEXTURĂ" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "SINGLE PLAYER" - -#~ msgid "Finite Liquid" -#~ msgstr "Lichid finit" - -#~ msgid "Preload item visuals" -#~ msgstr "Pre-încarcă imaginile obiectelor" - -#~ msgid "SETTINGS" -#~ msgstr "SETĂRI" - -#~ msgid "Password" -#~ msgstr "Parolă" - -#~ msgid "Name" -#~ msgstr "Nume" - -#~ msgid "START SERVER" -#~ msgstr "DESCHIDE SERVERUL" - -#~ msgid "Favorites:" -#~ msgstr "Preferate:" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adaugă modul" - -#~ msgid "Remove selected mod" -#~ msgstr "Șterge modul selectat" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFICĂ JOCUL" - -#~ msgid "new game" -#~ msgstr "joc nou" - -#~ msgid "Mods:" -#~ msgstr "Moduri:" - -#~ msgid "GAMES" -#~ msgstr "JOCURI" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Numele jocului" +#~ msgid "If disabled " +#~ msgstr "Dezactivează MP" #, fuzzy #~ msgid "If enabled, " #~ msgstr "activat" +#~ msgid "Game Name" +#~ msgstr "Numele jocului" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\"" + +#~ msgid "GAMES" +#~ msgstr "JOCURI" + +#~ msgid "Mods:" +#~ msgstr "Moduri:" + +#~ msgid "new game" +#~ msgstr "joc nou" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFICĂ JOCUL" + +#~ msgid "Remove selected mod" +#~ msgstr "Șterge modul selectat" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adaugă modul" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "Favorites:" +#~ msgstr "Preferate:" + +#~ msgid "START SERVER" +#~ msgstr "DESCHIDE SERVERUL" + +#~ msgid "Name" +#~ msgstr "Nume" + +#~ msgid "Password" +#~ msgstr "Parolă" + +#~ msgid "SETTINGS" +#~ msgstr "SETĂRI" + +#~ msgid "Preload item visuals" +#~ msgstr "Pre-încarcă imaginile obiectelor" + +#~ msgid "Finite Liquid" +#~ msgstr "Lichid finit" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "SINGLE PLAYER" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACHETE DE TEXTURĂ" + +#~ msgid "MODS" +#~ msgstr "MODURI" + +#~ msgid "Add mod:" +#~ msgstr "Adăugaţi mod:" + +#~ msgid "Local install" +#~ msgstr "Instalare locală" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "" +#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect" + #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Dezactivează MP" +#~ msgid "Downloading" +#~ msgstr "Descarcă" + +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "Se încarcă..." diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 260fb84a..f404b054 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -7,17 +7,17 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-02-21 12:34+0000\n" "Last-Translator: Dmitry Smirnov \n" -"Language-Team: Russian " -"\n" +"Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua @@ -74,8 +74,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Мы поддерживаем версии протоколов между $1 и $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Отменить" @@ -115,8 +116,8 @@ msgstr "Скрыть содержимое модпака" msgid "Mod:" msgstr "Мод:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Сохранить" @@ -189,6 +190,7 @@ msgid "No of course not!" msgstr "Никак нет!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Да" @@ -208,6 +210,94 @@ msgstr "Принять" msgid "Rename Modpack:" msgstr "Переименовать модпак:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(Отсутствует описание настройки)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Выбрать" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "Отключить" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Редактировать" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Включено" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "Формат -- это 3 числа в скобках, разделенные точками." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Формат: <Смещение>,<Масштаб>, (<По оси X>,<По оси Y>,<По оси Z>), <Зерно>, " +"<Октавы>,<Постоянство>" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Игры" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Моды" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "Опционально лакунарностью могут быть добавлены с ведущей запятой." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Пожалуйста, вводите запятые для разделения списка флагов." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Введите допустимое целое число." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Пожалуйста, введите корректное число." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Возможные значения: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Восстановить по-умолчанию" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Выбрать путь" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Отобразить технические названия" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Значение должно быть больше, чем $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Значение должно быть меньше, чем $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -301,10 +391,6 @@ msgstr "Установленные моды:" msgid "Mod information:" msgstr "Описание мода:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Моды" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Описание к моду отсутствует" @@ -417,92 +503,157 @@ msgid "Start Game" msgstr "Начать игру" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Отсутствует описание настройки)" +#, fuzzy +msgid "3D Clouds" +msgstr "3D облака" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Выбрать" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Настройки" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Уверены, что хотите сбросить мир одиночной игры?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Билинейная фильтрация" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Бампмаппинг" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Смена управления" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Отключить" +#, fuzzy +msgid "Connected Glass" +msgstr "Стёкла без швов" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Редактировать" +#, fuzzy +msgid "Enable Particles" +msgstr "Включить всё" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Включено" +msgid "Fancy Leaves" +msgstr "Красивая листва" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Формат -- это 3 числа в скобках, разделенные точками." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Генерировать карты нормалей" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Формат: <Смещение>,<Масштаб>, (<По оси X>,<По оси Y>,<По оси Z>), <Зерно>, " -"<Октавы>,<Постоянство>" +msgid "Mipmap" +msgstr "Мипмаппинг" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Игры" +msgid "Mipmap + Aniso. Filter" +msgstr "Мипмаппинг с анизотр. фильтром" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "Опционально лакунарностью могут быть добавлены с ведущей запятой." +#, fuzzy +msgid "No Filter" +msgstr "Фильтрация" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Пожалуйста, вводите запятые для разделения списка флагов." +msgid "No Mipmap" +msgstr "Без Мипмаппинга" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Введите допустимое целое число." +msgid "No!!!" +msgstr "Нет!" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Пожалуйста, введите корректное число." +#, fuzzy +msgid "Node Highlighting" +msgstr "Подсветка нод" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Ничего" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Возможные значения: " +msgid "Opaque Leaves" +msgstr "Непрозрачная листва" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Восстановить по-умолчанию" +msgid "Opaque Water" +msgstr "Непрозрачная вода" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Выбрать путь" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Parallax Occlusion" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Настройки" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Отобразить технические названия" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Шейдеры" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Значение должно быть больше, чем $1." +msgid "Simple Leaves" +msgstr "Упрощённая листва" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Значение должно быть меньше, чем $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Мягкое освещение" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Текстурирование:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "Для включения шейдеров необходим драйвер OpenGL." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "Чувствительность (пк)" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Трилинейная фильтрация" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Покачивание листвы" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Покачивание растений" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Волны на воде" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -528,10 +679,6 @@ msgstr "Одиночная игра" msgid "No information available" msgstr "Описание отсутствует" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Ничего" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Выберите пакет текстур:" @@ -556,10 +703,6 @@ msgstr "Инициирование нод" msgid "Initializing nodes..." msgstr "Инициирование нод..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Текстуры предметов..." - #: src/client.cpp msgid "Loading textures..." msgstr "Загрузка текстур..." @@ -1157,6 +1300,15 @@ msgstr "Доп. кнопка 2" msgid "Zoom" msgstr "Масштаб" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1174,6 +1326,7 @@ msgid "3D mode" msgstr "3D режим" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1181,7 +1334,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "Поддержка 3D.\n" "Сейчас поддерживаются:\n" @@ -1256,6 +1410,10 @@ msgstr "" msgid "Advanced" msgstr "Дополнительно" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "Всегда включен полёт и ускорение" @@ -1264,6 +1422,10 @@ msgstr "Всегда включен полёт и ускорение" msgid "Ambient occlusion gamma" msgstr "Гамма Ambient occlusion" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "Анизантропная фильтрация" @@ -1279,6 +1441,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "Запрос переподключения после дисконнекта" @@ -1292,6 +1458,11 @@ msgstr "Автоматически добавлять в список серве msgid "Backward key" msgstr "Назад" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Высота волн на воде" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "Базовый" @@ -1312,10 +1483,6 @@ msgstr "Биты на пиксель (глубина цвета) в полноэ msgid "Build inside player" msgstr "Разрешить ставить блоки на месте игрока" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Бампмаппинг" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Сглаживание камеры" @@ -1329,6 +1496,18 @@ msgstr "Сглаживание камеры в кинематографичес msgid "Camera update toggle key" msgstr "Клавиша переключения обновления камеры" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "Кнопка чата" @@ -1337,6 +1516,29 @@ msgstr "Кнопка чата" msgid "Chat toggle key" msgstr "Кнопка переключения чата" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "Размер чанка" @@ -1391,6 +1593,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "Команда" @@ -1449,10 +1657,30 @@ msgstr "" "Задает размеры пустыней и пляжей.\n" "Когда включены снежные биомы, 'mgv6_freq_desert' игнорируется." +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Сообщение при падении" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "Прозрачность перекрестия" @@ -1543,6 +1771,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "Устаревшее Lua API управление" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "Скорость снижения" @@ -1566,6 +1802,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "Отключить анти-чит" @@ -1595,15 +1838,9 @@ msgid "Dump the mapgen debug infos." msgstr "Дамп отладочной информации генератора мира." #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" -"Включите немного более низкую поверхность воды, чтобы она\n" -"не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n" -"и мягкое освещение на поверхности воды не работает с этим." +#, fuzzy +msgid "Enable VBO" +msgstr "Включить мультиплеер" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1617,10 +1854,6 @@ msgstr "Включает получение игроками урона и их msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1651,6 +1884,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1663,6 +1900,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Включить мини-карту." + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "Включить мини-карту." @@ -1755,6 +1997,14 @@ msgid "" msgstr "" "Файл, содержащий ваши любимые серверы, отображаемые на вкладке Multiplayer." +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1864,6 +2114,10 @@ msgstr "txr2img фильтр масштабирования интерфейса msgid "Gamma" msgstr "Гамма" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Генерировать карты нормалей" @@ -1871,10 +2125,11 @@ msgstr "Генерировать карты нормалей" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1885,6 +2140,11 @@ msgstr "Графика" msgid "Gravity" msgstr "Гравитация" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Моды" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "Клавиша переключения HUD" @@ -1897,6 +2157,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1910,7 +2174,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "Домашняя страница сервера, отображаемая в списке серверов." #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1935,6 +2199,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "IPv6" @@ -1991,7 +2259,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." -msgstr "Если включено, то новые игроки не смогут подключаться с пустым паролем." +msgstr "" +"Если включено, то новые игроки не смогут подключаться с пустым паролем." #: src/settings_translation_file.cpp msgid "" @@ -2031,6 +2300,10 @@ msgstr "Интервал сохранения важных изменений в msgid "Interval of sending time of day to clients." msgstr "Интервал отправки клиентам сведений о времени дня." +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "Кнопка открытия инвентаря" @@ -2049,47 +2322,36 @@ msgstr "Время жизни выброшенной вещи" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2102,15 +2364,15 @@ msgid "Jumping speed" msgstr "Скорость прыжков" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность " -"отображения.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Клавиша отключения ограничения зоны видимости.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2119,19 +2381,19 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша выкинуть выбранный предмет.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность " -"отображения.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Клавиша отключения ограничения зоны видимости.\n" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2140,8 +2402,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша прыжка.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp #, fuzzy @@ -2151,8 +2413,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша для быстрого перемещения.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2161,8 +2423,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша движения назад.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2171,8 +2433,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша движения вперед.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2181,8 +2443,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша движения влево.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2191,8 +2453,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша движения вправо.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2201,8 +2463,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша открытия чат-консоли.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2211,8 +2473,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша открытия окна чата для ввода комманды.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2221,8 +2483,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша открытия окна чата.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2231,8 +2493,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша открытия инвентаря.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2252,8 +2514,8 @@ msgstr "" "Клавиша красться.\n" "Также используется для спуска и погружения под воду, если aux1_descends " "отключена.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2262,8 +2524,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения вида от первого и от третьего лица.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2272,8 +2534,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша снятия скриншота.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2282,8 +2544,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения кинематографического режима.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2292,8 +2554,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения отображения миникарты.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2302,8 +2564,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения режима быстрого перемещения.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2312,8 +2574,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения режима полета.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2322,8 +2584,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения режима проверки столкновений.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2339,8 +2601,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения показа отладочной информации.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2349,8 +2611,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения отображения HUD.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2359,8 +2621,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения отображения чата.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2369,8 +2631,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша переключения отображения тумана.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2386,8 +2648,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Клавиша отключения ограничения зоны видимости.\n" -"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2397,6 +2659,14 @@ msgstr "" msgid "Language" msgstr "Язык" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "Стиль листвы" @@ -2503,36 +2773,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Каталог сохранения карт" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2573,6 +2833,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Название генератора карты" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2593,6 +2858,59 @@ msgstr "Дебаггинг генератора карты" msgid "Mapgen flags" msgstr "Флаги генератора карты" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Флаги генератора карты" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Флаги генератора карты" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Флаги генератора карты" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Повторение параллакса" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Флаги генератора карты" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2612,26 +2930,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Флаги генератора карты" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "Повторение параллакса" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2649,25 +2955,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Флаги генератора карты" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Флаги генератора карты" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Флаги генератора карты" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2812,6 +3117,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2840,14 +3157,6 @@ msgstr "Максимальный FPS" msgid "Maximum FPS when game is paused." msgstr "Максимальный FPS в режиме паузы." -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2941,6 +3250,10 @@ msgstr "Фраза дня" msgid "Message of the day displayed to players connecting." msgstr "Фраза дня отображаемая подключившимся игрокам." +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "Миникарта" @@ -2958,13 +3271,6 @@ msgstr "Высота сканирования миникарты" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "Mip-текстурирование (Мип-маппинг)" @@ -3050,11 +3356,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "New style water" -msgstr "Новый стиль воды" - #: src/settings_translation_file.cpp #, fuzzy msgid "New users need to input this password." @@ -3078,6 +3379,10 @@ msgstr "Подсветка нод" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3118,10 +3423,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Parallax Occlusion" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "Включить параллакс" @@ -3190,18 +3491,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "Предзагрузка текстур..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3225,6 +3514,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Random input" @@ -3256,6 +3549,22 @@ msgstr "Правая клавиша меню" msgid "Rightclick repetition interval" msgstr "Интервал повторного клика правой кнопкой." +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3390,10 +3699,6 @@ msgstr "" "Установка в true включает волны на воде.\n" "Это требует включение шейдеров." -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Шейдеры" - #: src/settings_translation_file.cpp #, fuzzy msgid "" @@ -3428,6 +3733,10 @@ msgstr "" "Размер чанка, генерируемого за один раз, установленный в мапблоках (16 " "кубиков)." +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3445,7 +3754,8 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "Плавное вращение камеры в кинематографическом режиме. 0 для отключения." +msgstr "" +"Плавное вращение камеры в кинематографическом режиме. 0 для отключения." #: src/settings_translation_file.cpp #, fuzzy @@ -3492,16 +3802,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Пакеты текстур" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3586,6 +3915,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Клавиша переключения режима камеры." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-текстурирование (Мип-маппинг)" + #: src/settings_translation_file.cpp #, fuzzy msgid "Tooltip delay" @@ -3673,7 +4007,27 @@ msgid "V-Sync" msgstr "V-Sync" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp @@ -3681,10 +4035,6 @@ msgstr "" msgid "Vertical screen synchronization." msgstr "Вертикальная синхронизация." -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Video driver" @@ -3694,6 +4044,12 @@ msgstr "Видео драйвер." msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "View range decrease key" @@ -3706,27 +4062,30 @@ msgstr "Клавиша увеличения видимого диапазона. #: src/settings_translation_file.cpp #, fuzzy -msgid "Viewing range maximum" +msgid "Viewing range" msgstr "Максимальная граница дальности отрисовки." -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Viewing range minimum" -msgstr "Минимальная граница дальности отрисовки." - #: src/settings_translation_file.cpp #, fuzzy msgid "Volume" msgstr "Громкость звука" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Скорость ходьбы" #: src/settings_translation_file.cpp #, fuzzy -msgid "Wanted FPS" -msgstr "Ожидаемый FPS" +msgid "Water Features" +msgstr "Текстуры предметов..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3843,6 +4202,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "Показывать данные отладки (аналогично нажатию F5)." +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Width of the selectionbox's lines around nodes." @@ -3854,6 +4217,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "cURL file download timeout" @@ -3867,99 +4238,98 @@ msgstr "" msgid "cURL timeout" msgstr "cURL тайм-аут" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Уверены, что хотите сбросить мир одиночной игры?" +#~ msgid "\"" +#~ msgstr "\"" -#~ msgid "Fancy Leaves" -#~ msgstr "Красивая листва" +#~ msgid "If disabled " +#~ msgstr "Если выключено " -#~ msgid "Mipmap" -#~ msgstr "Мипмаппинг" +#~ msgid "If enabled, " +#~ msgstr "Если включено " -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Мипмаппинг с анизотр. фильтром" +#~ msgid "Rendering:" +#~ msgstr "Рендеринг:" -#~ msgid "No Mipmap" -#~ msgstr "Без Мипмаппинга" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Перезапустите Minetest для принятия изменений" -#~ msgid "No!!!" -#~ msgstr "Нет!" +#~ msgid "Game Name" +#~ msgstr "Название" -#~ msgid "Opaque Leaves" -#~ msgstr "Непрозрачная листва" +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\"" -#~ msgid "Opaque Water" -#~ msgstr "Непрозрачная вода" +#~ msgid "GAMES" +#~ msgstr "ИГРЫ" -#~ msgid "Reset singleplayer world" -#~ msgstr "Сброс одиночной игры" +#~ msgid "Mods:" +#~ msgstr "Моды:" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Коэффициент масштаба интерфейса: " +#~ msgid "new game" +#~ msgstr "Создать игру" -#~ msgid "Simple Leaves" -#~ msgstr "Упрощённая листва" +#~ msgid "EDIT GAME" +#~ msgstr "РЕДАКТИРОВАНИЕ" -#~ msgid "Texturing:" -#~ msgstr "Текстурирование:" +#~ msgid "Remove selected mod" +#~ msgstr "Удалить мод" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "Для включения шейдеров необходим драйвер OpenGL." +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Добавить мод" -#~ msgid "Touch free target" -#~ msgstr "Свободный выбор цели" +#~ msgid "CLIENT" +#~ msgstr "КЛИЕНТ" -#~ msgid "Touchthreshold (px)" -#~ msgstr "Чувствительность (пк)" +#~ msgid "Favorites:" +#~ msgstr "Избранное:" -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Загрузить" +#~ msgid "START SERVER" +#~ msgstr "СЕРВЕР" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет" +#~ msgid "Name" +#~ msgstr "Имя" -#~ msgid "is required by:" -#~ msgstr "требуется для:" +#~ msgid "Password" +#~ msgstr "Пароль" -#~ msgid "Configuration saved. " -#~ msgstr "Настройки сохранены. " +#~ msgid "SETTINGS" +#~ msgstr "НАСТРОЙКИ" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Предупреждение: Неверная конфигурация. " +#~ msgid "Preload item visuals" +#~ msgstr "Предзагрузка изображений" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы" +#~ msgid "Finite Liquid" +#~ msgstr "Конечные жидкости" -#~ msgid "Show Public" -#~ msgstr "Публичные" +#~ msgid "SINGLE PLAYER" +#~ msgstr "ОДИНОЧНАЯ ИГРА" -#~ msgid "Show Favorites" -#~ msgstr "Избранные" +#~ msgid "TEXTURE PACKS" +#~ msgstr "ПАКЕТЫ ТЕКСТУР" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Оставьте адрес пустым для запуска локального сервера." +#~ msgid "MODS" +#~ msgstr "МОДЫ" -#~ msgid "Create world" -#~ msgstr "Создать мир" +#~ msgid "Add mod:" +#~ msgstr "Добавить мод:" -#~ msgid "Address required." -#~ msgstr "Нужно ввести адрес." +#~ msgid "Local install" +#~ msgstr "Локальная установка" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Невозможно удалить мир: Ничего не выбрано" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Предупреждение: Некоторые моды еще не настроены.\n" +#~ "Их стандартные настройки будут установлены, когда вы сохраните " +#~ "конфигурацию. " -#~ msgid "Files to be deleted" -#~ msgstr "Следующие файлы будут удалены" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Невозможно создать мир: Ни одной игры не найдено" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Невозможно настроить мир: ничего не выбрано" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Ошибка при удалении файлов мира" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Предупреждение: Некоторые моды не найдены.\n" +#~ "Их настройки будут удалены, когда вы сохраните конфигурацию. " #~ msgid "" #~ "Default Controls:\n" @@ -3986,95 +4356,107 @@ msgstr "cURL тайм-аут" #~ "- ESC: это меню\n" #~ "- T: чат\n" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Предупреждение: Некоторые моды не найдены.\n" -#~ "Их настройки будут удалены, когда вы сохраните конфигурацию. " +#~ msgid "Failed to delete all world files" +#~ msgstr "Ошибка при удалении файлов мира" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Невозможно настроить мир: ничего не выбрано" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Невозможно создать мир: Ни одной игры не найдено" + +#~ msgid "Files to be deleted" +#~ msgstr "Следующие файлы будут удалены" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Невозможно удалить мир: Ничего не выбрано" + +#~ msgid "Address required." +#~ msgstr "Нужно ввести адрес." + +#~ msgid "Create world" +#~ msgstr "Создать мир" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Оставьте адрес пустым для запуска локального сервера." + +#~ msgid "Show Favorites" +#~ msgstr "Избранные" + +#~ msgid "Show Public" +#~ msgstr "Публичные" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Предупреждение: Неверная конфигурация. " + +#~ msgid "Configuration saved. " +#~ msgstr "Настройки сохранены. " + +#~ msgid "is required by:" +#~ msgstr "требуется для:" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Загрузить" + +#~ msgid "Touch free target" +#~ msgstr "Свободный выбор цели" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Коэффициент масштаба интерфейса: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Сброс одиночной игры" + +#, fuzzy +#~ msgid "Wanted FPS" +#~ msgstr "Ожидаемый FPS" + +#, fuzzy +#~ msgid "Viewing range minimum" +#~ msgstr "Минимальная граница дальности отрисовки." + +#~ msgid "Preload inventory textures" +#~ msgstr "Предзагрузка текстур..." + +#, fuzzy +#~ msgid "New style water" +#~ msgstr "Новый стиль воды" #~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" #~ msgstr "" -#~ "Предупреждение: Некоторые моды еще не настроены.\n" -#~ "Их стандартные настройки будут установлены, когда вы сохраните " -#~ "конфигурацию. " +#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность " +#~ "отображения.\n" +#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgid "Local install" -#~ msgstr "Локальная установка" +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность " +#~ "отображения.\n" +#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgid "Add mod:" -#~ msgstr "Добавить мод:" - -#~ msgid "MODS" -#~ msgstr "МОДЫ" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "ПАКЕТЫ ТЕКСТУР" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "ОДИНОЧНАЯ ИГРА" - -#~ msgid "Finite Liquid" -#~ msgstr "Конечные жидкости" - -#~ msgid "Preload item visuals" -#~ msgstr "Предзагрузка изображений" - -#~ msgid "SETTINGS" -#~ msgstr "НАСТРОЙКИ" - -#~ msgid "Password" -#~ msgstr "Пароль" - -#~ msgid "Name" -#~ msgstr "Имя" - -#~ msgid "START SERVER" -#~ msgstr "СЕРВЕР" - -#~ msgid "Favorites:" -#~ msgstr "Избранное:" - -#~ msgid "CLIENT" -#~ msgstr "КЛИЕНТ" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Добавить мод" - -#~ msgid "Remove selected mod" -#~ msgstr "Удалить мод" - -#~ msgid "EDIT GAME" -#~ msgstr "РЕДАКТИРОВАНИЕ" - -#~ msgid "new game" -#~ msgstr "Создать игру" - -#~ msgid "Mods:" -#~ msgstr "Моды:" - -#~ msgid "GAMES" -#~ msgstr "ИГРЫ" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Название" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Перезапустите Minetest для принятия изменений" - -#~ msgid "Rendering:" -#~ msgstr "Рендеринг:" - -#~ msgid "If enabled, " -#~ msgstr "Если включено " - -#~ msgid "If disabled " -#~ msgstr "Если выключено " - -#~ msgid "\"" -#~ msgstr "\"" +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Включите немного более низкую поверхность воды, чтобы она\n" +#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n" +#~ "и мягкое освещение на поверхности воды не работает с этим." diff --git a/po/tr/minetest.po b/po/tr/minetest.po index 50289276..ff5557e6 100644 --- a/po/tr/minetest.po +++ b/po/tr/minetest.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-10-27 16:46+0200\n" "Last-Translator: PilzAdam \n" "Language-Team: Turkish , , (, , ), , " +", " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Oyun" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Eklentiler" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Select path" +msgstr "Seç" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -302,10 +391,6 @@ msgstr "Yüklenen eklentiler :" msgid "Mod information:" msgstr "Eklenti bilgileri:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Eklentiler" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Eklenti bilgisi yok" @@ -419,91 +504,159 @@ msgid "Start Game" msgstr "Oyunu Başlat" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." +msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(Açıklama bilgisi verilmedi)" +#, fuzzy +msgid "3D Clouds" +msgstr "3 boyutlu bulutlar" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Seç" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Ayarlar" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Tek kişilik dünyayı sıfırlamak istediğinizden emin misiniz ?" + +#: builtin/mainmenu/tab_settings.lua +msgid "Bilinear Filter" +msgstr "İki yönlü süzme" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Engebeler" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Tuşları değiştir" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "Paketi Kapat" +#, fuzzy +msgid "Connected Glass" +msgstr "İçiçe geçmiş cam" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Düzenle" +#, fuzzy +msgid "Enable Particles" +msgstr "Hepsini etkinleştir" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Etkinleştirildi" +#, fuzzy +msgid "Fancy Leaves" +msgstr "Şık ağaçlar" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Normal haritalar oluştur" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" +msgid "Mipmap" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Oyun" +#, fuzzy +msgid "Mipmap + Aniso. Filter" +msgstr "Mipmap Aniso. Süzgeci" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +#, fuzzy +msgid "No Filter" +msgstr "Süzme yok" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "" +msgid "No Mipmap" +msgstr "Mipmap kapalı" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "" +msgid "No!!!" +msgstr "Hayır!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "" +#, fuzzy +msgid "Node Highlighting" +msgstr "Nesne seçme göstergesi" -#: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "" - -#: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" msgstr "" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Select path" -msgstr "Seç" +msgid "Opaque Leaves" +msgstr "Şeffaf su" + +#: builtin/mainmenu/tab_settings.lua +msgid "Opaque Water" +msgstr "Şeffaf su" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "Parallax Occlusion" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Ayarlar" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Shaders" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "" +#, fuzzy +msgid "Simple Leaves" +msgstr "Dalgalanan Yapraklar" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "" +#, fuzzy +msgid "Smooth Lighting" +msgstr "Pürüzsüz ışıklandırma" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Doku:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "OpenGL sürücüleri seçilmeden Shader etkinleştirilemez." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "Touchthreshold (px)" + +#: builtin/mainmenu/tab_settings.lua +msgid "Trilinear Filter" +msgstr "Üç yönlü süzme" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Dalgalanan Yapraklar" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Dalgalanan Bitkiler" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Dalgalanan Su" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -529,10 +682,6 @@ msgstr "Tek Kişilik" msgid "No information available" msgstr "Bilgi yok" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Doku paketi seç :" @@ -559,10 +708,6 @@ msgstr "Nesneler yükleniyor..." msgid "Initializing nodes..." msgstr "Nesneler yükleniyor..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Nesne dokuları ..." - #: src/client.cpp msgid "Loading textures..." msgstr "Dokular yükleniyor..." @@ -1158,6 +1303,15 @@ msgstr "X Button 2" msgid "Zoom" msgstr "Yakınlaştır" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1182,7 +1336,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1238,6 +1393,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1246,6 +1405,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1262,6 +1425,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1275,6 +1442,11 @@ msgstr "" msgid "Backward key" msgstr "Geri" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "Dalgalanan Su" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1297,10 +1469,6 @@ msgstr "" msgid "Build inside player" msgstr "" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "Engebeler" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1313,6 +1481,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1323,6 +1503,29 @@ msgstr "Tuşları değiştir" msgid "Chat toggle key" msgstr "Tuşları değiştir" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1381,6 +1584,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1441,10 +1650,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1533,6 +1762,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1555,6 +1792,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1587,12 +1831,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Paketi Aç" #: src/settings_translation_file.cpp #, fuzzy @@ -1607,10 +1848,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1641,6 +1878,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1653,6 +1894,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Hasarı etkinleştir" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1741,6 +1987,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1853,6 +2107,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Generate normalmaps" @@ -1861,10 +2119,11 @@ msgstr "Normal haritalar oluştur" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1875,6 +2134,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Eklentiler" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1887,6 +2151,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1900,7 +2168,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1925,6 +2193,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2018,6 +2290,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2037,47 +2313,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2092,7 +2357,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2106,7 +2371,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2303,6 +2568,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2406,36 +2679,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2476,6 +2739,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2498,6 +2766,59 @@ msgstr "Mapgen" msgid "Mapgen flags" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Parallax Occlusion" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Mapgen" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2517,26 +2838,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Mapgen" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "Parallax Occlusion" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2554,25 +2863,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Mapgen" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2721,6 +3029,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2749,14 +3069,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2849,6 +3161,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2865,13 +3181,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2949,10 +3258,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2974,6 +3279,10 @@ msgstr "Nesne seçme göstergesi" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3014,10 +3323,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "Parallax Occlusion" - #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion" @@ -3089,19 +3394,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Dokular yükleniyor..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3125,6 +3417,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3155,6 +3451,22 @@ msgstr "Sağ Menu" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3281,10 +3593,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Shaders" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3310,6 +3618,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3367,16 +3679,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Doku paketi" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3448,6 +3779,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mapping" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3519,17 +3855,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3538,6 +3890,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3547,11 +3905,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3559,14 +3913,23 @@ msgstr "" msgid "Volume" msgstr "Ses yüksekliği :" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Walking speed" msgstr "Dalgalanan Yapraklar" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Nesne dokuları ..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3681,6 +4044,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3691,6 +4058,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3703,89 +4078,47 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Tek kişilik dünyayı sıfırlamak istediğinizden emin misiniz ?" - -#~ msgid "Bilinear Filter" -#~ msgstr "İki yönlü süzme" - -#, fuzzy -#~ msgid "Fancy Leaves" -#~ msgstr "Şık ağaçlar" - -#~ msgid "Mipmap" -#~ msgstr "Mipmap" - -#, fuzzy -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mipmap Aniso. Süzgeci" - -#~ msgid "No Mipmap" -#~ msgstr "Mipmap kapalı" - -#~ msgid "No!!!" -#~ msgstr "Hayır!!!" - -#, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "Şeffaf su" - -#~ msgid "Opaque Water" -#~ msgstr "Şeffaf su" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Tek kişilik oyunu sıfırlayın" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Ölçeklendirme menülere işlendi:" - -#, fuzzy -#~ msgid "Simple Leaves" -#~ msgstr "Dalgalanan Yapraklar" - -#~ msgid "Texturing:" -#~ msgstr "Doku:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "OpenGL sürücüleri seçilmeden Shader etkinleştirilemez." - -#~ msgid "Touch free target" -#~ msgstr "Touch free target" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "Touchthreshold (px)" - -#~ msgid "Trilinear Filter" -#~ msgstr "Üç yönlü süzme" - -#~ msgid "Downloading" -#~ msgstr "İndiriliyor" - -#~ msgid "please wait..." -#~ msgstr "lütfen bekleyin..." - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid "Numpad " -#~ msgstr "Numpad " - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın" - -#~ msgid "Rendering:" -#~ msgstr "Kaplama:" - -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "Etkinleştirildi" +#~ msgid "\"" +#~ msgstr "\"" #, fuzzy #~ msgid "If disabled " #~ msgstr "Paketi Kapat" -#~ msgid "\"" -#~ msgstr "\"" +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Etkinleştirildi" + +#~ msgid "Rendering:" +#~ msgstr "Kaplama:" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Değişikliklerin etkin olabilmesi için minetesti yeniden başlatın" + +#~ msgid "Numpad " +#~ msgstr "Numpad " + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid "please wait..." +#~ msgstr "lütfen bekleyin..." + +#~ msgid "Downloading" +#~ msgstr "İndiriliyor" + +#~ msgid "Touch free target" +#~ msgstr "Touch free target" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Ölçeklendirme menülere işlendi:" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Tek kişilik oyunu sıfırlayın" + +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "Dokular yükleniyor..." diff --git a/po/uk/minetest.po b/po/uk/minetest.po index c737ddb4..764c2a8e 100644 --- a/po/uk/minetest.po +++ b/po/uk/minetest.po @@ -7,17 +7,17 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2016-01-25 23:23+0000\n" "Last-Translator: Fixer \n" -"Language-Team: Ukrainian " -"\n" +"Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.5-dev\n" #: builtin/fstk/ui.lua @@ -75,8 +75,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Ми підтримуємо протокол між версіями $1 і $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "Скасувати" @@ -116,8 +117,8 @@ msgstr "Приховати контент багатокористувацько msgid "Mod:" msgstr "Модифікація:" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "Зберегти" @@ -190,6 +191,7 @@ msgid "No of course not!" msgstr "Ні, звісно ні!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "Так" @@ -209,6 +211,96 @@ msgstr "Прийняти" msgid "Rename Modpack:" msgstr "Перейменувати Збірку модифікацій:" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" не є правильним параметром." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(пояснення відсутнє)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "Проглянути" + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "Disabled" +msgstr "Вимкнути багатокористувацьку гру" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "Правити" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "Увімкнено" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "Формат: 3 номера, відокремлених комами і всередині дужок." + +#: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"Формат: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "Ігри" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Модифікації" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "Будь-ласка введіть перелік параметрів через кому." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "Будь-ласка введіть дійсне ціле число." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "Будь-ласка введіть дійсний номер." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "Можливі значення: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "Відновити як було" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "Вибрати шлях" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "Показувати технічні назви" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "Значення має бути більше за $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "Значення має бути менше ніж $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -305,10 +397,6 @@ msgstr "Встановлені модифікації:" msgid "Mod information:" msgstr "Інформація модифікації:" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Модифікації" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "Опис модифікації відсутній" @@ -422,16 +510,44 @@ msgid "Start Game" msgstr "Почати гру" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" не є правильним параметром." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(пояснення відсутнє)" +#, fuzzy +msgid "3D Clouds" +msgstr "Об'ємні хмари" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "Проглянути" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "Налаштування" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "Ви впевнені, що бажаєте скинути свій світ однокористувацької гри?" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "Білінійна фільтрація" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "MIP-текстурування" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -439,77 +555,118 @@ msgstr "Змінити клавіші" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Disabled" -msgstr "Вимкнути багатокористувацьку гру" - -#: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "Правити" - -#: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "Увімкнено" - -#: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Формат: 3 номера, відокремлених комами і всередині дужок." +msgid "Connected Glass" +msgstr "Підключитися" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"Формат: , , (, , ), , " -", " +msgid "Enable Particles" +msgstr "Увімкнути все" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "Ігри" +#, fuzzy +msgid "Fancy Leaves" +msgstr "Непрозоре листя" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "Генерувати карти нормалей" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Mipmap" +msgstr "MIP-текстурування" + +#: builtin/mainmenu/tab_settings.lua +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "Будь-ласка введіть перелік параметрів через кому." +#, fuzzy +msgid "No Filter" +msgstr "Анізотропна фільтрація" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "Будь-ласка введіть дійсне ціле число." +#, fuzzy +msgid "No Mipmap" +msgstr "MIP-текстурування" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "Будь-ласка введіть дійсний номер." +msgid "No!!!" +msgstr "Ні!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "Можливі значення: " +#, fuzzy +msgid "Node Highlighting" +msgstr "Рівне освітлення" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "Нічого" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "Відновити як було" +msgid "Opaque Leaves" +msgstr "Непрозоре листя" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "Вибрати шлях" +msgid "Opaque Water" +msgstr "Непрозора вода" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Parallax Occlusion" +msgstr "Parallax Occlusion" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Налаштування" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "Показувати технічні назви" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "Шейдери" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "Значення має бути більше за $1." +msgid "Simple Leaves" +msgstr "Просте листя" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "Значення має бути менше ніж $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "Рівне освітлення" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "Текстурування:" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "" +"Для того, щоб увімкнути шейдери, потрібно використовувати двайвер OpenGL." + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "Трилінійна фільтрація" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "Гарне листя" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "Гарне листя" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "Гарне листя" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -536,10 +693,6 @@ msgstr "Одиночна гра" msgid "No information available" msgstr "Інформація відсутня" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "Нічого" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "Оберіть набір текстур:" @@ -564,10 +717,6 @@ msgstr "Ініціалізація блоків" msgid "Initializing nodes..." msgstr "Ініціалізація блоків..." -#: src/client.cpp -msgid "Item textures..." -msgstr "Текстури предметів..." - #: src/client.cpp msgid "Loading textures..." msgstr "Завантаження текстур..." @@ -1184,6 +1333,15 @@ msgstr "Додаткова кнопка 2" msgid "Zoom" msgstr "Збільшити" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "" @@ -1209,7 +1367,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1265,6 +1424,10 @@ msgstr "" msgid "Advanced" msgstr "Додатково" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1273,6 +1436,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Anisotropic filtering" @@ -1289,6 +1456,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1302,6 +1473,10 @@ msgstr "" msgid "Backward key" msgstr "Назад" +#: src/settings_translation_file.cpp +msgid "Base terrain height" +msgstr "" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1325,11 +1500,6 @@ msgstr "" msgid "Build inside player" msgstr "Мережева гра" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "MIP-текстурування" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1342,6 +1512,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1352,6 +1534,29 @@ msgstr "Змінити клавіши" msgid "Chat toggle key" msgstr "Змінити клавіши" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1410,6 +1615,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1470,10 +1681,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1562,6 +1793,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1584,6 +1823,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1616,12 +1862,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "Увімкнути багатокористувацьку гру" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1635,10 +1878,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1669,6 +1908,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1681,6 +1924,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "Увімкнути ушкодження" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1768,6 +2016,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1879,6 +2135,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Generate normalmaps" @@ -1887,10 +2147,11 @@ msgstr "Генерувати карти нормалей" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1901,6 +2162,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Модифікації" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1913,6 +2179,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1926,7 +2196,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1951,6 +2221,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2044,6 +2318,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2063,47 +2341,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2118,7 +2385,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2132,7 +2399,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2329,6 +2596,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2432,36 +2707,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2502,6 +2767,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "Генератор карти" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2524,6 +2794,59 @@ msgstr "Генератор карти" msgid "Mapgen flags" msgstr "Генератор карти" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "Генератор карти" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "Генератор карти" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "Генератор карти" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "Оклюзія паралакса" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "Генератор карти" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2543,26 +2866,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "Генератор карти" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "Оклюзія паралакса" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2580,25 +2891,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "Генератор карти" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "Генератор карти" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "Генератор карти" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2747,6 +3057,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2775,14 +3097,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2875,6 +3189,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2891,13 +3209,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2975,10 +3286,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2999,6 +3306,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3039,11 +3350,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Parallax Occlusion" -msgstr "Parallax Occlusion" - #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion" @@ -3115,19 +3421,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "Завантаження текстур..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3151,6 +3444,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3181,6 +3478,22 @@ msgstr "Права клавіша Menu" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3306,10 +3619,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "Шейдери" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3335,6 +3644,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3392,16 +3705,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "Набори текстур" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3473,6 +3805,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "MIP-текстурування" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3543,17 +3880,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3562,6 +3915,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3571,11 +3930,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3583,13 +3938,22 @@ msgstr "" msgid "Volume" msgstr "Гучність звуку" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "Текстури предметів..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3699,6 +4063,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3709,6 +4077,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3721,107 +4097,89 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "Ви впевнені, що бажаєте скинути свій світ однокористувацької гри?" - -#~ msgid "No!!!" -#~ msgstr "Ні!!!" - -#~ msgid "Opaque Leaves" -#~ msgstr "Непрозоре листя" - -#~ msgid "Opaque Water" -#~ msgstr "Непрозора вода" - -#~ msgid "Reset singleplayer world" -#~ msgstr "Скинути світ однокористувацької гри" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Масштабування елементів меню: " - -#~ msgid "Simple Leaves" -#~ msgstr "Просте листя" - -#~ msgid "Texturing:" -#~ msgstr "Текстурування:" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "" -#~ "Для того, щоб увімкнути шейдери, потрібно використовувати двайвер OpenGL." - #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Вниз" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "" -#~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: " -#~ "Перемістити один предмет" - -#~ msgid "is required by:" -#~ msgstr "необхідний для:" - -#~ msgid "Configuration saved. " -#~ msgstr "Налаштування Збережено. " - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Попередження: Помилкова конфігурація. " - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи" - -#~ msgid "Show Public" -#~ msgstr "Показати Публічні" - -#~ msgid "Show Favorites" -#~ msgstr "Показати Улюблені" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Залишіть адресу незаповненою для створення локального серверу." - -#~ msgid "Create world" -#~ msgstr "Створити світ" - -#~ msgid "Address required." -#~ msgstr "Адреса необхідна." - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Неможливо видалити світ: Нічого не вибрано" - -#~ msgid "Files to be deleted" -#~ msgstr "Файлів, що підлягають видаленню" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Неможливо створити світ: Не знайдено жодної гри" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Помилка при видаленні файлів світу" - -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Кінцеві рідини" - -#~ msgid "Preload item visuals" -#~ msgstr "Попереднє завантаження зображень" - -#, fuzzy -#~ msgid "Password" -#~ msgstr "Старий Пароль" - -#~ msgid "Favorites:" -#~ msgstr "Улюблені:" - -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Гра" +#~ msgid "If disabled " +#~ msgstr "Вимкнути багатокористувацьку гру" #, fuzzy #~ msgid "If enabled, " #~ msgstr "Увімкнено" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Вимкнути багатокористувацьку гру" +#~ msgid "Game Name" +#~ msgstr "Гра" + +#~ msgid "Favorites:" +#~ msgstr "Улюблені:" + +#, fuzzy +#~ msgid "Password" +#~ msgstr "Старий Пароль" + +#~ msgid "Preload item visuals" +#~ msgstr "Попереднє завантаження зображень" + +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Кінцеві рідини" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Помилка при видаленні файлів світу" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Неможливо налаштувати світ: Нічого не вибрано" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Неможливо створити світ: Не знайдено жодної гри" + +#~ msgid "Files to be deleted" +#~ msgstr "Файлів, що підлягають видаленню" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Неможливо видалити світ: Нічого не вибрано" + +#~ msgid "Address required." +#~ msgstr "Адреса необхідна." + +#~ msgid "Create world" +#~ msgstr "Створити світ" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Залишіть адресу незаповненою для створення локального серверу." + +#~ msgid "Show Favorites" +#~ msgstr "Показати Улюблені" + +#~ msgid "Show Public" +#~ msgstr "Показати Публічні" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Неможливо створити світ: Ім'я містить недопустимі символи" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Попередження: Помилкова конфігурація. " + +#~ msgid "Configuration saved. " +#~ msgstr "Налаштування Збережено. " + +#~ msgid "is required by:" +#~ msgstr "необхідний для:" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "" +#~ "Ліва кнопка миші: Перемістити усі предмети, Права кнопка миші: " +#~ "Перемістити один предмет" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Вниз" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Масштабування елементів меню: " + +#~ msgid "Reset singleplayer world" +#~ msgstr "Скинути світ однокористувацької гри" + +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "Завантаження текстур..." diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index 52d850a3..00ab2b0f 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-12-30 16:01+0000\n" "Last-Translator: Jun Zhang \n" -"Language-Team: Chinese (China) " -"\n" +"Language-Team: Chinese (China) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,8 +72,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "我们支持的协议版本为 $1 至 $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "取消" @@ -111,8 +112,8 @@ msgstr "隐藏MOD包内容" msgid "Mod:" msgstr "MOD：" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "保存" @@ -185,6 +186,7 @@ msgid "No of course not!" msgstr "当然不！" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "是" @@ -204,6 +206,94 @@ msgstr "接受" msgid "Rename Modpack:" msgstr "重命名MOD包：" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "\"$1\" 不是合法的 flag." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "(没有关于此设置的信息)" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "浏览" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "已禁用" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "设置" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "已启用" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "格式: (X, Y, Z)." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"格式: , , (, , ), , " +", " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "游戏" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "MODS" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "请输入 flag, 多个 flag 以半角逗号分隔." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "请输入一个整数类型." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "请输入一个合法的数字." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "可设置的 flag: " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "回复初始设置" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "选择路径" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "显示高级设置" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "这个值必须大于 $1." + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "这个值必须小于 $1." + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -296,10 +386,6 @@ msgstr "已安装的MOD：" msgid "Mod information:" msgstr "MOD资料：" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "MODS" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "无MOD资料可得" @@ -412,92 +498,163 @@ msgid "Start Game" msgstr "启动游戏" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" 不是合法的 flag." +msgid "2x" +msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "(没有关于此设置的信息)" +#, fuzzy +msgid "3D Clouds" +msgstr "3D 云彩" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "浏览" +msgid "4x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "设置" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "你确定要重置您的单人世界吗？" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "双线性过滤" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "贴图处理" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "改变键位设置" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "已禁用" +#, fuzzy +msgid "Connected Glass" +msgstr "连接的玻璃" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "设置" +#, fuzzy +msgid "Enable Particles" +msgstr "全部启用" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "已启用" +#, fuzzy +msgid "Fancy Leaves" +msgstr "花式树" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "格式: (X, Y, Z)." +#, fuzzy +msgid "Generate Normalmaps" +msgstr "产生法线贴图" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"格式: , , (, , ), , , " -"" +#, fuzzy +msgid "Mipmap" +msgstr "贴图处理" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "游戏" - -#: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." +msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "请输入 flag, 多个 flag 以半角逗号分隔." +#, fuzzy +msgid "No Filter" +msgstr "各向异性过滤" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "请输入一个整数类型." +#, fuzzy +msgid "No Mipmap" +msgstr "贴图处理" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "请输入一个合法的数字." +msgid "No!!!" +msgstr "不!!!" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "可设置的 flag: " +#, fuzzy +msgid "Node Highlighting" +msgstr "平滑光照" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "无" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "回复初始设置" +#, fuzzy +msgid "Opaque Leaves" +msgstr "不透明的水" #: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "选择路径" +msgid "Opaque Water" +msgstr "不透明的水" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "视差贴图" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "设置" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "显示高级设置" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "着色器" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "这个值必须大于 $1." +#, fuzzy +msgid "Simple Leaves" +msgstr "摇动的叶子" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "这个值必须小于 $1." +#, fuzzy +msgid "Smooth Lighting" +msgstr "平滑光照" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "启用着色器需要使用OpenGL驱动。" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "触控阈值（像素）" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "三线性过滤" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "摇动的叶子" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "摇动的植物" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "摇动的水" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -524,10 +681,6 @@ msgstr "单人游戏" msgid "No information available" msgstr "无资料可得" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "无" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "选择材质包：" @@ -552,10 +705,6 @@ msgstr "初始化节点中" msgid "Initializing nodes..." msgstr "初始化节点..." -#: src/client.cpp -msgid "Item textures..." -msgstr "物品材质..." - #: src/client.cpp msgid "Loading textures..." msgstr "载入材质..." @@ -1150,6 +1299,15 @@ msgstr "X键2" msgid "Zoom" msgstr "缩放" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1174,7 +1332,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" #: src/settings_translation_file.cpp @@ -1230,6 +1389,10 @@ msgstr "" msgid "Advanced" msgstr "高级联机设置" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "" @@ -1238,6 +1401,10 @@ msgstr "" msgid "Ambient occlusion gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "各向异性过滤" @@ -1253,6 +1420,10 @@ msgid "" "minetest.net." msgstr "" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "" @@ -1266,6 +1437,11 @@ msgstr "" msgid "Backward key" msgstr "向后" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "摇动的水" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "" @@ -1288,11 +1464,6 @@ msgstr "" msgid "Build inside player" msgstr "多人游戏" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Bumpmapping" -msgstr "贴图处理" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1305,6 +1476,18 @@ msgstr "" msgid "Camera update toggle key" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Chat key" @@ -1315,6 +1498,29 @@ msgstr "改变键位设置" msgid "Chat toggle key" msgstr "改变键位设置" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "" @@ -1371,6 +1577,12 @@ msgid "" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Command key" @@ -1431,10 +1643,30 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "" @@ -1524,6 +1756,14 @@ msgstr "" msgid "Deprecated Lua API handling" msgstr "" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "" @@ -1546,6 +1786,13 @@ msgstr "" msgid "Detailed mod profiling" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" @@ -1578,12 +1825,9 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" +#, fuzzy +msgid "Enable VBO" +msgstr "启用MOD包" #: src/settings_translation_file.cpp #, fuzzy @@ -1598,10 +1842,6 @@ msgstr "" msgid "Enable random user input (only used for testing)." msgstr "" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1632,6 +1872,10 @@ msgid "" "Ignored if bind_address is set." msgstr "" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1644,6 +1888,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "开启伤害风险" + #: src/settings_translation_file.cpp #, fuzzy msgid "Enables minimap." @@ -1732,6 +1981,14 @@ msgid "" "the Multiplayer Tab." msgstr "" +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" @@ -1844,6 +2101,10 @@ msgstr "" msgid "Gamma" msgstr "" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Generate normalmaps" @@ -1852,10 +2113,11 @@ msgstr "产生法线贴图" #: src/settings_translation_file.cpp msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -1866,6 +2128,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "MODS" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1878,6 +2145,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1891,7 +2162,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1916,6 +2187,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2009,6 +2284,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Inventory key" @@ -2028,47 +2307,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2083,7 +2351,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2097,7 +2365,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2294,6 +2562,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2397,36 +2673,26 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2467,6 +2733,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "地图生成器" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2489,6 +2760,59 @@ msgstr "地图生成器" msgid "Mapgen flags" msgstr "地图生成器" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "地图生成器" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "地图生成器" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "地图生成器" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "视差贴图" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "地图生成器" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal" @@ -2508,26 +2832,14 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal flags" +msgid "Mapgen fractal fractal" msgstr "地图生成器" #: src/settings_translation_file.cpp #, fuzzy -msgid "Mapgen fractal julia iterations" +msgid "Mapgen fractal iterations" msgstr "视差贴图" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2545,25 +2857,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "地图生成器" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "地图生成器" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "地图生成器" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2712,6 +3023,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2740,14 +3063,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2840,6 +3155,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2856,13 +3175,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp #, fuzzy msgid "Mipmapping" @@ -2940,10 +3252,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2964,6 +3272,10 @@ msgstr "" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3004,10 +3316,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "视差贴图" - #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion" @@ -3079,19 +3387,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Preload inventory textures" -msgstr "载入中..." - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3115,6 +3410,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3145,6 +3444,22 @@ msgstr "右菜单" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3271,10 +3586,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "着色器" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3300,6 +3611,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Smooth lighting" @@ -3357,16 +3672,35 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Texture path" msgstr "材质包" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3438,6 +3772,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "贴图处理" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3509,17 +3848,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3528,6 +3883,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3537,11 +3898,7 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp @@ -3549,14 +3906,23 @@ msgstr "" msgid "Volume" msgstr "音量" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Walking speed" msgstr "摇动的叶子" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "物品材质..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3671,6 +4037,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3681,6 +4051,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3693,97 +4071,93 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "你确定要重置您的单人世界吗？" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "禁用MOD包" #, fuzzy -#~ msgid "Fancy Leaves" -#~ msgstr "花式树" +#~ msgid "If enabled, " +#~ msgstr "启用" -#~ msgid "No!!!" -#~ msgstr "不!!!" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "重启minetest让驱动变化生效" -#, fuzzy -#~ msgid "Opaque Leaves" -#~ msgstr "不透明的水" +#~ msgid "Game Name" +#~ msgstr "游戏名" -#~ msgid "Opaque Water" -#~ msgstr "不透明的水" +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”" -#, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "重置单人游戏" +#~ msgid "GAMES" +#~ msgstr "游戏" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "菜单元素应用缩放因子" +#~ msgid "Mods:" +#~ msgstr "MODS：" -#, fuzzy -#~ msgid "Simple Leaves" -#~ msgstr "摇动的叶子" +#~ msgid "new game" +#~ msgstr "新建游戏" -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "启用着色器需要使用OpenGL驱动。" +#~ msgid "EDIT GAME" +#~ msgstr "编辑游戏" -#~ msgid "Touch free target" -#~ msgstr "自由触摸目标" +#~ msgid "Remove selected mod" +#~ msgstr "删除选中MOD" -#~ msgid "Touchthreshold (px)" -#~ msgstr "触控阈值（像素）" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- 添加MOD" -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "下载中" +#~ msgid "CLIENT" +#~ msgstr "客户端" -#~ msgid " KB/s" -#~ msgstr "千字节/秒" +#~ msgid "Favorites:" +#~ msgstr "最爱的服务器：" -#~ msgid " MB/s" -#~ msgstr "兆字节/秒" +#~ msgid "START SERVER" +#~ msgstr "启动服务器" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "左键：移动所有物品，右键：移动单个物品" +#~ msgid "Name" +#~ msgstr "名字" -#~ msgid "is required by:" -#~ msgstr "被需要：" +#~ msgid "Password" +#~ msgstr "密码" -#~ msgid "Configuration saved. " -#~ msgstr "配置已保存。 " +#~ msgid "SETTINGS" +#~ msgstr "设置" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "警告：配置不一致。 " +#~ msgid "Preload item visuals" +#~ msgstr "预先加载物品图像" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "无法创建世界：名字包含非法字符" +#~ msgid "Finite Liquid" +#~ msgstr "液体有限延伸" -#~ msgid "Show Public" -#~ msgstr "显示公共" +#~ msgid "SINGLE PLAYER" +#~ msgstr "单人游戏" -#~ msgid "Show Favorites" -#~ msgstr "显示最爱" +#~ msgid "TEXTURE PACKS" +#~ msgstr "材质包" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "地址栏留空可启动本地服务器。" +#~ msgid "MODS" +#~ msgstr "MODS" -#~ msgid "Create world" -#~ msgstr "创造世界" +#~ msgid "Add mod:" +#~ msgstr "添加MOD：" -#~ msgid "Address required." -#~ msgstr "需要地址。" +#~ msgid "Local install" +#~ msgstr "本地安装" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "无法删除世界：没有选择世界" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "警告：一些MOD仍未设定。\n" +#~ "它们会在你保存配置的时候自动启用。 " -#~ msgid "Files to be deleted" -#~ msgstr "将被删除的文件" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "无法创造世界：未找到游戏模式" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "无法配置世界：没有选择世界" - -#~ msgid "Failed to delete all world files" -#~ msgstr "无法删除所有该世界的文件" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "警告：缺少一些设定了的MOD。\n" +#~ "它们的设置会在你保存配置的时候被移除。 " #~ msgid "" #~ "Default Controls:\n" @@ -3811,90 +4185,71 @@ msgstr "" #~ "ESC：菜单\n" #~ "T：聊天\n" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "警告：缺少一些设定了的MOD。\n" -#~ "它们的设置会在你保存配置的时候被移除。 " +#~ msgid "Failed to delete all world files" +#~ msgstr "无法删除所有该世界的文件" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "警告：一些MOD仍未设定。\n" -#~ "它们会在你保存配置的时候自动启用。 " +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "无法配置世界：没有选择世界" -#~ msgid "Local install" -#~ msgstr "本地安装" +#~ msgid "Cannot create world: No games found" +#~ msgstr "无法创造世界：未找到游戏模式" -#~ msgid "Add mod:" -#~ msgstr "添加MOD：" +#~ msgid "Files to be deleted" +#~ msgstr "将被删除的文件" -#~ msgid "MODS" -#~ msgstr "MODS" +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "无法删除世界：没有选择世界" -#~ msgid "TEXTURE PACKS" -#~ msgstr "材质包" +#~ msgid "Address required." +#~ msgstr "需要地址。" -#~ msgid "SINGLE PLAYER" -#~ msgstr "单人游戏" +#~ msgid "Create world" +#~ msgstr "创造世界" -#~ msgid "Finite Liquid" -#~ msgstr "液体有限延伸" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "地址栏留空可启动本地服务器。" -#~ msgid "Preload item visuals" -#~ msgstr "预先加载物品图像" +#~ msgid "Show Favorites" +#~ msgstr "显示最爱" -#~ msgid "SETTINGS" -#~ msgstr "设置" +#~ msgid "Show Public" +#~ msgstr "显示公共" -#~ msgid "Password" -#~ msgstr "密码" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "无法创建世界：名字包含非法字符" -#~ msgid "Name" -#~ msgstr "名字" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "警告：配置不一致。 " -#~ msgid "START SERVER" -#~ msgstr "启动服务器" +#~ msgid "Configuration saved. " +#~ msgstr "配置已保存。 " -#~ msgid "Favorites:" -#~ msgstr "最爱的服务器：" +#~ msgid "is required by:" +#~ msgstr "被需要：" -#~ msgid "CLIENT" -#~ msgstr "客户端" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "左键：移动所有物品，右键：移动单个物品" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- 添加MOD" +#~ msgid " MB/s" +#~ msgstr "兆字节/秒" -#~ msgid "Remove selected mod" -#~ msgstr "删除选中MOD" - -#~ msgid "EDIT GAME" -#~ msgstr "编辑游戏" - -#~ msgid "new game" -#~ msgstr "新建游戏" - -#~ msgid "Mods:" -#~ msgstr "MODS：" - -#~ msgid "GAMES" -#~ msgstr "游戏" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”" - -#~ msgid "Game Name" -#~ msgstr "游戏名" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "重启minetest让驱动变化生效" +#~ msgid " KB/s" +#~ msgstr "千字节/秒" #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "启用" +#~ msgid "Downloading" +#~ msgstr "下载中" + +#~ msgid "Touch free target" +#~ msgstr "自由触摸目标" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "菜单元素应用缩放因子" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "禁用MOD包" +#~ msgid "Reset singleplayer world" +#~ msgstr "重置单人游戏" + +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "载入中..." diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index ddbc1e3d..e47f4a76 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:23+0100\n" +"POT-Creation-Date: 2016-02-27 05:49+0100\n" "PO-Revision-Date: 2015-12-10 08:13+0000\n" "Last-Translator: Jeff Huang \n" -"Language-Team: Chinese (Taiwan) " -"\n" +"Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,8 +72,9 @@ msgid "We support protocol versions between version $1 and $2." msgstr "我們支援協定版本 $1 到 $2。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua -#: builtin/mainmenu/dlg_rename_modpack.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp src/keycode.cpp +#: builtin/mainmenu/dlg_rename_modpack.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp +#: src/keycode.cpp msgid "Cancel" msgstr "取消" @@ -113,8 +114,8 @@ msgstr "隱藏 mp 內容" msgid "Mod:" msgstr "Mod：" -#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_settings.lua -#: src/guiKeyChangeMenu.cpp +#: builtin/mainmenu/dlg_config_world.lua +#: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" msgstr "儲存" @@ -187,6 +188,7 @@ msgid "No of course not!" msgstr "不，絕對不是！" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_settings.lua msgid "Yes" msgstr "是" @@ -206,6 +208,94 @@ msgstr "接受" msgid "Rename Modpack:" msgstr "重新命名 Mod 包：" +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "\"$1\" is not a valid flag." +msgstr "「$1」不是一個有效的旗標。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "(No description of setting given)" +msgstr "（這個設定沒有描述可用）" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "< Back to Settings page" +msgstr "" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Browse" +msgstr "瀏覽" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Disabled" +msgstr "已停用" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Edit" +msgstr "編輯" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Enabled" +msgstr "已啟用" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Format is 3 numbers separated by commas and inside brackets." +msgstr "格式為 3 個在括號內的以逗號分離的數字。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "" +"Format: , , (, , ), , " +", " +msgstr "" +"格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續" +"性>" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Games" +msgstr "遊戲" + +#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua +msgid "Mods" +msgstr "Mods" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Optionally the lacunarity can be appended with a leading comma." +msgstr "選擇性的空隙度可以以一個逗號開頭附加。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a comma seperated list of flags." +msgstr "請輸入逗號以分離各項旗標。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid integer." +msgstr "請輸入有效的整數。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Please enter a valid number." +msgstr "請輸入有效的數字。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Possible values are: " +msgstr "可能的值為： " + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Restore Default" +msgstr "恢復預設值" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Select path" +msgstr "選取路徑" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "Show technical names" +msgstr "顯示技術名稱" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be greater than $1." +msgstr "值必須大於 $1。" + +#: builtin/mainmenu/dlg_settings_advanced.lua +msgid "The value must be lower than $1." +msgstr "值必須低於 $1。" + #: builtin/mainmenu/modmgr.lua msgid "" "\n" @@ -298,10 +388,6 @@ msgstr "已安裝的 Mod：" msgid "Mod information:" msgstr "Mod 資訊：" -#: builtin/mainmenu/tab_mods.lua builtin/mainmenu/tab_settings.lua -msgid "Mods" -msgstr "Mods" - #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" msgstr "找不到 mod 描述" @@ -414,92 +500,157 @@ msgid "Start Game" msgstr "開始遊戲" #: builtin/mainmenu/tab_settings.lua -msgid "\"$1\" is not a valid flag." -msgstr "「$1」不是一個有效的旗標。" +msgid "2x" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -msgid "(No description of setting given)" -msgstr "（這個設定沒有描述可用）" +#, fuzzy +msgid "3D Clouds" +msgstr "3D 雲朵" #: builtin/mainmenu/tab_settings.lua -msgid "Browse" -msgstr "瀏覽" +msgid "4x" +msgstr "4x" + +#: builtin/mainmenu/tab_settings.lua +msgid "8x" +msgstr "8x" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Advanced Settings" +msgstr "設定" + +#: builtin/mainmenu/tab_settings.lua +msgid "Antialiasing:" +msgstr "反鋸齒：" + +#: builtin/mainmenu/tab_settings.lua +msgid "Are you sure to reset your singleplayer world?" +msgstr "您確定要要重置您的單人遊戲世界嗎？" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bilinear Filter" +msgstr "雙線性過濾器" + +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "映射貼圖" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "變更按鍵" #: builtin/mainmenu/tab_settings.lua -msgid "Disabled" -msgstr "已停用" +#, fuzzy +msgid "Connected Glass" +msgstr "連接玻璃" #: builtin/mainmenu/tab_settings.lua -msgid "Edit" -msgstr "編輯" +#, fuzzy +msgid "Enable Particles" +msgstr "啟用全部" #: builtin/mainmenu/tab_settings.lua -msgid "Enabled" -msgstr "已啟用" +msgid "Fancy Leaves" +msgstr "華麗葉子" #: builtin/mainmenu/tab_settings.lua -msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "格式為 3 個在括號內的以逗號分離的數字。" +#, fuzzy +msgid "Generate Normalmaps" +msgstr "生成一般地圖" #: builtin/mainmenu/tab_settings.lua -msgid "" -"Format: , , (, , ), , " -", " -msgstr "" -"格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續" -"性>" +msgid "Mipmap" +msgstr "Mip 貼圖" #: builtin/mainmenu/tab_settings.lua -msgid "Games" -msgstr "遊戲" +msgid "Mipmap + Aniso. Filter" +msgstr "Mip 貼圖 + Aniso. 過濾器" #: builtin/mainmenu/tab_settings.lua -msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "選擇性的空隙度可以以一個逗號開頭附加。" +#, fuzzy +msgid "No Filter" +msgstr "過濾器" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a comma seperated list of flags." -msgstr "請輸入逗號以分離各項旗標。" +msgid "No Mipmap" +msgstr "無 Mip 貼圖" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid integer." -msgstr "請輸入有效的整數。" +msgid "No!!!" +msgstr "否！！！" #: builtin/mainmenu/tab_settings.lua -msgid "Please enter a valid number." -msgstr "請輸入有效的數字。" +#, fuzzy +msgid "Node Highlighting" +msgstr "突顯節點" + +#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua +msgid "None" +msgstr "無" #: builtin/mainmenu/tab_settings.lua -msgid "Possible values are: " -msgstr "可能的值為： " +msgid "Opaque Leaves" +msgstr "不透明葉子" #: builtin/mainmenu/tab_settings.lua -msgid "Restore Default" -msgstr "恢復預設值" +msgid "Opaque Water" +msgstr "不透明水" -#: builtin/mainmenu/tab_settings.lua -msgid "Select path" -msgstr "選取路徑" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Parallax Occlusion" +msgstr "視差遮蔽" #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "設定" -#: builtin/mainmenu/tab_settings.lua -msgid "Show technical names" -msgstr "顯示技術名稱" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Shaders" +msgstr "著色器" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be greater than $1." -msgstr "值必須大於 $1。" +msgid "Simple Leaves" +msgstr "簡易葉子" #: builtin/mainmenu/tab_settings.lua -msgid "The value must be lower than $1." -msgstr "值必須低於 $1。" +#, fuzzy +msgid "Smooth Lighting" +msgstr "平滑光" + +#: builtin/mainmenu/tab_settings.lua +msgid "Texturing:" +msgstr "紋理：" + +#: builtin/mainmenu/tab_settings.lua +msgid "To enable shaders the OpenGL driver needs to be used." +msgstr "要啟用著色器，必須使用 OpenGL 驅動程式。" + +#: builtin/mainmenu/tab_settings.lua +msgid "Touchthreshold (px)" +msgstr "碰觸限值（像素）" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Trilinear Filter" +msgstr "三線性過濾器" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Leaves" +msgstr "葉子擺動" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Plants" +msgstr "植物擺動" + +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Waving Water" +msgstr "波動的水" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -525,10 +676,6 @@ msgstr "單人遊戲" msgid "No information available" msgstr "不提供資訊" -#: builtin/mainmenu/tab_texturepacks.lua -msgid "None" -msgstr "無" - #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" msgstr "選取材質包：" @@ -553,10 +700,6 @@ msgstr "正在初始化節點" msgid "Initializing nodes..." msgstr "正在初始化節點..." -#: src/client.cpp -msgid "Item textures..." -msgstr "物品材質..." - #: src/client.cpp msgid "Loading textures..." msgstr "正在載入材質..." @@ -1151,6 +1294,15 @@ msgstr "X 按鈕 2" msgid "Zoom" msgstr "縮放" +#: src/settings_translation_file.cpp +msgid "" +"(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" +"Used to move a suitable spawn area of low land close to (0, 0).\n" +"The default is suitable for mandelbrot sets, it needs to be edited for julia " +"sets.\n" +"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" @@ -1168,6 +1320,7 @@ msgid "3D mode" msgstr "3D 模式" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1175,7 +1328,8 @@ msgid "" "- anaglyph: cyan/magenta color 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" "- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." msgstr "" "3D 支援。\n" "目前已支援：\n" @@ -1245,6 +1399,10 @@ msgstr "" msgid "Advanced" msgstr "進階" +#: src/settings_translation_file.cpp +msgid "Altitude Chill" +msgstr "" + #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "總是啟用飛行與快速" @@ -1253,6 +1411,10 @@ msgstr "總是啟用飛行與快速" msgid "Ambient occlusion gamma" msgstr "環境遮蔽光" +#: src/settings_translation_file.cpp +msgid "Amplifies the valleys" +msgstr "" + #: src/settings_translation_file.cpp msgid "Anisotropic filtering" msgstr "各向異性過濾" @@ -1270,6 +1432,10 @@ msgstr "" "公佈到這個伺服器列表。\n" "若您想要公佈您的 IPv6 地址，使用 serverlist_url = v6.servers.minetest.net。" +#: src/settings_translation_file.cpp +msgid "Approximate (X,Y,Z) scale of fractal in nodes." +msgstr "" + #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "詢問是否在當機後重新連線" @@ -1282,6 +1448,11 @@ msgstr "自動回報到伺服器列表。" msgid "Backward key" msgstr "後退鍵" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Base terrain height" +msgstr "波動的水高度" + #: src/settings_translation_file.cpp msgid "Basic" msgstr "基礎" @@ -1302,10 +1473,6 @@ msgstr "全螢幕模式中的位元／像素（又稱色彩深度）。" msgid "Build inside player" msgstr "在玩家內構建" -#: src/settings_translation_file.cpp -msgid "Bumpmapping" -msgstr "映射貼圖" - #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "攝影機平滑" @@ -1318,6 +1485,18 @@ msgstr "在電影模式中攝影機平滑" msgid "Camera update toggle key" msgstr "攝影機切換更新按鍵" +#: src/settings_translation_file.cpp +msgid "Cave noise #1" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Cave noise #2" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Caves and tunnels form at the intersection of the two noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Chat key" msgstr "聊天按鍵" @@ -1326,6 +1505,29 @@ msgstr "聊天按鍵" msgid "Chat toggle key" msgstr "聊天切換按鍵" +#: src/settings_translation_file.cpp +msgid "" +"Choice of 18 fractals from 9 formulas.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." +msgstr "" + #: src/settings_translation_file.cpp msgid "Chunk size" msgstr "方塊大小" @@ -1382,6 +1584,12 @@ msgstr "" "受信任的 Mod 列表，以逗號分隔，其可存取不安全的\n" "功能，即便 mod 安全性是（經由 request_insecure_environment()）。" +#: src/settings_translation_file.cpp +msgid "" +"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" +"allow them to upload and download data to/from the internet." +msgstr "" + #: src/settings_translation_file.cpp msgid "Command key" msgstr "指令按鍵" @@ -1439,10 +1647,30 @@ msgstr "" "控制在 Mapgen v6 中的沙漠與沙灘大小。\n" "當 snowbiomes 啟用時「mgv6_freq_desert」會被忽略。" +#: src/settings_translation_file.cpp +msgid "Controls steepness/depth of lake depressions." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls steepness/height of hills." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "當機訊息" +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable lava features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Creates unpredictable water features in caves.\n" +"These can make mining difficult. Zero disables them. (0-10)" +msgstr "" + #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "十字 alpha 值" @@ -1535,6 +1763,14 @@ msgstr "顯示工具提示前的延遲，以毫秒計算。" msgid "Deprecated Lua API handling" msgstr "不推薦使用 Lua API 處理" +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find large caves." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Depth below which you'll find massive caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "Descending speed" msgstr "遞減速度" @@ -1557,6 +1793,13 @@ msgstr "詳細的 mod 檔案資料。對 mod 開發者很有用。" msgid "Detailed mod profiling" msgstr "詳細的 mod 檔案" +#: src/settings_translation_file.cpp +msgid "" +"Determines terrain shape.\n" +"The 3 numbers in brackets control the scale of the\n" +"terrain, the 3 numbers should be identical." +msgstr "" + #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "停用反作弊" @@ -1586,15 +1829,9 @@ msgid "Dump the mapgen debug infos." msgstr "轉儲 mapgen 的除錯資訊。" #: src/settings_translation_file.cpp -msgid "" -"Enable a bit lower water surface, so it doesn't \"fill\" the node " -"completely.\n" -"Note that this is not quite optimized and that smooth lighting on the\n" -"water surface doesn't work with this." -msgstr "" -"啟用略低的的水面，所以它就不會完全「填滿」節點。\n" -"注意，這個功能並未最佳化完成，水面的\n" -"柔和光功能無法與此功能一同運作。" +#, fuzzy +msgid "Enable VBO" +msgstr "啟用 MP" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1608,10 +1845,6 @@ msgstr "啟用玩家傷害及瀕死。" msgid "Enable random user input (only used for testing)." msgstr "啟用隨機使用者輸入（僅供測試使用）。" -#: src/settings_translation_file.cpp -msgid "Enable selection highlighting for nodes (disables selectionbox)." -msgstr "啟用節點選擇突顯（停用選取框）。" - #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" @@ -1653,6 +1886,10 @@ msgstr "" "IPv6 客戶端才能連線，取決於系統設定。\n" "當 bind_address 被設定時將會被忽略。" +#: src/settings_translation_file.cpp +msgid "Enables animation of inventory items." +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -1668,6 +1905,11 @@ msgstr "" msgid "Enables caching of facedir rotated meshes." msgstr "啟用面旋轉方向的網格快取。" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Enables filmic tone mapping" +msgstr "啟用小地圖。" + #: src/settings_translation_file.cpp msgid "Enables minimap." msgstr "啟用小地圖。" @@ -1760,7 +2002,16 @@ msgstr "以度計算的視野。" msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "在 客戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。" +msgstr "" +"在 客戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。" + +#: src/settings_translation_file.cpp +msgid "Filler Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Filmic tone mapping" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1874,17 +2125,23 @@ msgstr "圖形使用者介面縮放比例過濾器 txr2img" msgid "Gamma" msgstr "Gamma" +#: src/settings_translation_file.cpp +msgid "General" +msgstr "" + #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "生成一般地圖" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" +"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" +"and junglegrass, in all other mapgens this flag controls all decorations.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"'trees' and 'flat' flags only have effect in mgv6." +"Flags starting with \"no\" are used to explicitly disable them." msgstr "" "全域地圖產生屬性。\n" "未在旗標字串中指定的旗標將不會自預設值修改。\n" @@ -1899,6 +2156,11 @@ msgstr "" msgid "Gravity" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "HTTP Mods" +msgstr "Mods" + #: src/settings_translation_file.cpp msgid "HUD toggle key" msgstr "" @@ -1911,6 +2173,10 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Height component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." msgstr "" @@ -1924,7 +2190,7 @@ msgid "Homepage of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -msgid "Horizontal initial window size." +msgid "How deep to make rivers" msgstr "" #: src/settings_translation_file.cpp @@ -1949,6 +2215,10 @@ msgid "" "Higher value is smoother, but will use more RAM." msgstr "" +#: src/settings_translation_file.cpp +msgid "How wide to make rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "IPv6" msgstr "" @@ -2041,6 +2311,10 @@ msgstr "" msgid "Interval of sending time of day to clients." msgstr "" +#: src/settings_translation_file.cpp +msgid "Inventory items animations" +msgstr "" + #: src/settings_translation_file.cpp msgid "Inventory key" msgstr "物品欄按鍵" @@ -2059,47 +2333,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Julia set: Approximate (X,Y,Z) scales in nodes." +"Iterations of the recursive function.\n" +"Controls the amount of fine detail." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +"Julia set only: W component of hypercomplex constant determining julia " +"shape.\n" +"Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: W value determining the 4D shape.\n" +"Julia set only: X component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: X value determining the 4D shape.\n" +"Julia set only: Y component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" #: src/settings_translation_file.cpp msgid "" -"Julia set: Y value determining the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Julia set: Z value determining the 4D shape.\n" +"Julia set only: Z component of hypercomplex constant determining julia " +"shape.\n" "Range roughly -2 to 2." msgstr "" @@ -2113,7 +2376,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for decreasing the viewing range. Modifies the minimum viewing range.\n" +"Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2127,7 +2390,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" -"Key for increasing the viewing range. Modifies the minimum viewing range.\n" +"Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" @@ -2324,6 +2587,14 @@ msgstr "" msgid "Language" msgstr "" +#: src/settings_translation_file.cpp +msgid "Large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Lava Features" +msgstr "" + #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "" @@ -2424,40 +2695,40 @@ msgstr "" msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -"Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: Iterations of the recursive function.\n" -"Controls scale of finest detail." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "" -"Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -"Range roughly -2 to 2." -msgstr "" - #: src/settings_translation_file.cpp msgid "Map directory" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen fractal.\n" -"'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +"Map generation attributes specific to Mapgen Valleys.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." +msgstr "" +"全域地圖產生屬性。\n" +"未在旗標字串中指定的旗標將不會自預設值修改。\n" +"以「no」開頭的旗標字串將會用於明確的停用它們。\n" +"「trees」與「flat」旗標只在 mgv6 有效。" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills added to the flat world.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"全域地圖產生屬性。\n" +"未在旗標字串中指定的旗標將不會自預設值修改。\n" +"以「no」開頭的旗標字串將會用於明確的停用它們。\n" +"「trees」與「flat」旗標只在 mgv6 有效。" #: src/settings_translation_file.cpp msgid "" @@ -2494,6 +2765,11 @@ msgstr "" msgid "Mapblock unload timeout" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen Valleys" +msgstr "地圖產生器名稱" + #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" msgstr "" @@ -2514,6 +2790,59 @@ msgstr "地圖產生器除錯" msgid "Mapgen flags" msgstr "地圖產生器旗標" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat" +msgstr "地圖產生器旗標" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave1 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave2 noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat filler depth noise parameters" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat flags" +msgstr "地圖產生器分形旗標" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat ground level" +msgstr "地圖產生器旗標" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill steepness" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat hill threshold" +msgstr "" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake steepness" +msgstr "地圖產生器分形朱麗亞迭代" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat lake threshold" +msgstr "地圖產生器分形旗標" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat large cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen flat terrain noise parameters" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "地圖產生器分形" @@ -2531,25 +2860,15 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal flags" +#, fuzzy +msgid "Mapgen fractal fractal" msgstr "地圖產生器分形旗標" #: src/settings_translation_file.cpp -msgid "Mapgen fractal julia iterations" +#, fuzzy +msgid "Mapgen fractal iterations" msgstr "地圖產生器分形朱麗亞迭代" -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal julia slice w" -msgstr "" - #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" msgstr "" @@ -2567,25 +2886,24 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot iterations" -msgstr "" +#, fuzzy +msgid "Mapgen fractal offset" +msgstr "地圖產生器分形旗標" #: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot offset" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot scale" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Mapgen fractal mandelbrot slice w" -msgstr "" +#, fuzzy +msgid "Mapgen fractal scale" +msgstr "地圖產生器分形" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal slice w" +msgstr "地圖產生器分形" + #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" @@ -2730,6 +3048,18 @@ msgstr "" msgid "Mapgen v7 terrain persistation noise parameters" msgstr "" +#: src/settings_translation_file.cpp +msgid "Massive cave depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive cave noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Massive caves form here." +msgstr "" + #: src/settings_translation_file.cpp msgid "Max block generate distance" msgstr "" @@ -2758,14 +3088,6 @@ msgstr "" msgid "Maximum FPS when game is paused." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Maximum distance above water level for player spawn.\n" -"Larger values result in spawn points closer to (x = 0, z = 0).\n" -"Smaller values may result in a suitable spawn point not being found,\n" -"resulting in a spawn at (0, 0, 0) possibly buried underground." -msgstr "" - #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" msgstr "" @@ -2857,6 +3179,10 @@ msgstr "" msgid "Message of the day displayed to players connecting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Method used to highlight selected object." +msgstr "" + #: src/settings_translation_file.cpp msgid "Minimap" msgstr "" @@ -2873,13 +3199,6 @@ msgstr "" msgid "Minimum texture size for filters" msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Minimum wanted FPS.\n" -"The amount of rendered stuff is dynamically set according to this. and " -"viewing range min and max." -msgstr "" - #: src/settings_translation_file.cpp msgid "Mipmapping" msgstr "映射貼圖" @@ -2956,10 +3275,6 @@ msgid "" "This value will be overridden when starting from the main menu." msgstr "" -#: src/settings_translation_file.cpp -msgid "New style water" -msgstr "" - #: src/settings_translation_file.cpp msgid "New users need to input this password." msgstr "" @@ -2980,6 +3295,10 @@ msgstr "突顯節點" msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +#: src/settings_translation_file.cpp +msgid "Noises" +msgstr "" + #: src/settings_translation_file.cpp msgid "Normalmaps sampling" msgstr "" @@ -3020,10 +3339,6 @@ msgstr "" msgid "Overall scale of parallax occlusion effect." msgstr "" -#: src/settings_translation_file.cpp -msgid "Parallax Occlusion" -msgstr "視差遮蔽" - #: src/settings_translation_file.cpp msgid "Parallax occlusion" msgstr "視差遮蔽" @@ -3088,18 +3403,6 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" -#: src/settings_translation_file.cpp -msgid "" -"Pre-generate all item visuals used in the inventory.\n" -"This increases startup time, but runs smoother in-game.\n" -"The generated textures can easily exceed your VRAM, causing artifacts in the " -"inventory." -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Preload inventory textures" -msgstr "預先載入物品欄材質" - #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" @@ -3123,6 +3426,10 @@ msgid "" "corners." msgstr "" +#: src/settings_translation_file.cpp +msgid "Raises terrain to make valleys around the rivers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Random input" msgstr "" @@ -3151,6 +3458,22 @@ msgstr "右鍵" msgid "Rightclick repetition interval" msgstr "" +#: src/settings_translation_file.cpp +msgid "River Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Noise" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River Size" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "River noise -- rivers occur close to zero" +msgstr "" + #: src/settings_translation_file.cpp msgid "Rollback recording" msgstr "" @@ -3268,10 +3591,6 @@ msgid "" "Requires shaders to be enabled." msgstr "" -#: src/settings_translation_file.cpp -msgid "Shaders" -msgstr "著色器" - #: src/settings_translation_file.cpp msgid "" "Shaders allow advanced visul effects and may increase performance on some " @@ -3297,6 +3616,10 @@ msgid "" "nodes)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Slope and fill work together to modify the heights" +msgstr "" + #: src/settings_translation_file.cpp msgid "Smooth lighting" msgstr "平滑光" @@ -3351,15 +3674,34 @@ msgstr "" msgid "Synchronous SQLite" msgstr "" +#: src/settings_translation_file.cpp +msgid "Terrain Height" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for hills.\n" +"Controls proportion of world area covered by hills.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Terrain noise threshold for lakes.\n" +"Controls proportion of world area covered by lakes.\n" +"Adjust towards 0.0 for a larger proportion." +msgstr "" + #: src/settings_translation_file.cpp msgid "Texture path" msgstr "材質路徑" #: src/settings_translation_file.cpp -msgid "" -"The allowed adjustment range for the automatic rendering range adjustment.\n" -"Set this to be equal to viewing range minimum to disable the auto-adjustment " -"algorithm." +msgid "The altitude at which temperature drops by 20C" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "The depth of dirt or other filler" msgstr "" #: src/settings_translation_file.cpp @@ -3431,6 +3773,11 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "映射貼圖" + #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3499,17 +3846,33 @@ msgid "V-Sync" msgstr "" #: src/settings_translation_file.cpp -msgid "Vertical initial window size." +msgid "VBO" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Depth" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Fill" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Profile" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valley Slope" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Valleys C Flags" msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." msgstr "" -#: src/settings_translation_file.cpp -msgid "Vertical spawn range" -msgstr "" - #: src/settings_translation_file.cpp msgid "Video driver" msgstr "" @@ -3518,6 +3881,12 @@ msgstr "" msgid "View bobbing" msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"View distance in nodes.\n" +"Min = 20" +msgstr "" + #: src/settings_translation_file.cpp msgid "View range decrease key" msgstr "" @@ -3527,24 +3896,29 @@ msgid "View range increase key" msgstr "" #: src/settings_translation_file.cpp -msgid "Viewing range maximum" -msgstr "" - -#: src/settings_translation_file.cpp -msgid "Viewing range minimum" +msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp msgid "Volume" msgstr "音量" +#: src/settings_translation_file.cpp +msgid "" +"W co-ordinate of the generated 3D slice of a 4D fractal.\n" +"Determines which 3D slice of the 4D shape is generated.\n" +"Has no effect on 3D fractals.\n" +"Range roughly -2 to 2." +msgstr "" + #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "走路速度" #: src/settings_translation_file.cpp -msgid "Wanted FPS" -msgstr "" +#, fuzzy +msgid "Water Features" +msgstr "物品材質..." #: src/settings_translation_file.cpp msgid "Water level" @@ -3652,6 +4026,10 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "Width component of the initial window size." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." msgstr "" @@ -3662,6 +4040,14 @@ msgid "" "Not needed if starting from the main menu." msgstr "" +#: src/settings_translation_file.cpp +msgid "Y of flat ground." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Y of upper limit of large pseudorandom caves." +msgstr "" + #: src/settings_translation_file.cpp msgid "cURL file download timeout" msgstr "" @@ -3674,71 +4060,39 @@ msgstr "" msgid "cURL timeout" msgstr "" -#~ msgid "Opaque Leaves" -#~ msgstr "不透明葉子" - -#~ msgid "Simple Leaves" -#~ msgstr "簡易葉子" - -#~ msgid "Fancy Leaves" -#~ msgstr "華麗葉子" - -#~ msgid "No Mipmap" -#~ msgstr "無 Mip 貼圖" - -#~ msgid "Mipmap" -#~ msgstr "Mip 貼圖" - -#~ msgid "Mipmap + Aniso. Filter" -#~ msgstr "Mip 貼圖 + Aniso. 過濾器" - -#~ msgid "2x" -#~ msgstr "2x" - -#~ msgid "4x" -#~ msgstr "4x" - -#~ msgid "8x" -#~ msgstr "8x" - -#~ msgid "Are you sure to reset your singleplayer world?" -#~ msgstr "您確定要要重置您的單人遊戲世界嗎？" - -#~ msgid "No!!!" -#~ msgstr "否！！！" - -#~ msgid "Opaque Water" -#~ msgstr "不透明水" - -#~ msgid "Texturing:" -#~ msgstr "紋理：" - -#~ msgid "Antialiasing:" -#~ msgstr "反鋸齒：" - -#~ msgid "Reset singleplayer world" -#~ msgstr "重置單人遊戲世界" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "套用在選單元素的縮放係數： " - -#~ msgid "Touch free target" -#~ msgstr "碰觸自由目標" - -#~ msgid "Touchthreshold (px)" -#~ msgstr "碰觸限值（像素）" - -#~ msgid "To enable shaders the OpenGL driver needs to be used." -#~ msgstr "要啟用著色器，必須使用 OpenGL 驅動程式。" - -#~ msgid "If enabled, " -#~ msgstr "若啟用， " - -#~ msgid "If disabled " -#~ msgstr "若停用 " +#~ msgid "\"" +#~ msgstr "\"" #~ msgid "Enable a bit lower water surface, so it doesn't " #~ msgstr "啟用較低的水面，所以它不會 " -#~ msgid "\"" -#~ msgstr "\"" +#~ msgid "If disabled " +#~ msgstr "若停用 " + +#~ msgid "If enabled, " +#~ msgstr "若啟用， " + +#~ msgid "Touch free target" +#~ msgstr "碰觸自由目標" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "套用在選單元素的縮放係數： " + +#~ msgid "Reset singleplayer world" +#~ msgstr "重置單人遊戲世界" + +#~ msgid "Preload inventory textures" +#~ msgstr "預先載入物品欄材質" + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "啟用節點選擇突顯（停用選取框）。" + +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n" +#~ "注意，這個功能並未最佳化完成，水面的\n" +#~ "柔和光功能無法與此功能一同運作。" diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index d3bf5a1f..d8e08521 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -88,9 +88,9 @@ fake_function() { gettext("Toggle camera mode key"); gettext("Key for switching between first- and third-person camera.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3"); gettext("View range increase key"); - gettext("Key for increasing the viewing range. Modifies the minimum viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3"); + gettext("Key for increasing the viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3"); gettext("View range decrease key"); - gettext("Key for decreasing the viewing range. Modifies the minimum viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3"); + gettext("Key for decreasing the viewing range.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3"); gettext("Print stacks"); gettext("Key for printing debug stacks. Used for development.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3"); gettext("Network"); @@ -109,10 +109,10 @@ fake_function() { gettext("Graphics"); gettext("In-Game"); gettext("Basic"); + gettext("VBO"); + gettext("Enable VBO"); gettext("Fog"); gettext("Whether to fog out the end of the visible area."); - gettext("New style water"); - gettext("Enable a bit lower water surface, so it doesn't \"fill\" the node completely.\nNote that this is not quite optimized and that smooth lighting on the\nwater surface doesn't work with this."); gettext("Leaves style"); gettext("Leaves style:\n- Fancy: all faces visible\n- Simple: only outer faces, if defined special_tiles are used\n- Opaque: disable transparency"); gettext("Connect glass"); @@ -123,6 +123,8 @@ fake_function() { gettext("Clouds are a client side effect."); gettext("3D clouds"); gettext("Use 3D cloud look instead of flat."); + gettext("Node highlighting"); + gettext("Method used to highlight selected object."); gettext("Filtering"); gettext("Mipmapping"); gettext("Use mip mapping to scale textures. May slightly increase performance."); @@ -141,6 +143,9 @@ fake_function() { gettext("Shaders"); gettext("Shaders"); gettext("Shaders allow advanced visul effects and may increase performance on some video cards.\nThy only work with the OpenGL video backend."); + gettext("Tone Mapping"); + gettext("Filmic tone mapping"); + gettext("Enables filmic tone mapping"); gettext("Bumpmapping"); gettext("Bumpmapping"); gettext("Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack\nor need to be auto-generated.\nRequires shaders to be enabled."); @@ -174,16 +179,12 @@ fake_function() { gettext("Waving plants"); gettext("Set to true enables waving plants.\nRequires shaders to be enabled."); gettext("Advanced"); - gettext("Wanted FPS"); - gettext("Minimum wanted FPS.\nThe amount of rendered stuff is dynamically set according to this. and viewing range min and max."); gettext("Maximum FPS"); gettext("If FPS would go higher than this, limit it by sleeping\nto not waste CPU power for no benefit."); gettext("FPS in pause menu"); gettext("Maximum FPS when game is paused."); - gettext("Viewing range maximum"); - gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range minimum to disable the auto-adjustment algorithm."); - gettext("Viewing range minimum"); - gettext("The allowed adjustment range for the automatic rendering range adjustment.\nSet this to be equal to viewing range maximum to disable the auto-adjustment algorithm."); + gettext("Viewing range"); + gettext("View distance in nodes.\nMin = 20"); gettext("Screen width"); gettext("Width component of the initial window size."); gettext("Screen height"); @@ -211,7 +212,7 @@ fake_function() { gettext("Fall bobbing"); gettext("Multiplier for fall bobbing.\nFor example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."); gettext("3D mode"); - gettext("3D support.\nCurrently supported:\n- none: no 3d output.\n- anaglyph: cyan/magenta color 3d.\n- interlaced: odd/even line based polarisation screen support.\n- topbottom: split screen top/bottom.\n- sidebyside: split screen side by side."); + gettext("3D support.\nCurrently supported:\n- none: no 3d output.\n- anaglyph: cyan/magenta color 3d.\n- interlaced: odd/even line based polarisation screen support.\n- topbottom: split screen top/bottom.\n- sidebyside: split screen side by side.\n- pageflip: quadbuffer based 3d."); gettext("Console color"); gettext("In-game chat console background color (R,G,B)."); gettext("Console alpha"); @@ -228,8 +229,6 @@ fake_function() { gettext("Whether node texture animations should be desynchronized per mapblock."); gettext("Maximum hotbar width"); gettext("Maximum proportion of current window to be used for hotbar.\nUseful if there's something to be displayed right or left of hotbar."); - gettext("Node highlighting"); - gettext("Enable selection highlighting for nodes (disables selectionbox)."); gettext("Mesh cache"); gettext("Enables caching of facedir rotated meshes."); gettext("Minimap"); @@ -242,6 +241,8 @@ fake_function() { gettext("Make fog and sky colors depend on daytime (dawn/sunset) and view direction."); gettext("Ambient occlusion gamma"); gettext("The strength (darkness) of node ambient-occlusion shading.\nLower is darker, Higher is lighter. The valid range of values for this\nsetting is 0.25 to 4.0 inclusive. If the value is out of range it will be\nset to the nearest valid value."); + gettext("Inventory items animations"); + gettext("Enables animation of inventory items."); gettext("Menus"); gettext("Clouds in menu"); gettext("Use a cloud animation for the main menu background."); @@ -343,8 +344,6 @@ fake_function() { gettext("Whether to allow players to damage and kill each other."); gettext("Static spawnpoint"); gettext("If this is set, players will always (re)spawn at the given position."); - gettext("Vertical spawn range"); - gettext("Maximum distance above water level for player spawn.\nLarger values result in spawn points closer to (x = 0, z = 0).\nSmaller values may result in a suitable spawn point not being found,\nresulting in a spawn at (0, 0, 0) possibly buried underground."); gettext("Disallow empty passwords"); gettext("If enabled, new players cannot join with an empty password."); gettext("Disable anticheat"); @@ -499,33 +498,74 @@ fake_function() { gettext("Mapgen flat cave1 noise parameters"); gettext("Mapgen flat cave2 noise parameters"); gettext("Mapgen fractal"); - gettext("Mapgen fractal formula"); - gettext("Choice of 8 4-dimensional fractals.\n1 = \"Roundy\" mandelbrot set.\n2 = \"Roundy\" julia set.\n3 = \"Squarry\" mandelbrot set.\n4 = \"Squarry\" julia set.\n5 = \"Mandy Cousin\" mandelbrot set.\n6 = \"Mandy Cousin\" julia set.\n7 = \"Variation\" mandelbrot set.\n8 = \"Variation\" julia set."); + gettext("Mapgen fractal fractal"); + gettext("Choice of 18 fractals from 9 formulas.\n1 = 4D \"Roundy\" mandelbrot set.\n2 = 4D \"Roundy\" julia set.\n3 = 4D \"Squarry\" mandelbrot set.\n4 = 4D \"Squarry\" julia set.\n5 = 4D \"Mandy Cousin\" mandelbrot set.\n6 = 4D \"Mandy Cousin\" julia set.\n7 = 4D \"Variation\" mandelbrot set.\n8 = 4D \"Variation\" julia set.\n9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n11 = 3D \"Christmas Tree\" mandelbrot set.\n12 = 3D \"Christmas Tree\" julia set.\n13 = 3D \"Mandelbulb\" mandelbrot set.\n14 = 3D \"Mandelbulb\" julia set.\n15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n16 = 3D \"Cosine Mandelbulb\" julia set.\n17 = 4D \"Mandelbulb\" mandelbrot set.\n18 = 4D \"Mandelbulb\" julia set."); gettext("Mapgen fractal iterations"); - gettext("Iterations of the recursive function.\nControls scale of finest detail."); + gettext("Iterations of the recursive function.\nControls the amount of fine detail."); gettext("Mapgen fractal scale"); gettext("Approximate (X,Y,Z) scale of fractal in nodes."); gettext("Mapgen fractal offset"); - gettext("(X,Y,Z) offset of fractal from world centre.\nUsed to move a suitable spawn area of low land close to (0, 0).\nThe default is suitable for mandelbrot sets, it needs to be edited for julia sets,\ndo this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0).\nRange roughly -2 to 2. Multiply by 'scale' for offset in nodes."); + gettext("(X,Y,Z) offset of fractal from world centre in units of 'scale'.\nUsed to move a suitable spawn area of low land close to (0, 0).\nThe default is suitable for mandelbrot sets, it needs to be edited for julia sets.\nRange roughly -2 to 2. Multiply by 'scale' for offset in nodes."); gettext("Mapgen fractal slice w"); - gettext("W co-ordinate of the generated 3D slice of the 4D shape.\nAlters the generated 3D shape.\nRange roughly -2 to 2."); + gettext("W co-ordinate of the generated 3D slice of a 4D fractal.\nDetermines which 3D slice of the 4D shape is generated.\nHas no effect on 3D fractals.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia x"); - gettext("Julia set only: X value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: X component of hypercomplex constant determining julia shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia y"); - gettext("Julia set only: Y value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: Y component of hypercomplex constant determining julia shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia z"); - gettext("Julia set only: Z value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: Z component of hypercomplex constant determining julia shape.\nRange roughly -2 to 2."); gettext("Mapgen fractal julia w"); - gettext("Julia set only: W value determining the 4D shape.\nRange roughly -2 to 2."); + gettext("Julia set only: W component of hypercomplex constant determining julia shape.\nHas no effect on 3D fractals.\nRange roughly -2 to 2."); gettext("Mapgen fractal seabed noise parameters"); gettext("Mapgen fractal filler depth noise parameters"); gettext("Mapgen fractal cave1 noise parameters"); gettext("Mapgen fractal cave2 noise parameters"); + gettext("Mapgen Valleys"); + gettext("General"); + gettext("Valleys C Flags"); + gettext("Map generation attributes specific to Mapgen Valleys.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.\n\"altitude_chill\" makes higher elevations colder, which may cause biome issues.\n\"humid_rivers\" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes."); + gettext("Altitude Chill"); + gettext("The altitude at which temperature drops by 20C"); + gettext("Large cave depth"); + gettext("Depth below which you'll find large caves."); + gettext("Lava Features"); + gettext("Creates unpredictable lava features in caves.\nThese can make mining difficult. Zero disables them. (0-10)"); + gettext("Massive cave depth"); + gettext("Depth below which you'll find massive caves."); + gettext("River Depth"); + gettext("How deep to make rivers"); + gettext("River Size"); + gettext("How wide to make rivers"); + gettext("Water Features"); + gettext("Creates unpredictable water features in caves.\nThese can make mining difficult. Zero disables them. (0-10)"); + gettext("Noises"); + gettext("Cave noise #1"); + gettext("Caves and tunnels form at the intersection of the two noises"); + gettext("Cave noise #2"); + gettext("Caves and tunnels form at the intersection of the two noises"); + gettext("Filler Depth"); + gettext("The depth of dirt or other filler"); + gettext("Massive cave noise"); + gettext("Massive caves form here."); + gettext("River Noise"); + gettext("River noise -- rivers occur close to zero"); + gettext("Terrain Height"); + gettext("Base terrain height"); + gettext("Valley Depth"); + gettext("Raises terrain to make valleys around the rivers"); + gettext("Valley Fill"); + gettext("Slope and fill work together to modify the heights"); + gettext("Valley Profile"); + gettext("Amplifies the valleys"); + gettext("Valley Slope"); + gettext("Slope and fill work together to modify the heights"); gettext("Security"); gettext("Enable mod security"); gettext("Prevent mods from doing insecure things like running shell commands."); gettext("Trusted mods"); gettext("Comma-separated list of trusted mods that are allowed to access insecure\nfunctions even when mod security is on (via request_insecure_environment())."); + gettext("HTTP Mods"); + gettext("Comma-seperated list of mods that are allowed to access HTTP APIs, which\nallow them to upload and download data to/from the internet."); gettext("Client and Server"); gettext("Player name"); gettext("Name of the player.\nWhen running a server, clients connecting with this name are admins.\nWhen starting from the main menu, this is overridden."); From 6969dd4224d0f309e006edf50b8eb1a188fc1254 Mon Sep 17 00:00:00 2001 From: Duane Robertson Date: Fri, 26 Feb 2016 20:41:13 -0600 Subject: [PATCH 311/531] Mgvalleys: Add Dry Riverbeds Lower water table where base humidity is low. Alter heat and humidity to compensate for river humidity and altitude chill. Correct misuse of surface_max_y in generateTerrain. Remove sand trails in the water at river mouths. Remove river water below water_level. Correct heat/humidity calculations where noises are less than zero. Correct heightmap errors as much as possible. Make humidity calculations more readable. --- src/mapgen_valleys.cpp | 138 +++++++++++++++++++++++++++++++---------- 1 file changed, 104 insertions(+), 34 deletions(-) diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index 2f96c339..f9625746 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -399,8 +399,21 @@ void MapgenValleys::calculateNoise() //mapgen_profiler->avg("noisemaps", tcn.stop() / 1000.f); + float heat_offset = 0.f; + float humidity_scale = 1.f; + + // Altitude chill tends to reduce the average heat. + if (use_altitude_chill) + heat_offset = 5.f; + + // River humidity tends to increase the humidity range. + if (humid_rivers) { + humidity_scale = 0.8f; + } + for (s32 index = 0; index < csize.X * csize.Z; index++) { - noise_heat->result[index] += noise_heat_blend->result[index]; + noise_heat->result[index] += noise_heat_blend->result[index] + heat_offset; + noise_humidity->result[index] *= humidity_scale; noise_humidity->result[index] += noise_humidity_blend->result[index]; } @@ -481,9 +494,10 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn) } // base - depth : height of the bottom of the river - // water_level - 6 : don't make rivers below 6 nodes under the surface + // water_level - 3 : don't make rivers below 3 nodes under the surface + // We use three because that's as low as the swamp biomes go. // There is no logical equivalent to this using rangelim. - mount = MYMIN(MYMAX(base - depth, (float) (water_level - 6)), mount); + mount = MYMIN(MYMAX(base - depth, (float)(water_level - 3)), mount); // Slope has no influence on rivers. *tn->slope = 0.f; @@ -503,7 +517,7 @@ float MapgenValleys::adjustedTerrainLevelFromNoise(TerrainNoise *tn) for (s16 y = y_start; y <= y_start + 1000; y++) { float fill = NoisePerlin3D(&noise_inter_valley_fill->np, tn->x, y, tn->z, seed); - if (fill * *tn->slope <= y - mount) { + if (fill * *tn->slope < y - mount) { mount = MYMAX(y - 1, mount); break; } @@ -552,6 +566,15 @@ float MapgenValleys::terrainLevelAtPoint(s16 x, s16 z) int MapgenValleys::generateTerrain() { + // Raising this reduces the rate of evaporation. + static const float evaporation = 300.f; + // from the lua + static const float humidity_dropoff = 4.f; + // constant to convert altitude chill (compatible with lua) to heat + static const float alt_to_heat = 20.f; + // humidity reduction by altitude + static const float alt_to_humid = 10.f; + MapNode n_air(CONTENT_AIR); MapNode n_river_water(c_river_water_source); MapNode n_sand(c_sand); @@ -564,42 +587,56 @@ int MapgenValleys::generateTerrain() for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) { - s16 river_y = floor(noise_rivers->result[index_2d]); - s16 surface_y = floor(noise_terrain_height->result[index_2d]); + float river_y = noise_rivers->result[index_2d]; + float surface_y = noise_terrain_height->result[index_2d]; float slope = noise_inter_valley_slope->result[index_2d]; + float t_heat = noise_heat->result[index_2d]; - heightmap[index_2d] = surface_y; + heightmap[index_2d] = -MAX_MAP_GENERATION_LIMIT; if (surface_y > surface_max_y) - surface_max_y = surface_y; + surface_max_y = ceil(surface_y); + + if (humid_rivers) { + // Derive heat from (base) altitude. This will be most correct + // at rivers, since other surface heights may vary below. + if (use_altitude_chill && (surface_y > 0.f || river_y > 0.f)) + t_heat -= alt_to_heat * MYMAX(surface_y, river_y) / altitude_chill; + + // If humidity is low or heat is high, lower the water table. + float delta = noise_humidity->result[index_2d] - 50.f; + if (delta < 0.f) { + float t_evap = (t_heat - 32.f) / evaporation; + river_y += delta * MYMAX(t_evap, 0.08f); + } + } u32 index_3d = (z - node_min.Z) * zstride + (x - node_min.X); u32 index_data = vm->m_area.index(x, node_min.Y - 1, z); // Mapgens concern themselves with stone and water. for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - float fill = 0.f; - fill = noise_inter_valley_fill->result[index_3d]; - if (vm->m_data[index_data].getContent() == CONTENT_IGNORE) { - bool river = (river_y > surface_y); + float fill = noise_inter_valley_fill->result[index_3d]; + float surface_delta = (float)y - surface_y; + bool river = y + 1 < river_y; - if (river && y == surface_y) { + if (fabs(surface_delta) <= 0.5f && y > water_level && river) { // river bottom vm->m_data[index_data] = n_sand; - } else if (river && y <= surface_y) { + } else if (slope * fill > surface_delta) { // ground vm->m_data[index_data] = n_stone; - } else if (river && y < river_y) { - // river - vm->m_data[index_data] = n_river_water; - } else if ((!river) && myround(fill * slope) >= y - surface_y) { - // ground - vm->m_data[index_data] = n_stone; - heightmap[index_2d] = surface_max_y = y; + if (y > heightmap[index_2d]) + heightmap[index_2d] = y; + if (y > surface_max_y) + surface_max_y = y; } else if (y <= water_level) { // sea vm->m_data[index_data] = n_water; + } else if (river) { + // river + vm->m_data[index_data] = n_river_water; } else { vm->m_data[index_data] = n_air; } @@ -609,18 +646,51 @@ int MapgenValleys::generateTerrain() index_3d += ystride; } - // Although the original valleys adjusts humidity by distance - // from seawater, this causes problems with the default biomes. - // Adjust only by freshwater proximity. - const float humidity_offset = 0.8f; // derived by testing - if (humid_rivers) - noise_humidity->result[index_2d] *= (1 + pow(0.5f, MYMAX((surface_max_y - - noise_rivers->result[index_2d]) / 3.f, 0.f))) * humidity_offset; + // This happens if we're generating a chunk that doesn't + // contain the terrain surface, in which case, we need + // to set heightmap to a value outside of the chunk, + // to avoid confusing lua mods that use heightmap. + if (heightmap[index_2d] == -MAX_MAP_GENERATION_LIMIT) { + s16 surface_y_int = myround(surface_y); + if (surface_y_int > node_max.Y + 1 || surface_y_int < node_min.Y - 1) { + // If surface_y is outside the chunk, it's good enough. + heightmap[index_2d] = surface_y_int; + } else { + // If the ground is outside of this chunk, but surface_y + // is within the chunk, give a value outside. + heightmap[index_2d] = node_min.Y - 2; + } + } - // Assign the heat adjusted by altitude. - if (use_altitude_chill && surface_max_y > 0) - noise_heat->result[index_2d] *= - pow(0.5f, (surface_max_y - altitude_chill / 3.f) / altitude_chill); + if (humid_rivers) { + // Use base ground (water table) in a riverbed, to + // avoid an unnatural rise in humidity. + float t_alt = MYMAX(noise_rivers->result[index_2d], (float)heightmap[index_2d]); + float humid = noise_humidity->result[index_2d]; + float water_depth = (t_alt - river_y) / humidity_dropoff; + humid *= 1.f + pow(0.5f, MYMAX(water_depth, 1.f)); + + // Reduce humidity with altitude (ignoring riverbeds). + // This is similar to the lua version's seawater adjustment, + // but doesn't increase the base humidity, which causes + // problems with the default biomes. + if (t_alt > 0.f) + humid -= alt_to_humid * t_alt / altitude_chill; + + noise_humidity->result[index_2d] = humid; + } + + // Assign the heat adjusted by any changed altitudes. + // The altitude will change about half the time. + if (use_altitude_chill) { + // ground height ignoring riverbeds + float t_alt = MYMAX(noise_rivers->result[index_2d], (float)heightmap[index_2d]); + if (humid_rivers && heightmap[index_2d] == (s16)myround(surface_y)) + // The altitude hasn't changed. Use the first result. + noise_heat->result[index_2d] = t_heat; + else if (t_alt > 0.f) + noise_heat->result[index_2d] -= alt_to_heat * t_alt / altitude_chill; + } } return surface_max_y; @@ -645,7 +715,7 @@ MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map) // generated mapchunk or if not, a node of overgenerated base terrain. content_t c_above = vm->m_data[vi + em.X].getContent(); bool air_above = c_above == CONTENT_AIR; - bool water_above = (c_above == c_water_source); + bool water_above = (c_above == c_water_source || c_above == c_river_water_source); // If there is air or water above enable top/filler placement, otherwise force // nplaced to stone level by setting a number exceeding any possible filler depth. @@ -714,7 +784,7 @@ MgStoneType MapgenValleys::generateBiomes(float *heat_map, float *humidity_map) water_above = true; } else if (c == c_river_water_source) { vm->m_data[vi] = MapNode(biome->c_river_water); - nplaced = U16_MAX; // Sand was already placed under rivers. + nplaced = depth_top; // Enable filler placement for next surface air_above = false; water_above = true; } else if (c == CONTENT_AIR) { From 6359ff9a8722d54c48391e8322b5c289e644d054 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 26 Feb 2016 22:30:50 +0000 Subject: [PATCH 312/531] Nodedef: Restore smooth lighting to water --- src/nodedef.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 6d740fac..1dd5aa53 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -853,7 +853,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef, assert(f->liquid_type == LIQUID_SOURCE); if (opaque_water) f->alpha = 255; - f->solidness = 0; + f->solidness = 1; is_liquid = true; break; case NDT_FLOWINGLIQUID: From b114fd87a95dbba147b5a659f12323fd47975ad6 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 27 Feb 2016 20:11:32 -0500 Subject: [PATCH 313/531] Resize object_marker_red.png to 16x16 Having a non-power-of-two image broke the Android app. --- textures/base/pack/object_marker_red.png | Bin 663 -> 449 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/base/pack/object_marker_red.png b/textures/base/pack/object_marker_red.png index 552a546e3e225942b9c8c47ca84adb6573ea369d..f345d037630af101d0d1b79bbe6321119b98c644 100644 GIT binary patch delta 410 zcmV;L0cHM|1;GO$iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy+e;XGV z3S95@ZU6uP9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0VPR9 zK~y-)rPDo5!$1%P;Li?7NoR?Mj-^W%AAypNBan`kBSA?8C0!`#5>60v0z&5sQ+TX6 zK_vV}MI#>jlAA~Qv(E(@9|%{|SMrU_fd*_5VevsnhG5SPq4^1Mgfw)v*W z3}<;1tW1$|>3ftBlh*De@2XwyA@@bfb;nZPz2ju9yb~#6ySC^4iM(sYaBED;K2#Cg z4Okv$s|6N65a`9NPz^A`xF%)s#^W92TRfv~KX-#r8r6&|iuVW}_7*UPTng@z0sL_j#6maWxUL>xuz4g)W3GEi{rsu!(4CVP#?IpCE#zU@2JGM@X!N zY+(@)tqd5Ds3FAcTM`RjSe}=AfA3iAJgAKa4(H4azxkc{!tmc%6|P9Wh~ywB5soES zg*UMRLY$U=;>F0`Ka*VEW@CHMjC)JdY<4%B{W5s;+hDI0pDKRPh=urtruFf~@am<` z%7sDRtTrb&!kwht%ua4`qo4Z_w=z~D`(QVDXmy5JRoWnYv#xpoqe^@I~5^HVdzx&EC7x+jyl&&l4E~IuwlX6tRlGXb;2M Date: Tue, 1 Mar 2016 11:15:08 +0100 Subject: [PATCH 314/531] Revert "Fix jumping at node edge" This reverts commit 60dc01dc258db842e229351b871d0989e3e7d62c. This fixes issue #3773 --- src/collision.cpp | 66 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/src/collision.cpp b/src/collision.cpp index 4680e0a5..d847f629 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -248,9 +248,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, bool any_position_valid = false; - // The order is important here, must be y first - for(s16 y = max_y; y >= min_y; y--) for(s16 x = min_x; x <= max_x; x++) + for(s16 y = min_y; y <= max_y; y++) for(s16 z = min_z; z <= max_z; z++) { v3s16 p(x,y,z); @@ -404,17 +403,15 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, Go through every nodebox, find nearest collision */ for (u32 boxindex = 0; boxindex < cboxes.size(); boxindex++) { + // Ignore if already stepped up this nodebox. + if(is_step_up[boxindex]) + continue; + // Find nearest collision of the two boxes (raytracing-like) f32 dtime_tmp; int collided = axisAlignedCollision( cboxes[boxindex], movingbox, *speed_f, d, &dtime_tmp); - // Ignore if already stepped up this nodebox. - if (is_step_up[boxindex]) { - pos_f->Y += (cboxes[boxindex].MaxEdge.Y - movingbox.MinEdge.Y); - continue; - } - if (collided == -1 || dtime_tmp >= nearest_dtime) continue; @@ -464,12 +461,10 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, is_collision = false; CollisionInfo info; - if (is_object[nearest_boxindex]) { + if (is_object[nearest_boxindex]) info.type = COLLISION_OBJECT; - result.standing_on_object = true; - } else { + else info.type = COLLISION_NODE; - } info.node_p = node_positions[nearest_boxindex]; info.bouncy = bouncy; @@ -487,13 +482,12 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, speed_f->X = 0; result.collides = true; result.collides_xz = true; - } else if(nearest_collided == 1) { // Y - if (fabs(speed_f->Y) > BS * 3) { + } + else if(nearest_collided == 1) { // Y + if (fabs(speed_f->Y) > BS * 3) speed_f->Y *= bounce; - } else { + else speed_f->Y = 0; - result.touching_ground = true; - } result.collides = true; } else if(nearest_collided == 2) { // Z if (fabs(speed_f->Z) > BS * 3) @@ -514,5 +508,43 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, } } + /* + Final touches: Check if standing on ground, step up stairs. + */ + aabb3f box = box_0; + box.MinEdge += *pos_f; + box.MaxEdge += *pos_f; + for (u32 boxindex = 0; boxindex < cboxes.size(); boxindex++) { + const aabb3f& cbox = cboxes[boxindex]; + + /* + See if the object is touching ground. + + Object touches ground if object's minimum Y is near node's + maximum Y and object's X-Z-area overlaps with the node's + X-Z-area. + + Use 0.15*BS so that it is easier to get on a node. + */ + if (cbox.MaxEdge.X - d > box.MinEdge.X && cbox.MinEdge.X + d < box.MaxEdge.X && + cbox.MaxEdge.Z - d > box.MinEdge.Z && + cbox.MinEdge.Z + d < box.MaxEdge.Z) { + if (is_step_up[boxindex]) { + pos_f->Y += (cbox.MaxEdge.Y - box.MinEdge.Y); + box = box_0; + box.MinEdge += *pos_f; + box.MaxEdge += *pos_f; + } + if (fabs(cbox.MaxEdge.Y - box.MinEdge.Y) < 0.15 * BS) { + result.touching_ground = true; + + if (is_object[boxindex]) + result.standing_on_object = true; + if (is_unloaded[boxindex]) + result.standing_on_unloaded = true; + } + } + } + return result; } From da97969c9b72ea1752efb741663b727c0225795a Mon Sep 17 00:00:00 2001 From: Aleksey Vorona Date: Wed, 2 Mar 2016 10:13:11 -0800 Subject: [PATCH 315/531] Fix a mistake in the world format documentation Fixed a minor mistake that made it appear as if the inventory is serialized multiple times - once per each variable. In fact it is serialized once per each node. --- doc/world_format.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/world_format.txt b/doc/world_format.txt index a6255053..a4fb3d8f 100644 --- a/doc/world_format.txt +++ b/doc/world_format.txt @@ -316,7 +316,7 @@ if map format version >= 23: u8[key_len] key u32 val_len u8[val_len] value - serialized inventory + serialized inventory - Node timers if map format version == 23: From effa24737d6997dc40508533635accca3ed099e9 Mon Sep 17 00:00:00 2001 From: "Esteban I. Ruiz Moreno" Date: Sun, 2 Jun 2013 21:16:32 -0300 Subject: [PATCH 316/531] Use the console instead of a dedicated window when pressing keymap_chat/cmd keymap_console opens a full window for chat history browsing. --- src/chat.cpp | 18 ++++----- src/chat.h | 9 +++-- src/game.cpp | 69 ++++++++++------------------------- src/guiChatConsole.cpp | 56 ++++++++++++++++++---------- src/guiChatConsole.h | 7 ++++ src/terminal_chat_console.cpp | 37 ++++++++++--------- 6 files changed, 97 insertions(+), 99 deletions(-) diff --git a/src/chat.cpp b/src/chat.cpp index 50391d39..d8cf3efd 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -417,20 +417,18 @@ void ChatPrompt::input(const std::wstring &str) m_nick_completion_end = 0; } -std::wstring ChatPrompt::submit() +void ChatPrompt::addToHistory(std::wstring line) { - std::wstring line = m_line; - m_line.clear(); if (!line.empty()) m_history.push_back(line); if (m_history.size() > m_history_limit) m_history.erase(m_history.begin()); m_history_index = m_history.size(); - m_view = 0; - m_cursor = 0; - m_nick_completion_start = 0; - m_nick_completion_end = 0; - return line; +} + +std::wstring ChatPrompt::getLine() +{ + return m_line; } void ChatPrompt::clear() @@ -442,13 +440,15 @@ void ChatPrompt::clear() m_nick_completion_end = 0; } -void ChatPrompt::replace(std::wstring line) +std::wstring ChatPrompt::replace(std::wstring line) { + std::wstring old_line = m_line; m_line = line; m_view = m_cursor = line.size(); clampView(); m_nick_completion_start = 0; m_nick_completion_end = 0; + return old_line; } void ChatPrompt::historyPrev() diff --git a/src/chat.h b/src/chat.h index 5d26baf7..367baaaf 100644 --- a/src/chat.h +++ b/src/chat.h @@ -146,14 +146,17 @@ public: void input(wchar_t ch); void input(const std::wstring &str); - // Submit, clear and return current line - std::wstring submit(); + // Add a string to the history + void addToHistory(std::wstring line); + + // Get current line + std::wstring getLine(); // Clear the current line void clear(); // Replace the current line with the given text - void replace(std::wstring line); + std::wstring replace(std::wstring line); // Select previous command from history void historyPrev(); diff --git a/src/game.cpp b/src/game.cpp index 18ca11d6..3d5f86e2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -176,19 +176,6 @@ struct LocalFormspecHandler : public TextDest { } } - if (m_formname == "MT_CHAT_MENU") { - assert(m_client != 0); - - if ((fields.find("btn_send") != fields.end()) || - (fields.find("quit") != fields.end())) { - StringMap::const_iterator it = fields.find("f_text"); - if (it != fields.end()) - m_client->typeChatMessage(utf8_to_wide(it->second)); - - return; - } - } - if (m_formname == "MT_DEATH_SCREEN") { assert(m_client != 0); @@ -1097,27 +1084,6 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec, #define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop #endif -static void show_chat_menu(GUIFormSpecMenu **cur_formspec, - InventoryManager *invmgr, IGameDef *gamedef, - IWritableTextureSource *tsrc, IrrlichtDevice *device, - Client *client, std::string text) -{ - std::string formspec = - FORMSPEC_VERSION_STRING - SIZE_TAG - "field[3,2.35;6,0.5;f_text;;" + text + "]" - "button_exit[4,3;3,0.5;btn_send;" + strgettext("Proceed") + "]" - ; - - /* Create menu */ - /* Note: FormspecFormSource and LocalFormspecHandler - * are deleted by guiFormSpecMenu */ - FormspecFormSource *fs_src = new FormspecFormSource(formspec); - LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_CHAT_MENU", client); - - create_formspec_menu(cur_formspec, invmgr, gamedef, tsrc, device, fs_src, txt_dst, NULL); -} - static void show_deathscreen(GUIFormSpecMenu **cur_formspec, InventoryManager *invmgr, IGameDef *gamedef, IWritableTextureSource *tsrc, IrrlichtDevice *device, Client *client) @@ -1548,7 +1514,7 @@ protected: void dropSelectedItem(); void openInventory(); - void openConsole(); + void openConsole(float height, const wchar_t *line=NULL); void toggleFreeMove(float *statustext_time); void toggleFreeMoveAlt(float *statustext_time, float *jump_timer); void toggleFast(float *statustext_time); @@ -2683,16 +2649,16 @@ void Game::processKeyboardInput(VolatileRunFlags *flags, } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INVENTORY])) { openInventory(); } else if (input->wasKeyDown(EscapeKey) || input->wasKeyDown(CancelKey)) { - show_pause_menu(¤t_formspec, client, gamedef, texture_src, device, - simple_singleplayer_mode); + if (!gui_chat_console->isOpenInhibited()) { + show_pause_menu(¤t_formspec, client, gamedef, + texture_src, device, simple_singleplayer_mode); + } } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CHAT])) { - show_chat_menu(¤t_formspec, client, gamedef, texture_src, device, - client, ""); + openConsole(0.2, L""); } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CMD])) { - show_chat_menu(¤t_formspec, client, gamedef, texture_src, device, - client, "/"); + openConsole(0.2, L"/"); } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_CONSOLE])) { - openConsole(); + openConsole(1); } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_FREEMOVE])) { toggleFreeMove(statustext_time); } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_JUMP])) { @@ -2727,15 +2693,15 @@ void Game::processKeyboardInput(VolatileRunFlags *flags, decreaseViewRange(statustext_time); } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_RANGESELECT])) { toggleFullViewRange(statustext_time); - } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_NEXT])) + } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_NEXT])) { quicktune->next(); - else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_PREV])) + } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_PREV])) { quicktune->prev(); - else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_INC])) + } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_INC])) { quicktune->inc(); - else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_DEC])) + } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_QUICKTUNE_DEC])) { quicktune->dec(); - else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DEBUG_STACKS])) { + } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DEBUG_STACKS])) { // Print debug stacks dstream << "-----------------------------------------" << std::endl; @@ -2835,11 +2801,14 @@ void Game::openInventory() } -void Game::openConsole() +void Game::openConsole(float height, const wchar_t *line) { if (!gui_chat_console->isOpenInhibited()) { - // Open up to over half of the screen - gui_chat_console->openConsole(0.6); + gui_chat_console->openConsole(height); + if (line) { + gui_chat_console->setCloseOnEnter(true); + gui_chat_console->replaceAndAddToHistory(line); + } guienv->setFocus(gui_chat_console); } } diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index 3937e405..4c0039e5 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -55,6 +55,7 @@ GUIChatConsole::GUIChatConsole( m_screensize(v2u32(0,0)), m_animate_time_old(0), m_open(false), + m_close_on_enter(false), m_height(0), m_desired_height(0), m_desired_height_fraction(0.0), @@ -148,6 +149,14 @@ f32 GUIChatConsole::getDesiredHeight() const return m_desired_height_fraction; } +void GUIChatConsole::replaceAndAddToHistory(std::wstring line) +{ + ChatPrompt& prompt = m_chat_backend->getPrompt(); + prompt.addToHistory(prompt.getLine()); + prompt.replace(line); +} + + void GUIChatConsole::setCursor( bool visible, bool blinking, f32 blink_speed, f32 relative_height) { @@ -381,6 +390,9 @@ void GUIChatConsole::drawPrompt() bool GUIChatConsole::OnEvent(const SEvent& event) { + + ChatPrompt &prompt = m_chat_backend->getPrompt(); + if(event.EventType == EET_KEY_INPUT_EVENT && event.KeyInput.PressedDown) { // Key input @@ -391,13 +403,16 @@ bool GUIChatConsole::OnEvent(const SEvent& event) // inhibit open so the_game doesn't reopen immediately m_open_inhibited = 50; + m_close_on_enter = false; return true; } else if(event.KeyInput.Key == KEY_ESCAPE) { closeConsoleAtOnce(); Environment->removeFocus(this); - // the_game will open the pause menu + m_close_on_enter = false; + // inhibit open so the_game doesn't reopen immediately + m_open_inhibited = 1; // so the ESCAPE button doesn't open the "pause menu" return true; } else if(event.KeyInput.Key == KEY_PRIOR) @@ -412,22 +427,28 @@ bool GUIChatConsole::OnEvent(const SEvent& event) } else if(event.KeyInput.Key == KEY_RETURN) { - std::wstring text = m_chat_backend->getPrompt().submit(); + prompt.addToHistory(prompt.getLine()); + std::wstring text = prompt.replace(L""); m_client->typeChatMessage(text); + if (m_close_on_enter) { + closeConsoleAtOnce(); + Environment->removeFocus(this); + m_close_on_enter = false; + } return true; } else if(event.KeyInput.Key == KEY_UP) { // Up pressed // Move back in history - m_chat_backend->getPrompt().historyPrev(); + prompt.historyPrev(); return true; } else if(event.KeyInput.Key == KEY_DOWN) { // Down pressed // Move forward in history - m_chat_backend->getPrompt().historyNext(); + prompt.historyNext(); return true; } else if(event.KeyInput.Key == KEY_LEFT) @@ -438,7 +459,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) event.KeyInput.Control ? ChatPrompt::CURSOROP_SCOPE_WORD : ChatPrompt::CURSOROP_SCOPE_CHARACTER; - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_LEFT, scope); @@ -452,7 +473,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) event.KeyInput.Control ? ChatPrompt::CURSOROP_SCOPE_WORD : ChatPrompt::CURSOROP_SCOPE_CHARACTER; - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_RIGHT, scope); @@ -462,7 +483,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) { // Home pressed // move to beginning of line - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_LEFT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -472,7 +493,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) { // End pressed // move to end of line - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -486,7 +507,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) event.KeyInput.Control ? ChatPrompt::CURSOROP_SCOPE_WORD : ChatPrompt::CURSOROP_SCOPE_CHARACTER; - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_LEFT, scope); @@ -500,7 +521,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) event.KeyInput.Control ? ChatPrompt::CURSOROP_SCOPE_WORD : ChatPrompt::CURSOROP_SCOPE_CHARACTER; - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_RIGHT, scope); @@ -513,17 +534,14 @@ bool GUIChatConsole::OnEvent(const SEvent& event) IOSOperator *os_operator = Environment->getOSOperator(); const c8 *text = os_operator->getTextFromClipboard(); if (text) - { - std::wstring wtext = narrow_to_wide(text); - m_chat_backend->getPrompt().input(wtext); - } + prompt.input(narrow_to_wide(text)); return true; } else if(event.KeyInput.Key == KEY_KEY_U && event.KeyInput.Control) { // Ctrl-U pressed // kill line to left end - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_LEFT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -533,7 +551,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) { // Ctrl-K pressed // kill line to right end - m_chat_backend->getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -545,7 +563,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) // Nick completion std::list names = m_client->getConnectedPlayerNames(); bool backwards = event.KeyInput.Shift; - m_chat_backend->getPrompt().nickCompletion(names, backwards); + prompt.nickCompletion(names, backwards); return true; } else if(event.KeyInput.Char != 0 && !event.KeyInput.Control) @@ -553,9 +571,9 @@ bool GUIChatConsole::OnEvent(const SEvent& event) #if (defined(linux) || defined(__linux)) wchar_t wc = L'_'; mbtowc( &wc, (char *) &event.KeyInput.Char, sizeof(event.KeyInput.Char) ); - m_chat_backend->getPrompt().input(wc); + prompt.input(wc); #else - m_chat_backend->getPrompt().input(event.KeyInput.Char); + prompt.input(event.KeyInput.Char); #endif return true; } diff --git a/src/guiChatConsole.h b/src/guiChatConsole.h index 652b265a..7b9fc673 100644 --- a/src/guiChatConsole.h +++ b/src/guiChatConsole.h @@ -51,11 +51,16 @@ public: void closeConsole(); // Close the console immediately, without animation. void closeConsoleAtOnce(); + // Set whether to close the console after the user presses enter. + void setCloseOnEnter(bool close) { m_close_on_enter = close; } // Return the desired height (fraction of screen size) // Zero if the console is closed or getting closed f32 getDesiredHeight() const; + // Replace actual line when adding the actual to the history (if there is any) + void replaceAndAddToHistory(std::wstring line); + // Change how the cursor looks void setCursor( bool visible, @@ -95,6 +100,8 @@ private: // should the console be opened or closed? bool m_open; + // should it close after you press enter? + bool m_close_on_enter; // current console height [pixels] s32 m_height; // desired height [pixels] diff --git a/src/terminal_chat_console.cpp b/src/terminal_chat_console.cpp index ac06285e..c86a960f 100644 --- a/src/terminal_chat_console.cpp +++ b/src/terminal_chat_console.cpp @@ -146,6 +146,7 @@ void TerminalChatConsole::typeChatMessage(const std::wstring &msg) void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) { + ChatPrompt &prompt = m_chat_backend.getPrompt(); // Helpful if you want to collect key codes that aren't documented /*if (ch != ERR) { m_chat_backend.addMessage(L"", @@ -177,20 +178,20 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case KEY_ENTER: case '\r': case '\n': { - std::wstring text = m_chat_backend.getPrompt().submit(); - typeChatMessage(text); + prompt.addToHistory(prompt.getLine()); + typeChatMessage(prompt.replace(L"")); break; } case KEY_UP: - m_chat_backend.getPrompt().historyPrev(); + prompt.historyPrev(); break; case KEY_DOWN: - m_chat_backend.getPrompt().historyNext(); + prompt.historyNext(); break; case KEY_LEFT: // Left pressed // move character to the left - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_LEFT, ChatPrompt::CURSOROP_SCOPE_CHARACTER); @@ -198,7 +199,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case 545: // Ctrl-Left pressed // move word to the left - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_LEFT, ChatPrompt::CURSOROP_SCOPE_WORD); @@ -206,7 +207,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case KEY_RIGHT: // Right pressed // move character to the right - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_CHARACTER); @@ -214,7 +215,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case 560: // Ctrl-Right pressed // move word to the right - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_WORD); @@ -222,7 +223,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case KEY_HOME: // Home pressed // move to beginning of line - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_LEFT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -230,7 +231,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case KEY_END: // End pressed // move to end of line - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_MOVE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -240,7 +241,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case 127: // Backspace pressed // delete character to the left - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_LEFT, ChatPrompt::CURSOROP_SCOPE_CHARACTER); @@ -248,7 +249,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case KEY_DC: // Delete pressed // delete character to the right - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_CHARACTER); @@ -256,7 +257,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case 519: // Ctrl-Delete pressed // delete word to the right - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_WORD); @@ -264,7 +265,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case 21: // Ctrl-U pressed // kill line to left end - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_LEFT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -272,7 +273,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case 11: // Ctrl-K pressed // kill line to right end - m_chat_backend.getPrompt().cursorOperation( + prompt.cursorOperation( ChatPrompt::CURSOROP_DELETE, ChatPrompt::CURSOROP_DIR_RIGHT, ChatPrompt::CURSOROP_SCOPE_LINE); @@ -280,7 +281,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) case KEY_TAB: // Tab pressed // Nick completion - m_chat_backend.getPrompt().nickCompletion(m_nicks, false); + prompt.nickCompletion(m_nicks, false); break; default: // Add character to the prompt, @@ -296,11 +297,11 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed) m_pending_utf8_bytes = ""; // hopefully only one char in the wstring... for (size_t i = 0; i < w.size(); i++) { - m_chat_backend.getPrompt().input(w.c_str()[i]); + prompt.input(w.c_str()[i]); } } } else if (IS_ASCII_PRINTABLE_CHAR(ch)) { - m_chat_backend.getPrompt().input(ch); + prompt.input(ch); } else { // Silently ignore characters we don't handle From 3edb7575a1ccca631994c0f5515b770b7a3e20d2 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 27 Feb 2016 15:51:09 -0500 Subject: [PATCH 317/531] Unlock cursor when opening console --- src/game.cpp | 3 +-- src/guiChatConsole.cpp | 13 ++++++++----- src/guiChatConsole.h | 8 ++++---- src/mainmenumanager.h | 21 +++++++++++---------- src/modalMenu.h | 4 ++-- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 3d5f86e2..6fba70df 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2175,7 +2175,7 @@ bool Game::initGui() // Chat backend and console gui_chat_console = new GUIChatConsole(guienv, guienv->getRootGUIElement(), - -1, chat_backend, client); + -1, chat_backend, client, &g_menumgr); if (!gui_chat_console) { *error_message = "Could not allocate memory for chat console"; errorstream << *error_message << std::endl; @@ -2809,7 +2809,6 @@ void Game::openConsole(float height, const wchar_t *line) gui_chat_console->setCloseOnEnter(true); gui_chat_console->replaceAndAddToHistory(line); } - guienv->setFocus(gui_chat_console); } } diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index 4c0039e5..4a084a8e 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -46,12 +46,14 @@ GUIChatConsole::GUIChatConsole( gui::IGUIElement* parent, s32 id, ChatBackend* backend, - Client* client + Client* client, + IMenuManager* menumgr ): IGUIElement(gui::EGUIET_ELEMENT, env, parent, id, core::rect(0,0,100,100)), m_chat_backend(backend), m_client(client), + m_menumgr(menumgr), m_screensize(v2u32(0,0)), m_animate_time_old(0), m_open(false), @@ -120,6 +122,8 @@ void GUIChatConsole::openConsole(f32 height) m_desired_height_fraction = height; m_desired_height = height * m_screensize.Y; reformatConsole(); + Environment->setFocus(this); + m_menumgr->createdMenu(this); } bool GUIChatConsole::isOpen() const @@ -135,11 +139,13 @@ bool GUIChatConsole::isOpenInhibited() const void GUIChatConsole::closeConsole() { m_open = false; + Environment->removeFocus(this); + m_menumgr->deletingMenu(this); } void GUIChatConsole::closeConsoleAtOnce() { - m_open = false; + closeConsole(); m_height = 0; recalculateConsolePosition(); } @@ -399,7 +405,6 @@ bool GUIChatConsole::OnEvent(const SEvent& event) if(KeyPress(event.KeyInput) == getKeySetting("keymap_console")) { closeConsole(); - Environment->removeFocus(this); // inhibit open so the_game doesn't reopen immediately m_open_inhibited = 50; @@ -409,7 +414,6 @@ bool GUIChatConsole::OnEvent(const SEvent& event) else if(event.KeyInput.Key == KEY_ESCAPE) { closeConsoleAtOnce(); - Environment->removeFocus(this); m_close_on_enter = false; // inhibit open so the_game doesn't reopen immediately m_open_inhibited = 1; // so the ESCAPE button doesn't open the "pause menu" @@ -432,7 +436,6 @@ bool GUIChatConsole::OnEvent(const SEvent& event) m_client->typeChatMessage(text); if (m_close_on_enter) { closeConsoleAtOnce(); - Environment->removeFocus(this); m_close_on_enter = false; } return true; diff --git a/src/guiChatConsole.h b/src/guiChatConsole.h index 7b9fc673..fe595f28 100644 --- a/src/guiChatConsole.h +++ b/src/guiChatConsole.h @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define GUICHATCONSOLE_HEADER #include "irrlichttypes_extrabloated.h" +#include "modalMenu.h" #include "chat.h" #include "config.h" @@ -33,7 +34,8 @@ public: gui::IGUIElement* parent, s32 id, ChatBackend* backend, - Client* client); + Client* client, + IMenuManager* menumgr); virtual ~GUIChatConsole(); // Open the console (height = desired fraction of screen size) @@ -86,11 +88,9 @@ private: void drawPrompt(); private: - // pointer to the chat backend ChatBackend* m_chat_backend; - - // pointer to the client Client* m_client; + IMenuManager* m_menumgr; // current screen size v2u32 m_screensize; diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h index 6f8aa913..17133b16 100644 --- a/src/mainmenumanager.h +++ b/src/mainmenumanager.h @@ -47,9 +47,9 @@ extern gui::IGUIStaticText *guiroot; class MainMenuManager : public IMenuManager { public: - virtual void createdMenu(GUIModalMenu *menu) + virtual void createdMenu(gui::IGUIElement *menu) { - for(std::list::iterator + for(std::list::iterator i = m_stack.begin(); i != m_stack.end(); ++i) { @@ -61,13 +61,13 @@ public: m_stack.push_back(menu); } - virtual void deletingMenu(GUIModalMenu *menu) + virtual void deletingMenu(gui::IGUIElement *menu) { // Remove all entries if there are duplicates bool removed_entry; do{ removed_entry = false; - for(std::list::iterator + for(std::list::iterator i = m_stack.begin(); i != m_stack.end(); ++i) { @@ -91,10 +91,10 @@ public: // Returns true to prevent further processing virtual bool preprocessEvent(const SEvent& event) { - if(!m_stack.empty()) - return m_stack.back()->preprocessEvent(event); - else + if (m_stack.empty()) return false; + GUIModalMenu *mm = dynamic_cast(m_stack.back()); + return mm && mm->preprocessEvent(event); } u32 menuCount() @@ -104,16 +104,17 @@ public: bool pausesGame() { - for(std::list::iterator + for(std::list::iterator i = m_stack.begin(); i != m_stack.end(); ++i) { - if((*i)->pausesGame()) + GUIModalMenu *mm = dynamic_cast(*i); + if (mm && mm->pausesGame()) return true; } return false; } - std::list m_stack; + std::list m_stack; }; extern MainMenuManager g_menumgr; diff --git a/src/modalMenu.h b/src/modalMenu.h index d5e975a8..43bb8e1b 100644 --- a/src/modalMenu.h +++ b/src/modalMenu.h @@ -31,8 +31,8 @@ class IMenuManager { public: // A GUIModalMenu calls these when this class is passed as a parameter - virtual void createdMenu(GUIModalMenu *menu) = 0; - virtual void deletingMenu(GUIModalMenu *menu) = 0; + virtual void createdMenu(gui::IGUIElement *menu) = 0; + virtual void deletingMenu(gui::IGUIElement *menu) = 0; }; /* From 430929e75a4e6c81d7dd2746570f925bb45e674e Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 27 Feb 2016 16:04:44 -0500 Subject: [PATCH 318/531] Add text selection and copying to console --- src/chat.cpp | 64 ++++++++++++++++---------------- src/chat.h | 14 ++++++- src/guiChatConsole.cpp | 84 +++++++++++++++++++++++++++++------------- 3 files changed, 103 insertions(+), 59 deletions(-) diff --git a/src/chat.cpp b/src/chat.cpp index d8cf3efd..809d4e42 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -390,6 +390,7 @@ ChatPrompt::ChatPrompt(std::wstring prompt, u32 history_limit): m_cols(0), m_view(0), m_cursor(0), + m_cursor_len(0), m_nick_completion_start(0), m_nick_completion_end(0) { @@ -426,11 +427,6 @@ void ChatPrompt::addToHistory(std::wstring line) m_history_index = m_history.size(); } -std::wstring ChatPrompt::getLine() -{ - return m_line; -} - void ChatPrompt::clear() { m_line.clear(); @@ -590,14 +586,12 @@ void ChatPrompt::cursorOperation(CursorOp op, CursorOpDir dir, CursorOpScope sco s32 length = m_line.size(); s32 increment = (dir == CURSOROP_DIR_RIGHT) ? 1 : -1; - if (scope == CURSOROP_SCOPE_CHARACTER) - { + switch (scope) { + case CURSOROP_SCOPE_CHARACTER: new_cursor += increment; - } - else if (scope == CURSOROP_SCOPE_WORD) - { - if (increment > 0) - { + break; + case CURSOROP_SCOPE_WORD: + if (dir == CURSOROP_DIR_RIGHT) { // skip one word to the right while (new_cursor < length && isspace(m_line[new_cursor])) new_cursor++; @@ -605,39 +599,47 @@ void ChatPrompt::cursorOperation(CursorOp op, CursorOpDir dir, CursorOpScope sco new_cursor++; while (new_cursor < length && isspace(m_line[new_cursor])) new_cursor++; - } - else - { + } else { // skip one word to the left while (new_cursor >= 1 && isspace(m_line[new_cursor - 1])) new_cursor--; while (new_cursor >= 1 && !isspace(m_line[new_cursor - 1])) new_cursor--; } - } - else if (scope == CURSOROP_SCOPE_LINE) - { + break; + case CURSOROP_SCOPE_LINE: new_cursor += increment * length; + break; + case CURSOROP_SCOPE_SELECTION: + break; } new_cursor = MYMAX(MYMIN(new_cursor, length), 0); - if (op == CURSOROP_MOVE) - { + switch (op) { + case CURSOROP_MOVE: m_cursor = new_cursor; - } - else if (op == CURSOROP_DELETE) - { - if (new_cursor < old_cursor) - { - m_line.erase(new_cursor, old_cursor - new_cursor); - m_cursor = new_cursor; + m_cursor_len = 0; + break; + case CURSOROP_DELETE: + if (m_cursor_len > 0) { // Delete selected text first + m_line.erase(m_cursor, m_cursor_len); + } else { + m_cursor = MYMIN(new_cursor, old_cursor); + m_line.erase(m_cursor, abs(new_cursor - old_cursor)); } - else if (new_cursor > old_cursor) - { - m_line.erase(old_cursor, new_cursor - old_cursor); - m_cursor = old_cursor; + m_cursor_len = 0; + break; + case CURSOROP_SELECT: + if (scope == CURSOROP_SCOPE_LINE) { + m_cursor = 0; + m_cursor_len = length; + } else { + m_cursor = MYMIN(new_cursor, old_cursor); + m_cursor_len += abs(new_cursor - old_cursor); + m_cursor_len = MYMIN(m_cursor_len, length - m_cursor); } + break; } clampView(); diff --git a/src/chat.h b/src/chat.h index 367baaaf..db4146d3 100644 --- a/src/chat.h +++ b/src/chat.h @@ -150,7 +150,11 @@ public: void addToHistory(std::wstring line); // Get current line - std::wstring getLine(); + std::wstring getLine() const { return m_line; } + + // Get section of line that is currently selected + std::wstring getSelection() const + { return m_line.substr(m_cursor, m_cursor_len); } // Clear the current line void clear(); @@ -172,10 +176,13 @@ public: std::wstring getVisiblePortion() const; // Get cursor position (relative to visible portion). -1 if invalid s32 getVisibleCursorPosition() const; + // Get length of cursor selection + s32 getCursorLength() const { return m_cursor_len; } // Cursor operations enum CursorOp { CURSOROP_MOVE, + CURSOROP_SELECT, CURSOROP_DELETE }; @@ -189,7 +196,8 @@ public: enum CursorOpScope { CURSOROP_SCOPE_CHARACTER, CURSOROP_SCOPE_WORD, - CURSOROP_SCOPE_LINE + CURSOROP_SCOPE_LINE, + CURSOROP_SCOPE_SELECTION }; // Cursor operation @@ -227,6 +235,8 @@ private: s32 m_view; // Cursor (index into m_line) s32 m_cursor; + // Cursor length (length of selected portion of line) + s32 m_cursor_len; // Last nick completion start (index into m_line) s32 m_nick_completion_start; diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index 4a084a8e..d1351a0f 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -377,13 +377,15 @@ void GUIChatConsole::drawPrompt() s32 cursor_pos = prompt.getVisibleCursorPosition(); if (cursor_pos >= 0) { + s32 cursor_len = prompt.getCursorLength(); video::IVideoDriver* driver = Environment->getVideoDriver(); s32 x = (1 + cursor_pos) * m_fontsize.X; core::rect destrect( x, - y + (1.0-m_cursor_height) * m_fontsize.Y, - x + m_fontsize.X, - y + m_fontsize.Y); + y + m_fontsize.Y * (1.0 - m_cursor_height), + x + m_fontsize.X * MYMAX(cursor_len, 1), + y + m_fontsize.Y * (cursor_len ? m_cursor_height+1 : 1) + ); video::SColor cursor_color(255,255,255,255); driver->draw2DRectangle( cursor_color, @@ -454,32 +456,20 @@ bool GUIChatConsole::OnEvent(const SEvent& event) prompt.historyNext(); return true; } - else if(event.KeyInput.Key == KEY_LEFT) + else if(event.KeyInput.Key == KEY_LEFT || event.KeyInput.Key == KEY_RIGHT) { - // Left or Ctrl-Left pressed - // move character / word to the left - ChatPrompt::CursorOpScope scope = - event.KeyInput.Control ? + // Left/right pressed + // Move/select character/word to the left depending on control and shift keys + ChatPrompt::CursorOp op = event.KeyInput.Shift ? + ChatPrompt::CURSOROP_SELECT : + ChatPrompt::CURSOROP_MOVE; + ChatPrompt::CursorOpDir dir = event.KeyInput.Key == KEY_LEFT ? + ChatPrompt::CURSOROP_DIR_LEFT : + ChatPrompt::CURSOROP_DIR_RIGHT; + ChatPrompt::CursorOpScope scope = event.KeyInput.Control ? ChatPrompt::CURSOROP_SCOPE_WORD : ChatPrompt::CURSOROP_SCOPE_CHARACTER; - prompt.cursorOperation( - ChatPrompt::CURSOROP_MOVE, - ChatPrompt::CURSOROP_DIR_LEFT, - scope); - return true; - } - else if(event.KeyInput.Key == KEY_RIGHT) - { - // Right or Ctrl-Right pressed - // move character / word to the right - ChatPrompt::CursorOpScope scope = - event.KeyInput.Control ? - ChatPrompt::CURSOROP_SCOPE_WORD : - ChatPrompt::CURSOROP_SCOPE_CHARACTER; - prompt.cursorOperation( - ChatPrompt::CURSOROP_MOVE, - ChatPrompt::CURSOROP_DIR_RIGHT, - scope); + prompt.cursorOperation(op, dir, scope); return true; } else if(event.KeyInput.Key == KEY_HOME) @@ -530,16 +520,58 @@ bool GUIChatConsole::OnEvent(const SEvent& event) scope); return true; } + else if(event.KeyInput.Key == KEY_KEY_A && event.KeyInput.Control) + { + // Ctrl-A pressed + // Select all text + prompt.cursorOperation( + ChatPrompt::CURSOROP_SELECT, + ChatPrompt::CURSOROP_DIR_LEFT, // Ignored + ChatPrompt::CURSOROP_SCOPE_LINE); + return true; + } + else if(event.KeyInput.Key == KEY_KEY_C && event.KeyInput.Control) + { + // Ctrl-C pressed + // Copy text to clipboard + if (prompt.getCursorLength() <= 0) + return true; + std::string selected = wide_to_narrow(prompt.getSelection()); + Environment->getOSOperator()->copyToClipboard(selected.c_str()); + return true; + } else if(event.KeyInput.Key == KEY_KEY_V && event.KeyInput.Control) { // Ctrl-V pressed // paste text from clipboard + if (prompt.getCursorLength() > 0) { + // Delete selected section of text + prompt.cursorOperation( + ChatPrompt::CURSOROP_DELETE, + ChatPrompt::CURSOROP_DIR_LEFT, // Ignored + ChatPrompt::CURSOROP_SCOPE_SELECTION); + } IOSOperator *os_operator = Environment->getOSOperator(); const c8 *text = os_operator->getTextFromClipboard(); if (text) prompt.input(narrow_to_wide(text)); return true; } + else if(event.KeyInput.Key == KEY_KEY_X && event.KeyInput.Control) + { + // Ctrl-X pressed + // Cut text to clipboard + if (prompt.getCursorLength() <= 0) + return true; + std::wstring wselected = prompt.getSelection(); + std::string selected(wselected.begin(), wselected.end()); + Environment->getOSOperator()->copyToClipboard(selected.c_str()); + prompt.cursorOperation( + ChatPrompt::CURSOROP_DELETE, + ChatPrompt::CURSOROP_DIR_LEFT, // Ignored + ChatPrompt::CURSOROP_SCOPE_SELECTION); + return true; + } else if(event.KeyInput.Key == KEY_KEY_U && event.KeyInput.Control) { // Ctrl-U pressed From 9dd38cf9682539ff5a2cf8e698a269cbcde3961a Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 27 Feb 2016 20:10:35 -0500 Subject: [PATCH 319/531] Add Android chat form --- src/game.cpp | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 6fba70df..c6125dd4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1574,6 +1574,10 @@ protected: static void settingChangedCallback(const std::string &setting_name, void *data); void readSettings(); +#ifdef __ANDROID__ + void handleAndroidChatInput(); +#endif + private: InputHandler *input; @@ -1660,8 +1664,8 @@ private: #ifdef __ANDROID__ bool m_cache_hold_aux1; + bool m_android_chat_open; #endif - }; Game::Game() : @@ -2610,10 +2614,10 @@ void Game::processUserInput(VolatileRunFlags *flags, input->step(dtime); #ifdef __ANDROID__ - - if (current_formspec != 0) + if (current_formspec != NULL) current_formspec->getAndroidUIInput(); - + else + handleAndroidChatInput(); #endif // Increase timer for double tap of "keymap_jump" @@ -2803,14 +2807,29 @@ void Game::openInventory() void Game::openConsole(float height, const wchar_t *line) { - if (!gui_chat_console->isOpenInhibited()) { - gui_chat_console->openConsole(height); - if (line) { - gui_chat_console->setCloseOnEnter(true); - gui_chat_console->replaceAndAddToHistory(line); - } +#ifdef __ANDROID__ + porting::showInputDialog(gettext("ok"), "", "", 2); + m_android_chat_open = true; +#else + if (gui_chat_console->isOpenInhibited()) + return; + gui_chat_console->openConsole(height); + if (line) { + gui_chat_console->setCloseOnEnter(true); + gui_chat_console->replaceAndAddToHistory(line); + } +#endif +} + +#ifdef __ANDROID__ +void Game::handleAndroidChatInput() +{ + if (m_android_chat_open && porting::getInputDialogState() == 0) { + std::string text = porting::getInputDialogValue(); + client->typeChatMessage(utf8_to_wide(text)); } } +#endif void Game::toggleFreeMove(float *statustext_time) From 8b006a154b31a2fd0fb58e77db25debef4bb61e0 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 28 Feb 2016 13:27:54 -0500 Subject: [PATCH 320/531] Add support for non-ASCII characters to chat console This still only supports 256 characters, but that's because Irrlicht's clipboard handlers don't support wide characters. --- src/guiChatConsole.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index d1351a0f..d59937c3 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -536,7 +536,8 @@ bool GUIChatConsole::OnEvent(const SEvent& event) // Copy text to clipboard if (prompt.getCursorLength() <= 0) return true; - std::string selected = wide_to_narrow(prompt.getSelection()); + std::wstring wselected = prompt.getSelection(); + std::string selected(wselected.begin(), wselected.end()); Environment->getOSOperator()->copyToClipboard(selected.c_str()); return true; } @@ -553,8 +554,10 @@ bool GUIChatConsole::OnEvent(const SEvent& event) } IOSOperator *os_operator = Environment->getOSOperator(); const c8 *text = os_operator->getTextFromClipboard(); - if (text) - prompt.input(narrow_to_wide(text)); + if (!text) + return true; + std::basic_string str((const unsigned char*)text); + prompt.input(std::wstring(str.begin(), str.end())); return true; } else if(event.KeyInput.Key == KEY_KEY_X && event.KeyInput.Control) From abd4a79acbdfcea0bb661b8065ef3ac8f3e25e80 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Wed, 2 Mar 2016 23:59:42 -0500 Subject: [PATCH 321/531] Remove debug.getupvalue from the Lua sandbox whitelist This function could be used to steal insecure environments from trusted mods. --- src/script/cpp_api/s_security.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index 36f8e9c0..730235c7 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -116,7 +116,6 @@ void ScriptApiSecurity::initializeSecurity() "upvaluejoin", "sethook", "debug", - "getupvalue", "setlocal", }; static const char *package_whitelist[] = { From 7bcbc0105b3e67b7e066be6fd77775769cffdd16 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 3 Mar 2016 00:57:19 -0500 Subject: [PATCH 322/531] Fix main menu being unable to set secure settings --- src/script/lua_api/l_util.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index cc4467bb..df46925d 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -75,9 +75,10 @@ int ModApiUtil::l_get_us_time(lua_State *L) } #define CHECK_SECURE_SETTING(L, name) \ - if (name.compare(0, 7, "secure.") == 0) {\ - lua_pushliteral(L, "Attempt to set secure setting.");\ - lua_error(L);\ + if (ScriptApiSecurity::isSecure(L) && \ + name.compare(0, 7, "secure.") == 0) { \ + lua_pushliteral(L, "Attempt to set secure setting."); \ + lua_error(L); \ } // setting_set(name, value) From 1100a5d614c2eaf8e1c4f3adbc70b477e01a405c Mon Sep 17 00:00:00 2001 From: Jeija Date: Thu, 25 Feb 2016 10:22:54 +0100 Subject: [PATCH 323/531] Require minetest.request_http_api to be called from the mod's main scope Fixes #3764 --- doc/lua_api.txt | 2 +- src/script/lua_api/l_http.cpp | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index aee3674d..8c879c96 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2337,7 +2337,7 @@ These functions return the leftover itemstack. otherwise returns `nil`. * The returned table contains the functions `fetch`, `fetch_async` and `fetch_async_get` described below. - * Only works at init time. + * Only works at init time and must be called from the mod's main scope (not from a function). * Function only exists if minetest server was built with cURL support. * **DO NOT ALLOW ANY OTHER MODS TO ACCESS THE RETURNED TABLE, STORE IT IN A LOCAL VARIABLE!** diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp index b0357e3e..8bd39b6e 100644 --- a/src/script/lua_api/l_http.cpp +++ b/src/script/lua_api/l_http.cpp @@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "lua_api/l_http.h" #include "httpfetch.h" #include "settings.h" +#include "debug.h" #include "log.h" #include @@ -130,11 +131,27 @@ int ModApiHttp::l_request_http_api(lua_State *L) { NO_MAP_LOCK_REQUIRED; + // We have to make sure that this function is being called directly by + // a mod, otherwise a malicious mod could override this function and + // steal its return value. + lua_Debug info; + + // Make sure there's only one item below this function on the stack... + if (lua_getstack(L, 2, &info)) { + return 0; + } + FATAL_ERROR_IF(!lua_getstack(L, 1, &info), "lua_getstack() failed"); + FATAL_ERROR_IF(!lua_getinfo(L, "S", &info), "lua_getinfo() failed"); + + // ...and that that item is the main file scope. + if (strcmp(info.what, "main") != 0) { + return 0; + } + // Mod must be listed in secure.http_mods or secure.trusted_mods lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME); if (!lua_isstring(L, -1)) { - lua_pushnil(L); - return 1; + return 0; } const char *mod_name = lua_tostring(L, -1); From 48a718e715710c9cb7edd6ad8e1cd7a0ed416908 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 27 Feb 2016 23:49:53 +0000 Subject: [PATCH 324/531] Decoration API: Allow force_placement of simple decorations --- doc/lua_api.txt | 5 +++-- src/mg_decoration.cpp | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 8c879c96..f8934b48 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3698,11 +3698,12 @@ Definition tables -- ^ Minimum and maximum `y` positions these decorations can be generated at. -- ^ This parameter refers to the `y` position of the decoration base, so -- the actual maximum height would be `height_max + size.Y`. - flags = "liquid_surface", + flags = "liquid_surface, force_placement", -- ^ Flags for all decoration types. -- ^ "liquid_surface": Instead of placement on the highest solid surface -- ^ in a mapchunk column, placement is on the highest liquid surface. -- ^ Placement is disabled if solid nodes are found above the liquid surface. + -- ^ "force_placement": Nodes other than "air" and "ignore" are replaced by the decoration. ----- Simple-type parameters decoration = "default:grass", @@ -3746,7 +3747,7 @@ Definition tables }, -- ^ See 'Schematic specifier' for details. replacements = {["oldname"] = "convert_to", ...}, - flags = "place_center_x, place_center_y, place_center_z, force_placement", + flags = "place_center_x, place_center_y, place_center_z", -- ^ Flags for schematic decorations. See 'Schematic attributes'. rotation = "90" -- rotate schematic 90 degrees on placement -- ^ Rotation can be "0", "90", "180", "270", or "random". diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp index 5959af25..8b6abb5d 100644 --- a/src/mg_decoration.cpp +++ b/src/mg_decoration.cpp @@ -304,13 +304,16 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p) s16 height = (deco_height_max > 0) ? pr->range(deco_height, deco_height_max) : deco_height; + bool force_placement = (flags & DECO_FORCE_PLACEMENT); + v3s16 em = vm->m_area.getExtent(); u32 vi = vm->m_area.index(p); for (int i = 0; i < height; i++) { vm->m_area.add_y(em, vi, 1); content_t c = vm->m_data[vi].getContent(); - if (c != CONTENT_AIR && c != CONTENT_IGNORE) + if (c != CONTENT_AIR && c != CONTENT_IGNORE && + !force_placement) break; vm->m_data[vi] = MapNode(c_place); From af714c7ade02d3f645671276a0f0514f5099b59e Mon Sep 17 00:00:00 2001 From: Duane Robertson Date: Tue, 1 Mar 2016 19:50:35 -0600 Subject: [PATCH 325/531] Mgvalleys: Correct spawn problems Increase maximum spawn altitude to reduce spawn issues. --- src/mapgen_valleys.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index f9625746..d6fcde5f 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -536,7 +536,7 @@ int MapgenValleys::getSpawnLevelAtPoint(v2s16 p) s16 level_at_point = terrainLevelAtPoint(p.X, p.Y); if (level_at_point <= water_level || - level_at_point > water_level + 16) + level_at_point > water_level + 32) return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point else return level_at_point; From 096a01ffef032a11239bd97e548a9ebb3c6add4a Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Fri, 5 Feb 2016 20:56:56 +0200 Subject: [PATCH 326/531] Update Android dependencies, -O3 optimization, remove old ARMv5 config * Update OpenSSL (thanks @sapier, i use his patch!), Curl and SQLite3. * Remove old arm config. Almost all phones that use ARMv5 have 1 core and 256-512 RAM, it's about 2-5 FPS. * Do -O3 optimization for libs and remove -fexpensive-optimizations for Minetest (-O3 includes this! Read gcc docs). * OpenSSL fix - thanks @sapier, again. --- build/android/Makefile | 28 ++++++++-------------------- build/android/jni/Android.mk | 2 +- build/android/openssl_arch.patch | 14 ++++++++------ 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index 2fa4aa9a..d27fb8cf 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -31,19 +31,6 @@ VERSION_PATCH := $(shell cat $(ROOT)/../../CMakeLists.txt | \ # Play Store actual version (16/03/15): 11 ANDROID_VERSION_CODE = 13 -################################################################################ -# toolchain config for arm old processors -################################################################################ -#TARGET_HOST = arm-linux -#TARGET_ABI = armeabi -#TARGET_LIBDIR = armeabi -#TARGET_TOOLCHAIN = arm-linux-androideabi- -#TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp -#TARGET_ARCH = arm -#CROSS_PREFIX = arm-linux-androideabi- -#COMPILER_VERSION = 4.8 -#HAVE_LEVELDB = 1 - ################################################################################ # toolchain config for arm new processors ################################################################################ @@ -51,7 +38,7 @@ TARGET_HOST = arm-linux TARGET_ABI = armeabi-v7a TARGET_LIBDIR = armeabi-v7a TARGET_TOOLCHAIN = arm-linux-androideabi- -TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3 +TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3 -O3 TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) TARGET_ARCH = armv7 CROSS_PREFIX = arm-linux-androideabi- @@ -112,7 +99,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) -OPENSSL_VERSION = 1.0.1p +OPENSSL_VERSION = 1.0.2g OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 @@ -120,7 +107,7 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.45.0 +CURL_VERSION = 7.47.0 CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp @@ -147,8 +134,8 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz -SQLITE3_FOLDER = sqlite-amalgamation-3090200 -SQLITE3_URL = http://www.sqlite.org/2015/$(SQLITE3_FOLDER).zip +SQLITE3_FOLDER = sqlite-amalgamation-3100200 +SQLITE3_URL = http://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip -include $(PATHCFGFILE) @@ -338,7 +325,8 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ - CC=${CROSS_PREFIX}gcc ./Configure android-${TARGET_ARCH} no-idea no-seed -no-sha0 -DL_ENDIAN;\ + CC=${CROSS_PREFIX}gcc ./Configure enable-gmp -DL_ENDIAN -I${GMP_DIR} -L${GMP_DIR}/usr/lib android-${TARGET_ARCH};\ + CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make depend; \ CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make build_libs; \ touch ${OPENSSL_TIMESTAMP}; \ touch ${OPENSSL_TIMESTAMP_INT}; \ @@ -612,7 +600,7 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB) export CXX=${CROSS_PREFIX}g++; \ export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \ export CPPFLAGS="$${CPPFLAGS} -I${OPENSSL_DIR}/include \ - -L${OPENSSL_DIR} ${TARGET_CFLAGS_ADDON}"; \ + ${TARGET_CFLAGS_ADDON}"; \ export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \ export LDFLAGS="$${LDFLAGS} -L${OPENSSL_DIR} ${TARGET_LDFLAGS_ADDON}"; \ ./configure --host=${TARGET_HOST} --disable-shared --enable-static --with-ssl; \ diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 0528c560..e1a2a54c 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -80,7 +80,7 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \ ifndef NDEBUG LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer else -LOCAL_CFLAGS += -fexpensive-optimizations -O3 +LOCAL_CFLAGS += -O3 endif ifdef GPROF diff --git a/build/android/openssl_arch.patch b/build/android/openssl_arch.patch index d9ebbd59..d15e2b13 100644 --- a/build/android/openssl_arch.patch +++ b/build/android/openssl_arch.patch @@ -1,11 +1,13 @@ ---- openssl-1.0.1j/Configure.orig 2014-10-15 14:53:39.000000000 +0200 -+++ openssl-1.0.1j/Configure 2015-01-03 22:41:43.505749921 +0100 -@@ -407,6 +407,8 @@ +--- openssl-1.0.2e.orig/Configure 2015-12-03 15:04:23.000000000 +0100 ++++ openssl-1.0.2e/Configure 2015-12-14 21:01:40.351265968 +0100 +@@ -464,8 +464,10 @@ + # Android: linux-* but without pointers to headers and libs. "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"android-arm","gcc:-march=armv4 -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"android-mips32","gcc:-march=mips32 -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"android-mips32","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### *BSD [do see comment about ${BSDthreads} above!] - "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", From 335ad705e6cb3cad4ba1a1e27d36d77d163777e8 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Thu, 3 Mar 2016 21:48:18 +0100 Subject: [PATCH 327/531] Update settings tab + some misc. clean-up --- builtin/mainmenu/dlg_settings_advanced.lua | 4 +- builtin/mainmenu/tab_settings.lua | 239 ++++++++++----------- 2 files changed, 114 insertions(+), 129 deletions(-) diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua index cab9f169..f5e80c25 100644 --- a/builtin/mainmenu/dlg_settings_advanced.lua +++ b/builtin/mainmenu/dlg_settings_advanced.lua @@ -151,8 +151,8 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se if setting_type == "float" then local default, min, max = remaining_line:match("^" -- first float is required, the last 2 are optional - .. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "?" - .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "?" + .. "(" .. CHAR_CLASSES.FLOAT .. "+)" .. CHAR_CLASSES.SPACE .. "*" + .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .. CHAR_CLASSES.SPACE .. "*" .. "(" .. CHAR_CLASSES.FLOAT .. "*)" .."$") diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index dc2bcff1..d3226e0f 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -17,6 +17,7 @@ -------------------------------------------------------------------------------- +-- Dropdown labels : Leaves local leaves_style_labels = { fgettext("Opaque Leaves"), fgettext("Simple Leaves"), @@ -24,10 +25,22 @@ local leaves_style_labels = { } local leaves_style = { - {leaves_style_labels[1] .. "," .. leaves_style_labels[2] .. "," .. leaves_style_labels[3]}, + table.concat(leaves_style_labels, ","), {"opaque", "simple", "fancy"}, } +-- Dropdown labels : Node highlighting +local node_highlighting_style_labels = { + fgettext("Node Outlining"), + fgettext("Node Highlighting") +} + +local node_highlighting_style = { + table.concat(node_highlighting_style_labels, ","), + {"box", "halo"}, +} + +-- Dropdown labels : Textures filtering local dd_filter_labels = { fgettext("No Filter"), fgettext("Bilinear Filter"), @@ -35,10 +48,11 @@ local dd_filter_labels = { } local filters = { - {dd_filter_labels[1] .. "," .. dd_filter_labels[2] .. "," .. dd_filter_labels[3]}, + table.concat(dd_filter_labels, ","), {"", "bilinear_filter", "trilinear_filter"}, } +-- Dropdown labels : Mip-mapping local dd_mipmap_labels = { fgettext("No Mipmap"), fgettext("Mipmap"), @@ -46,20 +60,11 @@ local dd_mipmap_labels = { } local mipmap = { - {dd_mipmap_labels[1] .. "," .. dd_mipmap_labels[2] .. "," .. dd_mipmap_labels[3]}, + table.concat(dd_mipmap_labels, ","), {"", "mip_map", "anisotropic_filter"}, } -local function getLeavesStyleSettingIndex() - local style = core.setting_get("leaves_style") - if (style == leaves_style[2][3]) then - return 3 - elseif (style == leaves_style[2][2]) then - return 2 - end - return 1 -end - +-- Dropdown labels : Anti-aliasing local dd_antialiasing_labels = { fgettext("None"), fgettext("2x"), @@ -68,34 +73,54 @@ local dd_antialiasing_labels = { } local antialiasing = { - {dd_antialiasing_labels[1] .. "," .. dd_antialiasing_labels[2] .. "," .. - dd_antialiasing_labels[3] .. "," .. dd_antialiasing_labels[4]}, + table.concat(dd_antialiasing_labels, ","), {"0", "2", "4", "8"} } +-- Dropdown index getter : Leaves +local function getLeavesStyleSettingIndex() + local style = core.setting_get("leaves_style") + for idx, name in pairs(leaves_style[2]) do + if style == name then return idx end + end + return 1 +end + +-- Dropdown index getter : Node highlighting +local function getNodeHighlightingSettingIndex() + local style = core.setting_get("node_highlighting") + for idx, name in pairs(node_highlighting_style[2]) do + if style == name then return idx end + end + return 1 +end + +-- Dropdown index getter : Textures filtering local function getFilterSettingIndex() - if (core.setting_get(filters[2][3]) == "true") then + if core.setting_get(filters[2][3]) == "true" then return 3 - end - if (core.setting_get(filters[2][3]) == "false" and core.setting_get(filters[2][2]) == "true") then + elseif core.setting_get(filters[2][3]) == "false" and + core.setting_get(filters[2][2]) == "true" then return 2 end return 1 end +-- Dropdown index getter : Mip-mapping local function getMipmapSettingIndex() - if (core.setting_get(mipmap[2][3]) == "true") then + if core.setting_get(mipmap[2][3]) == "true" then return 3 - end - if (core.setting_get(mipmap[2][3]) == "false" and core.setting_get(mipmap[2][2]) == "true") then + elseif core.setting_get(mipmap[2][3]) == "false" and + core.setting_get(mipmap[2][2]) == "true" then return 2 end return 1 end +-- Dropdown index getter : Anti-aliasing local function getAntialiasingSettingIndex() local antialiasing_setting = core.setting_get("fsaa") - for i = 1, #(antialiasing[2]) do + for i = 1, #antialiasing[2] do if antialiasing_setting == antialiasing[2][i] then return i end @@ -104,7 +129,7 @@ local function getAntialiasingSettingIndex() end local function antialiasing_fname_to_name(fname) - for i = 1, #(dd_antialiasing_labels) do + for i = 1, #dd_antialiasing_labels do if fname == dd_antialiasing_labels[i] then return antialiasing[2][i] end @@ -113,14 +138,10 @@ local function antialiasing_fname_to_name(fname) end local function dlg_confirm_reset_formspec(data) - local retval = - "size[8,3]" .. + return "size[8,3]" .. "label[1,1;" .. fgettext("Are you sure to reset your singleplayer world?") .. "]" .. - "button[1,2;2.6,0.5;dlg_reset_singleplayer_confirm;" .. - fgettext("Yes") .. "]" .. - "button[4,2;2.8,0.5;dlg_reset_singleplayer_cancel;" .. - fgettext("No!!!") .. "]" - return retval + "button[1,2;2.6,0.5;dlg_reset_singleplayer_confirm;" .. fgettext("Yes") .. "]" .. + "button[4,2;2.8,0.5;dlg_reset_singleplayer_cancel;" .. fgettext("No") .. "]" end local function dlg_confirm_reset_btnhandler(this, fields, dialogdata) @@ -129,7 +150,7 @@ local function dlg_confirm_reset_btnhandler(this, fields, dialogdata) local worldlist = core.get_worlds() local found_singleplayerworld = false - for i = 1, #worldlist, 1 do + for i = 1, #worldlist do if worldlist[i].name == "singleplayerworld" then found_singleplayerworld = true gamedata.worldindex = i @@ -141,12 +162,10 @@ local function dlg_confirm_reset_btnhandler(this, fields, dialogdata) end core.create_world("singleplayerworld", 1) - worldlist = core.get_worlds() - found_singleplayerworld = false - for i = 1, #worldlist, 1 do + for i = 1, #worldlist do if worldlist[i].name == "singleplayerworld" then found_singleplayerworld = true gamedata.worldindex = i @@ -170,41 +189,12 @@ local function showconfirm_reset(tabview) new_dlg:show() end -local function gui_scale_to_scrollbar() - local current_value = tonumber(core.setting_get("gui_scaling")) - - if (current_value == nil) or current_value < 0.25 then - return 0 - end - if current_value <= 1.25 then - return ((current_value - 0.25)/ 1.0) * 700 - end - if current_value <= 6 then - return ((current_value -1.25) * 100) + 700 - end - - return 1000 -end - -local function scrollbar_to_gui_scale(value) - value = tonumber(value) - - if (value <= 700) then - return ((value / 700) * 1.0) + 0.25 - end - if (value <= 1000) then - return ((value - 700) / 100) + 1.25 - end - - return 1 -end - local function formspec(tabview, name, tabdata) local tab_string = - "box[0,0;3.5,4.3;#999999]" .. - "checkbox[0.25,0;cb_smooth_lighting;" .. fgettext("Smooth Lighting") - .. ";" .. dump(core.setting_getbool("smooth_lighting")) .. "]" .. - "checkbox[0.25,0.5;cb_particles;" .. fgettext("Enable Particles") .. ";" + "box[0,0;3.5,4.5;#999999]" .. + "checkbox[0.25,0;cb_smooth_lighting;" .. fgettext("Smooth Lighting") .. ";" + .. dump(core.setting_getbool("smooth_lighting")) .. "]" .. + "checkbox[0.25,0.5;cb_particles;" .. fgettext("Particles") .. ";" .. dump(core.setting_getbool("enable_particles")) .. "]" .. "checkbox[0.25,1;cb_3d_clouds;" .. fgettext("3D Clouds") .. ";" .. dump(core.setting_getbool("enable_3d_clouds")) .. "]" .. @@ -212,20 +202,20 @@ local function formspec(tabview, name, tabdata) .. dump(core.setting_getbool("opaque_water")) .. "]" .. "checkbox[0.25,2.0;cb_connected_glass;" .. fgettext("Connected Glass") .. ";" .. dump(core.setting_getbool("connected_glass")) .. "]" .. - "checkbox[0.25,2.5;cb_node_highlighting;" .. fgettext("Node Highlighting") .. ";" - .. dump(core.setting_getbool("enable_node_highlighting")) .. "]" .. - "dropdown[0.25,3.4;3.3;dd_leaves_style;" .. leaves_style[1][1] .. ";" + "dropdown[0.25,2.8;3.3;dd_node_highlighting;" .. node_highlighting_style[1] .. ";" + .. getNodeHighlightingSettingIndex() .. "]" .. + "dropdown[0.25,3.6;3.3;dd_leaves_style;" .. leaves_style[1] .. ";" .. getLeavesStyleSettingIndex() .. "]" .. "box[3.75,0;3.75,3.45;#999999]" .. "label[3.85,0.1;" .. fgettext("Texturing:") .. "]" .. - "dropdown[3.85,0.55;3.85;dd_filters;" .. filters[1][1] .. ";" + "dropdown[3.85,0.55;3.85;dd_filters;" .. filters[1] .. ";" .. getFilterSettingIndex() .. "]" .. - "dropdown[3.85,1.35;3.85;dd_mipmap;" .. mipmap[1][1] .. ";" + "dropdown[3.85,1.35;3.85;dd_mipmap;" .. mipmap[1] .. ";" .. getMipmapSettingIndex() .. "]" .. "label[3.85,2.15;" .. fgettext("Antialiasing:") .. "]" .. - "dropdown[3.85,2.6;3.85;dd_antialiasing;" .. antialiasing[1][1] .. ";" + "dropdown[3.85,2.6;3.85;dd_antialiasing;" .. antialiasing[1] .. ";" .. getAntialiasingSettingIndex() .. "]" .. - "box[7.75,0;4,4;#999999]" .. + "box[7.75,0;4,4.4;#999999]" .. "checkbox[8,0;cb_shaders;" .. fgettext("Shaders") .. ";" .. dump(core.setting_getbool("enable_shaders")) .. "]" @@ -236,37 +226,40 @@ local function formspec(tabview, name, tabdata) if core.setting_get("touchscreen_threshold") ~= nil then tab_string = tab_string .. - "label[4.3,4.1;" .. fgettext("Touchthreshold (px)") .. "]" .. - "dropdown[3.85,4.55;3.85;dd_touchthreshold;0,10,20,30,40,50;" .. - ((tonumber(core.setting_get("touchscreen_threshold"))/10)+1) .. "]" + "label[4.3,4.1;" .. fgettext("Touchthreshold (px)") .. "]" .. + "dropdown[3.85,4.55;3.85;dd_touchthreshold;0,10,20,30,40,50;" .. + ((tonumber(core.setting_get("touchscreen_threshold")) / 10) + 1) .. "]" end if core.setting_getbool("enable_shaders") then tab_string = tab_string .. - "checkbox[8,0.5;cb_bumpmapping;" .. fgettext("Bumpmapping") .. ";" - .. dump(core.setting_getbool("enable_bumpmapping")) .. "]" .. - "checkbox[8,1.0;cb_generate_normalmaps;" .. fgettext("Generate Normalmaps") .. ";" - .. dump(core.setting_getbool("generate_normalmaps")) .. "]" .. - "checkbox[8,1.5;cb_parallax;" .. fgettext("Parallax Occlusion") .. ";" - .. dump(core.setting_getbool("enable_parallax_occlusion")) .. "]" .. - "checkbox[8,2.0;cb_waving_water;" .. fgettext("Waving Water") .. ";" - .. dump(core.setting_getbool("enable_waving_water")) .. "]" .. - "checkbox[8,2.5;cb_waving_leaves;" .. fgettext("Waving Leaves") .. ";" - .. dump(core.setting_getbool("enable_waving_leaves")) .. "]" .. - "checkbox[8,3.0;cb_waving_plants;" .. fgettext("Waving Plants") .. ";" - .. dump(core.setting_getbool("enable_waving_plants")) .. "]" + "checkbox[8,0.5;cb_bumpmapping;" .. fgettext("Bump Mapping") .. ";" + .. dump(core.setting_getbool("enable_bumpmapping")) .. "]" .. + "checkbox[8,1;cb_tonemapping;" .. fgettext("Tone Mapping") .. ";" + .. dump(core.setting_getbool("tone_mapping")) .. "]" .. + "checkbox[8,1.5;cb_generate_normalmaps;" .. fgettext("Normal Mapping") .. ";" + .. dump(core.setting_getbool("generate_normalmaps")) .. "]" .. + "checkbox[8,2;cb_parallax;" .. fgettext("Parallax Occlusion") .. ";" + .. dump(core.setting_getbool("enable_parallax_occlusion")) .. "]" .. + "checkbox[8,2.5;cb_waving_water;" .. fgettext("Waving Water") .. ";" + .. dump(core.setting_getbool("enable_waving_water")) .. "]" .. + "checkbox[8,3;cb_waving_leaves;" .. fgettext("Waving Leaves") .. ";" + .. dump(core.setting_getbool("enable_waving_leaves")) .. "]" .. + "checkbox[8,3.5;cb_waving_plants;" .. fgettext("Waving Plants") .. ";" + .. dump(core.setting_getbool("enable_waving_plants")) .. "]" else tab_string = tab_string .. - "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[8.33,0.7;3.5,4;shaders;" .. - "#888888," .. fgettext("Bumpmapping") .. "," .. - "#888888," .. fgettext("Generate Normalmaps") .. "," .. - "#888888," .. fgettext("Parallax Occlusion") .. "," .. - "#888888," .. fgettext("Waving Water") .. "," .. - "#888888," .. fgettext("Waving Leaves") .. "," .. - "#888888," .. fgettext("Waving Plants") .. "," .. - ";1]" + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[8.33,0.7;3.5,4;shaders;" .. + "#888888," .. fgettext("Bump Mapping") .. "," .. + "#888888," .. fgettext("Tone Mapping") .. "," .. + "#888888," .. fgettext("Normal Mapping") .. "," .. + "#888888," .. fgettext("Parallax Occlusion") .. "," .. + "#888888," .. fgettext("Waving Water") .. "," .. + "#888888," .. fgettext("Waving Leaves") .. "," .. + "#888888," .. fgettext("Waving Plants") .. "," .. + ";1]" end return tab_string @@ -283,7 +276,6 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) --mm_texture.update("singleplayer", current_game()) return true end - if fields["cb_smooth_lighting"] then core.setting_set("smooth_lighting", fields["cb_smooth_lighting"]) return true @@ -304,13 +296,9 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) core.setting_set("connected_glass", fields["cb_connected_glass"]) return true end - if fields["cb_node_highlighting"] then - core.setting_set("enable_node_highlighting", fields["cb_node_highlighting"]) - return true - end if fields["cb_shaders"] then - if (core.setting_get("video_driver") == "direct3d8" - or core.setting_get("video_driver") == "direct3d9") then + if (core.setting_get("video_driver") == "direct3d8" or + core.setting_get("video_driver") == "direct3d9") then core.setting_set("enable_shaders", "false") gamedata.errormessage = fgettext("To enable shaders the OpenGL driver needs to be used.") else @@ -320,9 +308,15 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) end if fields["cb_bumpmapping"] then core.setting_set("enable_bumpmapping", fields["cb_bumpmapping"]) + return true + end + if fields["cb_tonemapping"] then + core.setting_set("tone_mapping", fields["cb_tonemapping"]) + return true end if fields["cb_generate_normalmaps"] then core.setting_set("generate_normalmaps", fields["cb_generate_normalmaps"]) + return true end if fields["cb_parallax"] then core.setting_set("enable_parallax_occlusion", fields["cb_parallax"]) @@ -339,17 +333,6 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) core.setting_set("enable_waving_plants", fields["cb_waving_plants"]) return true end - - if fields["sb_gui_scaling"] then - local event = core.explode_scrollbar_event(fields["sb_gui_scaling"]) - - if event.type == "CHG" then - local tosave = string.format("%.2f",scrollbar_to_gui_scale(event.value)) - core.setting_set("gui_scaling", tosave) - return true - end - end - if fields["btn_change_keys"] then core.show_keys_menu() return true @@ -366,15 +349,17 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) --Note dropdowns have to be handled LAST! local ddhandled = false - if fields["dd_leaves_style"] == leaves_style_labels[1] then - core.setting_set("leaves_style", leaves_style[2][1]) - ddhandled = true - elseif fields["dd_leaves_style"] == leaves_style_labels[2] then - core.setting_set("leaves_style", leaves_style[2][2]) - ddhandled = true - elseif fields["dd_leaves_style"] == leaves_style_labels[3] then - core.setting_set("leaves_style", leaves_style[2][3]) - ddhandled = true + for i = 1, #leaves_style_labels do + if fields["dd_leaves_style"] == leaves_style_labels[i] then + core.setting_set("leaves_style", leaves_style[2][i]) + ddhandled = true + end + end + for i = 1, #node_highlighting_style_labels do + if fields["dd_node_highlighting"] == node_highlighting_style_labels[i] then + core.setting_set("node_highlighting", node_highlighting_style[2][i]) + ddhandled = true + end end if fields["dd_filters"] == dd_filter_labels[1] then core.setting_set("bilinear_filter", "false") @@ -408,7 +393,7 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) ddhandled = true end if fields["dd_touchthreshold"] then - core.setting_set("touchscreen_threshold",fields["dd_touchthreshold"]) + core.setting_set("touchscreen_threshold", fields["dd_touchthreshold"]) ddhandled = true end From 75db0543f3df4b30ce23731f5008d0c9afa277ff Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Sat, 5 Mar 2016 13:21:51 +0700 Subject: [PATCH 328/531] Add forgotten valleys mapgen in mapgen name Missing `valleys` in `settingtypes.txt` and `minetest.conf.example`. --- builtin/settingtypes.txt | 2 +- minetest.conf.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 493cedd6..3c808194 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -800,7 +800,7 @@ liquid_update (Liquid update tick) float 1.0 # Name of map generator to be used when creating a new world. # Creating a world in the main menu will override this. -mg_name (Mapgen name) enum v6 v5,v6,v7,flat,fractal,singlenode +mg_name (Mapgen name) enum v6 v5,v6,v7,flat,valleys,fractal,singlenode # Water surface level of the world. water_level (Water level) int 1 diff --git a/minetest.conf.example b/minetest.conf.example index e4193a77..6b7347cc 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -986,7 +986,7 @@ # Name of map generator to be used when creating a new world. # Creating a world in the main menu will override this. -# type: enum values: v5, v6, v7, flat, fractal, singlenode +# type: enum values: v5, v6, v7, flat, fractal, valleys, singlenode # mg_name = v6 # Water surface level of the world. From 24e8b0ac1ea45719937948607259f13866c8bc64 Mon Sep 17 00:00:00 2001 From: Rui914 Date: Mon, 7 Mar 2016 00:53:45 +0900 Subject: [PATCH 329/531] Faster insertion into table --- builtin/common/filterlist.lua | 2 +- builtin/common/misc_helpers.lua | 29 +++++++++++++-------------- builtin/common/serialize.lua | 13 ++++++------ builtin/fstk/buttonbar.lua | 7 ++++++- builtin/fstk/tabview.lua | 2 +- builtin/game/auth.lua | 2 +- builtin/game/chatcommands.lua | 6 +++--- builtin/game/misc.lua | 10 ++++----- builtin/game/register.lua | 8 ++++---- builtin/mainmenu/common.lua | 4 ++-- builtin/mainmenu/modmgr.lua | 6 +++--- builtin/mainmenu/tab_mods.lua | 2 +- builtin/mainmenu/tab_texturepacks.lua | 2 +- 13 files changed, 48 insertions(+), 45 deletions(-) diff --git a/builtin/common/filterlist.lua b/builtin/common/filterlist.lua index 21068113..2a62362e 100644 --- a/builtin/common/filterlist.lua +++ b/builtin/common/filterlist.lua @@ -189,7 +189,7 @@ function filterlist.process(self) for k,v in pairs(self.m_raw_list) do if self.m_filtercriteria == nil or self.m_filter_fct(v,self.m_filtercriteria) then - table.insert(self.m_processed_list,v) + self.m_processed_list[#self.m_processed_list + 1] = v end end diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua index 08a23043..e4653d41 100644 --- a/builtin/common/misc_helpers.lua +++ b/builtin/common/misc_helpers.lua @@ -2,7 +2,6 @@ -------------------------------------------------------------------------------- -- Localize functions to avoid table lookups (better performance). -local table_insert = table.insert local string_sub, string_find = string.sub, string.find -------------------------------------------------------------------------------- @@ -94,13 +93,13 @@ function dump2(o, name, dumped) -- the form _G["table: 0xFFFFFFF"] keyStr = string.format("_G[%q]", tostring(k)) -- Dump key table - table_insert(t, dump2(k, keyStr, dumped)) + t[#t + 1] = dump2(k, keyStr, dumped) end else keyStr = basic_dump(k) end local vname = string.format("%s[%s]", name, keyStr) - table_insert(t, dump2(v, vname, dumped)) + t[#t + 1] = dump2(v, vname, dumped) end return string.format("%s = {}\n%s", name, table.concat(t)) end @@ -135,7 +134,7 @@ function dump(o, indent, nested, level) local t = {} local dumped_indexes = {} for i, v in ipairs(o) do - table_insert(t, dump(v, indent, nested, level + 1)) + t[#t + 1] = dump(v, indent, nested, level + 1) dumped_indexes[i] = true end for k, v in pairs(o) do @@ -144,7 +143,7 @@ function dump(o, indent, nested, level) k = "["..dump(k, indent, nested, level + 1).."]" end v = dump(v, indent, nested, level + 1) - table_insert(t, k.." = "..v) + t[#t + 1] = k.." = "..v end end nested[o] = nil @@ -177,7 +176,7 @@ function string.split(str, delim, include_empty, max_splits, sep_is_pattern) local s = string_sub(str, pos, np - 1) if include_empty or (s ~= "") then max_splits = max_splits - 1 - table_insert(items, s) + items[#items + 1] = s end pos = npe + 1 until (max_splits == 0) or (pos > (len + 1)) @@ -186,8 +185,8 @@ end -------------------------------------------------------------------------------- function table.indexof(list, val) - for i = 1, #list do - if list[i] == val then + for i, v in ipairs(list) do + if v == val then return i end end @@ -324,7 +323,7 @@ function core.splittext(text,charlimit) local last_line = "" while start ~= nil do if string.len(last_line) + (stop-start) > charlimit then - table_insert(retval, last_line) + retval[#retval + 1] = last_line last_line = "" end @@ -335,7 +334,7 @@ function core.splittext(text,charlimit) last_line = last_line .. string_sub(text, current_idx, stop - 1) if gotnewline then - table_insert(retval, last_line) + retval[#retval + 1] = last_line last_line = "" gotnewline = false end @@ -353,11 +352,11 @@ function core.splittext(text,charlimit) --add last part of text if string.len(last_line) + (string.len(text) - current_idx) > charlimit then - table_insert(retval, last_line) - table_insert(retval, string_sub(text, current_idx)) + retval[#retval + 1] = last_line + retval[#retval + 1] = string_sub(text, current_idx) else last_line = last_line .. " " .. string_sub(text, current_idx) - table_insert(retval, last_line) + retval[#retval + 1] = last_line end return retval @@ -430,14 +429,14 @@ if INIT == "game" then if iswall then core.set_node(pos, {name = wield_name, - param2 = dirs1[fdir+1]}) + param2 = dirs1[fdir + 1]}) elseif isceiling then if orient_flags.force_facedir then core.set_node(pos, {name = wield_name, param2 = 20}) else core.set_node(pos, {name = wield_name, - param2 = dirs2[fdir+1]}) + param2 = dirs2[fdir + 1]}) end else -- place right side up if orient_flags.force_facedir then diff --git a/builtin/common/serialize.lua b/builtin/common/serialize.lua index 90b8b2ad..b2165648 100644 --- a/builtin/common/serialize.lua +++ b/builtin/common/serialize.lua @@ -104,7 +104,7 @@ function core.serialize(x) local i = local_index local_index = local_index + 1 var = "_["..i.."]" - table.insert(local_defs, var.." = "..val) + local_defs[#local_defs + 1] = var.." = "..val dumped[x] = var return var end @@ -135,16 +135,15 @@ function core.serialize(x) local np = nest_points[x] for i, v in ipairs(x) do if not np or not np[i] then - table.insert(vals, dump_or_ref_val(v)) + vals[#vals + 1] = dump_or_ref_val(v) end idx_dumped[i] = true end for k, v in pairs(x) do if (not np or not np[k]) and not idx_dumped[k] then - table.insert(vals, - "["..dump_or_ref_val(k).."] = " - ..dump_or_ref_val(v)) + vals[#vals + 1] = "["..dump_or_ref_val(k).."] = " + ..dump_or_ref_val(v) end end return "{"..table.concat(vals, ", ").."}" @@ -156,9 +155,9 @@ function core.serialize(x) local function dump_nest_points() for parent, vals in pairs(nest_points) do for k, v in pairs(vals) do - table.insert(local_defs, dump_or_ref_val(parent) + local_defs[#local_defs + 1] = dump_or_ref_val(parent) .."["..dump_or_ref_val(k).."] = " - ..dump_or_ref_val(v)) + ..dump_or_ref_val(v) end end end diff --git a/builtin/fstk/buttonbar.lua b/builtin/fstk/buttonbar.lua index 1ad17562..46558832 100644 --- a/builtin/fstk/buttonbar.lua +++ b/builtin/fstk/buttonbar.lua @@ -145,7 +145,12 @@ local buttonbar_metatable = { if image == nil then image = "" end if tooltip == nil then tooltip = "" end - table.insert(self.buttons,{ name=name, caption=caption, image=image, tooltip=tooltip}) + self.buttons[#self.buttons + 1] = { + name = name, + caption = caption, + image = image, + tooltip = tooltip + } if self.orientation == "horizontal" then if ( (self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2) > self.size.x ) then diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua index c65f6dd7..72551afd 100644 --- a/builtin/fstk/tabview.lua +++ b/builtin/fstk/tabview.lua @@ -46,7 +46,7 @@ local function add_tab(self,tab) tabdata = {}, } - table.insert(self.tablist,newtab) + self.tablist[#self.tablist + 1] = newtab if self.last_tab_index == #self.tablist then self.current_tab = tab.name diff --git a/builtin/game/auth.lua b/builtin/game/auth.lua index 423eb313..deb811b1 100644 --- a/builtin/game/auth.lua +++ b/builtin/game/auth.lua @@ -20,7 +20,7 @@ function core.privs_to_string(privs, delim) local list = {} for priv, bool in pairs(privs) do if bool then - table.insert(list, priv) + list[#list + 1] = priv end end return table.concat(list, delim) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 6b4ca0d1..2c7a0b53 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -116,7 +116,7 @@ core.register_chatcommand("help", { local cmds = {} for cmd, def in pairs(core.chatcommands) do if core.check_player_privs(name, def.privs) then - table.insert(cmds, cmd) + cmds[#cmds + 1] = cmd end end table.sort(cmds) @@ -127,7 +127,7 @@ core.register_chatcommand("help", { local cmds = {} for cmd, def in pairs(core.chatcommands) do if core.check_player_privs(name, def.privs) then - table.insert(cmds, format_help_line(cmd, def)) + cmds[#cmds + 1] = format_help_line(cmd, def) end end table.sort(cmds) @@ -135,7 +135,7 @@ core.register_chatcommand("help", { elseif param == "privs" then local privs = {} for priv, def in pairs(core.registered_privileges) do - table.insert(privs, priv .. ": " .. def.description) + privs[#privs + 1] = priv .. ": " .. def.description end table.sort(privs) return true, "Available privileges:\n"..table.concat(privs, "\n") diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua index d0e67bd8..4f58710d 100644 --- a/builtin/game/misc.lua +++ b/builtin/game/misc.lua @@ -40,12 +40,12 @@ end) function core.after(after, func, ...) assert(tonumber(time) and type(func) == "function", "Invalid core.after invocation") - table.insert(jobs, { + jobs[#jobs + 1] = { func = func, expire = time + after, arg = {...}, mod_origin = core.get_last_run_mod() - }) + } end function core.check_player_privs(player_or_name, ...) @@ -63,14 +63,14 @@ function core.check_player_privs(player_or_name, ...) -- We were provided with a table like { privA = true, privB = true }. for priv, value in pairs(requested_privs[1]) do if value and not player_privs[priv] then - table.insert(missing_privileges, priv) + missing_privileges[#missing_privileges + 1] = priv end end else -- Only a list, we can process it directly. for key, priv in pairs(requested_privs) do if not player_privs[priv] then - table.insert(missing_privileges, priv) + missing_privileges[#missing_privileges + 1] = priv end end end @@ -96,7 +96,7 @@ function core.get_connected_players() local temp_table = {} for index, value in pairs(player_list) do if value:is_player_connected() then - table.insert(temp_table, value) + temp_table[#temp_table + 1] = value end end return temp_table diff --git a/builtin/game/register.lua b/builtin/game/register.lua index ba5f69d6..398daf05 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -75,7 +75,7 @@ end function core.register_abm(spec) -- Add to core.registered_abms - core.registered_abms[#core.registered_abms+1] = spec + core.registered_abms[#core.registered_abms + 1] = spec spec.mod_origin = core.get_current_modname() or "??" end @@ -391,7 +391,7 @@ end local function make_registration() local t = {} local registerfunc = function(func) - table.insert(t, func) + t[#t + 1] = func core.callback_origins[func] = { mod = core.get_current_modname() or "??", name = debug.getinfo(1, "n").name or "??" @@ -467,9 +467,9 @@ end function core.register_on_player_hpchange(func, modifier) if modifier then - table.insert(core.registered_on_player_hpchanges.modifiers, func) + core.registered_on_player_hpchanges.modifiers[#core.registered_on_player_hpchanges.modifiers + 1] = func else - table.insert(core.registered_on_player_hpchanges.loggers, func) + core.registered_on_player_hpchanges.loggers[#core.registered_on_player_hpchanges.loggers + 1] = func end core.callback_origins[func] = { mod = core.get_current_modname() or "??", diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index f4020aaa..f40c787a 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -67,13 +67,13 @@ function order_favorite_list(list) for i=1,#list,1 do local fav = list[i] if is_server_protocol_compat(fav.proto_min, fav.proto_max) then - table.insert(res, fav) + res[#res + 1] = fav end end for i=1,#list,1 do local fav = list[i] if not is_server_protocol_compat(fav.proto_min, fav.proto_max) then - table.insert(res, fav) + res[#res + 1] = fav end end return res diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua index 41e747b3..f996df7b 100644 --- a/builtin/mainmenu/modmgr.lua +++ b/builtin/mainmenu/modmgr.lua @@ -23,7 +23,7 @@ function get_mods(path,retval,modpack) if name:sub(1, 1) ~= "." then local prefix = path .. DIR_DELIM .. name .. DIR_DELIM local toadd = {} - table.insert(retval, toadd) + retval[#retval + 1] = toadd local mod_conf = Settings(prefix .. "mod.conf"):to_table() if mod_conf.name then @@ -412,7 +412,7 @@ function modmgr.preparemodlist(data) for i=1,#global_mods,1 do global_mods[i].typ = "global_mod" - table.insert(retval,global_mods[i]) + retval[#retval + 1] = global_mods[i] end --read game mods @@ -421,7 +421,7 @@ function modmgr.preparemodlist(data) for i=1,#game_mods,1 do game_mods[i].typ = "game_mod" - table.insert(retval,game_mods[i]) + retval[#retval + 1] = game_mods[i] end if data.worldpath == nil then diff --git a/builtin/mainmenu/tab_mods.lua b/builtin/mainmenu/tab_mods.lua index 2ddc9b07..af758f8d 100644 --- a/builtin/mainmenu/tab_mods.lua +++ b/builtin/mainmenu/tab_mods.lua @@ -78,7 +78,7 @@ local function get_formspec(tabview, name, tabdata) descriptionfile:close() else descriptionlines = {} - table.insert(descriptionlines,fgettext("No mod description available")) + descriptionlines[#descriptionlines + 1] = fgettext("No mod description available") end retval = retval .. diff --git a/builtin/mainmenu/tab_texturepacks.lua b/builtin/mainmenu/tab_texturepacks.lua index d8b9ba35..d669d568 100644 --- a/builtin/mainmenu/tab_texturepacks.lua +++ b/builtin/mainmenu/tab_texturepacks.lua @@ -20,7 +20,7 @@ local function filter_texture_pack_list(list) local retval = {} for _, item in ipairs(list) do if item ~= "base" then - table.insert(retval, item) + retval[#retval + 1] = item end end From 04e311a36d15ad6c1e4436f169fe6b45e855009f Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sat, 5 Mar 2016 11:48:02 +0100 Subject: [PATCH 330/531] Settings Tab: Regroup dropdown datas in tables --- builtin/mainmenu/tab_settings.lua | 242 ++++++++++++++---------------- 1 file changed, 113 insertions(+), 129 deletions(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index d3226e0f..6285968e 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -17,121 +17,105 @@ -------------------------------------------------------------------------------- --- Dropdown labels : Leaves -local leaves_style_labels = { - fgettext("Opaque Leaves"), - fgettext("Simple Leaves"), - fgettext("Fancy Leaves") +local labels = { + leaves = { + fgettext("Opaque Leaves"), + fgettext("Simple Leaves"), + fgettext("Fancy Leaves") + }, + node_highlighting = { + fgettext("Node Outlining"), + fgettext("Node Highlighting") + }, + filters = { + fgettext("No Filter"), + fgettext("Bilinear Filter"), + fgettext("Trilinear Filter") + }, + mipmap = { + fgettext("No Mipmap"), + fgettext("Mipmap"), + fgettext("Mipmap + Aniso. Filter") + }, + antialiasing = { + fgettext("None"), + fgettext("2x"), + fgettext("4x"), + fgettext("8x") + } } -local leaves_style = { - table.concat(leaves_style_labels, ","), - {"opaque", "simple", "fancy"}, +local dd_options = { + leaves = { + table.concat(labels.leaves, ","), + {"opaque", "simple", "fancy"} + }, + node_highlighting = { + table.concat(labels.node_highlighting, ","), + {"box", "halo"} + }, + filters = { + table.concat(labels.filters, ","), + {"", "bilinear_filter", "trilinear_filter"} + }, + mipmap = { + table.concat(labels.mipmap, ","), + {"", "mip_map", "anisotropic_filter"} + }, + antialiasing = { + table.concat(labels.antialiasing, ","), + {"0", "2", "4", "8"} + } } --- Dropdown labels : Node highlighting -local node_highlighting_style_labels = { - fgettext("Node Outlining"), - fgettext("Node Highlighting") -} - -local node_highlighting_style = { - table.concat(node_highlighting_style_labels, ","), - {"box", "halo"}, -} - --- Dropdown labels : Textures filtering -local dd_filter_labels = { - fgettext("No Filter"), - fgettext("Bilinear Filter"), - fgettext("Trilinear Filter") -} - -local filters = { - table.concat(dd_filter_labels, ","), - {"", "bilinear_filter", "trilinear_filter"}, -} - --- Dropdown labels : Mip-mapping -local dd_mipmap_labels = { - fgettext("No Mipmap"), - fgettext("Mipmap"), - fgettext("Mipmap + Aniso. Filter") -} - -local mipmap = { - table.concat(dd_mipmap_labels, ","), - {"", "mip_map", "anisotropic_filter"}, -} - --- Dropdown labels : Anti-aliasing -local dd_antialiasing_labels = { - fgettext("None"), - fgettext("2x"), - fgettext("4x"), - fgettext("8x"), -} - -local antialiasing = { - table.concat(dd_antialiasing_labels, ","), - {"0", "2", "4", "8"} -} - --- Dropdown index getter : Leaves -local function getLeavesStyleSettingIndex() - local style = core.setting_get("leaves_style") - for idx, name in pairs(leaves_style[2]) do - if style == name then return idx end - end - return 1 -end - --- Dropdown index getter : Node highlighting -local function getNodeHighlightingSettingIndex() - local style = core.setting_get("node_highlighting") - for idx, name in pairs(node_highlighting_style[2]) do - if style == name then return idx end - end - return 1 -end - --- Dropdown index getter : Textures filtering -local function getFilterSettingIndex() - if core.setting_get(filters[2][3]) == "true" then - return 3 - elseif core.setting_get(filters[2][3]) == "false" and - core.setting_get(filters[2][2]) == "true" then - return 2 - end - return 1 -end - --- Dropdown index getter : Mip-mapping -local function getMipmapSettingIndex() - if core.setting_get(mipmap[2][3]) == "true" then - return 3 - elseif core.setting_get(mipmap[2][3]) == "false" and - core.setting_get(mipmap[2][2]) == "true" then - return 2 - end - return 1 -end - --- Dropdown index getter : Anti-aliasing -local function getAntialiasingSettingIndex() - local antialiasing_setting = core.setting_get("fsaa") - for i = 1, #antialiasing[2] do - if antialiasing_setting == antialiasing[2][i] then - return i +local getSettingIndex = { + Leaves = function() + local style = core.setting_get("leaves_style") + for idx, name in pairs(dd_options.leaves[2]) do + if style == name then return idx end end + return 1 + end, + NodeHighlighting = function() + local style = core.setting_get("node_highlighting") + for idx, name in pairs(dd_options.node_highlighting[2]) do + if style == name then return idx end + end + return 1 + end, + Filter = function() + if core.setting_get(dd_options.filters[2][3]) == "true" then + return 3 + elseif core.setting_get(dd_options.filters[2][3]) == "false" and + core.setting_get(dd_options.filters[2][2]) == "true" then + return 2 + end + return 1 + end, + Mipmap = function() + if core.setting_get(dd_options.mipmap[2][3]) == "true" then + return 3 + elseif core.setting_get(dd_options.mipmap[2][3]) == "false" and + core.setting_get(dd_options.mipmap[2][2]) == "true" then + return 2 + end + return 1 + end, + Antialiasing = function() + local antialiasing_setting = core.setting_get("fsaa") + for i = 1, #dd_options.antialiasing[2] do + if antialiasing_setting == dd_options.antialiasing[2][i] then + return i + end + end + return 1 end - return 1 -end +} local function antialiasing_fname_to_name(fname) - for i = 1, #dd_antialiasing_labels do - if fname == dd_antialiasing_labels[i] then - return antialiasing[2][i] + for i = 1, #labels.antialiasing do + if fname == labels.antialiasing[i] then + return dd_options.antialiasing[2][i] end end return 0 @@ -202,19 +186,19 @@ local function formspec(tabview, name, tabdata) .. dump(core.setting_getbool("opaque_water")) .. "]" .. "checkbox[0.25,2.0;cb_connected_glass;" .. fgettext("Connected Glass") .. ";" .. dump(core.setting_getbool("connected_glass")) .. "]" .. - "dropdown[0.25,2.8;3.3;dd_node_highlighting;" .. node_highlighting_style[1] .. ";" - .. getNodeHighlightingSettingIndex() .. "]" .. - "dropdown[0.25,3.6;3.3;dd_leaves_style;" .. leaves_style[1] .. ";" - .. getLeavesStyleSettingIndex() .. "]" .. + "dropdown[0.25,2.8;3.3;dd_node_highlighting;" .. dd_options.node_highlighting[1] .. ";" + .. getSettingIndex.NodeHighlighting() .. "]" .. + "dropdown[0.25,3.6;3.3;dd_leaves_style;" .. dd_options.leaves[1] .. ";" + .. getSettingIndex.Leaves() .. "]" .. "box[3.75,0;3.75,3.45;#999999]" .. "label[3.85,0.1;" .. fgettext("Texturing:") .. "]" .. - "dropdown[3.85,0.55;3.85;dd_filters;" .. filters[1] .. ";" - .. getFilterSettingIndex() .. "]" .. - "dropdown[3.85,1.35;3.85;dd_mipmap;" .. mipmap[1] .. ";" - .. getMipmapSettingIndex() .. "]" .. + "dropdown[3.85,0.55;3.85;dd_filters;" .. dd_options.filters[1] .. ";" + .. getSettingIndex.Filter() .. "]" .. + "dropdown[3.85,1.35;3.85;dd_mipmap;" .. dd_options.mipmap[1] .. ";" + .. getSettingIndex.Mipmap() .. "]" .. "label[3.85,2.15;" .. fgettext("Antialiasing:") .. "]" .. - "dropdown[3.85,2.6;3.85;dd_antialiasing;" .. antialiasing[1] .. ";" - .. getAntialiasingSettingIndex() .. "]" .. + "dropdown[3.85,2.6;3.85;dd_antialiasing;" .. dd_options.antialiasing[1] .. ";" + .. getSettingIndex.Antialiasing() .. "]" .. "box[7.75,0;4,4.4;#999999]" .. "checkbox[8,0;cb_shaders;" .. fgettext("Shaders") .. ";" .. dump(core.setting_getbool("enable_shaders")) .. "]" @@ -349,40 +333,40 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) --Note dropdowns have to be handled LAST! local ddhandled = false - for i = 1, #leaves_style_labels do - if fields["dd_leaves_style"] == leaves_style_labels[i] then - core.setting_set("leaves_style", leaves_style[2][i]) + for i = 1, #labels.leaves do + if fields["dd_leaves_style"] == labels.leaves[i] then + core.setting_set("leaves_style", dd_options.leaves[2][i]) ddhandled = true end end - for i = 1, #node_highlighting_style_labels do - if fields["dd_node_highlighting"] == node_highlighting_style_labels[i] then - core.setting_set("node_highlighting", node_highlighting_style[2][i]) + for i = 1, #labels.node_highlighting do + if fields["dd_node_highlighting"] == labels.node_highlighting[i] then + core.setting_set("node_highlighting", dd_options.node_highlighting[2][i]) ddhandled = true end end - if fields["dd_filters"] == dd_filter_labels[1] then + if fields["dd_filters"] == labels.filters[1] then core.setting_set("bilinear_filter", "false") core.setting_set("trilinear_filter", "false") ddhandled = true - elseif fields["dd_filters"] == dd_filter_labels[2] then + elseif fields["dd_filters"] == labels.filters[2] then core.setting_set("bilinear_filter", "true") core.setting_set("trilinear_filter", "false") ddhandled = true - elseif fields["dd_filters"] == dd_filter_labels[3] then + elseif fields["dd_filters"] == labels.filters[3] then core.setting_set("bilinear_filter", "false") core.setting_set("trilinear_filter", "true") ddhandled = true end - if fields["dd_mipmap"] == dd_mipmap_labels[1] then + if fields["dd_mipmap"] == labels.mipmap[1] then core.setting_set("mip_map", "false") core.setting_set("anisotropic_filter", "false") ddhandled = true - elseif fields["dd_mipmap"] == dd_mipmap_labels[2] then + elseif fields["dd_mipmap"] == labels.mipmap[2] then core.setting_set("mip_map", "true") core.setting_set("anisotropic_filter", "false") ddhandled = true - elseif fields["dd_mipmap"] == dd_mipmap_labels[3] then + elseif fields["dd_mipmap"] == labels.mipmap[3] then core.setting_set("mip_map", "true") core.setting_set("anisotropic_filter", "true") ddhandled = true From 88fbe7ca1e5451851ee0c7ab5524c39a7bb703c2 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 6 Mar 2016 14:41:26 -0500 Subject: [PATCH 331/531] Use LuaErrors in security check macros Throwing a LuaError calls destructors as it propagates up the stack, wheres lua_error just executes a longjmp. --- src/script/cpp_api/s_security.h | 5 ++--- src/script/lua_api/l_util.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/script/cpp_api/s_security.h b/src/script/cpp_api/s_security.h index 4a4389cf..97bc5c06 100644 --- a/src/script/cpp_api/s_security.h +++ b/src/script/cpp_api/s_security.h @@ -25,9 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #define CHECK_SECURE_PATH(L, path) \ if (!ScriptApiSecurity::checkPath(L, path)) { \ - lua_pushstring(L, (std::string("Attempt to access external file ") + \ - path + " with mod security on.").c_str()); \ - lua_error(L); \ + throw LuaError(std::string("Attempt to access external file ") + \ + path + " with mod security on."); \ } #define CHECK_SECURE_PATH_OPTIONAL(L, path) \ if (ScriptApiSecurity::isSecure(L)) { \ diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index df46925d..98f70d91 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -77,8 +77,7 @@ int ModApiUtil::l_get_us_time(lua_State *L) #define CHECK_SECURE_SETTING(L, name) \ if (ScriptApiSecurity::isSecure(L) && \ name.compare(0, 7, "secure.") == 0) { \ - lua_pushliteral(L, "Attempt to set secure setting."); \ - lua_error(L); \ + throw LuaError("Attempt to set secure setting."); \ } // setting_set(name, value) From d494733839e9cf6cb557462326ed21e7a58816c7 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 9 Feb 2016 07:08:31 +0100 Subject: [PATCH 332/531] Add minetest.register_lbm() to run code on block load only --- builtin/game/register.lua | 10 +- doc/lua_api.txt | 16 +++ src/environment.cpp | 250 +++++++++++++++++++++++++++++++++++ src/environment.h | 80 ++++++++++- src/nodedef.cpp | 12 +- src/nodedef.h | 5 +- src/script/cpp_api/s_base.h | 1 + src/script/cpp_api/s_env.cpp | 55 +++++++- src/script/lua_api/l_env.cpp | 40 ++++++ src/script/lua_api/l_env.h | 18 +++ src/server.cpp | 7 +- src/util/string.h | 24 ++-- 12 files changed, 493 insertions(+), 25 deletions(-) diff --git a/builtin/game/register.lua b/builtin/game/register.lua index 398daf05..f330491a 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -11,10 +11,11 @@ local register_alias_raw = core.register_alias_raw core.register_alias_raw = nil -- --- Item / entity / ABM registration functions +-- Item / entity / ABM / LBM registration functions -- core.registered_abms = {} +core.registered_lbms = {} core.registered_entities = {} core.registered_items = {} core.registered_nodes = {} @@ -79,6 +80,13 @@ function core.register_abm(spec) spec.mod_origin = core.get_current_modname() or "??" end +function core.register_lbm(spec) + -- Add to core.registered_lbms + check_modname_prefix(spec.name) + core.registered_lbms[#core.registered_lbms + 1] = spec + spec.mod_origin = core.get_current_modname() or "??" +end + function core.register_entity(name, prototype) -- Check name if name == nil then diff --git a/doc/lua_api.txt b/doc/lua_api.txt index f8934b48..0520096e 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1793,6 +1793,7 @@ Call these functions only at load time! * `minetest.register_entity(name, prototype table)` * `minetest.register_abm(abm definition)` +* `minetest.register_lbm(lbm definition)` * `minetest.register_node(name, node definition)` * `minetest.register_tool(name, item definition)` * `minetest.register_craftitem(name, item definition)` @@ -3305,6 +3306,21 @@ Definition tables action = func(pos, node, active_object_count, active_object_count_wider), } +### LBM (LoadingBlockModifier) definition (`register_lbm`) + + { + name = "modname:replace_legacy_door", + nodenames = {"default:lava_source"}, + -- ^ List of node names to trigger the LBM on. + -- Also non-registered nodes will work. + -- Groups (as of group:groupname) will work as well. + run_at_every_load = false, + -- ^ Whether to run the LBM's action every time a block gets loaded, + -- and not just for blocks that were saved last time before LBMs were + -- introduced to the world. + action = func(pos, node), + } + ### Item definition (`register_node`, `register_craftitem`, `register_tool`) { diff --git a/src/environment.cpp b/src/environment.cpp index 081079a7..6da376a1 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -48,6 +48,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")" +#define LBM_NAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_:" + Environment::Environment(): m_time_of_day_speed(0), m_time_of_day(9000), @@ -270,6 +272,223 @@ ABMWithState::ABMWithState(ActiveBlockModifier *abm_): timer = myrand_range(minval, maxval); } +/* + LBMManager +*/ + +void LBMContentMapping::deleteContents() +{ + for (std::vector::iterator it = lbm_list.begin(); + it != lbm_list.end(); ++it) { + delete *it; + } +} + +void LBMContentMapping::addLBM(LoadingBlockModifierDef *lbm_def, IGameDef *gamedef) +{ + // Add the lbm_def to the LBMContentMapping. + // Unknown names get added to the global NameIdMapping. + INodeDefManager *nodedef = gamedef->ndef(); + + lbm_list.push_back(lbm_def); + + for (std::set::const_iterator it = lbm_def->trigger_contents.begin(); + it != lbm_def->trigger_contents.end(); ++it) { + std::set c_ids; + bool found = nodedef->getIds(*it, c_ids); + if (!found) { + content_t c_id = gamedef->allocateUnknownNodeId(*it); + if (c_id == CONTENT_IGNORE) { + // Seems it can't be allocated. + warningstream << "Could not internalize node name \"" << *it + << "\" while loading LBM \"" << lbm_def->name << "\"." << std::endl; + continue; + } + c_ids.insert(c_id); + } + + for (std::set::const_iterator iit = + c_ids.begin(); iit != c_ids.end(); ++iit) { + content_t c_id = *iit; + map[c_id].push_back(lbm_def); + } + } +} + +const std::vector * + LBMContentMapping::lookup(content_t c) const +{ + container_map::const_iterator it = map.find(c); + if (it == map.end()) + return NULL; + // This first dereferences the iterator, returning + // a std::vector + // reference, then we convert it to a pointer. + return &(it->second); +} + +LBMManager::~LBMManager() +{ + for (std::map::iterator it = + m_lbm_defs.begin(); it != m_lbm_defs.end(); ++it) { + delete it->second; + } + for (lbm_lookup_map::iterator it = m_lbm_lookup.begin(); + it != m_lbm_lookup.end(); ++it) { + (it->second).deleteContents(); + } +} + +void LBMManager::addLBMDef(LoadingBlockModifierDef *lbm_def) +{ + // Precondition, in query mode the map isn't used anymore + FATAL_ERROR_IF(m_query_mode == true, + "attempted to modify LBMManager in query mode"); + + if (!string_allowed(lbm_def->name, LBM_NAME_ALLOWED_CHARS)) { + throw ModError("Error adding LBM \"" + lbm_def->name + + "\": Does not follow naming conventions: " + "Only chararacters [a-z0-9_:] are allowed."); + } + + m_lbm_defs[lbm_def->name] = lbm_def; +} + +void LBMManager::loadIntroductionTimes(const std::string ×, + IGameDef *gamedef, u32 now) +{ + m_query_mode = true; + + // name -> time map. + // Storing it in a map first instead of + // handling the stuff directly in the loop + // removes all duplicate entries. + // TODO make this std::unordered_map + std::map introduction_times; + + /* + The introduction times string consists of name~time entries, + with each entry terminated by a semicolon. The time is decimal. + */ + + size_t idx = 0; + size_t idx_new; + while ((idx_new = times.find(";", idx)) != std::string::npos) { + std::string entry = times.substr(idx, idx_new - idx); + std::vector components = str_split(entry, '~'); + if (components.size() != 2) + throw SerializationError("Introduction times entry \"" + + entry + "\" requires exactly one '~'!"); + const std::string &name = components[0]; + u32 time = from_string(components[1]); + introduction_times[name] = time; + idx = idx_new + 1; + } + + // Put stuff from introduction_times into m_lbm_lookup + for (std::map::const_iterator it = introduction_times.begin(); + it != introduction_times.end(); ++it) { + const std::string &name = it->first; + u32 time = it->second; + + std::map::iterator def_it = + m_lbm_defs.find(name); + if (def_it == m_lbm_defs.end()) { + // This seems to be an LBM entry for + // an LBM we haven't loaded. Discard it. + continue; + } + LoadingBlockModifierDef *lbm_def = def_it->second; + if (lbm_def->run_at_every_load) { + // This seems to be an LBM entry for + // an LBM that runs at every load. + // Don't add it just yet. + continue; + } + + m_lbm_lookup[time].addLBM(lbm_def, gamedef); + + // Erase the entry so that we know later + // what elements didn't get put into m_lbm_lookup + m_lbm_defs.erase(name); + } + + // Now also add the elements from m_lbm_defs to m_lbm_lookup + // that weren't added in the previous step. + // They are introduced first time to this world, + // or are run at every load (introducement time hardcoded to U32_MAX). + + LBMContentMapping &lbms_we_introduce_now = m_lbm_lookup[now]; + LBMContentMapping &lbms_running_always = m_lbm_lookup[U32_MAX]; + + for (std::map::iterator it = + m_lbm_defs.begin(); it != m_lbm_defs.end(); ++it) { + if (it->second->run_at_every_load) { + lbms_running_always.addLBM(it->second, gamedef); + } else { + lbms_we_introduce_now.addLBM(it->second, gamedef); + } + } + + // Clear the list, so that we don't delete remaining elements + // twice in the destructor + m_lbm_defs.clear(); +} + +std::string LBMManager::createIntroductionTimesString() +{ + // Precondition, we must be in query mode + FATAL_ERROR_IF(m_query_mode == false, + "attempted to query on non fully set up LBMManager"); + + std::ostringstream oss; + for (lbm_lookup_map::iterator it = m_lbm_lookup.begin(); + it != m_lbm_lookup.end(); ++it) { + u32 time = it->first; + std::vector &lbm_list = it->second.lbm_list; + for (std::vector::iterator iit = lbm_list.begin(); + iit != lbm_list.end(); ++iit) { + // Don't add if the LBM runs at every load, + // then introducement time is hardcoded + // and doesn't need to be stored + if ((*iit)->run_at_every_load) + continue; + oss << (*iit)->name << "~" << time << ";"; + } + } + return oss.str(); +} + +void LBMManager::applyLBMs(ServerEnvironment *env, MapBlock *block, u32 stamp) +{ + // Precondition, we need m_lbm_lookup to be initialized + FATAL_ERROR_IF(m_query_mode == false, + "attempted to query on non fully set up LBMManager"); + v3s16 pos_of_block = block->getPosRelative(); + v3s16 pos; + MapNode n; + content_t c; + lbm_lookup_map::const_iterator it = getLBMsIntroducedAfter(stamp); + for (pos.X = 0; pos.X < MAP_BLOCKSIZE; pos.X++) + for (pos.Y = 0; pos.Y < MAP_BLOCKSIZE; pos.Y++) + for (pos.Z = 0; pos.Z < MAP_BLOCKSIZE; pos.Z++) + { + n = block->getNodeNoEx(pos); + c = n.getContent(); + for (LBMManager::lbm_lookup_map::const_iterator iit = it; + iit != m_lbm_lookup.end(); ++iit) { + const std::vector *lbm_list = + iit->second.lookup(c); + if (!lbm_list) + continue; + for (std::vector::const_iterator iit = + lbm_list->begin(); iit != lbm_list->end(); ++iit) { + (*iit)->trigger(env, pos + pos_of_block, n); + } + } + } +} + /* ActiveBlockList */ @@ -505,6 +724,9 @@ void ServerEnvironment::saveMeta() args.setU64("game_time", m_game_time); args.setU64("time_of_day", getTimeOfDay()); args.setU64("last_clear_objects_time", m_last_clear_objects_time); + args.setU64("lbm_introduction_times_version", 1); + args.set("lbm_introduction_times", + m_lbm_mgr.createIntroductionTimesString()); args.writeLines(ss); ss<<"EnvArgsEnd\n"; @@ -555,6 +777,26 @@ void ServerEnvironment::loadMeta() // If missing, do as if clearObjects was never called m_last_clear_objects_time = 0; } + + std::string lbm_introduction_times = ""; + try { + u64 ver = args.getU64("lbm_introduction_times_version"); + if (ver == 1) { + lbm_introduction_times = args.get("lbm_introduction_times"); + } else { + infostream << "ServerEnvironment::loadMeta(): Non-supported" + << " introduction time version " << ver << std::endl; + } + } catch (SettingNotFoundException &e) { + // No problem, this is expected. Just continue with an empty string + } + m_lbm_mgr.loadIntroductionTimes(lbm_introduction_times, m_gamedef, m_game_time); + +} + +void ServerEnvironment::loadDefaultMeta() +{ + m_lbm_mgr.loadIntroductionTimes("", m_gamedef, m_game_time); } struct ActiveABM @@ -770,6 +1012,9 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime) // Activate stored objects activateObjects(block, dtime_s); + /* Handle LoadingBlockModifiers */ + m_lbm_mgr.applyLBMs(this, block, stamp); + // Run node timers std::map elapsed_timers = block->m_node_timers.step((float)dtime_s); @@ -795,6 +1040,11 @@ void ServerEnvironment::addActiveBlockModifier(ActiveBlockModifier *abm) m_abms.push_back(ABMWithState(abm)); } +void ServerEnvironment::addLoadingBlockModifierDef(LoadingBlockModifierDef *lbm) +{ + m_lbm_mgr.addLBMDef(lbm); +} + bool ServerEnvironment::setNode(v3s16 p, const MapNode &n) { INodeDefManager *ndef = m_gamedef->ndef(); diff --git a/src/environment.h b/src/environment.h index e7b818dc..448ed70e 100644 --- a/src/environment.h +++ b/src/environment.h @@ -139,7 +139,7 @@ private: }; /* - Active block modifier interface. + {Active, Loading} block modifier interface. These are fed into ServerEnvironment at initialization time; ServerEnvironment handles deleting them. @@ -177,6 +177,77 @@ struct ABMWithState ABMWithState(ActiveBlockModifier *abm_); }; +struct LoadingBlockModifierDef +{ + // Set of contents to trigger on + std::set trigger_contents; + std::string name; + bool run_at_every_load; + + virtual ~LoadingBlockModifierDef() {} + virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n){}; +}; + +struct LBMContentMapping +{ + typedef std::map > container_map; + container_map map; + + std::vector lbm_list; + + // Needs to be separate method (not inside destructor), + // because the LBMContentMapping may be copied and destructed + // many times during operation in the lbm_lookup_map. + void deleteContents(); + void addLBM(LoadingBlockModifierDef *lbm_def, IGameDef *gamedef); + const std::vector *lookup(content_t c) const; +}; + +class LBMManager +{ +public: + LBMManager(): + m_query_mode(false) + {} + + ~LBMManager(); + + // Don't call this after loadIntroductionTimes() ran. + void addLBMDef(LoadingBlockModifierDef *lbm_def); + + void loadIntroductionTimes(const std::string ×, + IGameDef *gamedef, u32 now); + + // Don't call this before loadIntroductionTimes() ran. + std::string createIntroductionTimesString(); + + // Don't call this before loadIntroductionTimes() ran. + void applyLBMs(ServerEnvironment *env, MapBlock *block, u32 stamp); + + // Warning: do not make this std::unordered_map, order is relevant here + typedef std::map lbm_lookup_map; + +private: + // Once we set this to true, we can only query, + // not modify + bool m_query_mode; + + // For m_query_mode == false: + // The key of the map is the LBM def's name. + // TODO make this std::unordered_map + std::map m_lbm_defs; + + // For m_query_mode == true: + // The key of the map is the LBM def's first introduction time. + lbm_lookup_map m_lbm_lookup; + + // Returns an iterator to the LBMs that were introduced + // after the given time. This is guaranteed to return + // valid values for everything + lbm_lookup_map::const_iterator getLBMsIntroducedAfter(u32 time) + { return m_lbm_lookup.lower_bound(time); } +}; + /* List of active blocks, used by ServerEnvironment */ @@ -254,6 +325,9 @@ public: */ void saveMeta(); void loadMeta(); + // to be called instead of loadMeta if + // env_meta.txt doesn't exist (e.g. new world) + void loadDefaultMeta(); /* External ActiveObject interface @@ -312,11 +386,12 @@ public: void activateBlock(MapBlock *block, u32 additional_dtime=0); /* - ActiveBlockModifiers + {Active,Loading}BlockModifiers ------------------------------------------- */ void addActiveBlockModifier(ActiveBlockModifier *abm); + void addLoadingBlockModifierDef(LoadingBlockModifierDef *lbm); /* Other stuff @@ -427,6 +502,7 @@ private: u32 m_last_clear_objects_time; // Active block modifiers std::vector m_abms; + LBMManager m_lbm_mgr; // An interval for generally sending object positions and stuff float m_recommended_send_interval; // Estimate for general maximum lag as determined by server. diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 1dd5aa53..ba9b4abf 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -419,7 +419,7 @@ public: inline virtual const ContentFeatures& get(const MapNode &n) const; virtual bool getId(const std::string &name, content_t &result) const; virtual content_t getId(const std::string &name) const; - virtual void getIds(const std::string &name, std::set &result) const; + virtual bool getIds(const std::string &name, std::set &result) const; virtual const ContentFeatures& get(const std::string &name) const; content_t allocateId(); virtual content_t set(const std::string &name, const ContentFeatures &def); @@ -603,22 +603,23 @@ content_t CNodeDefManager::getId(const std::string &name) const } -void CNodeDefManager::getIds(const std::string &name, +bool CNodeDefManager::getIds(const std::string &name, std::set &result) const { //TimeTaker t("getIds", NULL, PRECISION_MICRO); if (name.substr(0,6) != "group:") { content_t id = CONTENT_IGNORE; - if(getId(name, id)) + bool exists = getId(name, id); + if (exists) result.insert(id); - return; + return exists; } std::string group = name.substr(6); std::map::const_iterator i = m_group_to_items.find(group); if (i == m_group_to_items.end()) - return; + return true; const GroupItems &items = i->second; for (GroupItems::const_iterator j = items.begin(); @@ -627,6 +628,7 @@ void CNodeDefManager::getIds(const std::string &name, result.insert((*j).first); } //printf("getIds: %dus\n", t.stop()); + return true; } diff --git a/src/nodedef.h b/src/nodedef.h index db36021c..bf2c7bc7 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -303,7 +303,8 @@ public: virtual bool getId(const std::string &name, content_t &result) const=0; virtual content_t getId(const std::string &name) const=0; // Allows "group:name" in addition to regular node names - virtual void getIds(const std::string &name, std::set &result) + // returns false if node name not found, true otherwise + virtual bool getIds(const std::string &name, std::set &result) const=0; virtual const ContentFeatures &get(const std::string &name) const=0; @@ -327,7 +328,7 @@ public: // If not found, returns CONTENT_IGNORE virtual content_t getId(const std::string &name) const=0; // Allows "group:name" in addition to regular node names - virtual void getIds(const std::string &name, std::set &result) + virtual bool getIds(const std::string &name, std::set &result) const=0; // If not found, returns the features of CONTENT_UNKNOWN virtual const ContentFeatures &get(const std::string &name) const=0; diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h index ead385a4..f52474f0 100644 --- a/src/script/cpp_api/s_base.h +++ b/src/script/cpp_api/s_base.h @@ -83,6 +83,7 @@ public: protected: friend class LuaABM; + friend class LuaLBM; friend class InvRef; friend class ObjectRef; friend class NodeMetaRef; diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp index a1b11bfe..35b7b36f 100644 --- a/src/script/cpp_api/s_env.cpp +++ b/src/script/cpp_api/s_env.cpp @@ -86,13 +86,12 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env) setEnv(env); /* - Add ActiveBlockModifiers to environment + Add {Loading,Active}BlockModifiers to environment */ // Get core.registered_abms lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_abms"); - luaL_checktype(L, -1, LUA_TTABLE); int registered_abms = lua_gettop(L); if(lua_istable(L, registered_abms)){ @@ -154,6 +153,58 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env) // removes value, keeps key for next iteration lua_pop(L, 1); } + } else { + lua_pop(L, 1); + throw LuaError("core.registered_abms was not a lua table, as expected."); + } + lua_pop(L, 1); + + // Get core.registered_lbms + lua_getglobal(L, "core"); + lua_getfield(L, -1, "registered_lbms"); + int registered_lbms = lua_gettop(L); + + if (!lua_istable(L, registered_lbms)) { + lua_pop(L, 1); + throw LuaError("core.registered_lbms was not a lua table, as expected."); + } + + lua_pushnil(L); + while (lua_next(L, registered_lbms)) { + // key at index -2 and value at index -1 + int id = lua_tonumber(L, -2); + int current_lbm = lua_gettop(L); + + std::set trigger_contents; + lua_getfield(L, current_lbm, "nodenames"); + if (lua_istable(L, -1)) { + int table = lua_gettop(L); + lua_pushnil(L); + while (lua_next(L, table)) { + // key at index -2 and value at index -1 + luaL_checktype(L, -1, LUA_TSTRING); + trigger_contents.insert(lua_tostring(L, -1)); + // removes value, keeps key for next iteration + lua_pop(L, 1); + } + } else if (lua_isstring(L, -1)) { + trigger_contents.insert(lua_tostring(L, -1)); + } + lua_pop(L, 1); + + std::string name; + getstringfield(L, current_lbm, "name", name); + + bool run_at_every_load = getboolfield_default(L, current_lbm, + "run_at_every_load", false); + + LuaLBM *lbm = new LuaLBM(L, id, trigger_contents, name, + run_at_every_load); + + env->addLoadingBlockModifierDef(lbm); + + // removes value, keeps key for next iteration + lua_pop(L, 1); } lua_pop(L, 1); } diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index b445b1eb..f4ddc2af 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -90,6 +90,46 @@ void LuaABM::trigger(ServerEnvironment *env, v3s16 p, MapNode n, lua_pop(L, 1); // Pop error handler } +void LuaLBM::trigger(ServerEnvironment *env, v3s16 p, MapNode n) +{ + GameScripting *scriptIface = env->getScriptIface(); + scriptIface->realityCheck(); + + lua_State *L = scriptIface->getStack(); + sanity_check(lua_checkstack(L, 20)); + StackUnroller stack_unroller(L); + + int error_handler = PUSH_ERROR_HANDLER(L); + + // Get registered_lbms + lua_getglobal(L, "core"); + lua_getfield(L, -1, "registered_lbms"); + luaL_checktype(L, -1, LUA_TTABLE); + lua_remove(L, -2); // Remove core + + // Get registered_lbms[m_id] + lua_pushnumber(L, m_id); + lua_gettable(L, -2); + FATAL_ERROR_IF(lua_isnil(L, -1), "Entry with given id not found in registered_lbms table"); + lua_remove(L, -2); // Remove registered_lbms + + scriptIface->setOriginFromTable(-1); + + // Call action + luaL_checktype(L, -1, LUA_TTABLE); + lua_getfield(L, -1, "action"); + luaL_checktype(L, -1, LUA_TFUNCTION); + lua_remove(L, -2); // Remove registered_lbms[m_id] + push_v3s16(L, p); + pushnode(L, n, env->getGameDef()->ndef()); + + int result = lua_pcall(L, 2, 0, error_handler); + if (result) + scriptIface->scriptError(result, "LuaLBM::trigger"); + + lua_pop(L, 1); // Pop error handler +} + void LuaEmergeAreaCallback(v3s16 blockpos, EmergeAction action, void *param) { ScriptCallbackState *state = (ScriptCallbackState *)param; diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h index 4f8dfcd3..0e385ffe 100644 --- a/src/script/lua_api/l_env.h +++ b/src/script/lua_api/l_env.h @@ -220,6 +220,24 @@ public: u32 active_object_count, u32 active_object_count_wider); }; +class LuaLBM : public LoadingBlockModifierDef +{ +private: + int m_id; +public: + LuaLBM(lua_State *L, int id, + const std::set &trigger_contents, + const std::string &name, + bool run_at_every_load): + m_id(id) + { + this->run_at_every_load = run_at_every_load; + this->trigger_contents = trigger_contents; + this->name = name; + } + virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n); +}; + struct ScriptCallbackState { GameScripting *script; int callback_ref; diff --git a/src/server.cpp b/src/server.cpp index c4ed3225..75ca7448 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -344,10 +344,11 @@ Server::Server( servermap->addEventReceiver(this); // If file exists, load environment metadata - if(fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) - { - infostream<<"Server: Loading environment metadata"<loadMeta(); + } else { + m_env->loadDefaultMeta(); } // Add some test ActiveBlockModifiers to environment diff --git a/src/util/string.h b/src/util/string.h index c8f60b80..cf94b7f5 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -299,15 +299,6 @@ inline s32 mystoi(const std::string &str, s32 min, s32 max) } -/// Returns a 64-bit value represented by the string \p str (decimal). -inline s64 stoi64(const std::string &str) -{ - std::stringstream tmp(str); - s64 t; - tmp >> t; - return t; -} - // MSVC2010 includes it's own versions of these //#if !defined(_MSC_VER) || _MSC_VER < 1600 @@ -346,9 +337,22 @@ inline float mystof(const std::string &str) #define stoi mystoi #define stof mystof +/// Returns a value represented by the string \p val. +template +inline T from_string(const std::string &str) +{ + std::stringstream tmp(str); + T t; + tmp >> t; + return t; +} + +/// Returns a 64-bit signed value represented by the string \p str (decimal). +inline s64 stoi64(const std::string &str) { return from_string(str); } + // TODO: Replace with C++11 std::to_string. -/// Returns A string representing the value \p val. +/// Returns a string representing the value \p val. template inline std::string to_string(T val) { From 725cb4eb0743a382851e011fb7de1b7d443ce51f Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 7 Mar 2016 19:34:48 +0100 Subject: [PATCH 333/531] s_env.{cpp, h} cleanups * Replace string by-val passing with const reference * Fix code style * Remove redundant `int table` definition and indentation level --- src/script/cpp_api/s_env.cpp | 126 +++++++++++++++++------------------ src/script/cpp_api/s_env.h | 5 +- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp index 35b7b36f..82d0d4f0 100644 --- a/src/script/cpp_api/s_env.cpp +++ b/src/script/cpp_api/s_env.cpp @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "server.h" void ScriptApiEnv::environment_OnGenerated(v3s16 minp, v3s16 maxp, - u32 blockseed) + u32 blockseed) { SCRIPTAPI_PRECHECKHEADER @@ -44,7 +44,7 @@ void ScriptApiEnv::environment_OnGenerated(v3s16 minp, v3s16 maxp, void ScriptApiEnv::environment_Step(float dtime) { SCRIPTAPI_PRECHECKHEADER - //infostream<<"scriptapi_environment_step"< trigger_contents; - lua_getfield(L, current_abm, "nodenames"); - if(lua_istable(L, -1)){ - int table = lua_gettop(L); - lua_pushnil(L); - while(lua_next(L, table) != 0){ - // key at index -2 and value at index -1 - luaL_checktype(L, -1, LUA_TSTRING); - trigger_contents.insert(lua_tostring(L, -1)); - // removes value, keeps key for next iteration - lua_pop(L, 1); - } - } else if(lua_isstring(L, -1)){ - trigger_contents.insert(lua_tostring(L, -1)); - } - lua_pop(L, 1); - - std::set required_neighbors; - lua_getfield(L, current_abm, "neighbors"); - if(lua_istable(L, -1)){ - int table = lua_gettop(L); - lua_pushnil(L); - while(lua_next(L, table) != 0){ - // key at index -2 and value at index -1 - luaL_checktype(L, -1, LUA_TSTRING); - required_neighbors.insert(lua_tostring(L, -1)); - // removes value, keeps key for next iteration - lua_pop(L, 1); - } - } else if(lua_isstring(L, -1)){ - required_neighbors.insert(lua_tostring(L, -1)); - } - lua_pop(L, 1); - - float trigger_interval = 10.0; - getfloatfield(L, current_abm, "interval", trigger_interval); - - int trigger_chance = 50; - getintfield(L, current_abm, "chance", trigger_chance); - - bool simple_catch_up = true; - getboolfield(L, current_abm, "catch_up", simple_catch_up); - - LuaABM *abm = new LuaABM(L, id, trigger_contents, required_neighbors, - trigger_interval, trigger_chance, simple_catch_up); - - env->addActiveBlockModifier(abm); - - // removes value, keeps key for next iteration - lua_pop(L, 1); - } - } else { + if (!lua_istable(L, registered_abms)) { lua_pop(L, 1); throw LuaError("core.registered_abms was not a lua table, as expected."); } + lua_pushnil(L); + while (lua_next(L, registered_abms)) { + // key at index -2 and value at index -1 + int id = lua_tonumber(L, -2); + int current_abm = lua_gettop(L); + + std::set trigger_contents; + lua_getfield(L, current_abm, "nodenames"); + if (lua_istable(L, -1)) { + int table = lua_gettop(L); + lua_pushnil(L); + while (lua_next(L, table)) { + // key at index -2 and value at index -1 + luaL_checktype(L, -1, LUA_TSTRING); + trigger_contents.insert(lua_tostring(L, -1)); + // removes value, keeps key for next iteration + lua_pop(L, 1); + } + } else if (lua_isstring(L, -1)) { + trigger_contents.insert(lua_tostring(L, -1)); + } + lua_pop(L, 1); + + std::set required_neighbors; + lua_getfield(L, current_abm, "neighbors"); + if (lua_istable(L, -1)) { + int table = lua_gettop(L); + lua_pushnil(L); + while (lua_next(L, table)) { + // key at index -2 and value at index -1 + luaL_checktype(L, -1, LUA_TSTRING); + required_neighbors.insert(lua_tostring(L, -1)); + // removes value, keeps key for next iteration + lua_pop(L, 1); + } + } else if (lua_isstring(L, -1)) { + required_neighbors.insert(lua_tostring(L, -1)); + } + lua_pop(L, 1); + + float trigger_interval = 10.0; + getfloatfield(L, current_abm, "interval", trigger_interval); + + int trigger_chance = 50; + getintfield(L, current_abm, "chance", trigger_chance); + + bool simple_catch_up = true; + getboolfield(L, current_abm, "catch_up", simple_catch_up); + + LuaABM *abm = new LuaABM(L, id, trigger_contents, required_neighbors, + trigger_interval, trigger_chance, simple_catch_up); + + env->addActiveBlockModifier(abm); + + // removes value, keeps key for next iteration + lua_pop(L, 1); + } lua_pop(L, 1); // Get core.registered_lbms diff --git a/src/script/cpp_api/s_env.h b/src/script/cpp_api/s_env.h index 0d98e627..e0702456 100644 --- a/src/script/cpp_api/s_env.h +++ b/src/script/cpp_api/s_env.h @@ -26,7 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc., class ServerEnvironment; struct ScriptCallbackState; -class ScriptApiEnv : virtual public ScriptApiBase { +class ScriptApiEnv : virtual public ScriptApiBase +{ public: // Called on environment step void environment_Step(float dtime); @@ -35,7 +36,7 @@ public: void environment_OnGenerated(v3s16 minp, v3s16 maxp, u32 blockseed); // Called on player event - void player_event(ServerActiveObject *player, std::string type); + void player_event(ServerActiveObject *player, const std::string &type); // Called after emerge of a block queued from core.emerge_area() void on_emerge_area_completion(v3s16 blockpos, int action, From 095db16990eea878ce01b29c1eb85a128f98381a Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 29 Oct 2015 23:08:32 -0400 Subject: [PATCH 334/531] Simplify AreaStore ID management --- doc/lua_api.txt | 3 +- src/areastore.cpp | 37 +++++++++++------------- src/areastore.h | 46 +++++++++--------------------- src/script/lua_api/l_areastore.cpp | 17 ++--------- src/unittest/test_areastore.cpp | 28 +++++++----------- 5 files changed, 45 insertions(+), 86 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 0520096e..03b2d560 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2727,8 +2727,7 @@ If you chose the parameter-less constructor, a fast implementation will be autom * `get_area(id, include_borders, include_data)`: returns the area with the id `id`. (optional) Boolean values `include_borders` and `include_data` control what's copied. * `get_areas_for_pos(pos, include_borders, include_data)`: returns all areas that contain the position `pos`. (optional) Boolean values `include_borders` and `include_data` control what's copied. * `get_areas_in_area(edge1, edge2, accept_overlap, include_borders, include_data)`: returns all areas that contain all nodes inside the area specified by `edge1` and `edge2` (inclusive). If `accept_overlap` is true, also areas are returned that have nodes in common with the specified area. (optional) Boolean values `include_borders` and `include_data` control what's copied. -* `insert_area(edge1, edge2, data)`: inserts an area into the store. Returns the id if successful, nil otherwise. The (inclusive) positions `edge1` and `edge2` describe the area, `data` -is a string stored with the area. +* `insert_area(edge1, edge2, data)`: inserts an area into the store. Returns the new area's ID, or nil if the insertion failed. The (inclusive) positions `edge1` and `edge2` describe the area, `data` is a string stored with the area. * `reserve(count)`: reserves resources for at most `count` many contained areas. Only needed for efficiency, and only some implementations profit. * `remove_area(id)`: removes the area with the given id from the store, returns success. * `set_cache_params(params)`: sets params for the included prefiltering cache. Calling invalidates the cache, so that its elements have to be newly generated. diff --git a/src/areastore.cpp b/src/areastore.cpp index f9362c4a..c2cc4ce9 100644 --- a/src/areastore.cpp +++ b/src/areastore.cpp @@ -49,21 +49,6 @@ u16 AreaStore::size() const return areas_map.size(); } -u32 AreaStore::getFreeId(v3s16 minedge, v3s16 maxedge) -{ - int keep_on = 100; - while (keep_on--) { - m_highest_id++; - // Handle overflows, we dont want to return 0 - if (m_highest_id == AREA_ID_INVALID) - m_highest_id++; - if (areas_map.find(m_highest_id) == areas_map.end()) - return m_highest_id; - } - // search failed - return AREA_ID_INVALID; -} - const Area *AreaStore::getArea(u32 id) const { const Area *res = NULL; @@ -185,11 +170,17 @@ void AreaStore::getAreasForPos(std::vector *result, v3s16 pos) //// -void VectorAreaStore::insertArea(const Area &a) +bool VectorAreaStore::insertArea(Area *a) { - areas_map[a.id] = a; - m_areas.push_back(&(areas_map[a.id])); + a->id = getNextId(); + std::pair::iterator, bool> res = + areas_map.insert(std::make_pair(a->id, *a)); + if (!res.second) + // ID is not unique + return false; + m_areas.push_back(&res.first->second); invalidateCache(); + return true; } void VectorAreaStore::reserve(size_t count) @@ -273,11 +264,15 @@ static inline SpatialIndex::Point get_spatial_point(const v3s16 pos) } -void SpatialAreaStore::insertArea(const Area &a) +bool SpatialAreaStore::insertArea(Area *a) { - areas_map[a.id] = a; - m_tree->insertData(0, NULL, get_spatial_region(a.minedge, a.maxedge), a.id); + a->id = getNextId(); + if (!areas_map.insert(std::make_pair(a->id, *a)).second) + // ID is not unique + return false; + m_tree->insertData(0, NULL, get_spatial_region(a->minedge, a->maxedge), a->id); invalidateCache(); + return true; } bool SpatialAreaStore::removeArea(u32 id) diff --git a/src/areastore.h b/src/areastore.h index 57d96450..de458870 100644 --- a/src/areastore.h +++ b/src/areastore.h @@ -36,34 +36,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/serialize.h" #endif -#define AST_EXTREMIFY(min, max, pa, pb) \ - (min).X = MYMIN((pa).X, (pb).X); \ - (min).Y = MYMIN((pa).Y, (pb).Y); \ - (min).Z = MYMIN((pa).Z, (pb).Z); \ - (max).X = MYMAX((pa).X, (pb).X); \ - (max).Y = MYMAX((pa).Y, (pb).Y); \ - (max).Z = MYMAX((pa).Z, (pb).Z); - -#define AREA_ID_INVALID 0 struct Area { - Area(const v3s16 &minedge, const v3s16 &maxedge) - { - this->minedge = minedge; - this->maxedge = maxedge; - } - Area() {} - - void extremifyEdges() + Area(const v3s16 &mine, const v3s16 &maxe) { - v3s16 nminedge; - v3s16 nmaxedge; - - AST_EXTREMIFY(nminedge, nmaxedge, minedge, maxedge) - - maxedge = nmaxedge; - minedge = nminedge; + minedge = mine; + maxedge = maxe; + sortBoxVerticies(minedge, maxedge); } u32 id; @@ -76,13 +56,16 @@ std::vector get_areastore_typenames(); class AreaStore { protected: - // TODO change to unordered_map when we can - std::map areas_map; void invalidateCache(); virtual void getAreasForPosImpl(std::vector *result, v3s16 pos) = 0; + u32 getNextId() { return m_next_id++; } + + // TODO change to unordered_map when we can + std::map areas_map; bool cache_enabled; // don't write to this from subclasses, only read. public: - virtual void insertArea(const Area &a) = 0; + // Updates the area's ID + virtual bool insertArea(Area *a) = 0; virtual void reserve(size_t count) {}; virtual bool removeArea(u32 id) = 0; void getAreasForPos(std::vector *result, v3s16 pos); @@ -103,13 +86,12 @@ public: cache_enabled(true), m_cacheblock_radius(64), m_res_cache(1000, &cacheMiss, this), - m_highest_id(0) + m_next_id(0) { } void setCacheParams(bool enabled, u8 block_radius, size_t limit); - u32 getFreeId(v3s16 minedge, v3s16 maxedge); const Area *getArea(u32 id) const; u16 size() const; #if 0 @@ -120,7 +102,7 @@ private: static void cacheMiss(void *data, const v3s16 &mpos, std::vector *dest); u8 m_cacheblock_radius; // if you modify this, call invalidateCache() LRUCache > m_res_cache; - u32 m_highest_id; + u32 m_next_id; }; @@ -129,7 +111,7 @@ class VectorAreaStore : public AreaStore { protected: virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); public: - virtual void insertArea(const Area &a); + virtual bool insertArea(Area *a); virtual void reserve(size_t count); virtual bool removeArea(u32 id); virtual void getAreasInArea(std::vector *result, @@ -146,7 +128,7 @@ protected: virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); public: SpatialAreaStore(); - virtual void insertArea(const Area &a); + virtual bool insertArea(Area *a); virtual bool removeArea(u32 id); virtual void getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap); diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp index 4148780a..ff6abbd9 100644 --- a/src/script/lua_api/l_areastore.cpp +++ b/src/script/lua_api/l_areastore.cpp @@ -159,26 +159,15 @@ int LuaAreaStore::l_insert_area(lua_State *L) LuaAreaStore *o = checkobject(L, 1); AreaStore *ast = o->as; - Area a; - - a.minedge = check_v3s16(L, 2); - a.maxedge = check_v3s16(L, 3); - - a.extremifyEdges(); - a.id = ast->getFreeId(a.minedge, a.maxedge); - - if (a.id == AREA_ID_INVALID) { - // couldn't get free id - lua_pushnil(L); - return 1; - } + Area a(check_v3s16(L, 2), check_v3s16(L, 3)); size_t d_len; const char *data = luaL_checklstring(L, 4, &d_len); a.data = std::string(data, d_len); - ast->insertArea(a); + if (!ast->insertArea(&a)) + return 0; lua_pushnumber(L, a.id); return 1; diff --git a/src/unittest/test_areastore.cpp b/src/unittest/test_areastore.cpp index a0dcada9..9d70d0b7 100644 --- a/src/unittest/test_areastore.cpp +++ b/src/unittest/test_areastore.cpp @@ -62,18 +62,15 @@ void TestAreaStore::testSpatialStore() void TestAreaStore::genericStoreTest(AreaStore *store) { Area a(v3s16(-10, -3, 5), v3s16(0, 29, 7)); - a.id = 1; Area b(v3s16(-5, -2, 5), v3s16(0, 28, 6)); - b.id = 2; Area c(v3s16(-7, -3, 6), v3s16(-1, 27, 7)); - c.id = 3; std::vector res; UASSERTEQ(size_t, store->size(), 0); store->reserve(2); // sic - store->insertArea(a); - store->insertArea(b); - store->insertArea(c); + store->insertArea(&a); + store->insertArea(&b); + store->insertArea(&c); UASSERTEQ(size_t, store->size(), 3); store->getAreasForPos(&res, v3s16(-1, 0, 6)); @@ -81,20 +78,18 @@ void TestAreaStore::genericStoreTest(AreaStore *store) res.clear(); store->getAreasForPos(&res, v3s16(0, 0, 7)); UASSERTEQ(size_t, res.size(), 1); - UASSERTEQ(u32, res[0]->id, 1); res.clear(); - store->removeArea(1); + store->removeArea(a.id); store->getAreasForPos(&res, v3s16(0, 0, 7)); UASSERTEQ(size_t, res.size(), 0); res.clear(); - store->insertArea(a); + store->insertArea(&a); store->getAreasForPos(&res, v3s16(0, 0, 7)); UASSERTEQ(size_t, res.size(), 1); - UASSERTEQ(u32, res[0]->id, 1); res.clear(); store->getAreasInArea(&res, v3s16(-10, -3, 5), v3s16(0, 29, 7), false); @@ -109,21 +104,20 @@ void TestAreaStore::genericStoreTest(AreaStore *store) UASSERTEQ(size_t, res.size(), 3); res.clear(); - store->removeArea(1); - store->removeArea(2); - store->removeArea(3); + store->removeArea(a.id); + store->removeArea(b.id); + store->removeArea(c.id); Area d(v3s16(-100, -300, -200), v3s16(-50, -200, -100)); - d.id = 4; d.data = "Hi!"; - store->insertArea(d); + store->insertArea(&d); store->getAreasForPos(&res, v3s16(-75, -250, -150)); UASSERTEQ(size_t, res.size(), 1); - UASSERTEQ(u32, res[0]->id, 4); UASSERTEQ(u16, res[0]->data.size(), 3); UASSERT(strncmp(res[0]->data.c_str(), "Hi!", 3) == 0); res.clear(); - store->removeArea(4); + store->removeArea(d.id); } + From f021db724301f082cbde719afb2405ec1d8cf82c Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 29 Oct 2015 23:17:44 -0400 Subject: [PATCH 335/531] Make AreaStore cache setting private --- src/areastore.cpp | 6 +++--- src/areastore.h | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/areastore.cpp b/src/areastore.cpp index c2cc4ce9..b1b5c0db 100644 --- a/src/areastore.cpp +++ b/src/areastore.cpp @@ -112,14 +112,14 @@ void AreaStore::serialize(std::ostream &os) const void AreaStore::invalidateCache() { - if (cache_enabled) { + if (m_cache_enabled) { m_res_cache.invalidate(); } } void AreaStore::setCacheParams(bool enabled, u8 block_radius, size_t limit) { - cache_enabled = enabled; + m_cache_enabled = enabled; m_cacheblock_radius = MYMAX(block_radius, 16); m_res_cache.setLimit(MYMAX(limit, 20)); invalidateCache(); @@ -148,7 +148,7 @@ void AreaStore::cacheMiss(void *data, const v3s16 &mpos, std::vector *de void AreaStore::getAreasForPos(std::vector *result, v3s16 pos) { - if (cache_enabled) { + if (m_cache_enabled) { v3s16 mblock = getContainerPos(pos, m_cacheblock_radius); const std::vector *pre_list = m_res_cache.lookupCache(mblock); diff --git a/src/areastore.h b/src/areastore.h index de458870..493b4fc2 100644 --- a/src/areastore.h +++ b/src/areastore.h @@ -62,7 +62,6 @@ protected: // TODO change to unordered_map when we can std::map areas_map; - bool cache_enabled; // don't write to this from subclasses, only read. public: // Updates the area's ID virtual bool insertArea(Area *a) = 0; @@ -83,10 +82,10 @@ public: {} AreaStore() : - cache_enabled(true), m_cacheblock_radius(64), m_res_cache(1000, &cacheMiss, this), - m_next_id(0) + m_next_id(0), + m_cache_enabled(true) { } @@ -103,7 +102,7 @@ private: u8 m_cacheblock_radius; // if you modify this, call invalidateCache() LRUCache > m_res_cache; u32 m_next_id; - + bool m_cache_enabled; }; From 0079887b645e0ee441bd2cfcd7874a1148fdd656 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 29 Oct 2015 23:26:03 -0400 Subject: [PATCH 336/531] Move AreaStore to util --- build/android/jni/Android.mk | 2 +- src/CMakeLists.txt | 1 - src/script/lua_api/l_areastore.cpp | 2 +- src/script/lua_api/l_areastore.h | 13 ++++++------- src/script/lua_api/l_util.cpp | 1 - src/unittest/test_areastore.cpp | 2 +- src/util/CMakeLists.txt | 1 + src/{ => util}/areastore.cpp | 2 +- src/{ => util}/areastore.h | 6 +++--- 9 files changed, 14 insertions(+), 16 deletions(-) rename src/{ => util}/areastore.cpp (99%) rename src/{ => util}/areastore.h (98%) diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index e1a2a54c..92738e6c 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -112,7 +112,6 @@ LOCAL_C_INCLUDES := \ deps/sqlite/ LOCAL_SRC_FILES := \ - jni/src/areastore.cpp \ jni/src/ban.cpp \ jni/src/camera.cpp \ jni/src/cavegen.cpp \ @@ -221,6 +220,7 @@ LOCAL_SRC_FILES := \ jni/src/version.cpp \ jni/src/voxel.cpp \ jni/src/voxelalgorithms.cpp \ + jni/src/util/areastore.cpp \ jni/src/util/auth.cpp \ jni/src/util/base64.cpp \ jni/src/util/directiontables.cpp \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b84ff85..feca199c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -348,7 +348,6 @@ add_subdirectory(unittest) add_subdirectory(util) set(common_SRCS - areastore.cpp ban.cpp cavegen.cpp chat.cpp diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp index ff6abbd9..8b8b157d 100644 --- a/src/script/lua_api/l_areastore.cpp +++ b/src/script/lua_api/l_areastore.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common/c_converter.h" #include "cpp_api/s_security.h" #include "irr_v3d.h" -#include "areastore.h" +#include "util/areastore.h" #include "filesys.h" #ifndef ANDROID #include "cmake_config.h" diff --git a/src/script/lua_api/l_areastore.h b/src/script/lua_api/l_areastore.h index 543a2aa3..6321de6d 100644 --- a/src/script/lua_api/l_areastore.h +++ b/src/script/lua_api/l_areastore.h @@ -17,15 +17,14 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef L_AREASTORE_H_ -#define L_AREASTORE_H_ +#ifndef L_AREA_STORE_H_ +#define L_AREA_STORE_H_ #include "lua_api/l_base.h" -#include "areastore.h" -/* - AreaStore - */ + +class AreaStore; + class LuaAreaStore : public ModApiBase { private: @@ -66,4 +65,4 @@ public: static void Register(lua_State *L); }; -#endif /* L_AREASTORE_H_ */ +#endif // L_AREA_STORE_H_ diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index 98f70d91..f990dacf 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "serialization.h" #include "json/json.h" #include "cpp_api/s_security.h" -#include "areastore.h" #include "porting.h" #include "debug.h" #include "log.h" diff --git a/src/unittest/test_areastore.cpp b/src/unittest/test_areastore.cpp index 9d70d0b7..cac9e0b5 100644 --- a/src/unittest/test_areastore.cpp +++ b/src/unittest/test_areastore.cpp @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "test.h" -#include "areastore.h" +#include "util/areastore.h" class TestAreaStore : public TestBase { public: diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 33900a43..0e7cbad0 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -1,4 +1,5 @@ set(UTIL_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/areastore.cpp ${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp ${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp ${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp diff --git a/src/areastore.cpp b/src/util/areastore.cpp similarity index 99% rename from src/areastore.cpp rename to src/util/areastore.cpp index b1b5c0db..b0076faa 100644 --- a/src/areastore.cpp +++ b/src/util/areastore.cpp @@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "areastore.h" +#include "util/areastore.h" #include "util/serialize.h" #include "util/container.h" diff --git a/src/areastore.h b/src/util/areastore.h similarity index 98% rename from src/areastore.h rename to src/util/areastore.h index 493b4fc2..c36cbc38 100644 --- a/src/areastore.h +++ b/src/util/areastore.h @@ -17,8 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef AREASTORE_H_ -#define AREASTORE_H_ +#ifndef AREA_STORE_H_ +#define AREA_STORE_H_ #include "irr_v3d.h" #include "noise.h" // for PcgRandom @@ -174,4 +174,4 @@ private: #endif -#endif /* AREASTORE_H_ */ +#endif // AREA_STORE_H_ From 2e74e9ee20cee987a7326378c6ab73ec93e25457 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 29 Oct 2015 23:38:36 -0400 Subject: [PATCH 337/531] Move AreaStore container selection logic into getOptimalImplementation --- src/script/lua_api/l_areastore.cpp | 9 +-------- src/util/areastore.cpp | 10 ++++++++++ src/util/areastore.h | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp index 8b8b157d..8e9b2c7d 100644 --- a/src/script/lua_api/l_areastore.cpp +++ b/src/script/lua_api/l_areastore.cpp @@ -25,9 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irr_v3d.h" #include "util/areastore.h" #include "filesys.h" -#ifndef ANDROID - #include "cmake_config.h" -#endif #include static inline void get_data_and_border_flags(lua_State *L, u8 start_i, @@ -294,11 +291,7 @@ int LuaAreaStore::l_from_file(lua_State *L) LuaAreaStore::LuaAreaStore() { -#if USE_SPATIAL - this->as = new SpatialAreaStore(); -#else - this->as = new VectorAreaStore(); -#endif + this->as = AreaStore::getOptimalImplementation(); } LuaAreaStore::LuaAreaStore(const std::string &type) diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp index b0076faa..cf972586 100644 --- a/src/util/areastore.cpp +++ b/src/util/areastore.cpp @@ -44,6 +44,16 @@ with this program; if not, write to the Free Software Foundation, Inc., AST_OVERLAPS_IN_DIMENSION((amine), (amaxe), (b), Y) && \ AST_OVERLAPS_IN_DIMENSION((amine), (amaxe), (b), Z)) + +AreaStore *AreaStore::getOptimalImplementation() +{ +#if USE_SPATIAL + return new SpatialAreaStore(); +#else + return new VectorAreaStore(); +#endif +} + u16 AreaStore::size() const { return areas_map.size(); diff --git a/src/util/areastore.h b/src/util/areastore.h index c36cbc38..dee1f8ba 100644 --- a/src/util/areastore.h +++ b/src/util/areastore.h @@ -52,7 +52,6 @@ struct Area { std::string data; }; -std::vector get_areastore_typenames(); class AreaStore { protected: @@ -93,6 +92,8 @@ public: const Area *getArea(u32 id) const; u16 size() const; + + static AreaStore *getOptimalImplementation(); #if 0 bool deserialize(std::istream &is); void serialize(std::ostream &is) const; From 5641da43d635ae46770eb20c5482a8971086202f Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 30 Oct 2015 00:04:10 -0400 Subject: [PATCH 338/531] Clean up VectorAreaStore --- src/util/areastore.cpp | 48 +++++++++++++++++------------------------- src/util/areastore.h | 8 ++++--- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp index cf972586..56849238 100644 --- a/src/util/areastore.cpp +++ b/src/util/areastore.cpp @@ -183,7 +183,7 @@ void AreaStore::getAreasForPos(std::vector *result, v3s16 pos) bool VectorAreaStore::insertArea(Area *a) { a->id = getNextId(); - std::pair::iterator, bool> res = + std::pair res = areas_map.insert(std::make_pair(a->id, *a)); if (!res.second) // ID is not unique @@ -193,35 +193,27 @@ bool VectorAreaStore::insertArea(Area *a) return true; } -void VectorAreaStore::reserve(size_t count) -{ - m_areas.reserve(count); -} - bool VectorAreaStore::removeArea(u32 id) { - std::map::iterator itr = areas_map.find(id); - if (itr != areas_map.end()) { - size_t msiz = m_areas.size(); - for (size_t i = 0; i < msiz; i++) { - Area * b = m_areas[i]; - if (b->id == id) { - areas_map.erase(itr); - m_areas.erase(m_areas.begin() + i); - invalidateCache(); - return true; - } + AreaMap::iterator it = areas_map.find(id); + if (it == areas_map.end()) + return false; + Area *a = &it->second; + for (std::vector::iterator v_it = m_areas.begin(); + v_it != m_areas.end(); ++v_it) { + if (*v_it == a) { + m_areas.erase(v_it); + break; } - // we should never get here, it means we did find it in map, - // but not in the vector } - return false; + areas_map.erase(it); + invalidateCache(); + return true; } void VectorAreaStore::getAreasForPosImpl(std::vector *result, v3s16 pos) { - size_t msiz = m_areas.size(); - for (size_t i = 0; i < msiz; i++) { + for (size_t i = 0; i < m_areas.size(); ++i) { Area *b = m_areas[i]; if (AST_CONTAINS_PT(b, pos)) { result->push_back(b); @@ -232,9 +224,8 @@ void VectorAreaStore::getAreasForPosImpl(std::vector *result, v3s16 pos) void VectorAreaStore::getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap) { - size_t msiz = m_areas.size(); - for (size_t i = 0; i < msiz; i++) { - Area * b = m_areas[i]; + for (size_t i = 0; i < m_areas.size(); ++i) { + Area *b = m_areas[i]; if (accept_overlap ? AST_AREAS_OVERLAP(minedge, maxedge, b) : AST_CONTAINS_AREA(minedge, maxedge, b)) { result->push_back(b); @@ -243,11 +234,10 @@ void VectorAreaStore::getAreasInArea(std::vector *result, } #if 0 -bool VectorAreaStore::forEach(bool (*callback)(void *args, Area *a), void *args) const +bool SimpleAreaStore::forEach(bool (*callback)(void *args, Area *a), void *args) const { - size_t msiz = m_areas.size(); - for (size_t i = 0; i < msiz; i++) { - if (callback(args, m_areas[i])) { + for (size_t i = 0; i < m_areas.size(); ++i) { + if (callback(m_areas[i], arg)) { return true; } } diff --git a/src/util/areastore.h b/src/util/areastore.h index dee1f8ba..da787639 100644 --- a/src/util/areastore.h +++ b/src/util/areastore.h @@ -59,8 +59,10 @@ protected: virtual void getAreasForPosImpl(std::vector *result, v3s16 pos) = 0; u32 getNextId() { return m_next_id++; } - // TODO change to unordered_map when we can - std::map areas_map; + // Note: This can't be an unordered_map, since all + // references would be invalidated on rehash. + typedef std::map AreaMap; + AreaMap areas_map; public: // Updates the area's ID virtual bool insertArea(Area *a) = 0; @@ -111,8 +113,8 @@ class VectorAreaStore : public AreaStore { protected: virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); public: + virtual void reserve(size_t count) { m_areas.reserve(count); } virtual bool insertArea(Area *a); - virtual void reserve(size_t count); virtual bool removeArea(u32 id); virtual void getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap); From 6e9d71342a1d8d928d88bb3dfd1575a0dcf1e44a Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 30 Oct 2015 00:52:45 -0400 Subject: [PATCH 339/531] Sort AreaStore header --- src/util/areastore.cpp | 19 ++----- src/util/areastore.h | 126 +++++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 75 deletions(-) diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp index 56849238..fdd4d7b7 100644 --- a/src/util/areastore.cpp +++ b/src/util/areastore.cpp @@ -54,19 +54,12 @@ AreaStore *AreaStore::getOptimalImplementation() #endif } -u16 AreaStore::size() const -{ - return areas_map.size(); -} - const Area *AreaStore::getArea(u32 id) const { - const Area *res = NULL; - std::map::const_iterator itr = areas_map.find(id); - if (itr != areas_map.end()) { - res = &itr->second; - } - return res; + AreaMap::const_iterator it = areas_map.find(id); + if (it == areas_map.end()) + return NULL; + return &it->second; } #if 0 @@ -234,7 +227,7 @@ void VectorAreaStore::getAreasInArea(std::vector *result, } #if 0 -bool SimpleAreaStore::forEach(bool (*callback)(void *args, Area *a), void *args) const +bool SimpleAreaStore::forEach(ForEachCallback callback, void *arg) const { for (size_t i = 0; i < m_areas.size(); ++i) { if (callback(m_areas[i], arg)) { @@ -308,7 +301,7 @@ void SpatialAreaStore::getAreasInArea(std::vector *result, } #if 0 -bool SpatialAreaStore::forEach(bool (*callback)(void *args, Area *a), void *args) const +bool SpatialAreaStore::forEach(ForEachCallback callback, void *arg) const { // TODO ?? (this is only needed for serialisation, but libspatial has its own serialisation) return false; diff --git a/src/util/areastore.h b/src/util/areastore.h index da787639..20e9bdfc 100644 --- a/src/util/areastore.h +++ b/src/util/areastore.h @@ -39,21 +39,55 @@ with this program; if not, write to the Free Software Foundation, Inc., struct Area { Area() {} - Area(const v3s16 &mine, const v3s16 &maxe) + Area(const v3s16 &mine, const v3s16 &maxe) : + minedge(mine), maxedge(maxe) { - minedge = mine; - maxedge = maxe; sortBoxVerticies(minedge, maxedge); } u32 id; - v3s16 minedge; - v3s16 maxedge; + v3s16 minedge, maxedge; std::string data; }; class AreaStore { +public: + AreaStore() : + m_cache_enabled(true), + m_cacheblock_radius(64), + m_res_cache(1000, &cacheMiss, this), + m_next_id(0) + {} + + virtual ~AreaStore() {} + + static AreaStore *getOptimalImplementation(); + + virtual void reserve(size_t count) {}; + size_t size() const { return areas_map.size(); } + + // Updates the area's ID + virtual bool insertArea(Area *a) = 0; + virtual bool removeArea(u32 id) = 0; + void getAreasForPos(std::vector *result, v3s16 pos); + virtual void getAreasInArea(std::vector *result, + v3s16 minedge, v3s16 maxedge, bool accept_overlap) = 0; + void setCacheParams(bool enabled, u8 block_radius, size_t limit); + + const Area *getArea(u32 id) const; + +#if 0 + typedef bool (*ForEachCallback)(const Area *a, void *arg); + // Calls a passed function for every stored area, until the + // callback returns true. If that happens, it returns true, + // if the search is exhausted, it returns false. + virtual bool forEach(ForEachCallback, void *arg=NULL) const = 0; + + void serialize(std::ostream &is) const; + bool deserialize(std::istream &is); +#endif + protected: void invalidateCache(); virtual void getAreasForPosImpl(std::vector *result, v3s16 pos) = 0; @@ -63,98 +97,64 @@ protected: // references would be invalidated on rehash. typedef std::map AreaMap; AreaMap areas_map; -public: - // Updates the area's ID - virtual bool insertArea(Area *a) = 0; - virtual void reserve(size_t count) {}; - virtual bool removeArea(u32 id) = 0; - void getAreasForPos(std::vector *result, v3s16 pos); - virtual void getAreasInArea(std::vector *result, - v3s16 minedge, v3s16 maxedge, bool accept_overlap) = 0; -#if 0 - // calls a passed function for every stored area, until the - // callback returns true. If that happens, it returns true, - // if the search is exhausted, it returns false - virtual bool forEach(bool (*callback)(void *args, Area *a), void *args) const = 0; -#endif - - virtual ~AreaStore() - {} - - AreaStore() : - m_cacheblock_radius(64), - m_res_cache(1000, &cacheMiss, this), - m_next_id(0), - m_cache_enabled(true) - { - } - - void setCacheParams(bool enabled, u8 block_radius, size_t limit); - - const Area *getArea(u32 id) const; - u16 size() const; - - static AreaStore *getOptimalImplementation(); -#if 0 - bool deserialize(std::istream &is); - void serialize(std::ostream &is) const; -#endif private: static void cacheMiss(void *data, const v3s16 &mpos, std::vector *dest); + + bool m_cache_enabled; u8 m_cacheblock_radius; // if you modify this, call invalidateCache() LRUCache > m_res_cache; + u32 m_next_id; - bool m_cache_enabled; }; class VectorAreaStore : public AreaStore { -protected: - virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); public: virtual void reserve(size_t count) { m_areas.reserve(count); } virtual bool insertArea(Area *a); virtual bool removeArea(u32 id); virtual void getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap); - // virtual bool forEach(bool (*callback)(void *args, Area *a), void *args) const; + //virtual bool forEach(ForEachCallback, void *arg) const; + +protected: + virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); + private: std::vector m_areas; }; + #if USE_SPATIAL class SpatialAreaStore : public AreaStore { -protected: - virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); public: SpatialAreaStore(); + virtual ~SpatialAreaStore(); + virtual bool insertArea(Area *a); virtual bool removeArea(u32 id); virtual void getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap); - // virtual bool forEach(bool (*callback)(void *args, Area *a), void *args) const; + //virtual bool forEach(ForEachCallback, void *arg) const; + +protected: + virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); - virtual ~SpatialAreaStore(); private: SpatialIndex::ISpatialIndex *m_tree; SpatialIndex::IStorageManager *m_storagemanager; class VectorResultVisitor : public SpatialIndex::IVisitor { - private: - SpatialAreaStore *m_store; - std::vector *m_result; public: - VectorResultVisitor(std::vector *result, SpatialAreaStore *store) - { - m_store = store; - m_result = result; - } + VectorResultVisitor(std::vector *result, SpatialAreaStore *store) : + m_store(store), + m_result(result) + {} + ~VectorResultVisitor() {} - virtual void visitNode(const SpatialIndex::INode &in) - { - } + virtual void visitNode(const SpatialIndex::INode &in) {} virtual void visitData(const SpatialIndex::IData &in) { @@ -171,10 +171,12 @@ private: visitData(*(v[i])); } - ~VectorResultVisitor() {} + private: + SpatialAreaStore *m_store; + std::vector *m_result; }; }; -#endif +#endif // USE_SPATIAL #endif // AREA_STORE_H_ From 8ae1e1f4d29342d5d95648f7be1c8fe7f36eda52 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 30 Oct 2015 01:25:44 -0400 Subject: [PATCH 340/531] Add basic AreaStore method documentation --- src/util/areastore.h | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/util/areastore.h b/src/util/areastore.h index 20e9bdfc..5b4e9a71 100644 --- a/src/util/areastore.h +++ b/src/util/areastore.h @@ -67,21 +67,36 @@ public: virtual void reserve(size_t count) {}; size_t size() const { return areas_map.size(); } - // Updates the area's ID + /// Add an area to the store. + /// Updates the area's ID. virtual bool insertArea(Area *a) = 0; + + /// Removes an area from the store by ID. + /// @return Whether the area was in the store and removed. virtual bool removeArea(u32 id) = 0; + + /// Finds areas that the passed position is contained in. + /// Stores output in passed vector. void getAreasForPos(std::vector *result, v3s16 pos); + + /// Finds areas that are completely contained inside the area defined + /// by the passed edges. If @p accept_overlap is true this finds any + /// areas that intersect with the passed area at any point. virtual void getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap) = 0; + + /// Sets cache parameters. void setCacheParams(bool enabled, u8 block_radius, size_t limit); + /// Returns a pointer to the area coresponding to the passed ID, + /// or NULL if it doesn't exist. const Area *getArea(u32 id) const; #if 0 typedef bool (*ForEachCallback)(const Area *a, void *arg); - // Calls a passed function for every stored area, until the - // callback returns true. If that happens, it returns true, - // if the search is exhausted, it returns false. + /// Calls a passed function for every stored area, until the + /// callback returns true. If that happens, it returns true, + /// if the search is exhausted, it returns false. virtual bool forEach(ForEachCallback, void *arg=NULL) const = 0; void serialize(std::ostream &is) const; @@ -89,8 +104,15 @@ public: #endif protected: + /// Invalidates the getAreasForPos cache. + /// Call after adding or removing an area. void invalidateCache(); + + /// Implementation of getAreasForPos. + /// getAreasForPos calls this if the cache is disabled. virtual void getAreasForPosImpl(std::vector *result, v3s16 pos) = 0; + + /// Returns the next area ID and increments it. u32 getNextId() { return m_next_id++; } // Note: This can't be an unordered_map, since all @@ -99,10 +121,13 @@ protected: AreaMap areas_map; private: + /// Called by the cache when a value isn't found in the cache. static void cacheMiss(void *data, const v3s16 &mpos, std::vector *dest); bool m_cache_enabled; - u8 m_cacheblock_radius; // if you modify this, call invalidateCache() + /// Range, in nodes, of the getAreasForPos cache. + /// If you modify this, call invalidateCache() + u8 m_cacheblock_radius; LRUCache > m_res_cache; u32 m_next_id; From c4b7afed7ed12f8d5894c1a5dd15ea376af06da6 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 30 Oct 2015 10:26:14 -0400 Subject: [PATCH 341/531] Fix SpatialAreaStore not freeing removed areas --- src/util/areastore.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp index fdd4d7b7..357ce37f 100644 --- a/src/util/areastore.cpp +++ b/src/util/areastore.cpp @@ -275,6 +275,7 @@ bool SpatialAreaStore::removeArea(u32 id) Area *a = &itr->second; bool result = m_tree->deleteData(get_spatial_region(a->minedge, a->maxedge), id); + areas_map.erase(itr); invalidateCache(); return result; } else { From 821551a2669123ac9a476894d65b5efe10026040 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 30 Oct 2015 19:27:48 -0400 Subject: [PATCH 342/531] Implement AreaStore serialization --- doc/lua_api.txt | 4 ++ src/script/lua_api/l_areastore.cpp | 37 +++++++----- src/script/lua_api/l_areastore.h | 4 +- src/unittest/test_areastore.cpp | 39 ++++++++++++ src/util/areastore.cpp | 97 ++++++++++-------------------- src/util/areastore.h | 18 +++--- 6 files changed, 104 insertions(+), 95 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 03b2d560..50fa2527 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2737,6 +2737,10 @@ If you chose the parameter-less constructor, a fast implementation will be autom block_radius = number, -- the radius (in nodes) of the areas the cache generates prefiltered lists for, minimum 16, default 64 limit = number, -- the cache's size, minimum 20, default 1000 } +* `to_string()`: Experimental. Returns area store serialized as a (binary) string. +* `to_file(filename)`: Experimental. Like `to_string()`, but writes the data to a file. +* `from_string(str)`: Experimental. Deserializes string and loads it into the AreaStore. Returns success and, optionally, an error message. +* `from_file(filename)`: Experimental. Like `from_string()`, but reads the data from a file. ### `ItemStack` An `ItemStack` is a stack of items. diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp index 8e9b2c7d..261baf6c 100644 --- a/src/script/lua_api/l_areastore.cpp +++ b/src/script/lua_api/l_areastore.cpp @@ -70,6 +70,22 @@ static inline void push_areas(lua_State *L, const std::vector &areas, } } +// Deserializes value and handles errors +static int deserialization_helper(lua_State *L, AreaStore *as, + std::istream &is) +{ + try { + as->deserialize(is); + } catch (const SerializationError &e) { + lua_pushboolean(L, false); + lua_pushstring(L, e.what()); + return 2; + } + + lua_pushboolean(L, true); + return 1; +} + // garbage collector int LuaAreaStore::gc_object(lua_State *L) { @@ -217,17 +233,15 @@ int LuaAreaStore::l_set_cache_params(lua_State *L) return 0; } -#if 0 // to_string() int LuaAreaStore::l_to_string(lua_State *L) { NO_MAP_LOCK_REQUIRED; LuaAreaStore *o = checkobject(L, 1); - AreaStore *ast = o->as; std::ostringstream os(std::ios_base::binary); - ast->serialize(os); + o->as->serialize(os); std::string str = os.str(); lua_pushlstring(L, str.c_str(), str.length()); @@ -258,16 +272,12 @@ int LuaAreaStore::l_from_string(lua_State *L) NO_MAP_LOCK_REQUIRED; LuaAreaStore *o = checkobject(L, 1); - AreaStore *ast = o->as; size_t len; const char *str = luaL_checklstring(L, 2, &len); std::istringstream is(std::string(str, len), std::ios::binary); - bool success = ast->deserialize(is); - - lua_pushboolean(L, success); - return 1; + return deserialization_helper(L, o->as, is); } // from_file(filename) @@ -276,18 +286,13 @@ int LuaAreaStore::l_from_file(lua_State *L) NO_MAP_LOCK_REQUIRED; LuaAreaStore *o = checkobject(L, 1); - AreaStore *ast = o->as; const char *filename = luaL_checkstring(L, 2); CHECK_SECURE_PATH_OPTIONAL(L, filename); std::ifstream is(filename, std::ios::binary); - bool success = ast->deserialize(is); - - lua_pushboolean(L, success); - return 1; + return deserialization_helper(L, o->as, is); } -#endif LuaAreaStore::LuaAreaStore() { @@ -377,9 +382,9 @@ const luaL_reg LuaAreaStore::methods[] = { luamethod(LuaAreaStore, reserve), luamethod(LuaAreaStore, remove_area), luamethod(LuaAreaStore, set_cache_params), - /* luamethod(LuaAreaStore, to_string), + luamethod(LuaAreaStore, to_string), luamethod(LuaAreaStore, to_file), luamethod(LuaAreaStore, from_string), - luamethod(LuaAreaStore, from_file),*/ + luamethod(LuaAreaStore, from_file), {0,0} }; diff --git a/src/script/lua_api/l_areastore.h b/src/script/lua_api/l_areastore.h index 6321de6d..4bd94ceb 100644 --- a/src/script/lua_api/l_areastore.h +++ b/src/script/lua_api/l_areastore.h @@ -43,11 +43,11 @@ private: static int l_set_cache_params(lua_State *L); - /* static int l_to_string(lua_State *L); + static int l_to_string(lua_State *L); static int l_to_file(lua_State *L); static int l_from_string(lua_State *L); - static int l_from_file(lua_State *L); */ + static int l_from_file(lua_State *L); public: AreaStore *as; diff --git a/src/unittest/test_areastore.cpp b/src/unittest/test_areastore.cpp index cac9e0b5..62d446f5 100644 --- a/src/unittest/test_areastore.cpp +++ b/src/unittest/test_areastore.cpp @@ -31,6 +31,7 @@ public: void genericStoreTest(AreaStore *store); void testVectorStore(); void testSpatialStore(); + void testSerialization(); }; static TestAreaStore g_test_instance; @@ -41,6 +42,7 @@ void TestAreaStore::runTests(IGameDef *gamedef) #if USE_SPATIAL TEST(testSpatialStore); #endif + TEST(testSerialization); } //////////////////////////////////////////////////////////////////////////////// @@ -121,3 +123,40 @@ void TestAreaStore::genericStoreTest(AreaStore *store) store->removeArea(d.id); } +void TestAreaStore::testSerialization() +{ + VectorAreaStore store; + + Area a(v3s16(-1, 0, 1), v3s16(0, 1, 2)); + a.data = "Area A"; + store.insertArea(&a); + + Area b(v3s16(123, 456, 789), v3s16(32000, 100, 10)); + b.data = "Area B"; + store.insertArea(&b); + + std::ostringstream os; + store.serialize(os); + std::string str = os.str(); + + std::string str_wanted("\x00" // Version + "\x00\x02" // Count + "\xFF\xFF\x00\x00\x00\x01" // Area A min edge + "\x00\x00\x00\x01\x00\x02" // Area A max edge + "\x00\x06" // Area A data length + "Area A" // Area A data + "\x00\x7B\x00\x64\x00\x0A" // Area B min edge (last two swapped with max edge for sorting) + "\x7D\x00\x01\xC8\x03\x15" // Area B max edge (^) + "\x00\x06" // Area B data length + "Area B", // Area B data + 1 + 2 + + 6 + 6 + 2 + 6 + + 6 + 6 + 2 + 6); + UASSERTEQ(std::string, str, str_wanted); + + std::istringstream is(str); + store.deserialize(is); + + UASSERTEQ(size_t, store.size(), 4); // deserialize() doesn't clear the store +} + diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp index 357ce37f..17addb3a 100644 --- a/src/util/areastore.cpp +++ b/src/util/areastore.cpp @@ -62,56 +62,41 @@ const Area *AreaStore::getArea(u32 id) const return &it->second; } -#if 0 -Currently, serialisation is commented out. This is because of multiple reasons: -1. Why do we store the areastore into a file, why not into the database? -2. We don't use libspatial's serialisation, but we should, or perhaps not, because - it would remove the ability to switch. Perhaps write migration routines? -3. Various things need fixing, e.g. the size is serialized as - c++ implementation defined size_t -bool AreaStore::deserialize(std::istream &is) -{ - u8 ver = readU8(is); - if (ver != 1) - return false; - u16 count_areas = readU16(is); - for (u16 i = 0; i < count_areas; i++) { - // deserialize an area - Area a; - a.id = readU32(is); - a.minedge = readV3S16(is); - a.maxedge = readV3S16(is); - a.datalen = readU16(is); - a.data = new char[a.datalen]; - is.read((char *) a.data, a.datalen); - insertArea(a); - } - return true; -} - - -static bool serialize_area(void *ostr, Area *a) -{ - std::ostream &os = *((std::ostream *) ostr); - writeU32(os, a->id); - writeV3S16(os, a->minedge); - writeV3S16(os, a->maxedge); - writeU16(os, a->datalen); - os.write(a->data, a->datalen); - - return false; -} - - void AreaStore::serialize(std::ostream &os) const { - // write initial data - writeU8(os, 1); // serialisation version - writeU16(os, areas_map.size()); //DANGER: not platform independent - forEach(&serialize_area, &os); + writeU8(os, 0); // Serialisation version + + // TODO: Compression? + writeU16(os, areas_map.size()); + for (AreaMap::const_iterator it = areas_map.begin(); + it != areas_map.end(); ++it) { + const Area &a = it->second; + writeV3S16(os, a.minedge); + writeV3S16(os, a.maxedge); + writeU16(os, a.data.size()); + os.write(a.data.data(), a.data.size()); + } } -#endif +void AreaStore::deserialize(std::istream &is) +{ + u8 ver = readU8(is); + if (ver != 0) + throw SerializationError("Unknown AreaStore " + "serialization version!"); + + u16 num_areas = readU16(is); + for (u32 i = 0; i < num_areas; ++i) { + Area a; + a.minedge = readV3S16(is); + a.maxedge = readV3S16(is); + u16 data_len = readU16(is); + char *data = new char[data_len]; + is.read(data, data_len); + a.data = std::string(data, data_len); + insertArea(&a); + } +} void AreaStore::invalidateCache() { @@ -226,18 +211,6 @@ void VectorAreaStore::getAreasInArea(std::vector *result, } } -#if 0 -bool SimpleAreaStore::forEach(ForEachCallback callback, void *arg) const -{ - for (size_t i = 0; i < m_areas.size(); ++i) { - if (callback(m_areas[i], arg)) { - return true; - } - } - return false; -} -#endif - #if USE_SPATIAL static inline SpatialIndex::Region get_spatial_region(const v3s16 minedge, @@ -301,14 +274,6 @@ void SpatialAreaStore::getAreasInArea(std::vector *result, } } -#if 0 -bool SpatialAreaStore::forEach(ForEachCallback callback, void *arg) const -{ - // TODO ?? (this is only needed for serialisation, but libspatial has its own serialisation) - return false; -} -#endif - SpatialAreaStore::~SpatialAreaStore() { delete m_tree; diff --git a/src/util/areastore.h b/src/util/areastore.h index 5b4e9a71..ab6bd76a 100644 --- a/src/util/areastore.h +++ b/src/util/areastore.h @@ -92,16 +92,14 @@ public: /// or NULL if it doesn't exist. const Area *getArea(u32 id) const; -#if 0 - typedef bool (*ForEachCallback)(const Area *a, void *arg); - /// Calls a passed function for every stored area, until the - /// callback returns true. If that happens, it returns true, - /// if the search is exhausted, it returns false. - virtual bool forEach(ForEachCallback, void *arg=NULL) const = 0; - + /// Serializes the store's areas to a binary ostream. void serialize(std::ostream &is) const; - bool deserialize(std::istream &is); -#endif + + /// Deserializes the Areas from a binary istream. + /// This does not currently clear the AreaStore before adding the + /// areas, making it possible to deserialize multiple serialized + /// AreaStores. + void deserialize(std::istream &is); protected: /// Invalidates the getAreasForPos cache. @@ -141,7 +139,6 @@ public: virtual bool removeArea(u32 id); virtual void getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap); - //virtual bool forEach(ForEachCallback, void *arg) const; protected: virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); @@ -162,7 +159,6 @@ public: virtual bool removeArea(u32 id); virtual void getAreasInArea(std::vector *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap); - //virtual bool forEach(ForEachCallback, void *arg) const; protected: virtual void getAreasForPosImpl(std::vector *result, v3s16 pos); From 3ce6642a26d43fd368c24cdfc5460557258fb44f Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 30 Oct 2015 20:38:22 -0400 Subject: [PATCH 343/531] Add AreaStore custom ID API --- builtin/game/features.lua | 1 + doc/lua_api.txt | 2 +- src/script/lua_api/l_areastore.cpp | 5 ++++- src/util/areastore.cpp | 6 ++++-- src/util/areastore.h | 7 ++++--- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/builtin/game/features.lua b/builtin/game/features.lua index a5f17e54..2aad458d 100644 --- a/builtin/game/features.lua +++ b/builtin/game/features.lua @@ -8,6 +8,7 @@ core.features = { use_texture_alpha = true, no_legacy_abms = true, texture_names_parens = true, + area_store_custom_ids = true, } function core.has_feature(arg) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 50fa2527..65af5157 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2727,7 +2727,7 @@ If you chose the parameter-less constructor, a fast implementation will be autom * `get_area(id, include_borders, include_data)`: returns the area with the id `id`. (optional) Boolean values `include_borders` and `include_data` control what's copied. * `get_areas_for_pos(pos, include_borders, include_data)`: returns all areas that contain the position `pos`. (optional) Boolean values `include_borders` and `include_data` control what's copied. * `get_areas_in_area(edge1, edge2, accept_overlap, include_borders, include_data)`: returns all areas that contain all nodes inside the area specified by `edge1` and `edge2` (inclusive). If `accept_overlap` is true, also areas are returned that have nodes in common with the specified area. (optional) Boolean values `include_borders` and `include_data` control what's copied. -* `insert_area(edge1, edge2, data)`: inserts an area into the store. Returns the new area's ID, or nil if the insertion failed. The (inclusive) positions `edge1` and `edge2` describe the area, `data` is a string stored with the area. +* `insert_area(edge1, edge2, data, [id])`: inserts an area into the store. Returns the new area's ID, or nil if the insertion failed. The (inclusive) positions `edge1` and `edge2` describe the area. `data` is a string stored with the area. If passed, `id` will be used as the internal area ID, it must be a unique number between 0 and 2^32-2. If you use the `id` parameter you must always use it, or insertions are likely to fail due to conflicts. * `reserve(count)`: reserves resources for at most `count` many contained areas. Only needed for efficiency, and only some implementations profit. * `remove_area(id)`: removes the area with the given id from the store, returns success. * `set_cache_params(params)`: sets params for the included prefiltering cache. Calling invalidates the cache, so that its elements have to be newly generated. diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp index 261baf6c..20e7875c 100644 --- a/src/script/lua_api/l_areastore.cpp +++ b/src/script/lua_api/l_areastore.cpp @@ -164,7 +164,7 @@ int LuaAreaStore::l_get_areas_in_area(lua_State *L) return 1; } -// insert_area(edge1, edge2, data) +// insert_area(edge1, edge2, data, id) int LuaAreaStore::l_insert_area(lua_State *L) { NO_MAP_LOCK_REQUIRED; @@ -179,6 +179,9 @@ int LuaAreaStore::l_insert_area(lua_State *L) a.data = std::string(data, d_len); + if (lua_isnumber(L, 5)) + a.id = lua_tonumber(L, 5); + if (!ast->insertArea(&a)) return 0; diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp index 17addb3a..58f08a8c 100644 --- a/src/util/areastore.cpp +++ b/src/util/areastore.cpp @@ -160,7 +160,8 @@ void AreaStore::getAreasForPos(std::vector *result, v3s16 pos) bool VectorAreaStore::insertArea(Area *a) { - a->id = getNextId(); + if (a->id == U32_MAX) + a->id = getNextId(); std::pair res = areas_map.insert(std::make_pair(a->id, *a)); if (!res.second) @@ -232,7 +233,8 @@ static inline SpatialIndex::Point get_spatial_point(const v3s16 pos) bool SpatialAreaStore::insertArea(Area *a) { - a->id = getNextId(); + if (a->id == U32_MAX) + a->id = getNextId(); if (!areas_map.insert(std::make_pair(a->id, *a)).second) // ID is not unique return false; diff --git a/src/util/areastore.h b/src/util/areastore.h index ab6bd76a..bebecfd7 100644 --- a/src/util/areastore.h +++ b/src/util/areastore.h @@ -38,9 +38,9 @@ with this program; if not, write to the Free Software Foundation, Inc., struct Area { - Area() {} + Area() : id(U32_MAX) {} Area(const v3s16 &mine, const v3s16 &maxe) : - minedge(mine), maxedge(maxe) + id(U32_MAX), minedge(mine), maxedge(maxe) { sortBoxVerticies(minedge, maxedge); } @@ -68,7 +68,8 @@ public: size_t size() const { return areas_map.size(); } /// Add an area to the store. - /// Updates the area's ID. + /// Updates the area's ID if it hasn't already been set. + /// @return Whether the area insertion was successful. virtual bool insertArea(Area *a) = 0; /// Removes an area from the store by ID. From 4e59fcf5c1e40dee764317a1190dceadc3a77829 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Sun, 6 Mar 2016 12:02:21 -0800 Subject: [PATCH 344/531] Add consistent monotonic day counter - get_day_count() I've written several experimental bits of code that revolve around the need for a consistent calendar, but implementing one is extremely hard in mods due to time changes and mods overriding core.get_timeofday(), which will conflict. The second part of the problem is that doing this from a mod requires constant maintenance of a settings file. An implementation in core is trivial, however, and solves all of these problems at virtually no cost: No extra branches in server steps, and a single branch when minetest.set_time_of_day(), which is entirely reasonable. We store the day_count value in env_meta.txt. The use case is obvious: This change allows mods to create an actual virtual calendar, or properly account for seasonal changes, etc.. We add a "/days" chatcommand that displays the current day count. No permissions are needed. It can only retrieve the day count, not modify it. --- builtin/game/chatcommands.lua | 7 +++++++ doc/lua_api.txt | 2 ++ src/environment.cpp | 20 +++++++++++++++++++- src/environment.h | 5 +++++ src/script/lua_api/l_env.cpp | 10 ++++++++++ src/script/lua_api/l_env.h | 3 +++ 6 files changed, 46 insertions(+), 1 deletion(-) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 2c7a0b53..0b197664 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -785,6 +785,13 @@ core.register_chatcommand("time", { end, }) +core.register_chatcommand("days", { + description = "Display day count", + func = function(name, param) + return true, "Current day is " .. core.get_day_count() + end +}) + core.register_chatcommand("shutdown", { description = "shutdown server", privs = {server=true}, diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 65af5157..e2ab65dd 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1998,6 +1998,8 @@ and `minetest.auth_reload` call the authetification handler. * `val` is between `0` and `1`; `0` for midnight, `0.5` for midday * `minetest.get_timeofday()` * `minetest.get_gametime()`: returns the time, in seconds, since the world was created +* `minetest.get_day_count()`: returns number days elapsed since world was created, + * accounting for time changes. * `minetest.find_node_near(pos, radius, nodenames)`: returns pos or `nil` * `radius`: using a maximum metric * `nodenames`: e.g. `{"ignore", "group:tree"}` or `"default:dirt"` diff --git a/src/environment.cpp b/src/environment.cpp index 6da376a1..0d00ed17 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -208,6 +208,8 @@ void Environment::setDayNightRatioOverride(bool enable, u32 value) void Environment::setTimeOfDay(u32 time) { MutexAutoLock lock(this->m_time_lock); + if (m_time_of_day > time) + m_day_count++; m_time_of_day = time; m_time_of_day_f = (float)time / 24000.0; } @@ -238,8 +240,10 @@ void Environment::stepTimeOfDay(float dtime) bool sync_f = false; if (units > 0) { // Sync at overflow - if (m_time_of_day + units >= 24000) + if (m_time_of_day + units >= 24000) { sync_f = true; + m_day_count++; + } m_time_of_day = (m_time_of_day + units) % 24000; if (sync_f) m_time_of_day_f = (float)m_time_of_day / 24000.0; @@ -256,6 +260,13 @@ void Environment::stepTimeOfDay(float dtime) } } +u32 Environment::getDayCount() +{ + // Atomic counter + return m_day_count; +} + + /* ABMWithState */ @@ -727,6 +738,7 @@ void ServerEnvironment::saveMeta() args.setU64("lbm_introduction_times_version", 1); args.set("lbm_introduction_times", m_lbm_mgr.createIntroductionTimesString()); + args.setU64("day_count", m_day_count); args.writeLines(ss); ss<<"EnvArgsEnd\n"; @@ -792,6 +804,12 @@ void ServerEnvironment::loadMeta() } m_lbm_mgr.loadIntroductionTimes(lbm_introduction_times, m_gamedef, m_game_time); + try { + m_day_count = args.getU64("day_count"); + } catch (SettingNotFoundException &e) { + // If missing, start the day counter + m_day_count = 0; + } } void ServerEnvironment::loadDefaultMeta() diff --git a/src/environment.h b/src/environment.h index 448ed70e..9b91a092 100644 --- a/src/environment.h +++ b/src/environment.h @@ -95,6 +95,8 @@ public: void setDayNightRatioOverride(bool enable, u32 value); + u32 getDayCount(); + // counter used internally when triggering ABMs u32 m_added_objects; @@ -117,6 +119,9 @@ protected: // Overriding the day-night ratio is useful for custom sky visuals bool m_enable_day_night_ratio_override; u32 m_day_night_ratio_override; + // Days from the server start, accounts for time shift + // in game (e.g. /time or bed usage) + Atomic m_day_count; /* * Above: values managed by m_time_lock */ diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index f4ddc2af..af89da9a 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -561,6 +561,15 @@ int ModApiEnvMod::l_get_timeofday(lua_State *L) return 1; } +// get_day_count() -> int +int ModApiEnvMod::l_get_day_count(lua_State *L) +{ + GET_ENV_PTR; + + lua_pushnumber(L, env->getDayCount()); + return 1; +} + // get_gametime() int ModApiEnvMod::l_get_gametime(lua_State *L) { @@ -1055,6 +1064,7 @@ void ModApiEnvMod::Initialize(lua_State *L, int top) API_FCT(set_timeofday); API_FCT(get_timeofday); API_FCT(get_gametime); + API_FCT(get_day_count); API_FCT(find_node_near); API_FCT(find_nodes_in_area); API_FCT(find_nodes_in_area_under_air); diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h index 0e385ffe..89dd7978 100644 --- a/src/script/lua_api/l_env.h +++ b/src/script/lua_api/l_env.h @@ -113,6 +113,9 @@ private: // get_gametime() static int l_get_gametime(lua_State *L); + // get_day_count() -> int + static int l_get_day_count(lua_State *L); + // find_node_near(pos, radius, nodenames) -> pos or nil // nodenames: eg. {"ignore", "group:tree"} or "default:dirt" static int l_find_node_near(lua_State *L); From dc8bf4e9284bdc0b9367dc8dc23c394e7b5bde34 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 7 Mar 2016 20:23:34 -0800 Subject: [PATCH 345/531] Avoid try/catch for settings. We can just test for the presence of these settings nicely here, no need to use a try / catch construct. --- src/environment.cpp | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/environment.cpp b/src/environment.cpp index 0d00ed17..1de44e75 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -776,19 +776,13 @@ void ServerEnvironment::loadMeta() throw SerializationError("Couldn't load env meta game_time"); } - try { - setTimeOfDay(args.getU64("time_of_day")); - } catch (SettingNotFoundException &e) { - // This is not as important - setTimeOfDay(9000); - } + setTimeOfDay(args.exists("time_of_day") ? + // set day to morning by default + args.getU64("time_of_day") : 9000); - try { - m_last_clear_objects_time = args.getU64("last_clear_objects_time"); - } catch (SettingNotFoundException &e) { + m_last_clear_objects_time = args.exists("last_clear_objects_time") ? // If missing, do as if clearObjects was never called - m_last_clear_objects_time = 0; - } + args.getU64("last_clear_objects_time") : 0; std::string lbm_introduction_times = ""; try { @@ -804,12 +798,8 @@ void ServerEnvironment::loadMeta() } m_lbm_mgr.loadIntroductionTimes(lbm_introduction_times, m_gamedef, m_game_time); - try { - m_day_count = args.getU64("day_count"); - } catch (SettingNotFoundException &e) { - // If missing, start the day counter - m_day_count = 0; - } + m_day_count = args.exists("day_count") ? + args.getU64("day_count") : 0; } void ServerEnvironment::loadDefaultMeta() From f627ef39e038089d977f4f671b11cd357b1dcd70 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Sun, 28 Feb 2016 21:53:26 -0800 Subject: [PATCH 346/531] Introduce "protection_bypass" privilege. This privilege allows map protection bypassing for server operators and world moderators. Initially I had thought that bypassing protection mods would have been something that could entirely be done inside mods and minetest_game, but the concept of protection is defined in core, in the code of core.is_protected(). I don't feel that it would be logical to introduce a protection concept in core, but not some way around that for server operators to maintain map parts that need fixing, de-griefing or cleanup. Others had noticed the same problems, and proposed a patch to minetest_game. That patch is fine by itself, but it fails to add protection bypass functionality for digging normal nodes and placing nodes. So, instead, we indroduce the new priv "protection_bypass" in core, and modify 'on_place_node' and 'node_dig' to allow bypassing node protections if the player holds this priv. This priv was tested with protector redo by tenplus1. A followup patch to Minetest Game will include allowing special checks for doors, trapdoors, chests in Minetest Game. Protection mods will likely want to mimic the changes in their relevant code sections. --- builtin/game/item.lua | 6 ++++-- builtin/game/privileges.lua | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index c42aff5b..36c2c1a6 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -233,7 +233,8 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2) place_to = {x = under.x, y = under.y, z = under.z} end - if core.is_protected(place_to, placer:get_player_name()) then + if core.is_protected(place_to, placer:get_player_name()) and + not minetest.check_player_privs(placer, "protection_bypass") then core.log("action", placer:get_player_name() .. " tried to place " .. def.name .. " at protected position " @@ -444,7 +445,8 @@ function core.node_dig(pos, node, digger) return end - if core.is_protected(pos, digger:get_player_name()) then + if core.is_protected(pos, digger:get_player_name()) and + not minetest.check_player_privs(digger, "protection_bypass") then core.log("action", digger:get_player_name() .. " tried to dig " .. node.name .. " at protected position " diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua index 7e6387c7..bd5ead62 100644 --- a/builtin/game/privileges.lua +++ b/builtin/game/privileges.lua @@ -32,6 +32,7 @@ core.register_privilege("settime", "Can use /time") core.register_privilege("privs", "Can modify privileges") core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges") core.register_privilege("server", "Can do server maintenance stuff") +core.register_privilege("protection_bypass", "Can bypass node protection in the world") core.register_privilege("shout", "Can speak in chat") core.register_privilege("ban", "Can ban and unban players") core.register_privilege("kick", "Can kick players") From 6f325070dde739ab942286bd6e368930ea41cb42 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 11 Mar 2016 16:24:55 +0000 Subject: [PATCH 347/531] Documentation: Clarify global and mapgen-specific mapgen flags --- builtin/settingtypes.txt | 31 +++++++++++++++++++++---------- minetest.conf.example | 31 +++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 3c808194..1672e08c 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -819,8 +819,10 @@ map_generation_limit (Map generation limit) int 31000 0 31000 # Global map generation attributes. # In Mapgen v6 the 'decorations' flag controls all decorations except trees # and junglegrass, in all other mapgens this flag controls all decorations. +# The default flags set in the engine are: caves, light, decorations +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. mg_flags (Mapgen flags) flags caves,dungeons,light,decorations caves,dungeons,light,decorations,nocaves,nodungeons,nolight,nodecorations [**Advanced] @@ -875,9 +877,11 @@ mgv5_np_cave2 (Mapgen v5 cave2 noise parameters) noise_params 0, 12, (50, 50, 50 [***Mapgen v6] # Map generation attributes specific to Mapgen v6. -# When snowbiomes are enabled jungles are enabled and the jungles flag is ignored. +# When snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored. +# The default flags set in the engine are: biomeblend, mudflow +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes,trees jungles,biomeblend,mudflow,snowbiomes,flat,trees,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees # Controls size of deserts and beaches in Mapgen v6. @@ -900,9 +904,11 @@ mgv6_np_apple_trees (Mapgen v6 apple trees noise parameters) noise_params 0, 1, [***Mapgen v7] # Map generation attributes specific to Mapgen v7. -# 'ridges' are the rivers. +# The 'ridges' flag controls the rivers. +# The default flags set in the engine are: mountains, ridges +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountains,noridges mgv7_np_terrain_base (Mapgen v7 terrain base noise parameters) noise_params 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0 @@ -920,9 +926,11 @@ mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100, [***Mapgen flat] # Map generation attributes specific to Mapgen flat. -# Occasional lakes and hills added to the flat world. +# Occasional lakes and hills can be added to the flat world. +# The default flags set in the engine are: none +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. mgflat_spflags (Mapgen flat flags) flags lakes,hills,,nolakes,nohills # Y of flat ground. @@ -1027,10 +1035,13 @@ mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, ( [****General] # Map generation attributes specific to Mapgen Valleys. +# 'altitude_chill' makes higher elevations colder, which may cause biome issues. +# 'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool, +# it may interfere with delicately adjusted biomes. +# The default flags set in the engine are: altitude_chill, humid_rivers +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. -# "altitude_chill" makes higher elevations colder, which may cause biome issues. -# "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes. +# Flags starting with 'no' are used to explicitly disable them. mg_valleys_spflags (Valleys C Flags) flags altitude_chill,humid_rivers altitude_chill,noaltitude_chill,humid_rivers,nohumid_rivers # The altitude at which temperature drops by 20C diff --git a/minetest.conf.example b/minetest.conf.example index 6b7347cc..3177360c 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1009,8 +1009,10 @@ # Global map generation attributes. # In Mapgen v6 the 'decorations' flag controls all decorations except trees # and junglegrass, in all other mapgens this flag controls all decorations. +# The default flags set in the engine are: caves, light, decorations +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: caves, dungeons, light, decorations, nocaves, nodungeons, nolight, nodecorations # mg_flags = caves,dungeons,light,decorations @@ -1077,9 +1079,11 @@ #### Mapgen v6 # Map generation attributes specific to Mapgen v6. -# When snowbiomes are enabled jungles are enabled and the jungles flag is ignored. +# When snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored. +# The default flags set in the engine are: biomeblend, mudflow +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, trees, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat, notrees # mgv6_spflags = jungles,biomeblend,mudflow,snowbiomes,trees @@ -1127,9 +1131,11 @@ #### Mapgen v7 # Map generation attributes specific to Mapgen v7. -# 'ridges' are the rivers. +# The 'ridges' flag controls the rivers. +# The default flags set in the engine are: mountains, ridges +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: mountains, ridges, nomountains, noridges # mgv7_spflags = mountains,ridges @@ -1169,9 +1175,11 @@ #### Mapgen flat # Map generation attributes specific to Mapgen flat. -# Occasional lakes and hills added to the flat world. +# Occasional lakes and hills can be added to the flat world. +# The default flags set in the engine are: none +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. +# Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: lakes, hills, , nolakes, nohills # mgflat_spflags = @@ -1303,10 +1311,13 @@ ##### General # Map generation attributes specific to Mapgen Valleys. +# 'altitude_chill' makes higher elevations colder, which may cause biome issues. +# 'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool, +# it may interfere with delicately adjusted biomes. +# The default flags set in the engine are: altitude_chill, humid_rivers +# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. -# Flags starting with "no" are used to explicitly disable them. -# "altitude_chill" makes higher elevations colder, which may cause biome issues. -# "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes. +# Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers # mg_valleys_spflags = altitude_chill,humid_rivers From 0d2df732e5c5075cd8848b9a9530865430630bfe Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 11 Mar 2016 18:41:56 +0100 Subject: [PATCH 348/531] Fix ask_reconnect_on_crash option being ignored Since commit 3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7 "Optional reconnect functionality" there is a config option named ask_reconnect_on_crash. It asks the client to reconnect to the server if the server crashed. It has been implemeted and works, but due to a function parameter not being passed it never showed effect. This patch adds the parameter and fixes the bug. Also fixes the `reconnect` option of minetest.request_shutdown being ignored. --- src/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.cpp b/src/server.cpp index 75ca7448..2fa8c4cf 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2568,7 +2568,7 @@ void Server::DenyAccessVerCompliant(u16 peer_id, u16 proto_ver, AccessDeniedCode const std::string &str_reason, bool reconnect) { if (proto_ver >= 25) { - SendAccessDenied(peer_id, reason, str_reason); + SendAccessDenied(peer_id, reason, str_reason, reconnect); } else { std::wstring wreason = utf8_to_wide( reason == SERVER_ACCESSDENIED_CUSTOM_STRING ? str_reason : From 20312fda18cb93b85e26d39a5b7386d7f7be9148 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 11 Mar 2016 21:56:32 +0000 Subject: [PATCH 349/531] Documentation: Auto-update conf.example and settings_translation_file.cpp --- minetest.conf.example | 2 +- src/settings_translation_file.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/minetest.conf.example b/minetest.conf.example index 3177360c..1587cba7 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -986,7 +986,7 @@ # Name of map generator to be used when creating a new world. # Creating a world in the main menu will override this. -# type: enum values: v5, v6, v7, flat, fractal, valleys, singlenode +# type: enum values: v5, v6, v7, flat, valleys, fractal, singlenode # mg_name = v6 # Water surface level of the world. diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index d8e08521..e92a34cb 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -421,7 +421,7 @@ fake_function() { gettext("Map generation limit"); gettext("Where the map generator stops.\nPlease note:\n- Limited to 31000 (setting above has no effect)\n- The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks).\n- Those groups have an offset of -32, -32 nodes from the origin.\n- Only groups which are within the map_generation_limit are generated"); gettext("Mapgen flags"); - gettext("Global map generation attributes.\nIn Mapgen v6 the 'decorations' flag controls all decorations except trees\nand junglegrass, in all other mapgens this flag controls all decorations.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Global map generation attributes.\nIn Mapgen v6 the 'decorations' flag controls all decorations except trees\nand junglegrass, in all other mapgens this flag controls all decorations.\nThe default flags set in the engine are: caves, light, decorations\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them."); gettext("Advanced"); gettext("Chunk size"); gettext("Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes)."); @@ -448,7 +448,7 @@ fake_function() { gettext("Mapgen v5 cave2 noise parameters"); gettext("Mapgen v6"); gettext("Mapgen v6 flags"); - gettext("Map generation attributes specific to Mapgen v6.\nWhen snowbiomes are enabled jungles are enabled and the jungles flag is ignored.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Map generation attributes specific to Mapgen v6.\nWhen snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored.\nThe default flags set in the engine are: biomeblend, mudflow\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them."); gettext("Mapgen v6 desert frequency"); gettext("Controls size of deserts and beaches in Mapgen v6.\nWhen snowbiomes are enabled 'mgv6_freq_desert' is ignored."); gettext("Mapgen v6 beach frequency"); @@ -465,7 +465,7 @@ fake_function() { gettext("Mapgen v6 apple trees noise parameters"); gettext("Mapgen v7"); gettext("Mapgen v7 flags"); - gettext("Map generation attributes specific to Mapgen v7.\n'ridges' are the rivers.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Map generation attributes specific to Mapgen v7.\nThe 'ridges' flag controls the rivers.\nThe default flags set in the engine are: mountains, ridges\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them."); gettext("Mapgen v7 terrain base noise parameters"); gettext("Mapgen v7 terrain altitude noise parameters"); gettext("Mapgen v7 terrain persistation noise parameters"); @@ -479,7 +479,7 @@ fake_function() { gettext("Mapgen v7 cave2 noise parameters"); gettext("Mapgen flat"); gettext("Mapgen flat flags"); - gettext("Map generation attributes specific to Mapgen flat.\nOccasional lakes and hills added to the flat world.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them."); + gettext("Map generation attributes specific to Mapgen flat.\nOccasional lakes and hills can be added to the flat world.\nThe default flags set in the engine are: none\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them."); gettext("Mapgen flat ground level"); gettext("Y of flat ground."); gettext("Mapgen flat large cave depth"); @@ -523,7 +523,7 @@ fake_function() { gettext("Mapgen Valleys"); gettext("General"); gettext("Valleys C Flags"); - gettext("Map generation attributes specific to Mapgen Valleys.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with \"no\" are used to explicitly disable them.\n\"altitude_chill\" makes higher elevations colder, which may cause biome issues.\n\"humid_rivers\" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes."); + gettext("Map generation attributes specific to Mapgen Valleys.\n'altitude_chill' makes higher elevations colder, which may cause biome issues.\n'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool,\nit may interfere with delicately adjusted biomes.\nThe default flags set in the engine are: altitude_chill, humid_rivers\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them."); gettext("Altitude Chill"); gettext("The altitude at which temperature drops by 20C"); gettext("Large cave depth"); From 8c951cae5bcfa715e227d47d122cc2de45d70a63 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 12 Mar 2016 11:58:02 -0500 Subject: [PATCH 350/531] Fix chat console not opening after formspec opened over it The MainMenuManager set the console invisible when a formspec opened over it, but didn't properly close it, and the chat console never set itself visible again. --- src/guiChatConsole.cpp | 17 +++++++++++++++++ src/guiChatConsole.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index d59937c3..ec9d3ffd 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -122,6 +122,8 @@ void GUIChatConsole::openConsole(f32 height) m_desired_height_fraction = height; m_desired_height = height * m_screensize.Y; reformatConsole(); + m_animate_time_old = getTimeMs(); + IGUIElement::setVisible(true); Environment->setFocus(this); m_menumgr->createdMenu(this); } @@ -243,6 +245,11 @@ void GUIChatConsole::animate(u32 msec) { // animate the console height s32 goal = m_open ? m_desired_height : 0; + + // Set invisible if close animation finished (reset by openConsole) + if (!m_open && m_height == 0) + IGUIElement::setVisible(false); + if (m_height != goal) { s32 max_change = msec * m_screensize.Y * (m_height_speed / 1000.0); @@ -628,3 +635,13 @@ bool GUIChatConsole::OnEvent(const SEvent& event) return Parent ? Parent->OnEvent(event) : false; } +void GUIChatConsole::setVisible(bool visible) +{ + m_open = visible; + IGUIElement::setVisible(visible); + if (!visible) { + m_height = 0; + recalculateConsolePosition(); + } +} + diff --git a/src/guiChatConsole.h b/src/guiChatConsole.h index fe595f28..3013a1d3 100644 --- a/src/guiChatConsole.h +++ b/src/guiChatConsole.h @@ -77,6 +77,8 @@ public: virtual bool OnEvent(const SEvent& event); + virtual void setVisible(bool visible); + private: void reformatConsole(); void recalculateConsolePosition(); From e737b1c271c9d957651ef2201bb820e4465358bf Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 25 Feb 2016 00:16:31 -0800 Subject: [PATCH 351/531] Nodebox: Allow nodeboxes to "connect" We introduce a new nodebox type "connected", and allow these nodes to have optional nodeboxes that connect it to other connecting nodeboxes. This is all done at scenedraw time in the client. The client will inspect the surrounding nodes and if they are to be connected to, it will draw the appropriate connecting nodeboxes to make those connections. In the node_box definition, we have to specify separate nodeboxes for each valid connection. This allows us to make nodes that connect only horizontally (the common case) by providing optional nodeboxes for +x, -x, +z, -z directions. Or this allows us to make wires that can connect up and down, by providing nodeboxes that connect it up and down (+y, -y) as well. The optional nodeboxes can be arrays. They are named "connect_top, "connect_bottom", "connect_front", "connect_left", "connect_back" and "connect_right". Here, "front" means the south facing side of the node that has facedir = 0. Additionally, a "fixed" nodebox list present will always be drawn, so one can make a central post, for instance. This "fixed" nodebox can be omitted, or it can be an array of nodeboxes. Collision boxes are also updated in exactly the same fashion, which allows you to walk over the upper extremities of the individual node boxes, or stand really close to them. You can also walk up node noxes that are small in height, all as expected, and unlike the NDT_FENCELIKE nodes. I've posted a screenshot demonstrating the flexibility at http://i.imgur.com/zaJq8jo.png In the screenshot, all connecting nodes are of this new subtype. Transparent textures render incorrectly, Which I don't think is related to this text, as other nodeboxes also have issues with this. A protocol bump is performed in order to be able to send older clients a nodeblock that is usable for them. In order to avoid abuse of users we send older clients a "full-size" node, so that it's impossible for them to try and walk through a fence or wall that's created in this fashion. This was tested with a pre-bump client connected against a server running the new protocol. These nodes connect to other nodes, and you can select which ones those are by specifying node names (or group names) in the connects_to string array: connects_to = { "group:fence", "default:wood" } By default, nodes do not connect to anything, allowing you to create nodes that always have to be paired in order to connect. lua_api.txt is updated to reflect the extension to the node_box API. Example lua code needed to generate these nodes can be found here: https://gist.github.com/sofar/b381c8c192c8e53e6062 --- doc/lua_api.txt | 16 ++++ src/collision.cpp | 40 +++++++++- src/content_mapblock.cpp | 41 +++++++++- src/game.cpp | 7 +- src/localplayer.cpp | 3 +- src/mapnode.cpp | 65 ++++++++++++--- src/mapnode.h | 6 +- src/network/networkprotocol.h | 1 + src/nodedef.cpp | 136 +++++++++++++++++++++++++++++--- src/nodedef.h | 13 +++ src/script/common/c_content.cpp | 54 ++++++++----- src/script/cpp_api/s_node.cpp | 1 + src/server.cpp | 3 + 13 files changed, 334 insertions(+), 52 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index e2ab65dd..f51c950c 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -617,6 +617,18 @@ A nodebox is defined as any of: wall_bottom = box, wall_side = box } + { + -- A node that has optional boxes depending on neighbouring nodes' + -- presence and type. See also `connects_to`. + type = "connected", + fixed = box OR {box1, box2, ...} + connect_top = box OR {box1, box2, ...} + connect_bottom = box OR {box1, box2, ...} + connect_front = box OR {box1, box2, ...} + connect_left = box OR {box1, box2, ...} + connect_back = box OR {box1, box2, ...} + connect_right = box OR {box1, box2, ...} + } A `box` is defined as: @@ -3461,6 +3473,10 @@ Definition tables light_source = 0, -- Amount of light emitted by node damage_per_second = 0, -- If player is inside node, this damage is caused node_box = {type="regular"}, -- See "Node boxes" + connects_to = nodenames, --[[ + * Used for nodebox nodes with the type == "connected" + * Specifies to what neighboring nodes connections will be drawn + * e.g. `{"group:fence", "default:wood"}` or `"default:stone"` ]] mesh = "model", selection_box = {type="regular"}, -- See "Node boxes" --[[ ^ If drawtype "nodebox" is used and selection_box is nil, then node_box is used. ]] diff --git a/src/collision.cpp b/src/collision.cpp index d847f629..a3979f1d 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -185,6 +185,13 @@ bool wouldCollideWithCeiling( return false; } +static inline void getNeighborConnectingFace(v3s16 p, INodeDefManager *nodedef, + Map *map, MapNode n, int v, int *neighbors) +{ + MapNode n2 = map->getNodeNoEx(p); + if (nodedef->nodeboxConnects(n, n2)) + *neighbors |= v; +} collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, f32 pos_max_d, const aabb3f &box_0, @@ -261,12 +268,41 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, // Object collides into walkable nodes any_position_valid = true; - const ContentFeatures &f = gamedef->getNodeDefManager()->get(n); + INodeDefManager *nodedef = gamedef->getNodeDefManager(); + const ContentFeatures &f = nodedef->get(n); if(f.walkable == false) continue; int n_bouncy_value = itemgroup_get(f.groups, "bouncy"); - std::vector nodeboxes = n.getCollisionBoxes(gamedef->ndef()); + int neighbors = 0; + if (f.drawtype == NDT_NODEBOX && f.node_box.type == NODEBOX_CONNECTED) { + v3s16 p2 = p; + + p2.Y++; + getNeighborConnectingFace(p2, nodedef, map, n, 1, &neighbors); + + p2 = p; + p2.Y--; + getNeighborConnectingFace(p2, nodedef, map, n, 2, &neighbors); + + p2 = p; + p2.Z--; + getNeighborConnectingFace(p2, nodedef, map, n, 4, &neighbors); + + p2 = p; + p2.X--; + getNeighborConnectingFace(p2, nodedef, map, n, 8, &neighbors); + + p2 = p; + p2.Z++; + getNeighborConnectingFace(p2, nodedef, map, n, 16, &neighbors); + + p2 = p; + p2.X++; + getNeighborConnectingFace(p2, nodedef, map, n, 32, &neighbors); + } + std::vector nodeboxes; + n.getCollisionBoxes(gamedef->ndef(), &nodeboxes, neighbors); for(std::vector::iterator i = nodeboxes.begin(); i != nodeboxes.end(); ++i) diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index c15b9c42..c2934f26 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -163,6 +163,14 @@ void makeCuboid(MeshCollector *collector, const aabb3f &box, } } +static inline void getNeighborConnectingFace(v3s16 p, INodeDefManager *nodedef, + MeshMakeData *data, MapNode n, int v, int *neighbors) +{ + MapNode n2 = data->m_vmanip.getNodeNoEx(p); + if (nodedef->nodeboxConnects(n, n2)) + *neighbors |= v; +} + /* TODO: Fix alpha blending for special nodes Currently only the last element rendered is blended correct @@ -1501,7 +1509,38 @@ void mapblock_mesh_generate_special(MeshMakeData *data, v3f pos = intToFloat(p, BS); - std::vector boxes = n.getNodeBoxes(nodedef); + int neighbors = 0; + + // locate possible neighboring nodes to connect to + if (f.node_box.type == NODEBOX_CONNECTED) { + v3s16 p2 = p; + + p2.Y++; + getNeighborConnectingFace(blockpos_nodes + p2, nodedef, data, n, 1, &neighbors); + + p2 = p; + p2.Y--; + getNeighborConnectingFace(blockpos_nodes + p2, nodedef, data, n, 2, &neighbors); + + p2 = p; + p2.Z--; + getNeighborConnectingFace(blockpos_nodes + p2, nodedef, data, n, 4, &neighbors); + + p2 = p; + p2.X--; + getNeighborConnectingFace(blockpos_nodes + p2, nodedef, data, n, 8, &neighbors); + + p2 = p; + p2.Z++; + getNeighborConnectingFace(blockpos_nodes + p2, nodedef, data, n, 16, &neighbors); + + p2 = p; + p2.X++; + getNeighborConnectingFace(blockpos_nodes + p2, nodedef, data, n, 32, &neighbors); + } + + std::vector boxes; + n.getNodeBoxes(nodedef, &boxes, neighbors); for(std::vector::iterator i = boxes.begin(); i != boxes.end(); ++i) diff --git a/src/game.cpp b/src/game.cpp index c6125dd4..be4c46bc 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -358,7 +358,9 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio if (!isPointableNode(n, client, liquids_pointable)) { continue; } - std::vector boxes = n.getSelectionBoxes(nodedef); + + std::vector boxes; + n.getSelectionBoxes(nodedef, &boxes); v3s16 np(x, y, z); v3f npf = intToFloat(np, BS); @@ -389,7 +391,8 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio f32 d = 0.001 * BS; MapNode n = map.getNodeNoEx(pointed_pos); v3f npf = intToFloat(pointed_pos, BS); - std::vector boxes = n.getSelectionBoxes(nodedef); + std::vector boxes; + n.getSelectionBoxes(nodedef, &boxes); f32 face_min_distance = 1000 * BS; for (std::vector::const_iterator i = boxes.begin(); diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 524c6272..0c94582a 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -310,7 +310,8 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, if (sneak_node_found) { f32 cb_max = 0; MapNode n = map->getNodeNoEx(m_sneak_node); - std::vector nodeboxes = n.getCollisionBoxes(nodemgr); + std::vector nodeboxes; + n.getCollisionBoxes(nodemgr, &nodeboxes); for (std::vector::iterator it = nodeboxes.begin(); it != nodeboxes.end(); ++it) { aabb3f box = *it; diff --git a/src/mapnode.cpp b/src/mapnode.cpp index 671e949f..a5465887 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -214,12 +214,12 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) } } -static std::vector transformNodeBox(const MapNode &n, - const NodeBox &nodebox, INodeDefManager *nodemgr) +void transformNodeBox(const MapNode &n, const NodeBox &nodebox, + INodeDefManager *nodemgr, std::vector *p_boxes, u8 neighbors = 0) { - std::vector boxes; - if(nodebox.type == NODEBOX_FIXED || nodebox.type == NODEBOX_LEVELED) - { + std::vector &boxes = *p_boxes; + + if (nodebox.type == NODEBOX_FIXED || nodebox.type == NODEBOX_LEVELED) { const std::vector &fixed = nodebox.fixed; int facedir = n.getFaceDir(nodemgr); u8 axisdir = facedir>>2; @@ -395,32 +395,71 @@ static std::vector transformNodeBox(const MapNode &n, boxes.push_back(box); } } + else if (nodebox.type == NODEBOX_CONNECTED) + { + size_t boxes_size = boxes.size(); + boxes_size += nodebox.fixed.size(); + if (neighbors & 1) + boxes_size += nodebox.connect_top.size(); + if (neighbors & 2) + boxes_size += nodebox.connect_bottom.size(); + if (neighbors & 4) + boxes_size += nodebox.connect_front.size(); + if (neighbors & 8) + boxes_size += nodebox.connect_left.size(); + if (neighbors & 16) + boxes_size += nodebox.connect_back.size(); + if (neighbors & 32) + boxes_size += nodebox.connect_right.size(); + boxes.reserve(boxes_size); + +#define BOXESPUSHBACK(c) do { \ + for (std::vector::const_iterator \ + it = (c).begin(); \ + it != (c).end(); ++it) \ + (boxes).push_back(*it); \ + } while (0) + + BOXESPUSHBACK(nodebox.fixed); + + if (neighbors & 1) + BOXESPUSHBACK(nodebox.connect_top); + if (neighbors & 2) + BOXESPUSHBACK(nodebox.connect_bottom); + if (neighbors & 4) + BOXESPUSHBACK(nodebox.connect_front); + if (neighbors & 8) + BOXESPUSHBACK(nodebox.connect_left); + if (neighbors & 16) + BOXESPUSHBACK(nodebox.connect_back); + if (neighbors & 32) + BOXESPUSHBACK(nodebox.connect_right); + } else // NODEBOX_REGULAR { boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2)); } - return boxes; } -std::vector MapNode::getNodeBoxes(INodeDefManager *nodemgr) const +void MapNode::getNodeBoxes(INodeDefManager *nodemgr, std::vector *boxes, u8 neighbors) { const ContentFeatures &f = nodemgr->get(*this); - return transformNodeBox(*this, f.node_box, nodemgr); + transformNodeBox(*this, f.node_box, nodemgr, boxes, neighbors); } -std::vector MapNode::getCollisionBoxes(INodeDefManager *nodemgr) const +void MapNode::getCollisionBoxes(INodeDefManager *nodemgr, std::vector *boxes, u8 neighbors) { const ContentFeatures &f = nodemgr->get(*this); if (f.collision_box.fixed.empty()) - return transformNodeBox(*this, f.node_box, nodemgr); + transformNodeBox(*this, f.node_box, nodemgr, boxes, neighbors); else - return transformNodeBox(*this, f.collision_box, nodemgr); + transformNodeBox(*this, f.collision_box, nodemgr, boxes, neighbors); } -std::vector MapNode::getSelectionBoxes(INodeDefManager *nodemgr) const +void MapNode::getSelectionBoxes(INodeDefManager *nodemgr, std::vector *boxes) { const ContentFeatures &f = nodemgr->get(*this); - return transformNodeBox(*this, f.selection_box, nodemgr); + transformNodeBox(*this, f.selection_box, nodemgr, boxes); } u8 MapNode::getMaxLevel(INodeDefManager *nodemgr) const diff --git a/src/mapnode.h b/src/mapnode.h index 7cc25c60..4db88861 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -240,17 +240,17 @@ struct MapNode /* Gets list of node boxes (used for rendering (NDT_NODEBOX)) */ - std::vector getNodeBoxes(INodeDefManager *nodemgr) const; + void getNodeBoxes(INodeDefManager *nodemgr, std::vector *boxes, u8 neighbors = 0); /* Gets list of selection boxes */ - std::vector getSelectionBoxes(INodeDefManager *nodemgr) const; + void getSelectionBoxes(INodeDefManager *nodemg, std::vector *boxes); /* Gets list of collision boxes */ - std::vector getCollisionBoxes(INodeDefManager *nodemgr) const; + void getCollisionBoxes(INodeDefManager *nodemgr, std::vector *boxes, u8 neighbors = 0); /* Liquid helpers diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h index dc15326d..7cde6d76 100644 --- a/src/network/networkprotocol.h +++ b/src/network/networkprotocol.h @@ -135,6 +135,7 @@ with this program; if not, write to the Free Software Foundation, Inc., PROTOCOL_VERSION 27: backface_culling: backwards compatibility for playing with newer client on pre-27 servers. + Add nodedef v3 - connected nodeboxes */ #define LATEST_PROTOCOL_VERSION 27 diff --git a/src/nodedef.cpp b/src/nodedef.cpp index ba9b4abf..85cd848a 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "exceptions.h" #include "debug.h" #include "gamedef.h" +#include "mapnode.h" #include // Used in applyTextureOverrides() /* @@ -48,44 +49,91 @@ void NodeBox::reset() wall_top = aabb3f(-BS/2, BS/2-BS/16., -BS/2, BS/2, BS/2, BS/2); wall_bottom = aabb3f(-BS/2, -BS/2, -BS/2, BS/2, -BS/2+BS/16., BS/2); wall_side = aabb3f(-BS/2, -BS/2, -BS/2, -BS/2+BS/16., BS/2, BS/2); + // no default for other parts + connect_top.clear(); + connect_bottom.clear(); + connect_front.clear(); + connect_left.clear(); + connect_back.clear(); + connect_right.clear(); } void NodeBox::serialize(std::ostream &os, u16 protocol_version) const { - int version = protocol_version >= 21 ? 2 : 1; + int version = 1; + if (protocol_version >= 27) + version = 3; + else if (protocol_version >= 21) + version = 2; writeU8(os, version); - if (version == 1 && type == NODEBOX_LEVELED) - writeU8(os, NODEBOX_FIXED); - else - writeU8(os, type); + switch (type) { + case NODEBOX_LEVELED: + case NODEBOX_FIXED: + if (version == 1) + writeU8(os, NODEBOX_FIXED); + else + writeU8(os, type); - if(type == NODEBOX_FIXED || type == NODEBOX_LEVELED) - { writeU16(os, fixed.size()); - for(std::vector::const_iterator + for (std::vector::const_iterator i = fixed.begin(); i != fixed.end(); ++i) { writeV3F1000(os, i->MinEdge); writeV3F1000(os, i->MaxEdge); } - } - else if(type == NODEBOX_WALLMOUNTED) - { + break; + case NODEBOX_WALLMOUNTED: + writeU8(os, type); + writeV3F1000(os, wall_top.MinEdge); writeV3F1000(os, wall_top.MaxEdge); writeV3F1000(os, wall_bottom.MinEdge); writeV3F1000(os, wall_bottom.MaxEdge); writeV3F1000(os, wall_side.MinEdge); writeV3F1000(os, wall_side.MaxEdge); + break; + case NODEBOX_CONNECTED: + if (version <= 2) { + // send old clients nodes that can't be walked through + // to prevent abuse + writeU8(os, NODEBOX_FIXED); + + writeU16(os, 1); + writeV3F1000(os, v3f(-BS/2, -BS/2, -BS/2)); + writeV3F1000(os, v3f(BS/2, BS/2, BS/2)); + } else { + writeU8(os, type); + +#define WRITEBOX(box) do { \ + writeU16(os, (box).size()); \ + for (std::vector::const_iterator \ + i = (box).begin(); \ + i != (box).end(); ++i) { \ + writeV3F1000(os, i->MinEdge); \ + writeV3F1000(os, i->MaxEdge); \ + }; } while (0) + + WRITEBOX(fixed); + WRITEBOX(connect_top); + WRITEBOX(connect_bottom); + WRITEBOX(connect_front); + WRITEBOX(connect_left); + WRITEBOX(connect_back); + WRITEBOX(connect_right); + } + break; + default: + writeU8(os, type); + break; } } void NodeBox::deSerialize(std::istream &is) { int version = readU8(is); - if(version < 1 || version > 2) + if (version < 1 || version > 3) throw SerializationError("unsupported NodeBox version"); reset(); @@ -112,6 +160,26 @@ void NodeBox::deSerialize(std::istream &is) wall_side.MinEdge = readV3F1000(is); wall_side.MaxEdge = readV3F1000(is); } + else if (type == NODEBOX_CONNECTED) + { +#define READBOXES(box) do { \ + count = readU16(is); \ + (box).reserve(count); \ + while (count--) { \ + v3f min = readV3F1000(is); \ + v3f max = readV3F1000(is); \ + (box).push_back(aabb3f(min, max)); }; } while (0) + + u16 count; + + READBOXES(fixed); + READBOXES(connect_top); + READBOXES(connect_bottom); + READBOXES(connect_front); + READBOXES(connect_left); + READBOXES(connect_back); + READBOXES(connect_right); + } } /* @@ -261,6 +329,8 @@ void ContentFeatures::reset() sound_footstep = SimpleSoundSpec(); sound_dig = SimpleSoundSpec("__group"); sound_dug = SimpleSoundSpec(); + connects_to.clear(); + connects_to_ids.clear(); } void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const @@ -328,6 +398,10 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const os<::const_iterator i = connects_to_ids.begin(); + i != connects_to_ids.end(); ++i) + writeU16(os, *i); } void ContentFeatures::deSerialize(std::istream &is) @@ -402,6 +476,9 @@ void ContentFeatures::deSerialize(std::istream &is) mesh = deSerializeString(is); collision_box.deSerialize(is); floodable = readU8(is); + u16 connects_to_size = readU16(is); + for (u16 i = 0; i < connects_to_size; i++) + connects_to_ids.insert(readU16(is)); }catch(SerializationError &e) {}; } @@ -439,6 +516,8 @@ public: virtual bool cancelNodeResolveCallback(NodeResolver *nr); virtual void runNodeResolveCallbacks(); virtual void resetNodeResolveState(); + virtual void mapNodeboxConnections(); + virtual bool nodeboxConnects(MapNode from, MapNode to); private: void addNameIdMapping(content_t i, std::string name); @@ -1438,6 +1517,39 @@ void CNodeDefManager::resetNodeResolveState() m_pending_resolve_callbacks.clear(); } +void CNodeDefManager::mapNodeboxConnections() +{ + for (u32 i = 0; i < m_content_features.size(); i++) { + ContentFeatures *f = &m_content_features[i]; + if ((f->drawtype != NDT_NODEBOX) || (f->node_box.type != NODEBOX_CONNECTED)) + continue; + for (std::vector::iterator it = f->connects_to.begin(); + it != f->connects_to.end(); ++it) { + getIds(*it, f->connects_to_ids); + } + } +} + +bool CNodeDefManager::nodeboxConnects(MapNode from, MapNode to) +{ + const ContentFeatures &f1 = get(from); + + if ((f1.drawtype != NDT_NODEBOX) || (f1.node_box.type != NODEBOX_CONNECTED)) + return false; + + // lookup target in connected set + if (f1.connects_to_ids.find(to.param0) == f1.connects_to_ids.end()) + return false; + + const ContentFeatures &f2 = get(to); + + if ((f2.drawtype == NDT_NODEBOX) && (f1.node_box.type == NODEBOX_CONNECTED)) + // ignores actually looking if back connection exists + return (f2.connects_to_ids.find(from.param0) != f2.connects_to_ids.end()); + + // the target is just a regular node, so connect no matter back connection + return true; +} //// //// NodeResolver diff --git a/src/nodedef.h b/src/nodedef.h index bf2c7bc7..f92a3a94 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -80,6 +80,7 @@ enum NodeBoxType NODEBOX_FIXED, // Static separately defined box(es) NODEBOX_WALLMOUNTED, // Box for wall mounted nodes; (top, bottom, side) NODEBOX_LEVELED, // Same as fixed, but with dynamic height from param2. for snow, ... + NODEBOX_CONNECTED, // optionally draws nodeboxes if a neighbor node attaches }; struct NodeBox @@ -92,6 +93,13 @@ struct NodeBox aabb3f wall_top; aabb3f wall_bottom; aabb3f wall_side; // being at the -X side + // NODEBOX_CONNECTED + std::vector connect_top; + std::vector connect_bottom; + std::vector connect_front; + std::vector connect_left; + std::vector connect_back; + std::vector connect_right; NodeBox() { reset(); } @@ -269,6 +277,9 @@ struct ContentFeatures SimpleSoundSpec sound_dig; SimpleSoundSpec sound_dug; + std::vector connects_to; + std::set connects_to_ids; + /* Methods */ @@ -314,6 +325,7 @@ public: virtual void pendNodeResolve(NodeResolver *nr)=0; virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0; + virtual bool nodeboxConnects(const MapNode from, const MapNode to)=0; }; class IWritableNodeDefManager : public INodeDefManager { @@ -368,6 +380,7 @@ public: virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0; virtual void runNodeResolveCallbacks()=0; virtual void resetNodeResolveState()=0; + virtual void mapNodeboxConnections()=0; }; IWritableNodeDefManager *createNodeDefManager(); diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 96fb78d9..ababf071 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -535,6 +535,18 @@ ContentFeatures read_content_features(lua_State *L, int index) f.node_box = read_nodebox(L, -1); lua_pop(L, 1); + lua_getfield(L, index, "connects_to"); + if (lua_istable(L, -1)) { + int table = lua_gettop(L); + lua_pushnil(L); + while (lua_next(L, table) != 0) { + // Value at -1 + f.connects_to.push_back(lua_tostring(L, -1)); + lua_pop(L, 1); + } + } + lua_pop(L, 1); + lua_getfield(L, index, "selection_box"); if(lua_istable(L, -1)) f.selection_box = read_nodebox(L, -1); @@ -627,25 +639,31 @@ NodeBox read_nodebox(lua_State *L, int index) nodebox.type = (NodeBoxType)getenumfield(L, index, "type", ScriptApiNode::es_NodeBoxType, NODEBOX_REGULAR); - lua_getfield(L, index, "fixed"); - if(lua_istable(L, -1)) - nodebox.fixed = read_aabb3f_vector(L, -1, BS); - lua_pop(L, 1); +#define NODEBOXREAD(n, s) \ + do { \ + lua_getfield(L, index, (s)); \ + if (lua_istable(L, -1)) \ + (n) = read_aabb3f(L, -1, BS); \ + lua_pop(L, 1); \ + } while (0) - lua_getfield(L, index, "wall_top"); - if(lua_istable(L, -1)) - nodebox.wall_top = read_aabb3f(L, -1, BS); - lua_pop(L, 1); - - lua_getfield(L, index, "wall_bottom"); - if(lua_istable(L, -1)) - nodebox.wall_bottom = read_aabb3f(L, -1, BS); - lua_pop(L, 1); - - lua_getfield(L, index, "wall_side"); - if(lua_istable(L, -1)) - nodebox.wall_side = read_aabb3f(L, -1, BS); - lua_pop(L, 1); +#define NODEBOXREADVEC(n, s) \ + do { \ + lua_getfield(L, index, (s)); \ + if (lua_istable(L, -1)) \ + (n) = read_aabb3f_vector(L, -1, BS); \ + lua_pop(L, 1); \ + } while (0) + NODEBOXREADVEC(nodebox.fixed, "fixed"); + NODEBOXREAD(nodebox.wall_top, "wall_top"); + NODEBOXREAD(nodebox.wall_bottom, "wall_bottom"); + NODEBOXREAD(nodebox.wall_side, "wall_side"); + NODEBOXREADVEC(nodebox.connect_top, "connect_top"); + NODEBOXREADVEC(nodebox.connect_bottom, "connect_bottom"); + NODEBOXREADVEC(nodebox.connect_front, "connect_front"); + NODEBOXREADVEC(nodebox.connect_left, "connect_left"); + NODEBOXREADVEC(nodebox.connect_back, "connect_back"); + NODEBOXREADVEC(nodebox.connect_right, "connect_right"); } return nodebox; } diff --git a/src/script/cpp_api/s_node.cpp b/src/script/cpp_api/s_node.cpp index a905f843..17f0f0da 100644 --- a/src/script/cpp_api/s_node.cpp +++ b/src/script/cpp_api/s_node.cpp @@ -82,6 +82,7 @@ struct EnumString ScriptApiNode::es_NodeBoxType[] = {NODEBOX_FIXED, "fixed"}, {NODEBOX_WALLMOUNTED, "wallmounted"}, {NODEBOX_LEVELED, "leveled"}, + {NODEBOX_CONNECTED, "connected"}, {0, NULL}, }; diff --git a/src/server.cpp b/src/server.cpp index 2fa8c4cf..6c008a2a 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -320,6 +320,9 @@ Server::Server( // Perform pending node name resolutions m_nodedef->runNodeResolveCallbacks(); + // unmap node names for connected nodeboxes + m_nodedef->mapNodeboxConnections(); + // init the recipe hashes to speed up crafting m_craftdef->initHashes(this); From 37b4f0d34c73de58e0f5d153b7e699dc7430e23d Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 3 Mar 2016 23:18:04 -0800 Subject: [PATCH 352/531] Allow nodes to specify which sides to connect to. NDT_CONNECTED attempts to connect to any side of nodes that it can connect to, which is troublesome for FACEDIR type nodes that generally may only have one usable face, and can be rotated. We introduce a node parameter `connect_sides` that is valid for any node type. If specified, it lists faces of the node (in "top", "bottom", "front", "left", "back", "right", form, as array) that connecting nodeboxes can connect to. "front" corresponds to the south facing side of a node with facedir = 0. If the node is rotatable using *simple* FACEDIR, then the attached face is properly rotated before checking. This allows e.g. a chest to be attached to only from the rear side. --- doc/lua_api.txt | 2 ++ src/collision.cpp | 2 +- src/content_mapblock.cpp | 2 +- src/nodedef.cpp | 25 +++++++++++++++++++++++-- src/nodedef.h | 4 +++- src/script/common/c_content.cpp | 28 ++++++++++++++++++++++++++++ 6 files changed, 58 insertions(+), 5 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index f51c950c..733ac841 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -3477,6 +3477,8 @@ Definition tables * Used for nodebox nodes with the type == "connected" * Specifies to what neighboring nodes connections will be drawn * e.g. `{"group:fence", "default:wood"}` or `"default:stone"` ]] + connect_sides = { "top", "bottom", "front", "left", "back", "right" }, --[[ + ^ Tells connected nodebox nodes to connect only to these sides of this node. ]] mesh = "model", selection_box = {type="regular"}, -- See "Node boxes" --[[ ^ If drawtype "nodebox" is used and selection_box is nil, then node_box is used. ]] diff --git a/src/collision.cpp b/src/collision.cpp index a3979f1d..16db3310 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -189,7 +189,7 @@ static inline void getNeighborConnectingFace(v3s16 p, INodeDefManager *nodedef, Map *map, MapNode n, int v, int *neighbors) { MapNode n2 = map->getNodeNoEx(p); - if (nodedef->nodeboxConnects(n, n2)) + if (nodedef->nodeboxConnects(n, n2, v)) *neighbors |= v; } diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index c2934f26..6a83bd8f 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -167,7 +167,7 @@ static inline void getNeighborConnectingFace(v3s16 p, INodeDefManager *nodedef, MeshMakeData *data, MapNode n, int v, int *neighbors) { MapNode n2 = data->m_vmanip.getNodeNoEx(p); - if (nodedef->nodeboxConnects(n, n2)) + if (nodedef->nodeboxConnects(n, n2, v)) *neighbors |= v; } diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 85cd848a..edd02d9f 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -331,6 +331,7 @@ void ContentFeatures::reset() sound_dug = SimpleSoundSpec(); connects_to.clear(); connects_to_ids.clear(); + connect_sides = 0; } void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const @@ -402,6 +403,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const for (std::set::const_iterator i = connects_to_ids.begin(); i != connects_to_ids.end(); ++i) writeU16(os, *i); + writeU8(os, connect_sides); } void ContentFeatures::deSerialize(std::istream &is) @@ -479,6 +481,7 @@ void ContentFeatures::deSerialize(std::istream &is) u16 connects_to_size = readU16(is); for (u16 i = 0; i < connects_to_size; i++) connects_to_ids.insert(readU16(is)); + connect_sides = readU8(is); }catch(SerializationError &e) {}; } @@ -517,7 +520,7 @@ public: virtual void runNodeResolveCallbacks(); virtual void resetNodeResolveState(); virtual void mapNodeboxConnections(); - virtual bool nodeboxConnects(MapNode from, MapNode to); + virtual bool nodeboxConnects(MapNode from, MapNode to, u8 connect_face); private: void addNameIdMapping(content_t i, std::string name); @@ -1530,7 +1533,7 @@ void CNodeDefManager::mapNodeboxConnections() } } -bool CNodeDefManager::nodeboxConnects(MapNode from, MapNode to) +bool CNodeDefManager::nodeboxConnects(MapNode from, MapNode to, u8 connect_face) { const ContentFeatures &f1 = get(from); @@ -1547,6 +1550,24 @@ bool CNodeDefManager::nodeboxConnects(MapNode from, MapNode to) // ignores actually looking if back connection exists return (f2.connects_to_ids.find(from.param0) != f2.connects_to_ids.end()); + // does to node declare usable faces? + if (f2.connect_sides > 0) { + if ((f2.param_type_2 == CPT2_FACEDIR) && (connect_face >= 4)) { + static const u8 rot[33 * 4] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 32, 16, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 4 - back + 8, 4, 32, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8 - right + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 16, 8, 4, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 16 - front + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 32, 16, 8, 4 // 32 - left + }; + return (f2.connect_sides & rot[(connect_face * 4) + to.param2]); + } + return (f2.connect_sides & connect_face); + } // the target is just a regular node, so connect no matter back connection return true; } diff --git a/src/nodedef.h b/src/nodedef.h index f92a3a94..58d0faff 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -271,6 +271,8 @@ struct ContentFeatures bool legacy_facedir_simple; // Set to true if wall_mounted used to be set to true bool legacy_wallmounted; + // for NDT_CONNECTED pairing + u8 connect_sides; // Sound properties SimpleSoundSpec sound_footstep; @@ -325,7 +327,7 @@ public: virtual void pendNodeResolve(NodeResolver *nr)=0; virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0; - virtual bool nodeboxConnects(const MapNode from, const MapNode to)=0; + virtual bool nodeboxConnects(const MapNode from, const MapNode to, u8 connect_face)=0; }; class IWritableNodeDefManager : public INodeDefManager { diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index ababf071..06e20c2a 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -547,6 +547,34 @@ ContentFeatures read_content_features(lua_State *L, int index) } lua_pop(L, 1); + lua_getfield(L, index, "connect_sides"); + if (lua_istable(L, -1)) { + int table = lua_gettop(L); + lua_pushnil(L); + while (lua_next(L, table) != 0) { + // Value at -1 + std::string side(lua_tostring(L, -1)); + // Note faces are flipped to make checking easier + if (side == "top") + f.connect_sides |= 2; + else if (side == "bottom") + f.connect_sides |= 1; + else if (side == "front") + f.connect_sides |= 16; + else if (side == "left") + f.connect_sides |= 32; + else if (side == "back") + f.connect_sides |= 4; + else if (side == "right") + f.connect_sides |= 8; + else + warningstream << "Unknown value for \"connect_sides\": " + << side << std::endl; + lua_pop(L, 1); + } + } + lua_pop(L, 1); + lua_getfield(L, index, "selection_box"); if(lua_istable(L, -1)) f.selection_box = read_nodebox(L, -1); From 2c72f6da7b7595d2e180937f05f902c510ef1c14 Mon Sep 17 00:00:00 2001 From: Diego Martinez Date: Mon, 7 Mar 2016 19:09:07 -0300 Subject: [PATCH 353/531] Add options for screenshot format and quality --- builtin/settingtypes.txt | 8 ++++++++ minetest.conf.example | 10 ++++++++++ src/client.cpp | 7 +++++-- src/defaultsettings.cpp | 2 ++ src/settings_translation_file.cpp | 4 ++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 1672e08c..c1157b16 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -554,6 +554,14 @@ fallback_font_shadow_alpha (Fallback font shadow alpha) int 128 0 255 # Path to save screenshots at. screenshot_path (Screenshot folder) path +# Format of screenshots. +screenshot_format (Screenshot format) enum png png,jpg,bmp,pcx,ppm,tga + +# Screenshot quality. Only used for JPEG format. +# 1 means worst quality; 100 means best quality. +# Use 0 for default quality. +screenshot_quality (Screenshot quality) int 0 0 100 + [**Advanced] # Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens. diff --git a/minetest.conf.example b/minetest.conf.example index 1587cba7..cd0be529 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -653,6 +653,16 @@ # type: path # screenshot_path = +# Format of screenshots. +# type: enum values: png, jpg, bmp, pcx, ppm, tga +# screenshot_format = png + +# Screenshot quality. Only used for JPEG format. +# 1 means worst quality; 100 means best quality. +# Use 0 for default quality. +# type: int min: 0 max: 100 +# screenshot_quality = 0 + ### Advanced # Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens. diff --git a/src/client.cpp b/src/client.cpp index f27f031c..e13344ec 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1813,9 +1813,12 @@ void Client::makeScreenshot(IrrlichtDevice *device) + DIR_DELIM + std::string("screenshot_") + std::string(timetstamp_c); - std::string filename_ext = ".png"; + std::string filename_ext = "." + g_settings->get("screenshot_format"); std::string filename; + u32 quality = (u32)g_settings->getS32("screenshot_quality"); + quality = MYMIN(MYMAX(quality, 0), 100) / 100.0 * 255; + // Try to find a unique filename unsigned serial = 0; @@ -1837,7 +1840,7 @@ void Client::makeScreenshot(IrrlichtDevice *device) raw_image->copyTo(image); std::ostringstream sstr; - if (driver->writeImageToFile(image, filename.c_str())) { + if (driver->writeImageToFile(image, filename.c_str(), quality)) { sstr << "Saved screenshot to '" << filename << "'"; } else { sstr << "Failed to save screenshot '" << filename << "'"; diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index db2950fc..53059e8a 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -123,6 +123,8 @@ void set_default_settings(Settings *settings) settings->setDefault("invert_mouse", "false"); settings->setDefault("enable_clouds", "true"); settings->setDefault("screenshot_path", "."); + settings->setDefault("screenshot_format", "png"); + settings->setDefault("screenshot_quality", "0"); settings->setDefault("view_bobbing_amount", "1.0"); settings->setDefault("fall_bobbing_amount", "0.0"); settings->setDefault("enable_3d_clouds", "true"); diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index e92a34cb..f115bc01 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -272,6 +272,10 @@ fake_function() { gettext("Fallback font shadow alpha"); gettext("Screenshot folder"); gettext("Path to save screenshots at."); + gettext("Screenshot format"); + gettext("Format of screenshots."); + gettext("Screenshot quality"); + gettext("Screenshot quality. Only used for JPEG format.\n1 means worst quality; 100 means best quality.\nUse 0 for default quality."); gettext("Advanced"); gettext("DPI"); gettext("Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens."); From 089f9bbe817debc5c30f1d845170909f638c9642 Mon Sep 17 00:00:00 2001 From: Jeija Date: Mon, 15 Feb 2016 16:05:40 +0100 Subject: [PATCH 354/531] Resend blocks when modified while sending to client --- src/clientiface.cpp | 18 ++++++++++++------ src/clientiface.h | 10 ++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/clientiface.cpp b/src/clientiface.cpp index 8a1a6269..a3a17d43 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -370,17 +370,21 @@ queue_full_break: void RemoteClient::GotBlock(v3s16 p) { - if(m_blocks_sending.find(p) != m_blocks_sending.end()) - m_blocks_sending.erase(p); - else - { - m_excess_gotblocks++; + if (m_blocks_modified.find(p) == m_blocks_modified.end()) { + if (m_blocks_sending.find(p) != m_blocks_sending.end()) + m_blocks_sending.erase(p); + else + m_excess_gotblocks++; + + m_blocks_sent.insert(p); } - m_blocks_sent.insert(p); } void RemoteClient::SentBlock(v3s16 p) { + if (m_blocks_modified.find(p) != m_blocks_modified.end()) + m_blocks_modified.erase(p); + if(m_blocks_sending.find(p) == m_blocks_sending.end()) m_blocks_sending[p] = 0.0; else @@ -397,6 +401,7 @@ void RemoteClient::SetBlockNotSent(v3s16 p) m_blocks_sending.erase(p); if(m_blocks_sent.find(p) != m_blocks_sent.end()) m_blocks_sent.erase(p); + m_blocks_modified.insert(p); } void RemoteClient::SetBlocksNotSent(std::map &blocks) @@ -409,6 +414,7 @@ void RemoteClient::SetBlocksNotSent(std::map &blocks) i != blocks.end(); ++i) { v3s16 p = i->first; + m_blocks_modified.insert(p); if(m_blocks_sending.find(p) != m_blocks_sending.end()) m_blocks_sending.erase(p); diff --git a/src/clientiface.h b/src/clientiface.h index d7622cad..c0994290 100644 --- a/src/clientiface.h +++ b/src/clientiface.h @@ -394,6 +394,16 @@ private: */ std::map m_blocks_sending; + /* + Blocks that have been modified since last sending them. + These blocks will not be marked as sent, even if the + client reports it has received them to account for blocks + that are being modified while on the line. + + List of block positions. + */ + std::set m_blocks_modified; + /* Count of excess GotBlocks(). There is an excess amount because the client sometimes From 5a40a7dad8cbf46320c3b5dd1122808eb4919b62 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Sun, 13 Mar 2016 14:25:54 -0700 Subject: [PATCH 355/531] Connected nodes: fix 2 minor bugs 1. Copy-paste error: properly test for back-connection. In the case of two different connected nodebox types, we want to assure that if A connects to B, that B also connects to A. This test was accidentally not implemented correctly. 2. Clear the connects_to_ids before deserializing. With each new connected node, the deserialization code added more and more targets to the map, since the map wasn't cleared in between deserialization steps. This caused e.g. wall blocks to connect to things in the fence connects_to map. --- src/nodedef.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nodedef.cpp b/src/nodedef.cpp index edd02d9f..3a2cb00b 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -479,6 +479,7 @@ void ContentFeatures::deSerialize(std::istream &is) collision_box.deSerialize(is); floodable = readU8(is); u16 connects_to_size = readU16(is); + connects_to_ids.clear(); for (u16 i = 0; i < connects_to_size; i++) connects_to_ids.insert(readU16(is)); connect_sides = readU8(is); @@ -1546,7 +1547,7 @@ bool CNodeDefManager::nodeboxConnects(MapNode from, MapNode to, u8 connect_face) const ContentFeatures &f2 = get(to); - if ((f2.drawtype == NDT_NODEBOX) && (f1.node_box.type == NODEBOX_CONNECTED)) + if ((f2.drawtype == NDT_NODEBOX) && (f2.node_box.type == NODEBOX_CONNECTED)) // ignores actually looking if back connection exists return (f2.connects_to_ids.find(from.param0) != f2.connects_to_ids.end()); From c0b6986e3875e6f42682c78fd5db0080a7bae651 Mon Sep 17 00:00:00 2001 From: HybridDog Date: Mon, 4 Jan 2016 17:21:33 +0100 Subject: [PATCH 356/531] Fix player teleportation bug whilst sneaking Only set back position when sneaking if player wasn't teleported by adding and using a bool "got_teleported" to player it fixes #2876 --- src/localplayer.cpp | 5 ++++- src/network/clientpackethandler.cpp | 1 + src/player.cpp | 1 + src/player.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 0c94582a..dbd8c4a6 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -183,7 +183,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, */ if (control.sneak && m_sneak_node_exists && !(fly_allowed && g_settings->getBool("free_move")) && !in_liquid && - physics_override_sneak) { + physics_override_sneak && !got_teleported) { f32 maxd = 0.5 * BS + sneak_max; v3f lwn_f = intToFloat(m_sneak_node, BS); position.X = rangelim(position.X, lwn_f.X-maxd, lwn_f.X+maxd); @@ -204,6 +204,9 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, } } + if (got_teleported) + got_teleported = false; + // this shouldn't be hardcoded but transmitted from server float player_stepheight = touching_ground ? (BS*0.6) : (BS*0.2); diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index a49bbe16..28d147d3 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -552,6 +552,7 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt) *pkt >> pos >> pitch >> yaw; + player->got_teleported = true; player->setPosition(pos); infostream << "Client got TOCLIENT_MOVE_PLAYER" diff --git a/src/player.cpp b/src/player.cpp index 623dde23..5949712a 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Player::Player(IGameDef *gamedef, const char *name): + got_teleported(false), touching_ground(false), in_liquid(false), in_liquid_stable(false), diff --git a/src/player.h b/src/player.h index 50267c72..b317cda4 100644 --- a/src/player.h +++ b/src/player.h @@ -318,6 +318,7 @@ public: // Use a function, if isDead can be defined by other conditions bool isDead() { return hp == 0; } + bool got_teleported; bool touching_ground; // This oscillates so that the player jumps a bit above the surface bool in_liquid; From bb2ee54d3b841ebdb6c6a0b6573b64216ae0baae Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 13 Mar 2016 07:56:27 +0000 Subject: [PATCH 357/531] Mapgen: Fix light in tunnels at mapchunk borders Don't excavate the overgenerated stone at node_max.Y + 1, this creates a 'roof' over the tunnel, preventing light in tunnels at mapchunk borders when generating mapchunks upwards. --- src/mapgen_flat.cpp | 6 ++++++ src/mapgen_fractal.cpp | 6 ++++++ src/mapgen_v5.cpp | 6 ++++++ src/mapgen_v7.cpp | 6 ++++++ src/mapgen_valleys.cpp | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index 0d071411..d654a772 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -573,6 +573,12 @@ void MapgenFlat::generateCaves(s16 max_stone_y) for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + if (y > node_max.Y) + continue; + content_t c = vm->m_data[vi].getContent(); if (c == CONTENT_AIR || c == biome->c_water_top || c == biome->c_water) { diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 8a5c1e2b..cdea9c09 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -701,6 +701,12 @@ void MapgenFractal::generateCaves(s16 max_stone_y) for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + if (y > node_max.Y) + continue; + content_t c = vm->m_data[vi].getContent(); if (c == CONTENT_AIR || c == biome->c_water_top || c == biome->c_water) { diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 0bb3715a..e9b1b58b 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -519,6 +519,12 @@ void MapgenV5::generateCaves(int max_stone_y) for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { u32 vi = vm->m_area.index(node_min.X, y, z); for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + if (y > node_max.Y) + continue; + float d1 = contour(noise_cave1->result[index]); float d2 = contour(noise_cave2->result[index]); if (d1 * d2 > 0.125f) { diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 029f56a4..24867623 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -883,6 +883,12 @@ void MapgenV7::generateCaves(s16 max_stone_y) for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + if (y > node_max.Y) + continue; + content_t c = vm->m_data[vi].getContent(); if (c == CONTENT_AIR || c == biome->c_water_top || c == biome->c_water) { diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index d6fcde5f..34a316ab 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -931,6 +931,12 @@ void MapgenValleys::generateCaves(s16 max_stone_y) for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; y--, index_3d -= ystride, vm->m_area.add_y(em, index_data, -1)) { + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + if (y > node_max.Y) + continue; + float terrain = noise_terrain_height->result[index_2d]; // Saves some time. From e0151d1054c9923630b8ae9cdae36efa261756d3 Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 9 Mar 2016 03:12:22 +0100 Subject: [PATCH 358/531] Much better API for auth.{cpp, h} * No function overloading * Adhere coding style and with method names following lowercase_underscore_style * Use std::string in external API, handling these is much more fun --- src/client.cpp | 26 +++---- src/network/serverpackethandler.cpp | 36 ++++----- src/script/lua_api/l_util.cpp | 2 +- src/util/auth.cpp | 116 +++++++++++++++------------- src/util/auth.h | 35 ++++++--- 5 files changed, 112 insertions(+), 103 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index e13344ec..41468f0f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -399,7 +399,7 @@ void Client::step(float dtime) memset(pName, 0, PLAYERNAME_SIZE * sizeof(char)); memset(pPassword, 0, PASSWORD_SIZE * sizeof(char)); - std::string hashed_password = translatePassword(myplayer->getName(), m_password); + std::string hashed_password = translate_password(myplayer->getName(), m_password); snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName()); snprintf(pPassword, PASSWORD_SIZE, "%s", hashed_password.c_str()); @@ -1031,18 +1031,14 @@ void Client::startAuth(AuthMechanism chosen_auth_mechanism) switch (chosen_auth_mechanism) { case AUTH_MECHANISM_FIRST_SRP: { // send srp verifier to server + std::string verifier; + std::string salt; + generate_srp_verifier_and_salt(getPlayerName(), m_password, + &verifier, &salt); + NetworkPacket resp_pkt(TOSERVER_FIRST_SRP, 0); - char *salt, *bytes_v; - std::size_t len_salt, len_v; - salt = NULL; - getSRPVerifier(getPlayerName(), m_password, - &salt, &len_salt, &bytes_v, &len_v); - resp_pkt - << std::string((char*)salt, len_salt) - << std::string((char*)bytes_v, len_v) - << (u8)((m_password == "") ? 1 : 0); - free(salt); - free(bytes_v); + resp_pkt << salt << verifier << (u8)((m_password == "") ? 1 : 0); + Send(&resp_pkt); break; } @@ -1051,7 +1047,7 @@ void Client::startAuth(AuthMechanism chosen_auth_mechanism) u8 based_on = 1; if (chosen_auth_mechanism == AUTH_MECHANISM_LEGACY_PASSWORD) { - m_password = translatePassword(getPlayerName(), m_password); + m_password = translate_password(getPlayerName(), m_password); based_on = 0; } @@ -1197,8 +1193,8 @@ void Client::sendChangePassword(const std::string &oldpassword, m_new_password = newpassword; startAuth(choseAuthMech(m_sudo_auth_methods)); } else { - std::string oldpwd = translatePassword(playername, oldpassword); - std::string newpwd = translatePassword(playername, newpassword); + std::string oldpwd = translate_password(playername, oldpassword); + std::string newpwd = translate_password(playername, newpassword); NetworkPacket pkt(TOSERVER_PASSWORD_LEGACY, 2 * PASSWORD_SIZE); diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index ef99a634..ac00b1d8 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -261,9 +261,9 @@ void Server::handleCommand_Init(NetworkPacket* pkt) auth_mechs |= AUTH_MECHANISM_FIRST_SRP; } else { // Take care of default passwords. - client->enc_pwd = getSRPVerifier(playerName, default_password); + client->enc_pwd = get_encoded_srp_verifier(playerName, default_password); auth_mechs |= AUTH_MECHANISM_SRP; - // Create auth, but only on successful login + // Allocate player in db, but only on successful login. client->create_player_on_auth_success = true; } } @@ -549,7 +549,7 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt) std::string raw_default_password = g_settings->get("default_password"); std::string initial_password = - translatePassword(playername, raw_default_password); + translate_password(playername, raw_default_password); // If default_password is empty, allow any initial password if (raw_default_password.length() == 0) @@ -1831,7 +1831,7 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt) std::string initial_ver_key; - initial_ver_key = encodeSRPVerifier(verification_key, salt); + initial_ver_key = encode_srp_verifier(verification_key, salt); m_script->createAuth(playername, initial_ver_key); acceptAuth(pkt->getPeerId(), false); @@ -1843,7 +1843,7 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt) return; } m_clients.event(pkt->getPeerId(), CSE_SudoLeave); - std::string pw_db_field = encodeSRPVerifier(verification_key, salt); + std::string pw_db_field = encode_srp_verifier(verification_key, salt); bool success = m_script->setPassword(playername, pw_db_field); if (success) { actionstream << playername << " changes password" << std::endl; @@ -1917,22 +1917,14 @@ void Server::handleCommand_SrpBytesA(NetworkPacket* pkt) client->chosen_mech = chosen; - std::string bytes_s; - std::string bytes_v; + std::string salt; + std::string verifier; if (based_on == 0) { - char *p_bytes_s = 0; - size_t len_s = 0; - char *p_bytes_v = 0; - size_t len_v = 0; - getSRPVerifier(client->getName(), client->enc_pwd, - &p_bytes_s, &len_s, - &p_bytes_v, &len_v); - bytes_s = std::string(p_bytes_s, len_s); - bytes_v = std::string(p_bytes_v, len_v); - free(p_bytes_s); - free(p_bytes_v); - } else if (!decodeSRPVerifier(client->enc_pwd, &bytes_s, &bytes_v)) { + + generate_srp_verifier_and_salt(client->getName(), client->enc_pwd, + &verifier, &salt); + } else if (!decode_srp_verifier_and_salt(client->enc_pwd, &verifier, &salt)) { // Non-base64 errors should have been catched in the init handler actionstream << "Server: User " << client->getName() << " tried to log in, but srp verifier field" @@ -1946,8 +1938,8 @@ void Server::handleCommand_SrpBytesA(NetworkPacket* pkt) client->auth_data = srp_verifier_new(SRP_SHA256, SRP_NG_2048, client->getName().c_str(), - (const unsigned char *) bytes_s.c_str(), bytes_s.size(), - (const unsigned char *) bytes_v.c_str(), bytes_v.size(), + (const unsigned char *) salt.c_str(), salt.size(), + (const unsigned char *) verifier.c_str(), verifier.size(), (const unsigned char *) bytes_A.c_str(), bytes_A.size(), NULL, 0, (unsigned char **) &bytes_B, &len_B, NULL, NULL); @@ -1966,7 +1958,7 @@ void Server::handleCommand_SrpBytesA(NetworkPacket* pkt) } NetworkPacket resp_pkt(TOCLIENT_SRP_BYTES_S_B, 0, pkt->getPeerId()); - resp_pkt << bytes_s << std::string(bytes_B, len_B); + resp_pkt << salt << std::string(bytes_B, len_B); Send(&resp_pkt); } diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index f990dacf..c3e6c896 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -251,7 +251,7 @@ int ModApiUtil::l_get_password_hash(lua_State *L) NO_MAP_LOCK_REQUIRED; std::string name = luaL_checkstring(L, 1); std::string raw_password = luaL_checkstring(L, 2); - std::string hash = translatePassword(name, raw_password); + std::string hash = translate_password(name, raw_password); lua_pushstring(L, hash.c_str()); return 1; } diff --git a/src/util/auth.cpp b/src/util/auth.cpp index 0c17a923..91298725 100644 --- a/src/util/auth.cpp +++ b/src/util/auth.cpp @@ -1,6 +1,6 @@ /* Minetest -Copyright (C) 2015 est31 +Copyright (C) 2015, 2016 est31 This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., // their password. (Exception : if the password field is // blank, we send a blank password - this is for backwards // compatibility with password-less players). -std::string translatePassword(const std::string &name, +std::string translate_password(const std::string &name, const std::string &password) { if (password.length() == 0) @@ -46,7 +46,11 @@ std::string translatePassword(const std::string &name, return pwd; } -void getSRPVerifier(const std::string &name, +// Call lower level SRP code to generate a verifier with the +// given pointers. Contains the preparations, call parameters +// and error checking common to all srp verifier generation code. +// See docs of srp_create_salted_verification_key for more info. +static inline void gen_srp_v(const std::string &name, const std::string &password, char **salt, size_t *salt_len, char **bytes_v, size_t *len_v) { @@ -58,72 +62,76 @@ void getSRPVerifier(const std::string &name, FATAL_ERROR_IF(res != SRP_OK, "Couldn't create salted SRP verifier"); } -// Get a db-ready SRP verifier -// If the salt param is NULL, one is automatically generated. -// Please free() it afterwards. You shouldn't use it for other purposes, -// as you will need the contents of salt_len too. -inline static std::string getSRPVerifier(const std::string &name, - const std::string &password, char ** salt, size_t salt_len) -{ - char * bytes_v = NULL; - size_t len_v; - getSRPVerifier(name, password, salt, &salt_len, - &bytes_v, &len_v); - assert(*salt); // usually, srp_create_salted_verification_key promises us to return SRP_ERR when *salt == NULL - std::string ret_val = encodeSRPVerifier(std::string(bytes_v, len_v), - std::string(*salt, salt_len)); - free(bytes_v); - return ret_val; -} - -// Get a db-ready SRP verifier -std::string getSRPVerifier(const std::string &name, - const std::string &password) -{ - char * salt = NULL; - std::string ret_val = getSRPVerifier(name, - password, &salt, 0); - free(salt); - return ret_val; -} - -// Get a db-ready SRP verifier -std::string getSRPVerifier(const std::string &name, +/// Creates a verification key with given salt and password. +std::string generate_srp_verifier(const std::string &name, const std::string &password, const std::string &salt) { - // The implementation won't change the salt if its set, - // therefore we can cast. - char *salt_cstr = (char *)salt.c_str(); - return getSRPVerifier(name, password, - &salt_cstr, salt.size()); + size_t salt_len = salt.size(); + // The API promises us that the salt doesn't + // get modified if &salt_ptr isn't NULL. + char *salt_ptr = (char *)salt.c_str(); + + char *bytes_v = NULL; + size_t verifier_len = 0; + gen_srp_v(name, password, &salt_ptr, &salt_len, &bytes_v, &verifier_len); + std::string verifier = std::string(bytes_v, verifier_len); + free(bytes_v); + return verifier; } -// Make a SRP verifier db-ready -std::string encodeSRPVerifier(const std::string &verifier, +/// Creates a verification key and salt with given password. +void generate_srp_verifier_and_salt(const std::string &name, + const std::string &password, std::string *verifier, + std::string *salt) +{ + char *bytes_v = NULL; + size_t verifier_len; + char *salt_ptr = NULL; + size_t salt_len; + gen_srp_v(name, password, &salt_ptr, &salt_len, &bytes_v, &verifier_len); + *verifier = std::string(bytes_v, verifier_len); + *salt = std::string(salt_ptr, salt_len); + free(bytes_v); + free(salt_ptr); +} + +/// Gets an SRP verifier, generating a salt, +/// and encodes it as DB-ready string. +std::string get_encoded_srp_verifier(const std::string &name, + const std::string &password) +{ + std::string verifier; + std::string salt; + generate_srp_verifier_and_salt(name, password, &verifier, &salt); + return encode_srp_verifier(verifier, salt); +} + +/// Converts the passed SRP verifier into a DB-ready format. +std::string encode_srp_verifier(const std::string &verifier, const std::string &salt) { std::ostringstream ret_str; ret_str << "#1#" - << base64_encode((unsigned char*) salt.c_str(), salt.size()) << "#" - << base64_encode((unsigned char*) verifier.c_str(), verifier.size()); + << base64_encode((unsigned char *)salt.c_str(), salt.size()) << "#" + << base64_encode((unsigned char *)verifier.c_str(), verifier.size()); return ret_str.str(); } -bool decodeSRPVerifier(const std::string &enc_pwd, - std::string *salt, std::string *bytes_v) +/// Reads the DB-formatted SRP verifier and gets the verifier +/// and salt components. +bool decode_srp_verifier_and_salt(const std::string &encoded, + std::string *verifier, std::string *salt) { - std::vector pwd_components = str_split(enc_pwd, '#'); + std::vector components = str_split(encoded, '#'); - if ((pwd_components.size() != 4) - || (pwd_components[1] != "1") // 1 means srp - || !base64_is_valid(pwd_components[2]) - || !base64_is_valid(pwd_components[3])) + if ((components.size() != 4) + || (components[1] != "1") // 1 means srp + || !base64_is_valid(components[2]) + || !base64_is_valid(components[3])) return false; - std::string salt_str = base64_decode(pwd_components[2]); - std::string bytes_v_str = base64_decode(pwd_components[3]); - *salt = salt_str; - *bytes_v = bytes_v_str; + *salt = base64_decode(components[2]); + *verifier = base64_decode(components[3]); return true; } diff --git a/src/util/auth.h b/src/util/auth.h index 36d8c20a..1fd6ab45 100644 --- a/src/util/auth.h +++ b/src/util/auth.h @@ -1,6 +1,6 @@ /* Minetest -Copyright (C) 2015 est31 +Copyright (C) 2015, 2016 est31 This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -20,18 +20,31 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef AUTH_H #define AUTH_H -std::string translatePassword(const std::string &name, +/// Gets the base64 encoded legacy password db entry. +std::string translate_password(const std::string &name, const std::string &password); -void getSRPVerifier(const std::string &name, - const std::string &password, char **salt, size_t *salt_len, - char **bytes_v, size_t *len_v); -std::string getSRPVerifier(const std::string &name, - const std::string &password); -std::string getSRPVerifier(const std::string &name, + +/// Creates a verification key with given salt and password. +std::string generate_srp_verifier(const std::string &name, const std::string &password, const std::string &salt); -std::string encodeSRPVerifier(const std::string &verifier, + +/// Creates a verification key and salt with given password. +void generate_srp_verifier_and_salt(const std::string &name, + const std::string &password, std::string *verifier, + std::string *salt); + +/// Gets an SRP verifier, generating a salt, +/// and encodes it as DB-ready string. +std::string get_encoded_srp_verifier(const std::string &name, + const std::string &password); + +/// Converts the passed SRP verifier into a DB-ready format. +std::string encode_srp_verifier(const std::string &verifier, const std::string &salt); -bool decodeSRPVerifier(const std::string &enc_pwd, + +/// Reads the DB-formatted SRP verifier and gets the verifier +/// and salt components. +bool decode_srp_verifier_and_salt(const std::string &encoded, std::string *salt, std::string *bytes_v); -#endif \ No newline at end of file +#endif From 2607b97b4f2b41767d7a010e9376d3e7f578cb71 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 15 Mar 2016 08:55:45 +0100 Subject: [PATCH 359/531] Fix two reconnect bugs Fix two bugs related to the reconnect feature introduced by commit 3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7 "Optional reconnect functionality" 1. Set the password to the stored one Before, we have done the reconnect attempt with a cleared password, so using the feature would only work if you had an empty password. Thanks to @orwell96 for reporting the bug. 2. Reset the reconnect_requested flag after its use the_game only writes to the reconect_requested flag if it sets it to true. It never sets it to false. If the flag is not reset after its use, all "reset"s to the main menu will look like the server had requested a reconnect. --- src/client/clientlauncher.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp index 357d98b4..404a1631 100644 --- a/src/client/clientlauncher.cpp +++ b/src/client/clientlauncher.cpp @@ -201,6 +201,9 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args) bool game_has_run = launch_game(error_message, reconnect_requested, game_params, cmd_args); + // Reset the reconnect_requested flag + reconnect_requested = false; + // If skip_main_menu, we only want to startup once if (skip_main_menu && !first_loop) break; @@ -336,6 +339,7 @@ bool ClientLauncher::launch_game(std::string &error_message, MainMenuData menudata; menudata.address = address; menudata.name = playername; + menudata.password = password; menudata.port = itos(game_params.socket_port); menudata.script_data.errormessage = error_message; menudata.script_data.reconnect_requested = reconnect_requested; From af30183124d40a969040d7de4b3a487feec466e4 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 14 Mar 2016 10:18:29 +0100 Subject: [PATCH 360/531] Add option to not send pre v25 init packet The legacy init packet (pre v25) sends information about the client's password that a server could use to log in to other servers if the username and password are the same. All the other benefits of SRP of protocol v25 are missed if the legacy init packet is still sent during connection creation. This patch adds an option to not send the v25 init packet. Not sending the v25 packet means breaking compat with pre v25 servers, but as the option is not enabled by default, no servers are affected unless the user explicitly flips the switch. More than 90% of the servers on the serverlist support post v25 protocols. The patch also fixes a bug with greying out of non compliant servers being done wrongly, the min and max params were mixed. --- builtin/mainmenu/common.lua | 11 +++++-- builtin/mainmenu/tab_multiplayer.lua | 4 +++ builtin/settingtypes.txt | 6 ++++ minetest.conf.example | 7 ++++ src/client.cpp | 48 +++++++++++++++++----------- src/defaultsettings.cpp | 2 ++ src/network/networkprotocol.h | 5 ++- src/script/lua_api/l_mainmenu.cpp | 4 ++- src/serverlist.cpp | 6 +++- src/settings_translation_file.cpp | 2 ++ 10 files changed, 71 insertions(+), 24 deletions(-) diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index f40c787a..b9a010e6 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -22,9 +22,14 @@ menudata = {} -------------------------------------------------------------------------------- -- Local cached values -------------------------------------------------------------------------------- -local min_supp_proto = core.get_min_supp_proto() -local max_supp_proto = core.get_max_supp_proto() +local min_supp_proto +local max_supp_proto +function common_update_cached_supp_proto() + min_supp_proto = core.get_min_supp_proto() + max_supp_proto = core.get_max_supp_proto() +end +common_update_cached_supp_proto() -------------------------------------------------------------------------------- -- Menu helper functions -------------------------------------------------------------------------------- @@ -105,7 +110,7 @@ function render_favorite(spec,render_details) end local details = "" - local grey_out = not is_server_protocol_compat(spec.proto_max, spec.proto_min) + local grey_out = not is_server_protocol_compat(spec.proto_min, spec.proto_max) if spec.clients ~= nil and spec.clients_max ~= nil then local clients_color = '' diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index 57025971..2072f8c3 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -17,6 +17,10 @@ -------------------------------------------------------------------------------- local function get_formspec(tabview, name, tabdata) + -- Update the cached supported proto info, + -- it may have changed after a change by the settings menu. + common_update_cached_supp_proto() + local render_details = core.is_yes(core.setting_getbool("public_serverlist")) local retval = diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index c1157b16..99106e00 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -232,6 +232,12 @@ address (Server address) string # Note that the port field in the main menu overrides this setting. remote_port (Remote port) int 30000 1 65535 +# Whether to support older servers before protocol version 25. +# Enable if you want to connect to 0.4.12 servers and before. +# Servers starting with 0.4.13 will work, 0.4.12-dev servers may work. +# Disabling this option will protect your password better. +send_pre_v25_init (Support older servers) bool true + # Save the map received by the client on disk. enable_local_map_saving (Saving map received from server) bool false diff --git a/minetest.conf.example b/minetest.conf.example index cd0be529..6a9dc5ce 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -242,6 +242,13 @@ # type: int min: 1 max: 65535 # remote_port = 30000 +# Whether to support older servers before protocol version 25. +# Enable if you want to connect to 0.4.12 servers and before. +# Servers starting with 0.4.13 will work, 0.4.12-dev servers may work. +# Disabling this option will protect your password better. +# type: bool +# send_pre_v25_init = true + # Save the map received by the client on disk. # type: bool # enable_local_map_saving = false diff --git a/src/client.cpp b/src/client.cpp index 41468f0f..2a8e02d6 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -386,25 +386,30 @@ void Client::step(float dtime) Player *myplayer = m_env.getLocalPlayer(); FATAL_ERROR_IF(myplayer == NULL, "Local player not found in environment."); - // Send TOSERVER_INIT_LEGACY - // [0] u16 TOSERVER_INIT_LEGACY - // [2] u8 SER_FMT_VER_HIGHEST_READ - // [3] u8[20] player_name - // [23] u8[28] password (new in some version) - // [51] u16 minimum supported network protocol version (added sometime) - // [53] u16 maximum supported network protocol version (added later than the previous one) + u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ? + CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN; - char pName[PLAYERNAME_SIZE]; - char pPassword[PASSWORD_SIZE]; - memset(pName, 0, PLAYERNAME_SIZE * sizeof(char)); - memset(pPassword, 0, PASSWORD_SIZE * sizeof(char)); + if (proto_version_min < 25) { + // Send TOSERVER_INIT_LEGACY + // [0] u16 TOSERVER_INIT_LEGACY + // [2] u8 SER_FMT_VER_HIGHEST_READ + // [3] u8[20] player_name + // [23] u8[28] password (new in some version) + // [51] u16 minimum supported network protocol version (added sometime) + // [53] u16 maximum supported network protocol version (added later than the previous one) - std::string hashed_password = translate_password(myplayer->getName(), m_password); - snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName()); - snprintf(pPassword, PASSWORD_SIZE, "%s", hashed_password.c_str()); + char pName[PLAYERNAME_SIZE]; + char pPassword[PASSWORD_SIZE]; + memset(pName, 0, PLAYERNAME_SIZE * sizeof(char)); + memset(pPassword, 0, PASSWORD_SIZE * sizeof(char)); - sendLegacyInit(pName, pPassword); - if (LATEST_PROTOCOL_VERSION >= 25) + std::string hashed_password = translate_password(myplayer->getName(), m_password); + snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName()); + snprintf(pPassword, PASSWORD_SIZE, "%s", hashed_password.c_str()); + + sendLegacyInit(pName, pPassword); + } + if (CLIENT_PROTOCOL_VERSION_MAX >= 25) sendInit(myplayer->getName()); } @@ -1003,10 +1008,13 @@ void Client::sendLegacyInit(const char* playerName, const char* playerPassword) NetworkPacket pkt(TOSERVER_INIT_LEGACY, 1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2 + 2); + u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ? + CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN; + pkt << (u8) SER_FMT_VER_HIGHEST_READ; pkt.putRawString(playerName,PLAYERNAME_SIZE); pkt.putRawString(playerPassword, PASSWORD_SIZE); - pkt << (u16) CLIENT_PROTOCOL_VERSION_MIN << (u16) CLIENT_PROTOCOL_VERSION_MAX; + pkt << (u16) proto_version_min << (u16) CLIENT_PROTOCOL_VERSION_MAX; Send(&pkt); } @@ -1017,8 +1025,12 @@ void Client::sendInit(const std::string &playerName) // we don't support network compression yet u16 supp_comp_modes = NETPROTO_COMPRESSION_NONE; + + u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ? + CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN; + pkt << (u8) SER_FMT_VER_HIGHEST_READ << (u16) supp_comp_modes; - pkt << (u16) CLIENT_PROTOCOL_VERSION_MIN << (u16) CLIENT_PROTOCOL_VERSION_MAX; + pkt << (u16) proto_version_min << (u16) CLIENT_PROTOCOL_VERSION_MAX; pkt << playerName; Send(&pkt); diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 53059e8a..84098e3d 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -184,6 +184,8 @@ void set_default_settings(Settings *settings) settings->setDefault("minimap_shape_round", "true"); settings->setDefault("minimap_double_scan_height", "true"); + settings->setDefault("send_pre_v25_init", "true"); + settings->setDefault("curl_timeout", "5000"); settings->setDefault("curl_parallel_limit", "8"); settings->setDefault("curl_file_download_timeout", "300000"); diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h index 7cde6d76..177b9768 100644 --- a/src/network/networkprotocol.h +++ b/src/network/networkprotocol.h @@ -145,7 +145,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #define SERVER_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION // Client's supported network protocol range -#define CLIENT_PROTOCOL_VERSION_MIN 13 +// The minimal version depends on whether +// send_pre_v25_init is enabled or not +#define CLIENT_PROTOCOL_VERSION_MIN 25 +#define CLIENT_PROTOCOL_VERSION_MIN_LEGACY 13 #define CLIENT_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION // Constant that differentiates the protocol from random data and other protocols diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index c924a5d9..7b29db15 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -1095,7 +1095,9 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L) /******************************************************************************/ int ModApiMainMenu::l_get_min_supp_proto(lua_State *L) { - lua_pushinteger(L, CLIENT_PROTOCOL_VERSION_MIN); + u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ? + CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN; + lua_pushinteger(L, proto_version_min); return 1; } diff --git a/src/serverlist.cpp b/src/serverlist.cpp index 6e79b55a..de7962a6 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -69,8 +69,12 @@ std::vector getLocal() std::vector getOnline() { std::ostringstream geturl; + + u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ? + CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN; + geturl << g_settings->get("serverlist_url") << - "/list?proto_version_min=" << CLIENT_PROTOCOL_VERSION_MIN << + "/list?proto_version_min=" << proto_version_min << "&proto_version_max=" << CLIENT_PROTOCOL_VERSION_MAX; Json::Value root = fetchJsonValue(geturl.str(), NULL); diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index f115bc01..0e0c3acc 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -98,6 +98,8 @@ fake_function() { gettext("Address to connect to.\nLeave this blank to start a local server.\nNote that the address field in the main menu overrides this setting."); gettext("Remote port"); gettext("Port to connect to (UDP).\nNote that the port field in the main menu overrides this setting."); + gettext("Support older servers"); + gettext("Whether to support older servers before protocol version 25.\nEnable if you want to connect to 0.4.12 servers and before.\nServers starting with 0.4.13 will work, 0.4.12-dev servers may work.\nDisabling this option will protect your password better."); gettext("Saving map received from server"); gettext("Save the map received by the client on disk."); gettext("Connect to external media server"); From 095f623fa7278375a6fa4fe01ed39d2b68cce7af Mon Sep 17 00:00:00 2001 From: Ekdohibs Date: Tue, 15 Mar 2016 13:34:27 +0100 Subject: [PATCH 361/531] Remove chat escape sequences from chat messages, for future colored chat. --- src/chat.cpp | 3 +++ src/util/string.cpp | 27 +++++++++++++++++++++++++++ src/util/string.h | 7 +++++++ 3 files changed, 37 insertions(+) diff --git a/src/chat.cpp b/src/chat.cpp index 809d4e42..495e3450 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -679,6 +679,9 @@ ChatBackend::~ChatBackend() void ChatBackend::addMessage(std::wstring name, std::wstring text) { + name = removeChatEscapes(name); + text = removeChatEscapes(text); + // Note: A message may consist of multiple lines, for example the MOTD. WStrfnd fnd(text); while (!fnd.atend()) diff --git a/src/util/string.cpp b/src/util/string.cpp index 2c4143c7..c8f528a7 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -729,6 +729,33 @@ static bool parseNamedColorString(const std::string &value, video::SColor &color return true; } +std::wstring removeChatEscapes(const std::wstring &s) { + std::wstring output; + size_t i = 0; + while (i < s.length()) { + if (s[i] == L'\v') { + ++i; + if (i == s.length()) continue; + if (s[i] == L'(') { + ++i; + while (i < s.length() && s[i] != L')') { + if (s[i] == L'\\') { + ++i; + } + ++i; + } + ++i; + } else { + ++i; + } + continue; + } + output += s[i]; + ++i; + } + return output; +} + void str_replace(std::string &str, char from, char to) { std::replace(str.begin(), str.end(), from, to); diff --git a/src/util/string.h b/src/util/string.h index cf94b7f5..9e59ab20 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -386,6 +386,13 @@ inline void str_replace(std::string &str, const std::string &pattern, } } +/** + * Remove all chat escape sequences in \p s. + * + * @param s The string in which to remove escape sequences. + * @return \p s, with escape sequences removed. + */ +std::wstring removeChatEscapes(const std::wstring &s); /** * Replace all occurrences of the character \p from in \p str with \p to. From 3132bcb3732df51c08c8b2f34781e463cd94fe7f Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 16 Mar 2016 13:21:34 +0100 Subject: [PATCH 362/531] Set EXAMPLE_CONF_DIR to DOCDIR if DOCDIR gets customized Before, customisation of DOCDIR did not lead to changes of the EXAMPLE_CONF_DIR default value. This was inconsistent with expected behaviour if you didn't know of the existence of the EXAMPLE_CONF_DIR variable. The confusion is very strong, as (for not in place builds) both DOCDIR and EXAMPLE_CONF_DIR share the same default value, it is unexpected that setting CUSTOM_DOCDIR changes the location of all documentation files but one. The best meaning of EXAMPLE_CONF_DIR is to further allow customization of the mt.conf.example storage place, but otherwise keep defaulting to whatever DOCDIR is set to, at least for not in place builds. This patch implements that behaviour. Fixes #3863. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8278522..3f853f4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,9 @@ endif() set(CUSTOM_DOCDIR "" CACHE STRING "Directory to install documentation into") if(NOT CUSTOM_DOCDIR STREQUAL "") set(DOCDIR "${CUSTOM_DOCDIR}") + if(NOT RUN_IN_PLACE) + set(EXAMPLE_CONF_DIR ${DOCDIR}) + endif() message(STATUS "Using DOCDIR=${DOCDIR}") endif() From d915ca11249050fd67a87ebee16ca2b2f67f93d5 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 19 Mar 2016 09:18:22 +0100 Subject: [PATCH 363/531] lua_api.txt: improve vector documentation Before it rendered very badly in HTML. Also point out what vector.round does. --- doc/lua_api.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 733ac841..a01e7288 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1688,16 +1688,15 @@ or string form, a ColorString (defined above): `colorspec = "green"` Spatial Vectors --------------- - -* `vector.new([x[, y, z]])`: returns a vector. - * `x` is a table or the `x` position. - +--------------- +* `vector.new(a[, b, c])`: returns a vector: + * A copy of `a` if `a` is a vector. + * `{x = a, y = b, z = c}`, if all `a, b, c` are defined * `vector.direction(p1, p2)`: returns a vector * `vector.distance(p1, p2)`: returns a number * `vector.length(v)`: returns a number * `vector.normalize(v)`: returns a vector -* `vector.round(v)`: returns a vector +* `vector.round(v)`: returns a vector, each dimension rounded to floor * `vector.apply(v, func)`: returns a vector * `vector.equals(v1, v2)`: returns a boolean @@ -1709,7 +1708,7 @@ For the following functions `x` can be either a vector or a number: * `vector.divide(v, x)`: returns a scaled vector or Schur quotient Helper functions ------------------ +---------------- * `dump2(obj, name="_", dumped={})` * Return object serialized as a string, handles reference loops * `dump(obj, dumped={})` From c5c727d62735e334ec64f07c557a2896d6d66d9f Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 1 Mar 2016 23:14:26 -0800 Subject: [PATCH 364/531] Allow NodeTimer, ABM and block mgmt interval changes. ABM's are hardcoded to run every 1.0s, NodeTimers are hard coded to run at every 1.0s. Block mgmt is running every 2.0sec. However, these timers can be better tuned for both higher and lower values by server owners. Some server owners want to, and have the resources to send more packets per second to clients, and so they may wish to send smaller updates sooner. Right now all ABM's are coalesced into 1.0 second intervals, resulting in large send queues to all clients. By reducing the amount of possible timers, one can get a far better response rate and lower the perception of lag. On the other side of the camp, some servers may want to increase these values, which again isn't easily doable. The global settings abm_interval and nodetimer_interval are set to current values by default. I've tested with 0.2/0.5 type values and noticed a greatly improved response and better scattering of nodetimers, as well as enjoying not faceplanting into doors with pressure plates anymore. --- builtin/settingtypes.txt | 9 +++++++++ minetest.conf.example | 12 ++++++++++++ src/defaultsettings.cpp | 3 +++ src/environment.cpp | 24 ++++++++++++------------ src/environment.h | 3 +++ src/settings_translation_file.cpp | 6 ++++++ 6 files changed, 45 insertions(+), 12 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 99106e00..0cacb528 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -795,6 +795,15 @@ sqlite_synchronous (Synchronous SQLite) enum 2 0,1,2 # Length of a server tick and the interval at which objects are generally updated over network. dedicated_server_step (Dedicated server step) float 0.1 +# Time in between active block management cycles +active_block_mgmt_interval (Active Block Management interval) float 2.0 + +# Length of time between ABM execution cycles +abm_interval (Active Block Modifier interval) float 1.0 + +# Length of time between NodeTimer execution cycles +nodetimer_interval (NodeTimer interval) float 1.0 + # If enabled, invalid world data won't cause the server to shut down. # Only enable this if you know what you are doing. ignore_world_load_errors (Ignore world errors) bool false diff --git a/minetest.conf.example b/minetest.conf.example index 6a9dc5ce..65b1f19e 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -980,6 +980,18 @@ # type: float # dedicated_server_step = 0.1 +# Length of time between Active Block Management execution cycles +# type: float +# active_block_mgmt_interval = 2.0 + +# Length of time between ABM execution cycles +# type: float +# abm_interval = 1.0 + +# Length of time between NodeTimer execution cycles +# type: float +# nodetimer_interval = 1.0 + # If enabled, invalid world data won't cause the server to shut down. # Only enable this if you know what you are doing. # type: bool diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 84098e3d..e00ff148 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -280,6 +280,9 @@ void set_default_settings(Settings *settings) settings->setDefault("sqlite_synchronous", "2"); settings->setDefault("full_block_send_enable_min_time_from_building", "2.0"); settings->setDefault("dedicated_server_step", "0.1"); + settings->setDefault("active_block_mgmt_interval", "2.0"); + settings->setDefault("abm_interval", "1.0"); + settings->setDefault("nodetimer_interval", "1.0"); settings->setDefault("ignore_world_load_errors", "false"); settings->setDefault("remote_media", ""); settings->setDefault("debug_log_level", "action"); diff --git a/src/environment.cpp b/src/environment.cpp index 1de44e75..902e2bda 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -59,6 +59,9 @@ Environment::Environment(): m_day_night_ratio_override(0.0f) { m_cache_enable_shaders = g_settings->getBool("enable_shaders"); + m_cache_active_block_mgmt_interval = g_settings->getFloat("active_block_mgmt_interval"); + m_cache_abm_interval = g_settings->getFloat("abm_interval"); + m_cache_nodetimer_interval = g_settings->getFloat("nodetimer_interval"); } Environment::~Environment() @@ -1322,9 +1325,8 @@ void ServerEnvironment::step(float dtime) /* Manage active block list */ - if(m_active_blocks_management_interval.step(dtime, 2.0)) - { - ScopeProfiler sp(g_profiler, "SEnv: manage act. block list avg /2s", SPT_AVG); + if (m_active_blocks_management_interval.step(dtime, m_cache_active_block_mgmt_interval)) { + ScopeProfiler sp(g_profiler, "SEnv: manage act. block list avg per interval", SPT_AVG); /* Get player block positions */ @@ -1399,11 +1401,10 @@ void ServerEnvironment::step(float dtime) /* Mess around in active blocks */ - if(m_active_blocks_nodemetadata_interval.step(dtime, 1.0)) - { - ScopeProfiler sp(g_profiler, "SEnv: mess in act. blocks avg /1s", SPT_AVG); + if (m_active_blocks_nodemetadata_interval.step(dtime, m_cache_nodetimer_interval)) { + ScopeProfiler sp(g_profiler, "SEnv: mess in act. blocks avg per interval", SPT_AVG); - float dtime = 1.0; + float dtime = m_cache_nodetimer_interval; for(std::set::iterator i = m_active_blocks.m_list.begin(); @@ -1446,19 +1447,18 @@ void ServerEnvironment::step(float dtime) } } - const float abm_interval = 1.0; - if(m_active_block_modifier_interval.step(dtime, abm_interval)) + if (m_active_block_modifier_interval.step(dtime, m_cache_abm_interval)) do{ // breakable if(m_active_block_interval_overload_skip > 0){ ScopeProfiler sp(g_profiler, "SEnv: ABM overload skips"); m_active_block_interval_overload_skip--; break; } - ScopeProfiler sp(g_profiler, "SEnv: modify in blocks avg /1s", SPT_AVG); - TimeTaker timer("modify in active blocks"); + ScopeProfiler sp(g_profiler, "SEnv: modify in blocks avg per interval", SPT_AVG); + TimeTaker timer("modify in active blocks per interval"); // Initialize handling of ActiveBlockModifiers - ABMHandler abmhandler(m_abms, abm_interval, this, true); + ABMHandler abmhandler(m_abms, m_cache_abm_interval, this, true); for(std::set::iterator i = m_active_blocks.m_list.begin(); diff --git a/src/environment.h b/src/environment.h index 9b91a092..660c6f1b 100644 --- a/src/environment.h +++ b/src/environment.h @@ -136,6 +136,9 @@ protected: * a later release. */ bool m_cache_enable_shaders; + float m_cache_active_block_mgmt_interval; + float m_cache_abm_interval; + float m_cache_nodetimer_interval; private: Mutex m_time_lock; diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index 0e0c3acc..77fd6c68 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -409,6 +409,12 @@ fake_function() { gettext("See http://www.sqlite.org/pragma.html#pragma_synchronous"); gettext("Dedicated server step"); gettext("Length of a server tick and the interval at which objects are generally updated over network."); + gettext("Active Block Management interval"); + gettext("Time in between active block management cycles"); + gettext("ABM modifier interval"); + gettext("Length of time between ABM execution cycles"); + gettext("NodeTimer interval"); + gettext("Length of time between NodeTimer execution cycles"); gettext("Ignore world errors"); gettext("If enabled, invalid world data won't cause the server to shut down.\nOnly enable this if you know what you are doing."); gettext("Liquid loop max"); From f1aea6b4ff7a3bcd0227527f3fd4c1a29fc89fe4 Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 15 Mar 2016 17:28:29 +0000 Subject: [PATCH 365/531] Mgv7: Limit pseudorandom caves to surface mapchunk or below To avoid bright caves at mapchunk borders when generating mapchunks upwards --- src/mapgen_v7.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 24867623..9e3e3f1a 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -912,6 +912,9 @@ void MapgenV7::generateCaves(s16 max_stone_y) } } + if (node_min.Y >= water_level) + return; + PseudoRandom ps(blockseed + 21343); u32 bruises_count = ps.range(0, 2); for (u32 i = 0; i < bruises_count; i++) { From 65c09a96f41705bb8e75fc5ff4276342be91ed11 Mon Sep 17 00:00:00 2001 From: Rui914 Date: Sat, 19 Mar 2016 21:43:58 +0900 Subject: [PATCH 366/531] Set acceleration only once in falling node --- builtin/game/falling.lua | 81 +++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 46 deletions(-) diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index 5b5e806f..f8a4f0d6 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -6,42 +6,46 @@ core.register_entity(":__builtin:falling_node", { initial_properties = { - physical = true, - collide_with_objects = false, - collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5}, visual = "wielditem", + visual_size = {x = 0.667, y = 0.667}, textures = {}, - visual_size = {x=0.667, y=0.667}, - }, + physical = true, + is_visible = false, + collide_with_objects = false, + collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, + } node = {}, set_node = function(self, node) self.node = node - local prop = { + self.object:set_properties({ is_visible = true, textures = {node.name}, - } - self.object:set_properties(prop) + }) end, get_staticdata = function(self) - return self.node.name + return core.serialize(self.node) end, on_activate = function(self, staticdata) - self.object:set_armor_groups({immortal=1}) - if staticdata then - self:set_node({name=staticdata}) + -- Set gravity + self.object:setacceleration({x = 0, y = -10, z = 0}) + self.object:set_armor_groups({immortal = 1}) + + local node = core.deserialize(staticdata) + if node then + self:set_node(node) + elseif staticdata ~= "" then + self:set_node({name = staticdata}) end end, on_step = function(self, dtime) - -- Set gravity - self.object:setacceleration({x=0, y=-10, z=0}) -- Turn to actual sand when collides to ground or just move local pos = self.object:getpos() - local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point + local bcp = {x = pos.x, y = pos.y - 0.7, z = pos.z} -- Position of bottom center point local bcn = core.get_node(bcp) local bcd = core.registered_nodes[bcn.name] -- Note: walkable is in the node definition, not in item groups @@ -52,7 +56,7 @@ core.register_entity(":__builtin:falling_node", { if bcd and bcd.leveled and bcn.name == self.node.name then local addlevel = self.node.level - if addlevel == nil or addlevel <= 0 then + if not addlevel or addlevel <= 0 then addlevel = bcd.leveled end if core.add_node_level(bcp, addlevel) == 0 then @@ -65,7 +69,7 @@ core.register_entity(":__builtin:falling_node", { core.remove_node(bcp) return end - local np = {x=bcp.x, y=bcp.y+1, z=bcp.z} + local np = {x = bcp.x, y = bcp.y + 1, z = bcp.z} -- Check what's here local n2 = core.get_node(np) -- If it's not air or liquid, remove node and replace it with @@ -76,15 +80,13 @@ core.register_entity(":__builtin:falling_node", { if core.registered_nodes[n2.name].buildable_to == false then -- Add dropped items local drops = core.get_node_drops(n2.name, "") - local _, dropped_item for _, dropped_item in ipairs(drops) do core.add_item(np, dropped_item) end end -- Run script hook - local _, callback for _, callback in ipairs(core.registered_on_dignodes) do - callback(np, n2, nil) + callback(np, n2) end end -- Create node and remove entity @@ -94,7 +96,7 @@ core.register_entity(":__builtin:falling_node", { return end local vel = self.object:getvelocity() - if vector.equals(vel, {x=0,y=0,z=0}) then + if vector.equals(vel, {x = 0, y = 0, z = 0}) then local npos = self.object:getpos() self.object:setpos(vector.round(npos)) end @@ -109,7 +111,7 @@ end function drop_attached_node(p) local nn = core.get_node(p).name core.remove_node(p) - for _,item in ipairs(core.get_node_drops(nn, "")) do + for _, item in ipairs(core.get_node_drops(nn, "")) do local pos = { x = p.x + math.random()/2 - 0.25, y = p.y + math.random()/2 - 0.25, @@ -121,25 +123,13 @@ end function check_attached_node(p, n) local def = core.registered_nodes[n.name] - local d = {x=0, y=0, z=0} + local d = {x = 0, y = 0, z = 0} if def.paramtype2 == "wallmounted" then - if n.param2 == 0 then - d.y = 1 - elseif n.param2 == 1 then - d.y = -1 - elseif n.param2 == 2 then - d.x = 1 - elseif n.param2 == 3 then - d.x = -1 - elseif n.param2 == 4 then - d.z = 1 - elseif n.param2 == 5 then - d.z = -1 - end + d = core.wallmounted_to_dir(n.param2) else d.y = -1 end - local p2 = {x=p.x+d.x, y=p.y+d.y, z=p.z+d.z} + local p2 = vector.add(p, d) local nn = core.get_node(p2).name local def2 = core.registered_nodes[nn] if def2 and not def2.walkable then @@ -155,7 +145,7 @@ end function nodeupdate_single(p, delay) local n = core.get_node(p) if core.get_item_group(n.name, "falling_node") ~= 0 then - local p_bottom = {x=p.x, y=p.y-1, z=p.z} + local p_bottom = {x = p.x, y = p.y - 1, z = p.z} local n_bottom = core.get_node(p_bottom) -- Note: walkable is in the node definition, not in item groups if core.registered_nodes[n_bottom.name] and @@ -166,7 +156,7 @@ function nodeupdate_single(p, delay) (not core.registered_nodes[n_bottom.name].walkable or core.registered_nodes[n_bottom.name].buildable_to) then if delay then - core.after(0.1, nodeupdate_single, {x=p.x, y=p.y, z=p.z}, false) + core.after(0.1, nodeupdate_single, p, false) else n.level = core.get_node_level(p) core.remove_node(p) @@ -186,14 +176,13 @@ end function nodeupdate(p, delay) -- Round p to prevent falling entities to get stuck - p.x = math.floor(p.x+0.5) - p.y = math.floor(p.y+0.5) - p.z = math.floor(p.z+0.5) + p = vector.round(p) - for x = -1,1 do - for y = -1,1 do - for z = -1,1 do - nodeupdate_single({x=p.x+x, y=p.y+y, z=p.z+z}, delay or not (x==0 and y==0 and z==0)) + for x = -1, 1 do + for y = -1, 1 do + for z = -1, 1 do + local d = vector.new(x, y, z) + nodeupdate_single(vector.add(p, d), delay or not (x == 0 and y == 0 and z == 0)) end end end From 2ce02c99b4dee5c2c6c6260d1a7ff522c89db878 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 19 Mar 2016 18:36:48 +0000 Subject: [PATCH 367/531] Builtin/game/falling: Re-add comma removed by recent commit --- builtin/game/falling.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index f8a4f0d6..6282f655 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -13,7 +13,7 @@ core.register_entity(":__builtin:falling_node", { is_visible = false, collide_with_objects = false, collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - } + }, node = {}, From eb7db21d50f866d1e847d7556f83995294a7e54f Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 19 Mar 2016 01:21:58 -0400 Subject: [PATCH 368/531] Tweak travis script Exit if cd fails and don't insert '\' in string. --- util/travis/script.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/util/travis/script.sh b/util/travis/script.sh index 5be747e5..870954eb 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -2,10 +2,8 @@ if [[ $PLATFORM == "Unix" ]]; then mkdir -p travisbuild - cd travisbuild - CMAKE_FLAGS='-DCMAKE_BUILD_TYPE=Debug \ - -DRUN_IN_PLACE=TRUE \ - -DENABLE_GETTEXT=TRUE' + cd travisbuild || exit 1 + CMAKE_FLAGS='' # Clang builds with FreeType fail on Travis if [[ $CC == "clang" ]]; then CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE' @@ -13,7 +11,10 @@ if [[ $PLATFORM == "Unix" ]]; then if [[ $TRAVIS_OS_NAME == "osx" ]]; then CMAKE_FLAGS+=' -DCUSTOM_GETTEXT_PATH=/usr/local/opt/gettext' fi - cmake $CMAKE_FLAGS .. + cmake -DCMAKE_BUILD_TYPE=Debug \ + -DRUN_IN_PLACE=TRUE \ + -DENABLE_GETTEXT=TRUE \ + $CMAKE_FLAGS .. make -j2 echo "Running unit tests." ../bin/minetest --run-unittests && exit 0 @@ -34,9 +35,9 @@ elif [[ $PLATFORM == Win* ]]; then export EXISTING_MINETEST_DIR=$OLDDIR export NO_MINETEST_GAME=1 if [[ $PLATFORM == "Win32" ]]; then - $OLDDIR/util/buildbot/buildwin32.sh travisbuild && exit 0 + "$OLDDIR/util/buildbot/buildwin32.sh" travisbuild && exit 0 elif [[ $PLATFORM == "Win64" ]]; then - $OLDDIR/util/buildbot/buildwin64.sh travisbuild && exit 0 + "$OLDDIR/util/buildbot/buildwin64.sh" travisbuild && exit 0 fi else echo "Unknown platform \"${PLATFORM}\"." From 93887043d9443ba6627fea68921994d0f1896517 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 19 Mar 2016 12:08:24 -0400 Subject: [PATCH 369/531] Clean up Strfnd Changes: * Fix indentation. * Pass strings by const reference. * Merge Strfnd and WStrfnd into one class instead of copying them. * Remove trailing spaces. * Fix variable names. * Move to util. * Other miscellaneous style fixes. --- src/ban.cpp | 2 +- src/chat.cpp | 4 +- src/client/tile.cpp | 4 +- src/craftdef.cpp | 4 +- src/guiFormSpecMenu.cpp | 2 +- src/inventory.cpp | 6 +- src/inventorymanager.cpp | 2 +- src/mods.cpp | 4 +- src/network/clientpackethandler.cpp | 4 +- src/settings.cpp | 2 +- src/shader.cpp | 1 - src/strfnd.h | 176 ---------------------------- src/subgame.cpp | 8 +- src/util/strfnd.h | 82 +++++++++++++ 14 files changed, 103 insertions(+), 198 deletions(-) delete mode 100644 src/strfnd.h create mode 100644 src/util/strfnd.h diff --git a/src/ban.cpp b/src/ban.cpp index 57b9f49a..5fa43070 100644 --- a/src/ban.cpp +++ b/src/ban.cpp @@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "threading/mutex_auto_lock.h" #include #include -#include "strfnd.h" +#include "util/strfnd.h" #include "util/string.h" #include "log.h" #include "filesys.h" diff --git a/src/chat.cpp b/src/chat.cpp index 495e3450..7a5196ed 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "chat.h" #include "debug.h" -#include "strfnd.h" +#include "util/strfnd.h" #include #include #include "util/string.h" @@ -684,7 +684,7 @@ void ChatBackend::addMessage(std::wstring name, std::wstring text) // Note: A message may consist of multiple lines, for example the MOTD. WStrfnd fnd(text); - while (!fnd.atend()) + while (!fnd.at_end()) { std::wstring line = fnd.next(L"\n"); m_console_buffer.addLine(name, line); diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 995526ea..7a9bc015 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mesh.h" #include "log.h" #include "gamedef.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "util/string.h" // for parseColorString() #include "imagefilters.h" #include "guiscalingfilter.h" @@ -1242,7 +1242,7 @@ bool TextureSource::generateImagePart(std::string part_of_name, baseimg = driver->createImage(video::ECF_A8R8G8B8, dim); baseimg->fill(video::SColor(0,0,0,0)); } - while (sf.atend() == false) { + while (sf.at_end() == false) { u32 x = stoi(sf.next(",")); u32 y = stoi(sf.next("=")); std::string filename = sf.next(":"); diff --git a/src/craftdef.cpp b/src/craftdef.cpp index 67c3ae62..d3f1edaf 100644 --- a/src/craftdef.cpp +++ b/src/craftdef.cpp @@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/serialize.h" #include "util/string.h" #include "util/numeric.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "exceptions.h" inline bool isGroupRecipeStr(const std::string &rec_name) @@ -90,7 +90,7 @@ static bool inputItemMatchesRecipe(const std::string &inp_name, all_groups_match = false; break; } - } while (!f.atend()); + } while (!f.at_end()); if (all_groups_match) return true; } diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 2e9421b3..6492eb9d 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "constants.h" #include "gamedef.h" #include "keycode.h" -#include "strfnd.h" +#include "util/strfnd.h" #include #include #include diff --git a/src/inventory.cpp b/src/inventory.cpp index e89993e6..fce8575e 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include "log.h" #include "itemdef.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "content_mapnode.h" // For loading legacy MaterialItems #include "nameidmapping.h" // For loading legacy MaterialItems #include "util/serialize.h" @@ -218,7 +218,7 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) Strfnd fnd(all); fnd.next("\""); // If didn't skip to end, we have ""s - if(!fnd.atend()){ + if(!fnd.at_end()){ name = fnd.next("\""); } else { // No luck, just read a word then fnd.start(all); @@ -246,7 +246,7 @@ void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef) Strfnd fnd(all); fnd.next("\""); // If didn't skip to end, we have ""s - if(!fnd.atend()){ + if(!fnd.at_end()){ name = fnd.next("\""); } else { // No luck, just read a word then fnd.start(all); diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index 5b29b6f1..3d851349 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "settings.h" #include "craftdef.h" #include "rollback_interface.h" -#include "strfnd.h" +#include "util/strfnd.h" #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")" diff --git a/src/mods.cpp b/src/mods.cpp index be6e1e5d..1b1bdb07 100644 --- a/src/mods.cpp +++ b/src/mods.cpp @@ -21,11 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include "mods.h" #include "filesys.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "log.h" #include "subgame.h" #include "settings.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "convert_json.h" #include "exceptions.h" diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index 28d147d3..0498f404 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "nodedef.h" #include "serialization.h" #include "server.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "network/clientopcodes.h" #include "util/serialize.h" #include "util/srp.h" @@ -641,7 +641,7 @@ void Client::handleCommand_AnnounceMedia(NetworkPacket* pkt) *pkt >> str; Strfnd sf(str); - while(!sf.atend()) { + while(!sf.at_end()) { std::string baseurl = trim(sf.next(",")); if (baseurl != "") m_media_downloader->addRemoteServer(baseurl); diff --git a/src/settings.cpp b/src/settings.cpp index 8ea687d1..56afa613 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_bloated.h" #include "exceptions.h" #include "threading/mutex_auto_lock.h" -#include "strfnd.h" +#include "util/strfnd.h" #include #include #include diff --git a/src/shader.cpp b/src/shader.cpp index ed6585bd..e13ab8df 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -35,7 +35,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "EShaderTypes.h" #include "log.h" #include "gamedef.h" -#include "strfnd.h" // trim() #include "client/tile.h" /* diff --git a/src/strfnd.h b/src/strfnd.h deleted file mode 100644 index 3142cc10..00000000 --- a/src/strfnd.h +++ /dev/null @@ -1,176 +0,0 @@ -/* -Minetest -Copyright (C) 2013 celeron55, Perttu Ahola - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef STRFND_HEADER -#define STRFND_HEADER - -#include - -class Strfnd{ - std::string tek; - unsigned int p; -public: - void start(std::string niinq){ - tek = niinq; - p=0; - } - unsigned int where(){ - return p; - } - void to(unsigned int i){ - p = i; - } - std::string what(){ - return tek; - } - std::string next(std::string plop){ - //std::cout<<"tek=\""<=tek.size()"<= tek.size()) - return ""; - - realp = p; - do { - n = tek.find(plop, p); - if (n == std::string::npos || plop == "") - n = tek.length(); - p = n + plop.length(); - } while (n > 0 && tek[n - 1] == '\\'); - - return tek.substr(realp, n - realp); - } - - void skip_over(std::string chars){ - while(p < tek.size()){ - bool is = false; - for(unsigned int i=0; i=tek.size()) return true; - return false; - } - Strfnd(std::string s){ - start(s); - } -}; - -class WStrfnd{ - std::wstring tek; - unsigned int p; -public: - void start(std::wstring niinq){ - tek = niinq; - p=0; - } - unsigned int where(){ - return p; - } - void to(unsigned int i){ - p = i; - } - std::wstring what(){ - return tek; - } - std::wstring next(std::wstring plop){ - //std::cout<<"tek=\""<=tek.size()"<= tek.size()) - return L""; - - realp = p; - do { - n = tek.find(plop, p); - if (n == std::wstring::npos || plop == L"") - n = tek.length(); - p = n + plop.length(); - } while (n > 0 && tek[n - 1] == '\\'); - - return tek.substr(realp, n - realp); - } - - bool atend(){ - if(p>=tek.size()) return true; - return false; - } - WStrfnd(std::wstring s){ - start(s); - } -}; - -#endif - diff --git a/src/subgame.cpp b/src/subgame.cpp index 20f5116e..7e9a0b36 100644 --- a/src/subgame.cpp +++ b/src/subgame.cpp @@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "filesys.h" #include "settings.h" #include "log.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "defaultsettings.h" // for override_default_settings #include "mapgen.h" // for MapgenParams #include "util/string.h" @@ -79,7 +79,7 @@ SubgameSpec findSubgame(const std::string &id) Strfnd search_paths(getSubgamePathEnv()); - while (!search_paths.atend()) { + while (!search_paths.at_end()) { std::string path = search_paths.next(PATH_DELIM); find_paths.push_back(GameFindPath( path + DIR_DELIM + id, false)); @@ -153,7 +153,7 @@ std::set getAvailableGameIds() Strfnd search_paths(getSubgamePathEnv()); - while (!search_paths.atend()) + while (!search_paths.at_end()) gamespaths.insert(search_paths.next(PATH_DELIM)); for (std::set::const_iterator i = gamespaths.begin(); @@ -230,7 +230,7 @@ std::vector getAvailableWorlds() Strfnd search_paths(getWorldPathEnv()); - while (!search_paths.atend()) + while (!search_paths.at_end()) worldspaths.insert(search_paths.next(PATH_DELIM)); worldspaths.insert(porting::path_user + DIR_DELIM + "worlds"); diff --git a/src/util/strfnd.h b/src/util/strfnd.h new file mode 100644 index 00000000..a7cd2bad --- /dev/null +++ b/src/util/strfnd.h @@ -0,0 +1,82 @@ +/* +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef STRFND_HEADER +#define STRFND_HEADER + +#include + +template +class BasicStrfnd { + typedef std::basic_string String; + String str; + size_t pos; +public: + BasicStrfnd(const String &s) : str(s), pos(0) {} + void start(const String &s) { str = s; pos = 0; } + size_t where() { return pos; } + void to(size_t i) { pos = i; } + bool at_end() { return pos >= str.size(); } + String what() { return str; } + + String next(const String &sep) + { + if (pos >= str.size()) + return String(); + + size_t n; + if (sep.empty() || (n = str.find(sep, pos)) == String::npos) { + n = str.size(); + } + String ret = str.substr(pos, n - pos); + pos = n + sep.size(); + return ret; + } + + // Returns substr up to the next occurence of sep that isn't escaped with esc ('\\') + String next_esc(const String &sep, T esc=static_cast('\\')) + { + if (pos >= str.size()) + return String(); + + size_t n, old_p = pos; + do { + if (sep.empty() || (n = str.find(sep, pos)) == String::npos) { + pos = n = str.size(); + break; + } + pos = n + sep.length(); + } while (n > 0 && str[n - 1] == esc); + + return str.substr(old_p, n - old_p); + } + + void skip_over(const String &chars) + { + size_t p = str.find_first_not_of(chars, pos); + if (p != String::npos) + pos = p; + } +}; + +typedef BasicStrfnd Strfnd; +typedef BasicStrfnd WStrfnd; + +#endif + From 493a298c0c94d03cdcdb4a52684094f88cbd48c5 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 19 Mar 2016 19:10:37 +0000 Subject: [PATCH 370/531] Mgv7/flat/fractal: Stop tunnel-floor biome nodes being placed everywhere A bool for 'in or under tunnel' was missing 1-node-deep stone ledges were being replaced with biome surface material --- src/mapgen_flat.cpp | 6 +++++- src/mapgen_fractal.cpp | 6 +++++- src/mapgen_v7.cpp | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index d654a772..7a5302df 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -565,6 +565,7 @@ void MapgenFlat::generateCaves(s16 max_stone_y) for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { bool column_is_open = false; // Is column open to overground + bool is_tunnel = false; // Is tunnel or tunnel floor u32 vi = vm->m_area.index(x, node_max.Y + 1, z); u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); @@ -591,13 +592,16 @@ void MapgenFlat::generateCaves(s16 max_stone_y) if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); - } else if (column_is_open && + is_tunnel = true; + } else if (is_tunnel && column_is_open && (c == biome->c_filler || c == biome->c_stone)) { // Tunnel entrance floor vm->m_data[vi] = MapNode(biome->c_top); column_is_open = false; + is_tunnel = false; } else { column_is_open = false; + is_tunnel = false; } } } diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index cdea9c09..0430f92f 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -693,6 +693,7 @@ void MapgenFractal::generateCaves(s16 max_stone_y) for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { bool column_is_open = false; // Is column open to overground + bool is_tunnel = false; // Is tunnel or tunnel floor u32 vi = vm->m_area.index(x, node_max.Y + 1, z); u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); @@ -719,13 +720,16 @@ void MapgenFractal::generateCaves(s16 max_stone_y) if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); - } else if (column_is_open && + is_tunnel = true; + } else if (is_tunnel && column_is_open && (c == biome->c_filler || c == biome->c_stone)) { // Tunnel entrance floor vm->m_data[vi] = MapNode(biome->c_top); column_is_open = false; + is_tunnel = false; } else { column_is_open = false; + is_tunnel = false; } } } diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 9e3e3f1a..db13e3ce 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -875,6 +875,7 @@ void MapgenV7::generateCaves(s16 max_stone_y) for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { bool column_is_open = false; // Is column open to overground + bool is_tunnel = false; // Is tunnel or tunnel floor u32 vi = vm->m_area.index(x, node_max.Y + 1, z); u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); @@ -901,13 +902,16 @@ void MapgenV7::generateCaves(s16 max_stone_y) if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); - } else if (column_is_open && + is_tunnel = true; + } else if (is_tunnel && column_is_open && (c == biome->c_filler || c == biome->c_stone)) { // Tunnel entrance floor vm->m_data[vi] = MapNode(biome->c_top); column_is_open = false; + is_tunnel = false; } else { column_is_open = false; + is_tunnel = false; } } } From 80cec4702dde598ded6a5b31e291d2973b26cc7b Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 14 Mar 2016 23:20:56 -0700 Subject: [PATCH 371/531] Fix connected nodes' selection boxes. This allows the player to more easily target and punch connected nodeboxes, especially if they have a fixed nodebox that is very small, like technic cabling, or xpanes. Tried it on fences and my xpane conversion, and happy with the result. --- src/game.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++--- src/mapnode.cpp | 4 ++-- src/mapnode.h | 2 +- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index be4c46bc..c1f80c5a 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -273,6 +273,49 @@ inline bool isPointableNode(const MapNode &n, (liquids_pointable && features.isLiquid()); } +static inline void getNeighborConnectingFace(v3s16 p, INodeDefManager *nodedef, + ClientMap *map, MapNode n, u8 bitmask, u8 *neighbors) +{ + MapNode n2 = map->getNodeNoEx(p); + if (nodedef->nodeboxConnects(n, n2, bitmask)) + *neighbors |= bitmask; +} + +static inline u8 getNeighbors(v3s16 p, INodeDefManager *nodedef, ClientMap *map, MapNode n) +{ + u8 neighbors = 0; + const ContentFeatures &f = nodedef->get(n); + // locate possible neighboring nodes to connect to + if (f.drawtype == NDT_NODEBOX && f.node_box.type == NODEBOX_CONNECTED) { + v3s16 p2 = p; + + p2.Y++; + getNeighborConnectingFace(p2, nodedef, map, n, 1, &neighbors); + + p2 = p; + p2.Y--; + getNeighborConnectingFace(p2, nodedef, map, n, 2, &neighbors); + + p2 = p; + p2.Z--; + getNeighborConnectingFace(p2, nodedef, map, n, 4, &neighbors); + + p2 = p; + p2.X--; + getNeighborConnectingFace(p2, nodedef, map, n, 8, &neighbors); + + p2 = p; + p2.Z++; + getNeighborConnectingFace(p2, nodedef, map, n, 16, &neighbors); + + p2 = p; + p2.X++; + getNeighborConnectingFace(p2, nodedef, map, n, 32, &neighbors); + } + + return neighbors; +} + /* Find what the player is pointing at */ @@ -350,8 +393,9 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio for (s16 x = xstart; x <= xend; x++) { MapNode n; bool is_valid_position; + v3s16 p(x, y, z); - n = map.getNodeNoEx(v3s16(x, y, z), &is_valid_position); + n = map.getNodeNoEx(p, &is_valid_position); if (!is_valid_position) { continue; } @@ -360,7 +404,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio } std::vector boxes; - n.getSelectionBoxes(nodedef, &boxes); + n.getSelectionBoxes(nodedef, &boxes, getNeighbors(p, nodedef, &map, n)); v3s16 np(x, y, z); v3f npf = intToFloat(np, BS); @@ -392,7 +436,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio MapNode n = map.getNodeNoEx(pointed_pos); v3f npf = intToFloat(pointed_pos, BS); std::vector boxes; - n.getSelectionBoxes(nodedef, &boxes); + n.getSelectionBoxes(nodedef, &boxes, getNeighbors(pointed_pos, nodedef, &map, n)); f32 face_min_distance = 1000 * BS; for (std::vector::const_iterator i = boxes.begin(); diff --git a/src/mapnode.cpp b/src/mapnode.cpp index a5465887..eba47446 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -456,10 +456,10 @@ void MapNode::getCollisionBoxes(INodeDefManager *nodemgr, std::vector *b transformNodeBox(*this, f.collision_box, nodemgr, boxes, neighbors); } -void MapNode::getSelectionBoxes(INodeDefManager *nodemgr, std::vector *boxes) +void MapNode::getSelectionBoxes(INodeDefManager *nodemgr, std::vector *boxes, u8 neighbors) { const ContentFeatures &f = nodemgr->get(*this); - transformNodeBox(*this, f.selection_box, nodemgr, boxes); + transformNodeBox(*this, f.selection_box, nodemgr, boxes, neighbors); } u8 MapNode::getMaxLevel(INodeDefManager *nodemgr) const diff --git a/src/mapnode.h b/src/mapnode.h index 4db88861..2f6224f0 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -245,7 +245,7 @@ struct MapNode /* Gets list of selection boxes */ - void getSelectionBoxes(INodeDefManager *nodemg, std::vector *boxes); + void getSelectionBoxes(INodeDefManager *nodemg, std::vector *boxes, u8 neighbors = 0); /* Gets list of collision boxes From 2f640888d8c0224bcd3ceb13454bd6542d5ae5ef Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 22 Mar 2016 21:59:23 -0700 Subject: [PATCH 372/531] Make `options` local here. Undoubtably this may cause problems later if unchecked. ``` 2016-03-22 21:57:52: WARNING[Server]: Assignment to undeclared global "options" inside a function at .../sofar/git/minetest/bin/../builtin/game/chatcommands.lua:862. ``` --- builtin/game/chatcommands.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 0b197664..4deff281 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -859,7 +859,7 @@ core.register_chatcommand("clearobjects", { description = "clear all objects in world", privs = {server=true}, func = function(name, param) - options = {} + local options = {} if param == "" or param == "full" then options.mode = "full" elseif param == "quick" then From 21c479688b4ee93c58f41d20f5c7555a41e4ad97 Mon Sep 17 00:00:00 2001 From: Rui Date: Mon, 21 Mar 2016 13:15:50 +0900 Subject: [PATCH 373/531] Credits: Make that easy to add/remove --- builtin/mainmenu/tab_credits.lua | 129 +++++++++++++++++-------------- 1 file changed, 71 insertions(+), 58 deletions(-) diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 6b135b2c..5cb730b3 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -17,64 +17,77 @@ -------------------------------------------------------------------------------- +local core_developers = { + "Perttu Ahola (celeron55) ", + "Ryan Kwolek (kwolekr) ", + "PilzAdam ", + "sfan5 ", + "kahrl ", + "sapier", + "ShadowNinja ", + "Nathanael Courant (Nore/Ekdohibs) ", + "BlockMen", + "Craig Robbins (Zeno)", + "Loic Blot (nerzhul/nrz) ", + "Mat Gregory (paramat)", + "est31 ", +} + +local active_contributors = { + "SmallJoker ", + "Andrew Ward (rubenwardy) ", + "Aaron Suen ", + "Sokomine ", + "Břetislav Štec (t0suj4/TBC_x)", + "TeTpaAka", + "Jean-Patrick G (kilbith) ", + "Diego Martinez (kaeza) ", +} + +local previous_core_developers = { + "Maciej Kasatkin (RealBadAngel) ", + "Lisa Milne (darkrose) ", + "proller", + "Ilya Zhuravlev (xyz) ", +} + +local previous_contributors = { + "Vanessa Ezekowitz (VanessaE) ", + "Jurgen Doser (doserj) ", + "Gregory Currie (gregorycu)", + "Jeija ", + "MirceaKitsune ", + "dannydark ", + "0gb.us <0gb.us@0gb.us>", + "Guiseppe Bilotta (Oblomov) ", + "Jonathan Neuschafer ", + "Nils Dagsson Moskopp (erlehmann) ", + "Constantin Wenger (SpeedProg) ", + "matttpt ", + "JacobF ", + "TriBlade9 ", + "Zefram ", +} + tab_credits = { name = "credits", caption = fgettext("Credits"), - cbf_formspec = function (tabview, name, tabdata) - local logofile = defaulttexturedir .. "logo.png" - return "label[0.5,3.2;Minetest " .. core.get_version() .. "]" .. - "label[0.5,3.5;http://minetest.net]" .. - "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. - "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[3.5,-0.25;8.5,5.8;list_credits;" .. - "#FFFF00," .. fgettext("Core Developers") .."," .. - ",Perttu Ahola (celeron55) ,".. - ",Ryan Kwolek (kwolekr) ,".. - ",PilzAdam ," .. - ",sfan5 ,".. - ",kahrl ,".. - ",sapier,".. - ",ShadowNinja ,".. - ",Nathanael Courant (Nore/Ekdohibs) ,".. - ",BlockMen,".. - ",Craig Robbins (Zeno),".. - ",Loic Blot (nerzhul/nrz) ,".. - ",Mat Gregory (paramat),".. - ",est31 ," .. - ",,".. - "#FFFF00," .. fgettext("Active Contributors") .. "," .. - ",SmallJoker ," .. - ",Andrew Ward (rubenwardy) ," .. - ",Aaron Suen ," .. - ",Sokomine ," .. - ",Břetislav Štec (t0suj4/TBC_x)," .. - ",TeTpaAka," .. - ",Jean-Patrick G (kilbith) ," .. - ",Diego Martinez (kaeza) ," .. - ",," .. - "#FFFF00," .. fgettext("Previous Core Developers") .."," .. - ",Maciej Kasatkin (RealBadAngel) ,".. - ",Lisa Milne (darkrose) ," .. - ",proller," .. - ",Ilya Zhuravlev (xyz) ," .. - ",," .. - "#FFFF00," .. fgettext("Previous Contributors") .. "," .. - ",Vanessa Ezekowitz (VanessaE) ,".. - ",Jurgen Doser (doserj) ,".. - ",Gregory Currie (gregorycu)," .. - ",Jeija ,".. - ",MirceaKitsune ,".. - ",dannydark ,".. - ",0gb.us <0gb.us@0gb.us>,".. - ",Guiseppe Bilotta (Oblomov) ,".. - ",Jonathan Neuschafer ,".. - ",Nils Dagsson Moskopp (erlehmann) ,".. - ",Constantin Wenger (SpeedProg) ,".. - ",matttpt ,".. - ",JacobF ,".. - ",TriBlade9 ,".. - ",Zefram ,".. - ";1]" - end - } + cbf_formspec = function(tabview, name, tabdata) + local logofile = defaulttexturedir .. "logo.png" + return "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. + "label[0.5,3.2;Minetest " .. core.get_version() .. "]" .. + "label[0.5,3.5;http://minetest.net]" .. + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[3.5,-0.25;8.5,5.8;list_credits;" .. + "#FFFF00," .. fgettext("Core Developers") .. ",," .. + table.concat(core_developers, ",,") .. ",,," .. + "#FFFF00," .. fgettext("Active Contributors") .. ",," .. + table.concat(active_contributors, ",,") .. ",,," .. + "#FFFF00," .. fgettext("Previous Core Developers") ..",," .. + table.concat(previous_core_developers, ",,") .. ",,," .. + "#FFFF00," .. fgettext("Previous Contributors") .. ",," .. + table.concat(previous_contributors, ",,") .. "," .. + ";1]" + end +} From 25da0594eb09bb0e72816aaf8280573a668af00c Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 27 Feb 2016 14:48:10 +0100 Subject: [PATCH 374/531] Translated using Weblate (German) Currently translated at 100.0% (865 of 865 strings) This is a merger of 3 commits. --- po/de/minetest.po | 384 ++++++++++++++++++++++++---------------------- 1 file changed, 198 insertions(+), 186 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index d4952c27..bbc70e92 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-11-12 18:10+0000\n" +"PO-Revision-Date: 2016-02-28 13:24+0000\n" "Last-Translator: Wuzzy \n" -"Language-Team: German \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -153,7 +153,7 @@ msgstr "Spiel" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Kartengenerator" +msgstr "Kartenerzeuger" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -222,7 +222,7 @@ msgstr "(Keine Beschreibung vorhanden)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Zurück zur Einstellungsseite" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -517,7 +517,6 @@ msgid "2x" msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "3D-Wolken" @@ -530,9 +529,8 @@ msgid "8x" msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Einstellungen" +msgstr "Erweiterte Einstellungen" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -543,7 +541,6 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Bilinearer Filter" @@ -556,21 +553,18 @@ msgid "Change keys" msgstr "Tasten ändern" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" msgstr "Verbundenes Glas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Alle an" +msgstr "Partikel aktivieren" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Schöne Blätter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "Normalmaps generieren" @@ -583,9 +577,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "Mipmap u. Aniso. Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filter" +msgstr "Kein Filter" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -596,7 +589,6 @@ msgid "No!!!" msgstr "Nein!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" msgstr "Blöcke hervorheben" @@ -629,7 +621,6 @@ msgid "Simple Leaves" msgstr "Einfache Blätter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Geglättetes Licht" @@ -646,22 +637,18 @@ msgid "Touchthreshold (px)" msgstr "Berührungsempfindlichkeit (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Trilinearer Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "Wehende Blätter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "Wehende Pflanzen" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "Wasserwellen" @@ -719,7 +706,7 @@ msgstr "Lade Texturen..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "Shader wiederherstellen..." +msgstr "Shader wiederherstellen …" #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -779,7 +766,7 @@ msgstr "Weiter" #: src/game.cpp msgid "Creating client..." -msgstr "Erstelle Klienten..." +msgstr "Erstelle Client ..." #: src/game.cpp msgid "Creating server..." @@ -1317,6 +1304,12 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"(X;Y;Z)-Versatz des Fraktals vom Weltmittelpunkt in Einheiten von „scale“.\n" +"Benutzt, um einen geeigneten Startbereich mit niedrigem Land in\n" +"die Nähe von (0; 0) zu verschieben. Der Standardwert ist für Mandel-\n" +"brotmengen geeignet, er muss für Juliamengen bearbeitet werden.\n" +"Reichweite ist grob zwischen -2 und 2. Mit „scale“ multiplizieren für einen\n" +"Versatz in Nodes." #: src/settings_translation_file.cpp msgid "" @@ -1335,7 +1328,6 @@ msgid "3D mode" msgstr "3D-Modus" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1352,7 +1344,8 @@ msgstr "" "- anaglyph: Türkises / magenta 3D.\n" "- interlaced: Gerade / ungerade zeilenbasierte Polarisation.\n" "- topbottom: Bildschirm horizontal teilen.\n" -"- sidebyside: Bildschirm vertikal teilen." +"- sidebyside: Bildschirm vertikal teilen.\n" +"- pageflip: quadbufferbasiertes 3D." #: src/settings_translation_file.cpp msgid "" @@ -1366,13 +1359,13 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" -"Eine Nachricht, die an alle verbundenen Klienten versendet wird, wenn der " +"Eine Nachricht, die an alle verbundenen Clients versendet wird, wenn der " "Server abstürzt." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" -"Eine Nachricht, die an alle verbundene Klienten gesendet wird, wenn der " +"Eine Nachricht, die an alle verbundene Clients gesendet wird, wenn der " "Server herunterfährt." #: src/settings_translation_file.cpp @@ -1413,7 +1406,7 @@ msgid "" "This setting is for the client only and is ignored by the server." msgstr "" "Ändert die Gammakodierung der Lichttabellen. Kleinere Werte sind heller.\n" -"Diese Einstellung ist klientenseitig und wird vom Server ignoriert." +"Diese Einstellung ist clientseitig und wird vom Server ignoriert." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1421,7 +1414,7 @@ msgstr "Erweitert" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Höhenabkühlung" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1433,7 +1426,7 @@ msgstr "Umgebungsverdeckungs-Gamma" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Betont die Täler" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1454,9 +1447,8 @@ msgstr "" "v6.servers.minetest.net gesetzt werden." #: src/settings_translation_file.cpp -#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Nodes." +msgstr "Ungefähre (X,Y,Z)-Skalierungen des Fraktals in Nodes." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1471,9 +1463,8 @@ msgid "Backward key" msgstr "Rückwärtstaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Wasserwellenhöhe" +msgstr "Basisgeländehöhe" #: src/settings_translation_file.cpp msgid "Basic" @@ -1509,15 +1500,15 @@ msgstr "Taste zum Umschalten der Kameraaktualisierung" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Höhlenrauschen Nr. 1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Höhlenrauschen Nr. 2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Höhlen und Tunnel bilden sich am Schnittpunkt der zwei Rauschen" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1549,6 +1540,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"Auswahl von 18 Fraktalen aus 9 Formeln.\n" +"1 = 4D-Mangelbrotmenge, Typ „rund“.\n" +"2 = 4D-Juliamenge, Typ „rund“.\n" +"3 = 4D-Mangelbrotmenge, Typ „eckig“.\n" +"4 = 4D-Juliamenge, Typ „eckig“.\n" +"5 = 4D-Mangelbrotmenge, Typ „Mandel-Cousin“.\n" +"6 = 4D-Juliamenge, Typ „Mandel-Cousin“.\n" +"7 = 4D-Mangelbrotmenge, Typ „Variante“.\n" +"8 = 4D-Juliamenge, Typ „Variante“.\n" +"9 = 3D-Mangelbrotmenge, Typ „Madelbrot/Mandelbar“.\n" +"10 = 3D-Juliamenge, Typ „Madelbrot/Mandelbar“.\n" +"11 = 3D-Mangelbrotmenge, Typ „Weihnachtsbaum“.\n" +"12 = 3D-Juliamenge, Typ „Weihnachtsbaum“.\n" +"13 = 3D-Mangelbrotmenge, Typ „Mandelbulb“.\n" +"14 = 3D-Juliamenge, Typ „Mandelbulb“.\n" +"15 = 3D-Mangelbrotmenge, Typ „Kosinus-Mandelbulb“.\n" +"16 = 3D-Juliamenge, Typ „Kosinus-Mandelbulb“.\n" +"17 = 4D-Mangelbrotmenge, Typ „Mandelbulb“.\n" +"18 = 4D-Juliamenge, Typ „Mandelbulb“." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1588,7 +1598,7 @@ msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Wolken sind ein klientenseitiger Effekt." +msgstr "Wolken sind ein clientenseitiger Effekt." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1614,6 +1624,9 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Kommagetrennte Liste von Mods, welche auf HTTP-APIs, welche es\n" +"ihnen ermöglicht, Daten aus dem Internet hoch- und herunterzuladen,\n" +"zugreifen dürfen." #: src/settings_translation_file.cpp msgid "Command key" @@ -1676,11 +1689,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Legt die Steilheit/Tiefe von Seesenken fest." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Steuert die Steilheit/Höhe von Hügeln." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1691,12 +1704,18 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Erzeugt unvorhersehbare Lavakammern in Höhlen.\n" +"Sie können das Graben erschweren. Null deaktiviert sie.\n" +"Gültige Werte: 0 bis 10." #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Erzeugt unvorhersehbare Wasserkammern in Höhlen.\n" +"Sie können das Graben erschweren. Null deaktiviert sie.\n" +"Gültige Werte: 0 bis 10." #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1795,11 +1814,11 @@ msgstr "Veraltete Lua-API-Handhabung" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Tiefe, unter der man große Höhlen finden wird." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Tiefe, unter der man gigantische Höhlen finden wird." #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1831,6 +1850,9 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Legt die Geländeform fest.\n" +"Die 3 Zahlen in Klammern steuern die Skalierung\n" +"des Geländes, die 3 Zahlen sollten identisch sein." #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1861,9 +1883,8 @@ msgid "Dump the mapgen debug infos." msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "MP aktivieren" +msgstr "VBO aktivieren" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1893,8 +1914,8 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" -"Aktivieren, um alten Klienten die Verbindung zu verwehren.\n" -"Ältere Klienten sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " +"Aktivieren, um alten Clients die Verbindung zu verwehren.\n" +"Ältere Clients sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " "neuen\n" "Servern nicht abstürzen, aber sie könnten nicht alle neuen Funktionen, die " "Sie\n" @@ -1920,12 +1941,12 @@ msgid "" "Ignored if bind_address is set." msgstr "" "Server als IPv6 laufen lassen. Ein IPv6-Server könnte,\n" -"abhängig von der Systemkonfiguration, auf IPv6-Klienten eingeschränkt sein.\n" +"abhängig von der Systemkonfiguration, auf IPv6-Clients eingeschränkt sein.\n" "Wird ignoriert, wenn bind_address gesetzt ist." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Aktiviert Animation von Inventaritems." #: src/settings_translation_file.cpp msgid "" @@ -1947,9 +1968,8 @@ msgstr "" "werden." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Aktiviert die Übersichtskarte." +msgstr "Aktiviert filmisches Tone-Mapping" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -2049,11 +2069,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "" +msgstr "Füllertiefe" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "Filmisches Tone-Mapping" #: src/settings_translation_file.cpp msgid "" @@ -2132,21 +2152,21 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" -"Von wie weit weg Kartenblöcke für Klienten erzeugt werden.\n" +"Von wie weit weg Kartenblöcke für Clients erzeugt werden.\n" "1 Kartenblock = 16×16×16 Blöcke." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Kartenblöcke zu Klienten gesendet werden.\n" +"Von wie weit weg Kartenblöcke zu Clients gesendet werden.\n" "1 Kartenblock = 16×16×16 Blöcke." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Klienten über Objekte bescheid wissen,\n" +"Von wie weit weg Clients über Objekte bescheid wissen,\n" "in Kartenblöcken (16 Blöcke)." #: src/settings_translation_file.cpp @@ -2179,14 +2199,13 @@ msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Allgemein" #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2195,11 +2214,11 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" -"Falls Schneebiome aktiviert sind, werden Dschungel aktiviert und der\n" -"„jungles“-Bitschalter wird ignoriert.\n" -"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" -"werden von der Standardeinstellung unverändert gelassen.\n" +"Globale Kartengenerierungsattribute.\n" +"Im Kartengenerator v6 wird der Bitschalter „decorations“ alle Dekorationen\n" +"außer Bäume und Dschungelgras beeinflussen, in allen anderen " +"Kartengeneratoren\n" +"wird er alle Dekorationen beeinflussen.\n" "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." @@ -2212,9 +2231,8 @@ msgid "Gravity" msgstr "Gravitation" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Mods" +msgstr "HTTP-Mods" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2228,17 +2246,17 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" "Handhabung für veraltete Lua-API-Aufrufe:\n" -"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für " -"Release).\n" +"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release)." +"\n" "- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs " -"protokollieren (Standard für Debug).\n" -"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen " -"(empfohlen für Mod-Entwickler)." +"protokollieren\n" +" (Standard für Debug).\n" +"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen\n" +" (empfohlen für Mod-Entwickler)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Height component of the initial window size." -msgstr "Anfängliche Fensterbreite." +msgstr "Höhenkomponente der anfänglichen Fenstergröße." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -2254,7 +2272,7 @@ msgstr "Homepage des Servers. Wird in der Serverliste angezeigt." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Wie tief Flüsse gemacht werden" #: src/settings_translation_file.cpp msgid "" @@ -2290,7 +2308,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Wie breit Flüsse gemacht werden" #: src/settings_translation_file.cpp msgid "IPv6" @@ -2412,11 +2430,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "Zeitintervall, in dem die Tageszeit an Klienten gesendet wird." +msgstr "Zeitintervall, in dem die Tageszeit an Clients gesendet wird." #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "Inventaritemanimationen" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2435,13 +2453,12 @@ msgid "Item entity TTL" msgstr "Item-Entity-TTL" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Iterations of the recursive function.\n" "Controls the amount of fine detail." msgstr "" -"Julia-Menge: Iterationen der rekursiven Funktion.\n" -"Steuert die Skalierung mit einem sehr hohem Detailgrad." +"Iterationen der rekursiven Funktion.\n" +"Steuert den Detailgrad." #: src/settings_translation_file.cpp msgid "" @@ -2450,36 +2467,40 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"Nur für Juliamengen: W-Komponente der hyperkomplexen Konstante, die die " +"Julaform festlegt.\n" +"Hat keine Wirkung auf 3D-Fraktale.\n" +"Reichweite liegt etwa zwischen -2 und 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Julia set only: X component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: X-Wert, der die 4D-Form festlegt.\n" -"Weite liegt grob zwischen -2 und 2." +"Nur Juliamengen: X-Komponente der hyperkomplexen Konstante, die die " +"Juliaform festlegt.\n" +"Reichweite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Julia set only: Y component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: Y-Wert, der die 4D-Form festlegt.\n" -"Weite liegt grob zwischen -2 und 2." +"Nur Juliamengen: Y-Komponente der hyperkomplexen Konstante, die die " +"Juliaform festlegt.\n" +"Reichweite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Julia set only: Z component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: Z-Wert, der die 4D-Form festlegt.\n" -"Weite liegt grob zwischen -2 und 2." +"Nur Juliamengen: Z-Komponente der hyperkomplexen Konstante, die die " +"Juliaform festlegt.\n" +"Reichweite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "Jump key" @@ -2490,15 +2511,14 @@ msgid "Jumping speed" msgstr "Sprunggeschwindigkeit" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Taste, um die Sichtweite zu verringern.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2511,15 +2531,14 @@ msgstr "" "html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Taste, um die Sichtweite zu erhöhen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2794,11 +2813,11 @@ msgstr "Sprache" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "Tiefe für große Höhlen" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Lavakammern" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -2876,7 +2895,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "Flüssigkeitswiederstand" +msgstr "Flüssigkeitswiderstand" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" @@ -2932,7 +2951,6 @@ msgid "Map directory" msgstr "Weltordner" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "Flags that are not specified in the flag string are not modified from the " @@ -2943,16 +2961,19 @@ msgid "" "\"humid_rivers\" modifies the humidity around rivers and in areas where " "water would tend to pool. It may interfere with delicately adjusted biomes." msgstr "" -"Globale Kartengenerierungsattribute.\n" -"Bitschalter, welche nicht in der Bitschalterzeichenkette festgelegt sind, " -"werden\n" -"nicht von der Standardeinstellung abweichen.\n" -"Bitschalter, die mit „no“ beginnen, werden benutzt, um sie explizit zu " +"Kartengenerierungsattribute für den Täler-Kartengenerator.\n" +"Bitschalter, welche nicht im Text angegeben sind, werden von der " +"Standardeinstellung\n" +"nicht verändert. Bitschalter, die mit „no“ beginnen, werden benutzt, um sie " +"explizit zu\n" "deaktivieren.\n" -"Die Bitschalter „trees“ und „flat“ haben nur mit mgv6 eine Wirkung." +"„altitude_chill“ macht höhere Höhen kühler, was ein paar Probleme mit Biomen " +"verursachen kann.\n" +"„humid_rivers“ verändert die Luftfeuchtigkeit um Flüssen und in Gebieten, wo " +"sich Wasser ansammeln würde. Es könnte Auswirkungen auf genau abgestimmte " +"Biome haben." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills added to the flat world.\n" @@ -2960,12 +2981,13 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für Kartengenerator v7.\n" -"„ridges“ sind die Flüsse.\n" -"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" -"werden von der Standardeinstellung unverändert gelassen.\n" -"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" -"zu deaktivieren." +"Kartengenerierungsattribute speziell für den Ebenen-Kartengenerator.\n" +"Ab und zu werden Seen und Hügel zur flachen Welt hinzugefügt.\n" +"Bitschalter, welche nicht im Text angegeben sind, werden von der " +"Standardeinstellung\n" +"nicht verändert. Bitschalter, die mit „no“ beginnen, werden benutzt, um sie " +"explizit zu\n" +"deaktivieren." #: src/settings_translation_file.cpp msgid "" @@ -3016,9 +3038,8 @@ msgid "Mapblock unload timeout" msgstr "Timeout zum Entladen von Kartenblöcken" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Kartengeneratorname" +msgstr "Täler-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -3041,62 +3062,52 @@ msgid "Mapgen flags" msgstr "Kartenerzeuger-Bitschalter" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Kartenerzeuger-Bitschalter" +msgstr "Ebenen-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave1 noise parameters" -msgstr "cave1-Rauschparameter für Fraktale-Kartenerzeuger" +msgstr "cave1-Rauschparameter für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave2 noise parameters" -msgstr "cave2-Rauschparameter für Fraktale-Kartenerzeuger" +msgstr "cave2-Rauschparameter für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat filler depth noise parameters" -msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" +msgstr "Fülltiefenrauschparameter für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Bitschalter für Fraktale-Kartenerzeuger" +msgstr "Bitschalter für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "Kartenerzeuger-Bitschalter" +msgstr "Basishöhe für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Hügelsteilheit für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "Hügellimit für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" +msgstr "See-Steilheit für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" +msgstr "Seen-Höhenlimit für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat large cave depth" -msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" +msgstr "Tiefe für große Höhlen im Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat terrain noise parameters" -msgstr "Basisgelände-Rauschparameter" +msgstr "Basisgelände-Rauschparameter für Ebenen-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal" @@ -3115,14 +3126,12 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Bitschalter für Fraktale-Kartenerzeuger" +msgstr "Fraktal für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" +msgstr "Iterationen für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -3141,23 +3150,20 @@ msgid "Mapgen fractal julia z" msgstr "z-Parameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "Julia-Versatz für Fraktale-Kartenerzeuger" +msgstr "Versatz für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" +msgstr "Skalierung für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "Meeresgrundrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "w-Ausschnitt für Fraktale-Kartenerzeuger" +msgstr "w-Scheibe für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -3305,15 +3311,15 @@ msgstr "Geländepersistenz-Rauschparameter" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "" +msgstr "Tiefe für gigantische Höhlen" #: src/settings_translation_file.cpp msgid "Massive cave noise" -msgstr "" +msgstr "Rauschen für gigantische Höhlen" #: src/settings_translation_file.cpp msgid "Massive caves form here." -msgstr "" +msgstr "Hier bilden sich gigantische Höhlen." #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -3395,7 +3401,7 @@ msgstr "" "Maximale Anzahl der Pakete, die pro Sende-Schritt gesendet werden. Falls Sie " "eine\n" "langsame Verbindung haben, probieren Sie, diesen Wert zu reduzieren,\n" -"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Klienten, die " +"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Clients, die " "Sie\n" "anstreben." @@ -3460,7 +3466,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." -msgstr "" +msgstr "Art der Hervorhebung von ausgewählten Objekten." #: src/settings_translation_file.cpp msgid "Minimap" @@ -3548,7 +3554,7 @@ msgid "" "When starting from the main menu, this is overridden." msgstr "" "Name des Spielers.\n" -"Wenn ein Server gestartet wird, werden Klienten mit diesem Namen zu " +"Wenn ein Server gestartet wird, werden Clients mit diesem Namen zu " "Administratoren.\n" "Wird vom Hauptmenü aus gestartet, wird diese Einstellung überschrieben." @@ -3597,7 +3603,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Noises" -msgstr "" +msgstr "Rauschen" #: src/settings_translation_file.cpp msgid "Normalmaps sampling" @@ -3750,7 +3756,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "" +msgstr "Erhöht das Gelände, um Täler um die Flüsse zu erzeugen" #: src/settings_translation_file.cpp msgid "Random input" @@ -3782,19 +3788,19 @@ msgstr "Rechtsklick-Wiederholungsrate" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "" +msgstr "Flusstiefe" #: src/settings_translation_file.cpp msgid "River Noise" -msgstr "" +msgstr "Flussrauschen" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "" +msgstr "Flussgröße" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" -msgstr "" +msgstr "Flussrauschen – Flüsse treten nahe 0 auf" #: src/settings_translation_file.cpp msgid "Rollback recording" @@ -3960,7 +3966,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" -msgstr "" +msgstr "Schrägen und Füllungen arbeiten zusammen, um die Höhen zu verändern" #: src/settings_translation_file.cpp msgid "Smooth lighting" @@ -3997,7 +4003,7 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" -"Spezifiziert die URL, von der die Klienten die Medien (Texturen, Sounds, …) " +"Spezifiziert die URL, von der die Clients die Medien (Texturen, Sounds, …) " "herunterladen.\n" "$Dateiname sollte von $remote_media$Dateiname mittels cURL erreichbar sein\n" "(diese Einstellung sollte also mit einem Schrägstrich enden).\n" @@ -4027,7 +4033,7 @@ msgstr "Synchrones SQLite" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "" +msgstr "Geländehöhe" #: src/settings_translation_file.cpp msgid "" @@ -4035,6 +4041,9 @@ msgid "" "Controls proportion of world area covered by hills.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"Geländerauschschwellwert für Hügel.\n" +"Steuert das Verhältnis des Weltgebiets, das von Hügeln bedeckt ist.\n" +"Werte nahe bei 0 vergrößern das Verhältnis." #: src/settings_translation_file.cpp msgid "" @@ -4042,6 +4051,9 @@ msgid "" "Controls proportion of world area covered by lakes.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"Geländerauschschwellwert für Seen.\n" +"Steuert das Verhältnis des Weltgebiets, das von Seen bedeckt ist.\n" +"Werte nahe bei 0 vergrößern das Verhältnis." #: src/settings_translation_file.cpp msgid "Texture path" @@ -4049,11 +4061,11 @@ msgstr "Texturpfad" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" -msgstr "" +msgstr "Die Höhe, bei der die Temperatur um 20 °C fällt" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" -msgstr "" +msgstr "Die Tiefe der Erde oder einem anderem Füller" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." @@ -4152,9 +4164,8 @@ msgid "Toggle camera mode key" msgstr "Kameraauswahltaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-Mapping" +msgstr "Tone-Mapping" #: src/settings_translation_file.cpp msgid "Tooltip delay" @@ -4234,27 +4245,27 @@ msgstr "Vertikale Synchronisation" #: src/settings_translation_file.cpp msgid "VBO" -msgstr "" +msgstr "VBO" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "" +msgstr "Taltiefe" #: src/settings_translation_file.cpp msgid "Valley Fill" -msgstr "" +msgstr "Talfüllung" #: src/settings_translation_file.cpp msgid "Valley Profile" -msgstr "" +msgstr "Talprofil" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "" +msgstr "Talhang" #: src/settings_translation_file.cpp msgid "Valleys C Flags" -msgstr "" +msgstr "Täler-C-Bitschalter" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." @@ -4273,6 +4284,8 @@ msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"Sichtweite in Nodes.\n" +"Minimum = 20" #: src/settings_translation_file.cpp msgid "View range decrease key" @@ -4283,33 +4296,32 @@ msgid "View range increase key" msgstr "Taste „Sichtweite erhöhen“" #: src/settings_translation_file.cpp -#, fuzzy msgid "Viewing range" -msgstr "Maximale Sichtweite" +msgstr "Sichtweite" #: src/settings_translation_file.cpp msgid "Volume" msgstr "Tonlautstärke" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "W co-ordinate of the generated 3D slice of a 4D fractal.\n" "Determines which 3D slice of the 4D shape is generated.\n" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" -"Die Weite liegt grob zwischen -2 und 2." +"W-Koordinate des erzeugten 3D-Teils eines 4D-Fraktals.\n" +"Legt fest, welcher 3D-Teil der 4D-Form erzeugt wird.\n" +"Hat keine Auswirkung auf 3D-Fraktale.\n" +"Reichweite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Gehgeschwindigkeit" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Meeresspiegel" +msgstr "Wasserkammern" #: src/settings_translation_file.cpp msgid "Water level" @@ -4408,7 +4420,8 @@ msgstr "" "Kartenblöcke).\n" "- Diese Gruppen haben einen Abstand von [-32, -32] Blöcken vom Ursprung.\n" "- Nur Gruppen, welche innerhalb der von map_generation_limit definierten " -"Grenze liegen, werden erzeugt." +"Grenze liegen, werden\n" +" erzeugt." #: src/settings_translation_file.cpp msgid "" @@ -4427,7 +4440,7 @@ msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" -"Ob Spieler an Klienten ohne Distanzbegrenzung angezeit werden.\n" +"Ob Spieler an Clients ohne Distanzbegrenzung angezeit werden.\n" "Veraltet, benutzen Sie die Einstellung „player_transfer_distance“ " "stattdessen." @@ -4440,7 +4453,7 @@ msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" -"Ob Klienten gefragt werden sollen, sich nach einem (Lua-)Absturz\n" +"Ob Clients gefragt werden sollen, sich nach einem (Lua-)Absturz\n" "neu zu verbinden. Auf „wahr“ setzen, falls Ihr Server für auto-\n" "matische Neustarts eingerichtet ist." @@ -4452,13 +4465,12 @@ msgstr "Ob das Ende des sichtbaren Gebietes im Nebel verschwinden soll." msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" -"Ob der Klienten Debug-Informationen zeigen soll (hat die selbe Wirkung\n" +"Ob der Client Debug-Informationen zeigen soll (hat die selbe Wirkung\n" "wie das Drücken von F5)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Width component of the initial window size." -msgstr "Anfängliche Fensterbreite." +msgstr "Breitenkomponente der anfänglichen Fenstergröße." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." @@ -4474,11 +4486,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Y of flat ground." -msgstr "" +msgstr "Y-Wert des flachen Bodens." #: src/settings_translation_file.cpp msgid "Y of upper limit of large pseudorandom caves." -msgstr "" +msgstr "Y-Wert der Obergrenze für große pseudozufällige Höhlen." #: src/settings_translation_file.cpp msgid "cURL file download timeout" From 3a18c237bdb7215aca10a613a9e8da2efefc9f69 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 28 Feb 2016 09:11:41 +0100 Subject: [PATCH 375/531] Translated using Weblate (Spanish) Currently translated at 45.3% (392 of 865 strings) --- po/es/minetest.po | 68 ++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 39ce439b..68c98ebf 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-02-20 00:31+0000\n" -"Last-Translator: Miguel Isaac \n" -"Language-Team: Spanish \n" +"PO-Revision-Date: 2016-02-28 09:11+0000\n" +"Last-Translator: ShadowNinja \n" +"Language-Team: Spanish " +"\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,11 +67,11 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "Solo se soporta la version de protocolo $1" +msgstr "Solo se soporta la version de protocolo $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2" +msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua @@ -268,7 +268,7 @@ msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a comma seperated list of flags." -msgstr "Por favor, introduzca una lista separada por comas de indicadores." +msgstr "Por favor, introduzca una lista de indicadores separados por comas." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid integer." @@ -280,7 +280,7 @@ msgstr "Por favor, introduzca un número válido." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Possible values are: " -msgstr "Los posibles valores son: " +msgstr "Los valores posibles son: " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Restore Default" @@ -1321,13 +1321,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" -"0 = Oclusion de paralaje cpn informacion pendiente (rapido).\n" -"1 = Mapeo Aliviado (Lento, Mas Preciso)." +"0 = oclusión de paralaje con información de inclinación (más rápido).\n" +"1 = mapa de relieve (más lento, más preciso)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1363,9 +1362,9 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Una semilla de mapa para un mapa nuevo, deja vacio para una semilla al " -"azar.\n" -"Sera borrado creando un nuevo mundo en el menu principal." +"Una semilla de mapa para un mapa nuevo, deja vacío para una semilla al azar." +"\n" +"Será anulado si se crea un nuevo mundo en el menú principal." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." @@ -1400,27 +1399,26 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" -"Dirección a la cual conectarse.\n" -"Dejar en blanco para iniciar un servidor local.\n" -"A tener en cuenta: el campo de dirección en el menú principal sobreescribe " -"esta opción." +"Dirección a conectarse.\n" +"Dejar aquí vacío para iniciar un servidor local.\n" +"Nótese que el campo de dirección en el menú principal anula este ajuste." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" -"Ajustar la configuración de puntos por pulgada a la pantalla (no X11/solo " -"Android) p.ej. para pantallas 4K." +"Ajustar la configuración de puntos por pulgada a tu pantalla (único no " +"X11/Android) p.ej. para pantallas 4K." #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" -"Ajustar la codificación de gamma para las tablas de luz. Números bajos para " -"más brillante.\n" -"Esta opción es solamente para el cliente y es ignorada por el servidor." +"Ajustar la codificación de gamma para las tablas de luz. Números bajos son " +"más luminosos.\n" +"Este ajuste es para el cliente sólo y está ignorado por el servidor." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1456,6 +1454,9 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Anunciar a esta lista de servidores.\n" +"Si deseas anunciar tu dirección ipv6, usa serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1498,7 +1499,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "" +msgstr "Construir dentro de jugador" #: src/settings_translation_file.cpp msgid "Camera smoothing" @@ -1608,6 +1609,9 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Lista de mods de fiar separada por coma que se permiten acceder a funciones\n" +"inseguras incluso quando securidad de mods está puesto (vía " +"request_insecure_environment())." #: src/settings_translation_file.cpp msgid "" @@ -1620,9 +1624,8 @@ msgid "Command key" msgstr "Tecla comando" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Vidrios conectados" +msgstr "Conectar vidrio" #: src/settings_translation_file.cpp msgid "Connect to external media server" @@ -1633,9 +1636,8 @@ msgid "Connects glass if supported by node." msgstr "Conectar gafas si el nodo lo soporta." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Consola" +msgstr "Alfa de consola" #: src/settings_translation_file.cpp msgid "Console color" @@ -1663,12 +1665,17 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Controla el duración del ciclo día/noche.\n" +"Ejemplos: 72 = 20min, 360 = 4min, 1 = 24hora, 0 = día/noche/lo que sea se " +"queda inalterado." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Controla el tamaño de desiertos y playas en Mapgen v6.\n" +"Cuando snowbiomes están activados 'mgv6_freq_desert' se ignora." #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." @@ -1711,8 +1718,9 @@ msgid "Crosshair color (R,G,B)." msgstr "Color de la cruz (R,G,B)." #: src/settings_translation_file.cpp +#, fuzzy msgid "Crouch speed" -msgstr "" +msgstr "Velocidad de agacharse" #: src/settings_translation_file.cpp msgid "DPI" @@ -4054,7 +4062,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "Tiempo de espera de cURL" #, fuzzy #~ msgid "If disabled " From 228abc52bd29ebbf67e06f238c377689bafd9a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= Date: Fri, 4 Mar 2016 04:45:18 +0100 Subject: [PATCH 376/531] Translated using Weblate (Czech) Currently translated at 54.1% (468 of 865 strings) --- po/cs/minetest.po | 49 +++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/po/cs/minetest.po b/po/cs/minetest.po index af3b87e0..2356eb2d 100644 --- a/po/cs/minetest.po +++ b/po/cs/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-12-10 15:36+0000\n" +"PO-Revision-Date: 2016-03-04 04:45+0000\n" "Last-Translator: Jakub Vaněk \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -520,9 +520,8 @@ msgid "8x" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Nastavení" +msgstr "Pokročilá nastavení" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -553,14 +552,13 @@ msgstr "Propojené sklo" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Enable Particles" -msgstr "Povolit vše" +msgstr "Povolit částice" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Vícevrstevné listí" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "Generovat normálové mapy" @@ -573,9 +571,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "Mipmapa + Anizo. filtr" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filtrování" +msgstr "Žádné filtr" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -586,9 +583,8 @@ msgid "No!!!" msgstr "Ne!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "Zvýraznění označených bloků" +msgstr "Zvýraznění bloků" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -1326,7 +1322,6 @@ msgid "3D mode" msgstr "Režim 3D zobrazení" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1340,10 +1335,10 @@ msgstr "" "Podpora 3D zobrazení.\n" "V současné době podporovány:\n" "- none: žádný 3D výstup.\n" -"- anaglyph: azurová/purpurová barva 3D.\n" -"- interlaced: pro polarizaci ve stylu lichý/sudý řádek.\n" +"- anaglyph: azurové/purpurové barevné 3D.\n" +"- interlaced: pro polarizaci lichý/sudý řádek.\n" "- topbottom: rozdělení obrazovky na horní a dolní část.\n" -"- sidebyside: rozdělené obrazovky na levou a pravou část." +"- sidebyside: rozdělení obrazovky na levou a pravou část." #: src/settings_translation_file.cpp msgid "" @@ -1454,9 +1449,8 @@ msgid "Backward key" msgstr "Vzad" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Výška vodních vln" +msgstr "Základní výška terénu" #: src/settings_translation_file.cpp msgid "Basic" @@ -1833,9 +1827,8 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Povolit balíček" +msgstr "Povolit VBO" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1903,9 +1896,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Povolit minimapu." +msgstr "Povolit filmový tone mapping" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -2138,9 +2130,8 @@ msgid "Gravity" msgstr "Gravitace" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Mody" +msgstr "HTTP mody" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2737,9 +2728,8 @@ msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Jméno generátoru mapy" +msgstr "Mapgen údolí" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2762,9 +2752,8 @@ msgid "Mapgen flags" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Jméno generátoru mapy" +msgstr "Mapgen plochy" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -3737,9 +3726,8 @@ msgid "Toggle camera mode key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-mapování" +msgstr "Tone mapping" #: src/settings_translation_file.cpp msgid "Tooltip delay" @@ -3879,9 +3867,8 @@ msgid "Walking speed" msgstr "Rychlost chůze" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Textury věcí..." +msgstr "Vlastnosti vody" #: src/settings_translation_file.cpp msgid "Water level" From 485344ea800522b3ef46883cc02ffff1be47bea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kisbenedek=20M=C3=A1rton?= Date: Fri, 4 Mar 2016 08:53:59 +0100 Subject: [PATCH 377/531] Translated using Weblate (Hungarian) Currently translated at 74.9% (648 of 865 strings) This is a merger of 3 commits. --- po/hu/minetest.po | 375 +++++++++++++++++++++++++--------------------- 1 file changed, 202 insertions(+), 173 deletions(-) diff --git a/po/hu/minetest.po b/po/hu/minetest.po index e4dacffe..a99a2a11 100644 --- a/po/hu/minetest.po +++ b/po/hu/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-02-07 12:19+0000\n" +"PO-Revision-Date: 2016-03-19 13:00+0000\n" "Last-Translator: Kisbenedek Márton \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian " +"\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -217,11 +217,11 @@ msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Nincs megadva leírás a beállításhoz)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Vissza a Beállítások oldalra" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -241,7 +241,7 @@ msgstr "Engedélyezve" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "A formátum 3 szám vesszőkkel elválasztva zárójelek között." +msgstr "A formátum 3 szám vesszőkkel elválasztva, zárójelek között." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "" @@ -307,7 +307,7 @@ msgstr "" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" -msgstr "$1 telepítése meghiúsult" +msgstr "$1 telepítése meghiúsult ide: $2" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" @@ -448,6 +448,7 @@ msgid "PvP enabled" msgstr "PvP engedélyezve" #: builtin/mainmenu/tab_server.lua +#, fuzzy msgid "Bind Address" msgstr "Bind Address" @@ -506,7 +507,6 @@ msgid "2x" msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "3D felhők" @@ -519,9 +519,8 @@ msgid "8x" msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Beállítások" +msgstr "Haladó beállítások" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -532,7 +531,6 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "Biztosan visszaállítod az egyjátékos világod?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Bilineáris szűrés" @@ -546,21 +544,18 @@ msgid "Change keys" msgstr "Gombok változtatása" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Üveg csatlakozása" +msgstr "Csatlakozó üveg" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Mind engedélyez" +msgstr "Részecskék engedélyezése" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Szép levelek" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "Normálfelületek generálása" @@ -575,35 +570,32 @@ msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Aniso. Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Szűrés" +msgstr "Nincs szűrés" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Mipmap" -msgstr "No Mipmap" +msgstr "Nincs Mipmap" #: builtin/mainmenu/tab_settings.lua msgid "No!!!" msgstr "Nem!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" msgstr "Blokk kiemelés" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "Semmi" +msgstr "Nincs" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" -msgstr "Áttetsző levelek" +msgstr "Átlátszatlan levelek" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Water" -msgstr "Áttetsző víz" +msgstr "Átlátszatlan víz" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp #, fuzzy @@ -623,7 +615,6 @@ msgid "Simple Leaves" msgstr "Egyszerű levelek" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Simított megvilágítás" @@ -636,27 +627,22 @@ msgid "To enable shaders the OpenGL driver needs to be used." msgstr "A shaderek engedélyezéséhez OpenGL driver használata szükséges." #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Touchthreshold (px)" -msgstr "Touchthreshold (px)" +msgstr "Érintésküszöb (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Tri-lineáris szűrés" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "Hullámzó levelek" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "Hullámzó növények" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "Hullámzó víz" @@ -693,9 +679,8 @@ msgid "Texturepacks" msgstr "Textúra pakkok" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Csatlakozási hiba (idő lejárt?)" +msgstr "Csatlakozási idő lejárt." #: src/client.cpp msgid "Done!" @@ -800,13 +785,13 @@ msgstr "" "- WASD: Mozgás\n" "- Space: Ugrás/Mászás\n" "- Shift: Lopakodás/Lefelé\n" -"- Q: Tárgyak eldobása\n" +"- Q: Tárgy eldobása\n" "- I: Eszköztár\n" "- Egér: Forgás/Nézelődés\n" "- Bal-egér: Ásás/Ütés\n" "- Jobb-egér: Helyez/Használ\n" "- Egér görgő: Tárgy kiválaszt\n" -"- T: Beszélgetés\n" +"- T: Csevegés\n" #: src/game.cpp msgid "" @@ -825,14 +810,14 @@ msgid "" msgstr "" "Alapértelmezett irányítás:\n" "Nem látható menü:\n" -"- egy érintés: gomb aktiválás\n" -"- dupla érintés: helyez/használat\n" +"- egy érintés: gomb aktivál\n" +"- dupla érintés: helyez/használ\n" "- ujj csúsztatás: körbenéz\n" "Menü/Eszköztár látható:\n" "- dupla érintés (külső):\n" " -->bezár\n" "- stack, vagy slot érintése:\n" -" --> stack mozgatása\n" +" --> stack mozgatás\n" "- érint&megfogás, érintés 2. ujjal\n" " --> egy elem slotba helyezése\n" @@ -1100,6 +1085,7 @@ msgid "Insert" msgstr "Beilleszt" #: src/keycode.cpp +#, fuzzy msgid "Junja" msgstr "Junjaa" @@ -1109,6 +1095,7 @@ msgid "Kana" msgstr "Kana" #: src/keycode.cpp +#, fuzzy msgid "Kanji" msgstr "Kanjii" @@ -1240,7 +1227,7 @@ msgstr "Plusz" #: src/keycode.cpp msgid "Print" -msgstr "" +msgstr "Nyomtat" #: src/keycode.cpp msgid "Prior" @@ -1334,7 +1321,6 @@ msgstr "" "1 = relief mapping (lassabb, pontosabb)." #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "3D felhők" @@ -1417,7 +1403,7 @@ msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" -"Gamma kódolás beállítása. Alacsonyabb számok - nagyobb fényerő.\n" +"Gamma kódolás beállítása a fényhez. Alacsonyabb számok - nagyobb fényerő.\n" "Ez a beállítás csak a kliensre érvényes, a szerver nem veszi figyelembe." #: src/settings_translation_file.cpp @@ -1438,7 +1424,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Felerősíti a völgyeket" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1454,9 +1440,9 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" -"Bejelentés a szerverlistára.\n" -"Ha be akarod jelenteni az ipv6 címedet, használd ezt: serverlist_url = v6." -"servers.minetest.net." +"Kihirdetés a szerverlistára.\n" +"Ha ki akarod hirdetni az ipv6 címedet, használd ezt: serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1475,9 +1461,8 @@ msgid "Backward key" msgstr "Vissza gomb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Hullámzó víz magassága" +msgstr "Alap terep magassága" #: src/settings_translation_file.cpp msgid "Basic" @@ -1497,9 +1482,8 @@ msgid "Bits per pixel (aka color depth) in fullscreen mode." msgstr "Bit/pixel (vagyis színmélység) teljes képernyős módban." #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "Építés játékosba" +msgstr "Építés játékos helyére" #: src/settings_translation_file.cpp msgid "Camera smoothing" @@ -1561,14 +1545,12 @@ msgid "Chunk size" msgstr "Térképdarab (chunk) mérete" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "\"Cinematic\" mód" +msgstr "Filmkészítő mód" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "\"Cinematic\" mód gomb" +msgstr "Filmkészítő mód gomb" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1621,6 +1603,9 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Modok vesszővel elválasztott listája, melyeknek engedélyezett HTTP API-k " +"elérése, amik\n" +"lehetővé teszik, hogy feltöltsenek és letöltsenek adatokat a netről/netre." #: src/settings_translation_file.cpp msgid "Command key" @@ -1677,17 +1662,17 @@ msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"Sivatagok mérete és tengerpartok a v6 térképgenerátorban.\n" +"Sivatagok és tengerpartok mérete a v6 térképgenerátorban.\n" "Amikor a havas területek engedélyezve vannak, 'mgv6_freq_desert' figyelmen " "kívül hagyva." #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "A tavak süllyedésének meredekségét/mélységét állítja." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "A dombok meredekségét/magasságát állítja." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1698,12 +1683,16 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Kiszámíthatatlanná teszi a láva viselkedését a barlangokban.\n" +"Ez megnehezítheti a bányászatot. Nulla érték kikapcsolja. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Kiszámíthatatlanná teszi a víz viselkedését a barlangokban.\n" +"Ez megnehezítheti a bányászatot. Nulla érték kikapcsolja. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1787,7 +1776,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "Eszköztippek megjelenítésének késleltetése, miliszekundumban." +msgstr "Eszköztippek megjelenítésének késleltetése, ezredmásodpercben megadva." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" @@ -1795,11 +1784,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "A mélység, ami alatt nagy terjedelmű barlangokat találsz majd." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "A mélység, ami alatt masszív barlangokat találsz majd." #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1819,7 +1808,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" +msgstr "Részletes mod profil adat. Mod fejlesztőknek hasznos." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" @@ -1831,6 +1820,9 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"A terep alakját határozza meg.\n" +"A 3 szám a zárójelben határozza meg a terep \n" +"méretarányát, a 3 számnak meg kell egyeznie." #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1861,9 +1853,8 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Modpakk engedélyez" +msgstr "VBO engedélyez" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1882,6 +1873,8 @@ msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"A simított megvilágítás engedélyezése egyszerű ambient occlusion-nel.\n" +"A sebesség érdekében vagy másféle kinézetért kikapcsolhatod." #: src/settings_translation_file.cpp msgid "" @@ -1914,10 +1907,14 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"IPv6 szerver futtatásának engedélyezése/letiltása. Egy IPv6 szerver " +"lehetséges, hogy\n" +"IPv6 kliensekre van korlátozva, a rendszer konfigurációtól függően.\n" +"Nincs figyelembe véve, ha bind_address van beállítva." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Az eszköztár elemeinek animációjának engedélyezése." #: src/settings_translation_file.cpp msgid "" @@ -1932,9 +1929,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Minitérkép engedélyezése." +msgstr "" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -2105,16 +2101,22 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"Milyen távolságból generálódnak a blokkok a kliensek számára, " +"térképblokkokban megadva (16 blokk)." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"Milyen távolságból lesznek elküldve a blokkok a kliens számára, " +"térképblokkokban megadva (16 blokk)." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" +"Milyen távolságból szereznek tudomást az objektumokról a kliensek, " +"térképblokkokban megadva (16 blokk)." #: src/settings_translation_file.cpp msgid "Full screen" @@ -2146,10 +2148,9 @@ msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Általános" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" msgstr "Normálfelületek generálása" @@ -2172,9 +2173,8 @@ msgid "Gravity" msgstr "Gravitáció" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Modok" +msgstr "HTTP Modok" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2189,9 +2189,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Height component of the initial window size." -msgstr "Kezdeti vízszintes ablak méret." +msgstr "A kezdeti ablak méret magasság összetevője." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -2199,7 +2198,7 @@ msgstr "A felhők megjelenésének magassága." #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "Nagy pontosságú FPU" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." @@ -2207,7 +2206,7 @@ msgstr "A szerver honlapja, ami a szerverlistában megjelenik." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Milyen mélyek legyenek a folyók" #: src/settings_translation_file.cpp msgid "" @@ -2230,14 +2229,17 @@ msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" +"Mennyi ideig vár a szerver, mielőtt betöltetlenné teszi a nem használt " +"térképblokkokat.\n" +"Magasabb érték egyenletesebb, de több RAM-ot használ." #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Milyen szélesek legyenek a folyók" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" @@ -2260,6 +2262,9 @@ msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" +"Ha le van tiltva, a használat (use) gomb lesz használatban a gyors " +"repüléshez,\n" +"ha a repülés és a gyors mód is engedélyezve van." #: src/settings_translation_file.cpp msgid "" @@ -2295,8 +2300,7 @@ msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" -"Ha engedélyezve van, érvénytelen világ adat nem okozza a szerver " -"leállítását.\n" +"Ha engedélyezve van, érvénytelen világ adat nem okozza a szerver leállását.\n" "Csak akkor engedélyezd, ha tudod, hogy mit csinálsz." #: src/settings_translation_file.cpp @@ -2348,7 +2352,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "Eszköztár elemek animációi" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2410,15 +2414,14 @@ msgid "Jumping speed" msgstr "Ugrás sebessége" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Gomb a végtelen látóterület bekapcsolásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Gomb a látóterület csökkentéséhez.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2431,15 +2434,14 @@ msgstr "" "html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Gomb a végtelen látóterület bekapcsolásához.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Gomb a látóterület növeléséhez.\n" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2709,18 +2711,17 @@ msgstr "Nyelv" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "Nagy barlang mélység" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Láva jellemzők" #: src/settings_translation_file.cpp msgid "Leaves style" msgstr "Levelek stílusa" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Leaves style:\n" "- Fancy: all faces visible\n" @@ -2728,9 +2729,10 @@ msgid "" "- Opaque: disable transparency" msgstr "" "Levelek stílusa:\n" -"- Fancy: all faces visible\n" -"- Simple: only outer faces, if defined special_tiles are used\n" -"- Opaque: átlátszóság kikapcsolása" +"- Szép (Fancy): minden oldal látható\n" +"- Egyszerű (Simple): csak a külső oldalak láthatók, if defined " +"special_tiles are used\n" +"- Átlátszatlan (Opaque): átlátszóság kikapcsolása" #: src/settings_translation_file.cpp msgid "Left key" @@ -2789,7 +2791,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "Folyadék süllyedés" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." @@ -2820,12 +2822,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." msgstr "" +"Lehetővé teszi, hogy a DriectX működjön a LuaJIT-tel. Tiltsd le, ha " +"problémákat okoz." #: src/settings_translation_file.cpp msgid "Map directory" msgstr "Térkép mappája" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "Flags that are not specified in the flag string are not modified from the " @@ -2836,8 +2841,17 @@ msgid "" "\"humid_rivers\" modifies the humidity around rivers and in areas where " "water would tend to pool. It may interfere with delicately adjusted biomes." msgstr "" +"Térkép generálási jellemzők csak a Valleys térképgenerátor esetében.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them.\n" +"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"issues.\n" +"\"humid_rivers\" modifies the humidity around rivers and in areas where " +"water would tend to pool. It may interfere with delicately adjusted biomes." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills added to the flat world.\n" @@ -2845,8 +2859,14 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Térkép generálási jellemzők csak a Flat (lapos) térképgenerátor esetében.\n" +"Esetenkénti tavak és dombok generálása a lapos világba.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" "When snowbiomes are enabled jungles are enabled and the jungles flag is " @@ -2855,6 +2875,12 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with \"no\" are used to explicitly disable them." #: src/settings_translation_file.cpp msgid "" @@ -2867,7 +2893,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "Térkép generálási korlát" #: src/settings_translation_file.cpp msgid "Map save interval" @@ -2875,16 +2901,15 @@ msgstr "Térkép mentésének időköze" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "Térképblokk korlát" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Térkép generátor neve" +msgstr "Valleys térképgenerátor" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2903,14 +2928,12 @@ msgid "Mapgen debug" msgstr "Térkép generátor hibakereső" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Térkép generátor" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Térkép generátor" +msgstr "Flat (lapos) térképgenerátor" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -2930,40 +2953,36 @@ msgid "Mapgen flat flags" msgstr "Térkép generátor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "Térkép generátor" +msgstr "Flat (lapos) térképgenerátor talaj szint" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Flat (lapos) térképgenerátor domb meredekség" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "Flat (lapos) térképgenerátor domb küszöb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Parallax Occlusion" +msgstr "Flat (lapos) térképgenerátor tó meredekség" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Térkép generátor" +msgstr "Flat (lapos) térképgenerátor tó küszöb" #: src/settings_translation_file.cpp msgid "Mapgen flat large cave depth" -msgstr "" +msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" #: src/settings_translation_file.cpp msgid "Mapgen flat terrain noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Térkép generátor" +msgstr "Fractal térképgenerátor" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -2978,14 +2997,12 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Térkép generátor" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Parallax Occlusion" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -3004,23 +3021,20 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "Térkép generátor" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "Térkép generátor" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "Térkép generátor" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -3064,7 +3078,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "" +msgstr "V6 térképgenerátor tengerpart gyakoriság" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" @@ -3080,7 +3094,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "V6 térképgenerátor sivatag gyakoriság" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" @@ -3168,7 +3182,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "" +msgstr "Masszív barlang mélység" #: src/settings_translation_file.cpp msgid "Massive cave noise" @@ -3176,7 +3190,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Massive caves form here." -msgstr "" +msgstr "Masszív barlangok innentől." #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -3200,7 +3214,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "Maximum FPS (képkocka/mp)" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." @@ -3216,19 +3230,23 @@ msgstr "Maximum hotbar szélesség" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." -msgstr "" +msgstr "Maximum blokkok száma, amik sorban állhatnak betöltésre." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Maximum blokkok száma, amik sorban állhatnak generálásra.\n" +"Hagyd üresen, hogy automatikusan legyen kiválasztva a megfelelő mennyiség." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Maximum blokkok száma, amik sorban állhatnak egy fájlból való betöltésre.\n" +"Hagyd üresen, hogy automatikusan legyen kiválasztva a megfelelő mennyiség." #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." @@ -3239,6 +3257,8 @@ msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" +"Maximum térképblokkok száma, amit a kliens memóriában tárolhat.\n" +"Állítsd -1-re végtelen mennyiségért." #: src/settings_translation_file.cpp msgid "" @@ -3272,6 +3292,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" +"Egy fájl letöltésének maximum ideje (milliszekundumban), amíg eltarthat (pl. " +"mod letöltés)." #: src/settings_translation_file.cpp msgid "Maximum users" @@ -3299,7 +3321,7 @@ msgstr "Napi üzenet a csatlakozó játékosoknak." #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." -msgstr "" +msgstr "Kijelölt objektum kiemelésére használt módszer." #: src/settings_translation_file.cpp msgid "Minimap" @@ -3311,11 +3333,11 @@ msgstr "Minitérkép gomb" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "Minitérkép letapogatási magasság" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" -msgstr "" +msgstr "Minimum textúra méret a szűrőknek" #: src/settings_translation_file.cpp #, fuzzy @@ -3328,15 +3350,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Modstore details URL" -msgstr "" +msgstr "Mod áruház részletek URL" #: src/settings_translation_file.cpp msgid "Modstore download URL" -msgstr "" +msgstr "Mod áruház letöltés URL" #: src/settings_translation_file.cpp msgid "Modstore mods list URL" -msgstr "" +msgstr "Mod áruház mod lista URL" #: src/settings_translation_file.cpp msgid "Monospace font path" @@ -3473,27 +3495,25 @@ msgstr "Parallax Occlusion" #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion Scale" -msgstr "Parallax Occlusion" +msgstr "Parallax Occlusion skála" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "Parallax Occlusion" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "Parallax Occlusion" +msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion mode" -msgstr "Parallax Occlusion" +msgstr "Parallax Occlusion mód" #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion strength" -msgstr "Parallax Occlusion" +msgstr "Parallax Occlusion ereje" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." @@ -3566,7 +3586,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "" +msgstr "Megemeli a terepet, hogy völgyek alakuljanak a folyók körül" #: src/settings_translation_file.cpp msgid "Random input" @@ -3594,11 +3614,11 @@ msgstr "Jobb gomb" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "Jobb kattintás ismétlés időköz" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "" +msgstr "Folyó mélység" #: src/settings_translation_file.cpp msgid "River Noise" @@ -3606,7 +3626,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "" +msgstr "Folyó méret" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" @@ -3622,14 +3642,13 @@ msgstr "Kör alakú minitérkép" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "" +msgstr "A kliens által fogadott térkép mentése lemezre." #: src/settings_translation_file.cpp msgid "Saving map received from server" msgstr "A szerverről fogadott térkép mentése" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Scale gui by a user specified value.\n" "Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" @@ -3638,10 +3657,11 @@ msgid "" "edge pixels when images are scaled by non-integer sizes." msgstr "" "A felhasználói felület méretezése egy meghatározott értékkel.\n" -"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n" -"This will smooth over some of the rough edges, and blend\n" -"pixels when scaling down, at the cost of blurring some\n" -"edge pixels when images are scaled by non-integer sizes." +"A legközelebbi szomszédos anti-alias szűrőt használja a GUI méretezésére.\n" +"Ez elsimít néhány durva élt, és elhajlít pixeleket a méretezés " +"csökkentésekor,\n" +"de ennek az az ára, hogy elhomályosít néhány szélső pixelt, ha a képek nem\n" +"egész számok alapján vannak méretezve." #: src/settings_translation_file.cpp msgid "Screen height" @@ -3724,7 +3744,7 @@ msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" -"Ha \"true\" beállítás esetén hullámzó levelek.\n" +"A \"true\" beállítás engedélyezi a levelek hullámzását.\n" "A shaderek engedélyezése szükséges hozzá." #: src/settings_translation_file.cpp @@ -3732,7 +3752,7 @@ msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" -"A \"true\" beállítás esetén hullámzó növények.\n" +"A \"true\" beállítás engedélyezi a növények hullámzását.\n" "A shaderek engedélyezése szükséges hozzá." #: src/settings_translation_file.cpp @@ -3740,7 +3760,7 @@ msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" -"A \"true\" beállítás esetén hullámzó víz.\n" +"A \"true\" beállítás engedélyezi a víz hullámzását.\n" "A shaderek engedélyezése szükséges hozzá." #: src/settings_translation_file.cpp @@ -3749,6 +3769,9 @@ msgid "" "video cards.\n" "Thy only work with the OpenGL video backend." msgstr "" +"A shaderek fejlett vizuális effekteket engedélyeznek és növelhetik a " +"teljesítményt néhány videókártya esetében.\n" +"Csak OpenGL-el működnek." #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." @@ -3769,6 +3792,8 @@ msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" +"Az egyszerre generált térképblokkok mérete, térképblokkokban megadva (16 " +"blokk)." #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" @@ -3833,7 +3858,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "" +msgstr "Terep magasság" #: src/settings_translation_file.cpp msgid "" @@ -3855,7 +3880,7 @@ msgstr "Textúrák útvonala" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" -msgstr "" +msgstr "A magasság, ahol a hőmérséklet 20 fokkal csökken" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" @@ -3898,6 +3923,8 @@ msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" +"Ennyi másodperc szükséges az ismételt jobb kattintáshoz a jobb egérgomb " +"nyomva tartásakor." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." @@ -3930,8 +3957,8 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" -"A lag csökkentéséért a blokkok lerakása le van lassítva, ha a játékos épít " -"valamit.\n" +"A lag (késés) csökkentéséért a blokkok lerakása le van lassítva, ha a " +"játékos épít valamit.\n" "Ez azt határozza meg, hogy mennyire van lelassítva blokkok elhelyezésekor, " "vagy eltávolításakor." @@ -3940,16 +3967,14 @@ msgid "Toggle camera mode key" msgstr "Kamera mód váltó gomb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-mapping" +msgstr "" #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Eszköztipp késleltetés" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "Tri-lineáris szűrés" @@ -3959,6 +3984,9 @@ msgid "" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"True = 256\n" +"False = 128\n" +"Arra használható, hogy simábbá tegye a minitérképet lassabb gépeken." #: src/settings_translation_file.cpp msgid "Trusted mods" @@ -3966,7 +3994,7 @@ msgstr "Megbízható modok" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" +msgstr "A Többjátékos fül alatt megjelenített szerverlista URL-je." #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" @@ -4020,7 +4048,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "" +msgstr "Völgyek mélysége" #: src/settings_translation_file.cpp msgid "Valley Fill" @@ -4032,7 +4060,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "" +msgstr "Völgyek meredeksége" #: src/settings_translation_file.cpp msgid "Valleys C Flags" @@ -4044,7 +4072,7 @@ msgstr "Függőleges képernyő szinkronizálás." #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "Videó driver" #: src/settings_translation_file.cpp msgid "View bobbing" @@ -4055,6 +4083,8 @@ msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"Látótávolság blokkokban megadva.\n" +"Min = 20" #: src/settings_translation_file.cpp msgid "View range decrease key" @@ -4065,9 +4095,8 @@ msgid "View range increase key" msgstr "Látóterület növelés gomb" #: src/settings_translation_file.cpp -#, fuzzy msgid "Viewing range" -msgstr "Maximum látóterület" +msgstr "Látóterület" #: src/settings_translation_file.cpp msgid "Volume" @@ -4086,9 +4115,8 @@ msgid "Walking speed" msgstr "Járás sebessége" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Vízszint" +msgstr "Víz jellemzők" #: src/settings_translation_file.cpp msgid "Water level" @@ -4196,10 +4224,12 @@ msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"Kérjük-e a klienseket, hogy újracsatlakozzanak egy (Lua) összeomlás után.\n" +"Állítsd true-ra, ha a szervered automatikus újraindításra van állítva." #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "A látható terület vége el legyen-e ködösítve." #: src/settings_translation_file.cpp msgid "" @@ -4207,9 +4237,8 @@ msgid "" msgstr "A hibakereső infó mutatása (ugyanaz a hatás, ha F5-öt nyomunk)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Width component of the initial window size." -msgstr "Kezdeti vízszintes ablak méret." +msgstr "Kezdeti ablak méret szélessége." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." From 5f09574326ab4e53505e272d83e0a378ee69a5b7 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Sat, 5 Mar 2016 14:40:03 +0100 Subject: [PATCH 378/531] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (865 of 865 strings) This is a merger of 2 commits. --- po/zh_TW/minetest.po | 932 +++++++++++++++++++++++++++---------------- 1 file changed, 590 insertions(+), 342 deletions(-) diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index e47f4a76..c3330792 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -2,16 +2,16 @@ # Copyright (C) 2015 THE minetest'S COPYRIGHT HOLDER # This file is distributed under the same license as the minetest package. # Automatically generated, 2015. -# +# Jeff Huang , 2016. msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-12-10 08:13+0000\n" +"PO-Revision-Date: 2016-03-05 14:43+0000\n" "Last-Translator: Jeff Huang \n" -"Language-Team: Chinese (Taiwan) \n" +"Language-Team: Chinese (Taiwan) " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "在 Lua 指令稿中發生錯誤，像是 mod：" +msgstr "在 Lua 指令稿中發生錯誤，如 mod：" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -98,9 +98,7 @@ msgstr "啟用全部" msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." -msgstr "" -"啟用 mod 「$1」 失敗，因為其包含了不合法的字元。只有 字元 [a-z0-9_] 才是可用" -"的。" +msgstr "啟用 mod 「$1」 失敗，因為其包含了不合法的字元。只有 字元 [a-z0-9_] 才是可用的。" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -218,7 +216,7 @@ msgstr "（這個設定沒有描述可用）" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< 回到設定頁面" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -244,9 +242,7 @@ msgstr "格式為 3 個在括號內的以逗號分離的數字。" msgid "" "Format: , , (, , ), , " ", " -msgstr "" -"格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續" -"性>" +msgstr "格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續性>" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -504,7 +500,6 @@ msgid "2x" msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "3D 雲朵" @@ -517,9 +512,8 @@ msgid "8x" msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "設定" +msgstr "進階設定" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -530,7 +524,6 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "您確定要要重置您的單人遊戲世界嗎？" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "雙線性過濾器" @@ -543,21 +536,18 @@ msgid "Change keys" msgstr "變更按鍵" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" msgstr "連接玻璃" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "啟用全部" +msgstr "啟用粒子" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "華麗葉子" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "生成一般地圖" @@ -570,9 +560,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "Mip 貼圖 + Aniso. 過濾器" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "過濾器" +msgstr "無過濾器" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -583,7 +572,6 @@ msgid "No!!!" msgstr "否！！！" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" msgstr "突顯節點" @@ -616,9 +604,8 @@ msgid "Simple Leaves" msgstr "簡易葉子" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" -msgstr "平滑光" +msgstr "平滑光線" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" @@ -633,22 +620,18 @@ msgid "Touchthreshold (px)" msgstr "碰觸限值（像素）" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "三線性過濾器" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "葉子擺動" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "植物擺動" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "波動的水" @@ -1302,6 +1285,10 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"在「比例尺」中單位的 (X,Y,Z) 偏移。\n" +"用於移動適合的低地生成區域靠近 (0, 0)。\n" +"預設值適合曼德博集合，若要用於朱利亞集合則必須修改。\n" +"範圍大約在 -2 至 2 間。乘以節點的偏移值。" #: src/settings_translation_file.cpp msgid "" @@ -1320,7 +1307,6 @@ msgid "3D mode" msgstr "3D 模式" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1337,7 +1323,8 @@ msgstr "" "- 浮雕：青色／品紅色彩色 3D。\n" "- 交錯的：基於偏振螢幕的奇／偶行支援。\n" "- 頂底：將螢幕分離為頂部／底部。\n" -"- 一邊一個：將螢幕分離為一邊一個。" +"- 一邊一個：將螢幕分離為一邊一個。\n" +"- 翻頁：基於四重緩衝的 3D。" #: src/settings_translation_file.cpp msgid "" @@ -1401,7 +1388,7 @@ msgstr "進階" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "高度寒冷" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1413,7 +1400,7 @@ msgstr "環境遮蔽光" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "放大山谷" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1434,7 +1421,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "大約 (X,Y,Z) 的節點碎形規模。" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1449,9 +1436,8 @@ msgid "Backward key" msgstr "後退鍵" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "波動的水高度" +msgstr "基礎地形高度" #: src/settings_translation_file.cpp msgid "Basic" @@ -1487,15 +1473,15 @@ msgstr "攝影機切換更新按鍵" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "洞穴噪音 #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "洞穴噪音 #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "洞穴與隧道形成兩種噪音的交集" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1527,6 +1513,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"從 9 種公式裡選取 18 種碎形。\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1589,6 +1594,8 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"以逗號分隔的 mod 清單，讓您可以存取 HTTP API，\n" +"其可從網際網路上傳及下載資料。" #: src/settings_translation_file.cpp msgid "Command key" @@ -1649,11 +1656,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "控制湖泊窪地的陡度／深度。" #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "控制山丘的陡度／深度。" #: src/settings_translation_file.cpp msgid "Crash message" @@ -1664,12 +1671,16 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"在洞穴中建立無法預測的岩漿功能。\n" +"這些會讓挖礦變得困難。設為零以停用。 (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"在洞穴中建立無法預測的水功能。\n" +"這些會讓挖礦變得困難。設為零以停用。 (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1765,11 +1776,11 @@ msgstr "不推薦使用 Lua API 處理" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "您會發現大型洞穴的深度。" #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "您會發現大量洞穴的深度。" #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1799,6 +1810,9 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"決定地形的形狀。\n" +"在括號中的 3 個數字控制著\n" +"地形的規模，那三個數字應該要是相同的。" #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1829,9 +1843,8 @@ msgid "Dump the mapgen debug infos." msgstr "轉儲 mapgen 的除錯資訊。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "啟用 MP" +msgstr "啟用 VBO" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1888,7 +1901,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "啟用物品欄物品動畫。" #: src/settings_translation_file.cpp msgid "" @@ -1906,9 +1919,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "啟用面旋轉方向的網格快取。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "啟用小地圖。" +msgstr "啟用電影色調映射" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -2002,16 +2014,15 @@ msgstr "以度計算的視野。" msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "" -"在 客戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。" +msgstr "在 客戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。" #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "" +msgstr "填充深度" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "電影色調映射" #: src/settings_translation_file.cpp msgid "" @@ -2127,14 +2138,13 @@ msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "一般" #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "生成一般地圖" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2144,26 +2154,26 @@ msgid "" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" "全域地圖產生屬性。\n" +"在 Mapgen v6 中，「decorations」旗標控制所有除了樹木\n" +"與叢林以外的裝飾，在其他所有的 mapgen 中，這個旗標控制所有裝飾。\n" "未在旗標字串中指定的旗標將不會自預設值修改。\n" -"以「no」開頭的旗標字串將會用於明確的停用它們。\n" -"「trees」與「flat」旗標只在 mgv6 有效。" +"以「no」開頭的旗標字串將會用於明確的停用它們。" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "圖形" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "重力" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Mods" +msgstr "HTTP Mod" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "HUD 切換鍵" #: src/settings_translation_file.cpp msgid "" @@ -2172,26 +2182,30 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +"處理已棄用的 Lua API 呼叫：\n" +"- 舊式：（嘗試）模仿舊的行為（release 模式預設值）。\n" +"- 紀錄：模仿並記錄已棄用呼叫的反向追蹤（debug 模式預設值）\n" +"- 錯誤：在使用到棄用的呼叫時中止（建議 mod 開發者使用）。" #: src/settings_translation_file.cpp msgid "Height component of the initial window size." -msgstr "" +msgstr "初始視窗大小的高度組件。" #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "雲朵要出現的高度。" #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "高精度 FPU" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "伺服器的首頁，會在伺服器清單中顯示。" #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "河流多深" #: src/settings_translation_file.cpp msgid "" @@ -2199,49 +2213,55 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" +"活躍的區塊要遵循多大的區域，以地圖區塊（16 個節點）計。\n" +"活動區塊物件將會被載入，而 ABM 會執行。" #: src/settings_translation_file.cpp msgid "" "How many blocks are flying in the wire simultaneously for the whole server." -msgstr "" +msgstr "整個伺服器有多少個區塊同時以線性方式飛行。" #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." -msgstr "" +msgstr "每個客戶端有多少個區塊同時以線性方式飛行。" #: src/settings_translation_file.cpp msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" +"在取消載入前要有多少未使用的地圖區塊。\n" +"較高的值會較平滑，但會使用更多的記憶體。" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "河流多寬" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "IPv6 伺服器" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "IPv6 支援。" #: src/settings_translation_file.cpp msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"若 FPS 高於此，以休眠的方式限制它\n" +"以避免無謂的浪費 CPU 的電力。" #: src/settings_translation_file.cpp msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." -msgstr "" +msgstr "若停用，在飛行與快速模式皆啟用時，「使用」鍵將用於快速飛行。" #: src/settings_translation_file.cpp msgid "" @@ -2249,47 +2269,53 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" +"若與飛行模式一同啟用，玩家就可以飛過固體節點。\n" +"這需要在伺服器上的「noclip」特權。" #: src/settings_translation_file.cpp msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." -msgstr "" +msgstr "若啟用，向下爬與下降將使用「使用」鍵而非「潛行」鍵。" #: src/settings_translation_file.cpp msgid "" "If enabled, actions are recorded for rollback.\n" "This option is only read when server starts." msgstr "" +"若啟用，動作會被記錄以供復原。\n" +"這個選項只會在伺服器啟動時讀取。" #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "" +msgstr "若啟用，將會停用在多人遊戲中的防止作弊。" #: src/settings_translation_file.cpp msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" +"若啟用，無效的世界資訊將不會造成伺服器關機。\n" +"只在您知道您在幹嘛時才啟用這個選項。" #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." -msgstr "" +msgstr "若啟用，新玩家將無法以空密碼加入。" #: src/settings_translation_file.cpp msgid "" "If enabled, you can place blocks at the position (feet + eye level) where " "you stand.\n" "This is helpful when working with nodeboxes in small areas." -msgstr "" +msgstr "若啟用，您可以在您站立的位置（腳與眼睛的高度）放置方塊。當在小區域裡與節點盒一同工作時非常有用。" #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." -msgstr "" +msgstr "如果設定了這個，玩家將會總是在指定的位置重生。" #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "忽略世界錯誤" #: src/settings_translation_file.cpp msgid "In-Game" @@ -2297,23 +2323,23 @@ msgstr "遊戲中" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "遊戲內聊天視窗背景 alpha 值（不透明度，介於 0 到 255 間）。" #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "遊戲內聊天視窗背景顏色 (R,G,B)。" #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." -msgstr "" +msgstr "儲存世界中的重要變更的間隔，以秒計。" #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "" +msgstr "發送當日時間至客戶端的間隔。" #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "物品欄物品動畫" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2321,21 +2347,23 @@ msgstr "物品欄按鍵" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "滑鼠反相" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "反轉滑鼠移動的方向。" #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "物品主體 TTL" #: src/settings_translation_file.cpp msgid "" "Iterations of the recursive function.\n" "Controls the amount of fine detail." msgstr "" +"遞迴函數的迭代。\n" +"控制細節的品質。" #: src/settings_translation_file.cpp msgid "" @@ -2344,6 +2372,9 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"僅朱利亞集合：可交換超複數的 W 元素決定了 朱利亞形狀。\n" +"在 3D 碎形上沒有效果。\n" +"範圍約在 -2 至 2 間。" #: src/settings_translation_file.cpp msgid "" @@ -2351,6 +2382,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"僅朱利亞集合：可交換超複數的 X 元素決定了 朱利亞形狀。\n" +"在 3D 碎形上沒有效果。\n" +"範圍約在 -2 至 2 間。" #: src/settings_translation_file.cpp msgid "" @@ -2358,6 +2392,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"僅朱利亞集合：可交換超複數的 Y 元素決定了 朱利亞形狀。\n" +"在 3D 碎形上沒有效果。\n" +"範圍約在 -2 至 2 間。" #: src/settings_translation_file.cpp msgid "" @@ -2365,6 +2402,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"僅朱利亞集合：可交換超複數的 Z 元素決定了 朱利亞形狀。\n" +"在 3D 碎形上沒有效果。\n" +"範圍約在 -2 至 2 間。" #: src/settings_translation_file.cpp msgid "Jump key" @@ -2372,7 +2412,7 @@ msgstr "跳躍鍵" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "跳躍速度" #: src/settings_translation_file.cpp msgid "" @@ -2380,6 +2420,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"降低視野範圍的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2387,6 +2430,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"丟棄目前選定物品的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2394,6 +2440,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"增加視野範圍的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2401,6 +2450,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"跳躍的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2408,6 +2460,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"在快速模式中快速移動的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2415,6 +2470,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"將玩家往後方移動的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2422,6 +2480,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"將玩家往前方移動的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2429,6 +2490,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"將玩家往左方移動的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2436,6 +2500,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"將玩家往右方移動的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2443,6 +2510,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"開啟聊天視窗的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2450,6 +2520,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"開啟對話視窗以供輸入指令的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2457,6 +2530,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"開啟對話視窗的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2464,6 +2540,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"開啟物品欄的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2471,6 +2550,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"印出除錯堆疊的按鍵。對開發來說很有用。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2480,6 +2562,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"潛行的按鍵。\n" +"若 aux1_ 降低停用時，也會用於向下攀爬與在水中下潛。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2487,6 +2573,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"用來切換第一與第三人稱視角的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2494,6 +2583,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"拍攝螢幕截圖的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2501,6 +2593,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換電影模式的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2508,6 +2603,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換顯示迷你地圖的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2515,6 +2613,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換快速模式的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2522,6 +2623,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換飛行的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2529,6 +2633,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換 noclip 模式的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2536,6 +2643,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換視角更新的按鍵。僅對開發有用。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2543,6 +2653,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換顯示除錯資訊的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2550,6 +2663,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換顯示 HUD 的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2557,6 +2673,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換顯示聊天的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2564,6 +2683,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換顯示霧的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2571,6 +2693,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換顯示輪廓的按鍵。對開發有用。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2578,26 +2703,29 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"切換無限視野的按鍵。\n" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" +"3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "用於攀爬／下降的按鍵" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "語言" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "大型洞穴深度" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "岩漿功能" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "樹葉樣式" #: src/settings_translation_file.cpp msgid "" @@ -2606,6 +2734,10 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"樹葉樣式：\n" +"- 花俏：所有表面均可見\n" +"- 簡單：只有外部表面，若有已定義的 special_tiles，則會使用它\n" +"- 不透明：停用透明度" #: src/settings_translation_file.cpp msgid "Left key" @@ -2615,7 +2747,7 @@ msgstr "左鍵" msgid "" "Length of a server tick and the interval at which objects are generally " "updated over network." -msgstr "" +msgstr "伺服器 tick 的長度與相關物件的間隔通常透過網路更新。" #: src/settings_translation_file.cpp msgid "" @@ -2628,14 +2760,22 @@ msgid "" "- info\n" "- verbose" msgstr "" +"要被寫入到 debug.txt 的紀錄等級：\n" +"- （不記錄）\n" +"- none（無等級的訊息）\n" +"- error\n" +"- warning\n" +"- action\n" +"- info\n" +"- verbose" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "" +msgstr "在磁碟上出現佇列的限制" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "" +msgstr "要生成的出現佇列的限制" #: src/settings_translation_file.cpp msgid "" @@ -2645,38 +2785,43 @@ msgid "" "- Downloads performed by main menu (e.g. mod manager).\n" "Only has an effect if compiled with cURL." msgstr "" +"限制平行的 HTTP 請求數量。影響：\n" +"- 媒體擷取，若伺服器使用 remote_media 設定。\n" +"- 伺服器清單下載與伺服器公告。\n" +"- 從主選單下載的東西（例如 mod 管理員）。\n" +"只會在包含 cURL 進行編譯時有影響。" #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "液體流動性" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "液體流動平滑" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "" +msgstr "液體迴路最大值" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" -msgstr "" +msgstr "液體佇列清除時間" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "液體下沉" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "液體更新間隔，以秒計。" #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "" +msgstr "液體更新 tick" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "主選單遊戲管理員" #: src/settings_translation_file.cpp msgid "Main menu mod manager" @@ -2689,18 +2834,17 @@ msgstr "主選單指令稿" #: src/settings_translation_file.cpp msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." -msgstr "" +msgstr "讓霧與天空的顏色取決於時間（黎明／日落）與觀看方向。" #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." -msgstr "" +msgstr "讓 DirectX 與 LuaJIT 一同運作。若其造成麻煩則請停用。" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "地圖目錄" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "Flags that are not specified in the flag string are not modified from the " @@ -2711,13 +2855,13 @@ msgid "" "\"humid_rivers\" modifies the humidity around rivers and in areas where " "water would tend to pool. It may interfere with delicately adjusted biomes." msgstr "" -"全域地圖產生屬性。\n" +"專用於 Mapgen 山谷的地圖生成屬性。\n" "未在旗標字串中指定的旗標將不會自預設值修改。\n" "以「no」開頭的旗標字串將會用於明確的停用它們。\n" -"「trees」與「flat」旗標只在 mgv6 有效。" +"「altitude_chill」會讓較高的地方更寒冷，可能會造成生物群落的問題。\n" +"「humid_rivers」會修改在河流附近的濕度，在那些區域附近水將會傾向變為一池。這可能會對微妙調整過的生物群落造成干擾。" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills added to the flat world.\n" @@ -2725,10 +2869,10 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"全域地圖產生屬性。\n" +"專用於 Mapgen flat 的地圖生成屬性。\n" +"偶而會在平坦的世界中加入湖泊與山丘。\n" "未在旗標字串中指定的旗標將不會自預設值修改。\n" -"以「no」開頭的旗標字串將會用於明確的停用它們。\n" -"「trees」與「flat」旗標只在 mgv6 有效。" +"以「no」開頭的旗標字串將會用於明確的停用它們。" #: src/settings_translation_file.cpp msgid "" @@ -2739,6 +2883,10 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"專用於 Mapgen v6 的地圖生成屬性。\n" +"當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n" +"未在旗標字串中指定的旗標將不會自預設值修改。\n" +"以「no」開頭的旗標字串將會用於明確的停用它們。" #: src/settings_translation_file.cpp msgid "" @@ -2748,100 +2896,98 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"專用於 Mapgen v7 的地圖生成屬性。\n" +"「ridges」為河流。\n" +"未在旗標字串中指定的旗標將不會自預設值修改。\n" +"以「no」開頭的旗標字串將會用於明確的停用它們。" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "地圖生成限制" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "地圖儲存間隔" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "地圖區塊限制" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "" +msgstr "地圖區塊卸除逾時" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "地圖產生器名稱" +msgstr "Mapgen 山谷" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "" +msgstr "Mapgen 生物群落 熱 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "" +msgstr "Mapgen 生物群落 濕度 混合 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "" +msgstr "Mapgen 生物群落 濕度 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen debug" -msgstr "地圖產生器除錯" +msgstr "Mapgen 除錯" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "地圖產生器旗標" +msgstr "Mapgen 旗標" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "地圖產生器旗標" +msgstr "Mapgen flat" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" -msgstr "" +msgstr "Mapgen flat 洞穴1 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen flat cave2 noise parameters" -msgstr "" +msgstr "Mapgen flat 洞穴2 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen flat filler depth noise parameters" -msgstr "" +msgstr "Mapgen flat 填充器 深度 噪音 參數" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "地圖產生器分形旗標" +msgstr "Mapgen flat 旗標" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "地圖產生器旗標" +msgstr "Mapgen flat 地面" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Mapgen flat 山丘坡度" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "Mapgen flat 山丘閾值" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "地圖產生器分形朱麗亞迭代" +msgstr "Mapgen flat 湖泊坡度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "地圖產生器分形旗標" +msgstr "Mapgen flat 湖泊閾值" #: src/settings_translation_file.cpp msgid "Mapgen flat large cave depth" -msgstr "" +msgstr "Mapgen flat 大型洞穴深度" #: src/settings_translation_file.cpp msgid "Mapgen flat terrain noise parameters" -msgstr "" +msgstr "Mapgen flat 地形 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen fractal" @@ -2849,152 +2995,147 @@ msgstr "地圖產生器分形" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" -msgstr "" +msgstr "Mapgen fractal 洞穴1 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave2 noise parameters" -msgstr "" +msgstr "Mapgen fractal 洞穴2 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen fractal filler depth noise parameters" -msgstr "" +msgstr "Mapgen fractal 填充器 深度 噪音 參數" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "地圖產生器分形旗標" +msgstr "Mapgen fractal fractal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "地圖產生器分形朱麗亞迭代" +msgstr "Mapgen fractal 迭代" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "Mapgen fractal 朱利亞 w" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "Mapgen fractal 朱利亞 x" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "Mapgen fractal 朱利亞 y" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "Mapgen fractal 朱利亞 z" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "地圖產生器分形旗標" +msgstr "Mapgen fractal 偏移" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "地圖產生器分形" +msgstr "Mapgen fractal 規模" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" -msgstr "" +msgstr "Mapgen fractal 海床 噪音 參數" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "地圖產生器分形" +msgstr "Mapgen fractal slice w" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "" +msgstr "Mapgen 熱 混合 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen name" -msgstr "地圖產生器名稱" +msgstr "Mapgen 名稱" #: src/settings_translation_file.cpp msgid "Mapgen v5" -msgstr "地圖產生器 v5" +msgstr "Mapgen v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "" +msgstr "Mapgen v5 洞穴1 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "" +msgstr "Mapgen v5 洞穴2 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "" +msgstr "Mapgen v5 因子 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "" +msgstr "Mapgen v5 填充器 深度 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "" +msgstr "Mapgen v5 高度 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6" -msgstr "地圖產生器 v6" +msgstr "Mapgen v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "" +msgstr "Mapgen v6 蘋果樹 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "" +msgstr "Mapgen v6 海灘頻率" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "" +msgstr "Mapgen v6 海灘 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "" +msgstr "Mapgen v6 生物群落 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "" +msgstr "Mapgen v6 洞穴 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "Mapgen v6 沙漠頻率" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "" +msgstr "Mapgen v6 旗標" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "" +msgstr "Mapgen v6 高度 選擇 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "" +msgstr "Mapgen v6 濕度 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "" +msgstr "Mapgen v6 泥土 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "" +msgstr "Mapgen v6 坡度 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "" +msgstr "Mapgen v6 地形 海拔 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "" +msgstr "Mapgen v6 地形 基礎 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "" +msgstr "Mapgen v6 樹 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7" @@ -3002,125 +3143,131 @@ msgstr "地圖產生器 v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "" +msgstr "Mapgen v7 洞穴1 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "" +msgstr "Mapgen v7 洞穴2 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" -msgstr "" +msgstr "Mapgen v7 填充器 深度 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "" +msgstr "Mapgen v7 旗標" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "" +msgstr "Mapgen v7 高度 選擇 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "" +msgstr "Mapgen v7 坐騎 高度 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "" +msgstr "Mapgen v7 山 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "" +msgstr "Mapgen v7 ridge 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "" +msgstr "Mapgen v7 ridge 水 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "" +msgstr "Mapgen v7 地形 海拔 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "" +msgstr "Mapgen v7 地形 基礎 噪音 參數" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "" +msgstr "Mapgen v7 地形 持久 噪音 參數" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "" +msgstr "大規模洞穴深度" #: src/settings_translation_file.cpp msgid "Massive cave noise" -msgstr "" +msgstr "大規模洞穴噪音" #: src/settings_translation_file.cpp msgid "Massive caves form here." -msgstr "" +msgstr "這裡的大規模洞穴結構。" #: src/settings_translation_file.cpp msgid "Max block generate distance" -msgstr "" +msgstr "最大區塊產生距離" #: src/settings_translation_file.cpp msgid "Max block send distance" -msgstr "" +msgstr "最大區塊傳送距離" #: src/settings_translation_file.cpp msgid "Max liquids processed per step." -msgstr "" +msgstr "最大按步驟處理液體。" #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" -msgstr "" +msgstr "最大清晰物件額外區塊" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" -msgstr "" +msgstr "每個迭代最大封包" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "最高 FPS" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "當遊戲暫停時的最高 FPS。" #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "" +msgstr "強制載入區塊的最大值" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "快捷列最大寬度" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." -msgstr "" +msgstr "可被放進佇列內等待載入的最大區塊數。" #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"可被放進佇列內等待生成的最大區塊數。\n" +"將其設定留空則會自動選擇適當的值。" #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"可被放進佇列內等待從檔案載入的最大區塊數。\n" +"將其設定留空則會自動選擇適當的值。" #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "" +msgstr "強制載入地圖區塊的最大數量。" #: src/settings_translation_file.cpp msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" +"要保留在記憶體中的客戶端地圖區塊最大值。\n" +"設定為 -1 則不限制數量。" #: src/settings_translation_file.cpp msgid "" @@ -3128,40 +3275,45 @@ msgid "" "try reducing it, but don't reduce it to a number below double of targeted\n" "client number." msgstr "" +"每個傳送步驟要傳送的最大封包數，若您的網路連線緩慢\n" +"請試著降低它，但請不要降低到低於兩倍的目標\n" +"客戶端數。" #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "" +msgstr "最大可同時連線的玩家數。" #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "" +msgstr "最大靜態儲存於一個區塊中的物件數量。" #: src/settings_translation_file.cpp msgid "" "Maximum proportion of current window to be used for hotbar.\n" "Useful if there's something to be displayed right or left of hotbar." msgstr "" +"要用於目前視窗的最大比例，放在快捷列中。\n" +"如果有東西要顯示在快捷列左邊或右邊時很有用。" #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "" +msgstr "每個客戶端最大同時傳送區塊數" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "" +msgstr "總和最大同時傳送區塊數" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." -msgstr "" +msgstr "檔案下載（例如下載 mod）可花費的最大時間，以毫秒計。" #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "最多使用者" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "" +msgstr "每個區塊最大物件數" #: src/settings_translation_file.cpp msgid "Menus" @@ -3169,35 +3321,35 @@ msgstr "選單" #: src/settings_translation_file.cpp msgid "Mesh cache" -msgstr "" +msgstr "網狀快取" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "每日訊息" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." -msgstr "" +msgstr "每日訊息會在玩家連線時顯示。" #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." -msgstr "" +msgstr "用於突顯物件的方法。" #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "迷你地圖" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "迷你地圖按鍵" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "迷你地圖掃描高度" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" -msgstr "" +msgstr "過濾器的最大材質大小" #: src/settings_translation_file.cpp msgid "Mipmapping" @@ -3205,53 +3357,59 @@ msgstr "映射貼圖" #: src/settings_translation_file.cpp msgid "Mod profiling" -msgstr "" +msgstr "Mod 分析器" #: src/settings_translation_file.cpp msgid "Modstore details URL" -msgstr "" +msgstr "Modstore 詳細資訊 URL" #: src/settings_translation_file.cpp msgid "Modstore download URL" -msgstr "" +msgstr "Modstore 下載 URL" #: src/settings_translation_file.cpp msgid "Modstore mods list URL" -msgstr "" +msgstr "Modstore mod 清單 URL" #: src/settings_translation_file.cpp msgid "Monospace font path" -msgstr "" +msgstr "等寬字型路徑" #: src/settings_translation_file.cpp msgid "Monospace font size" -msgstr "" +msgstr "等寬字型大小" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "滑鼠靈敏度" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "滑鼠靈敏度倍數。" #: src/settings_translation_file.cpp msgid "" "Multiplier for fall bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"落差晃動的倍數。\n" +"舉例來說：設為 0 就不會有視野晃動；1.0 是一般情況；2.0 為雙倍。" #: src/settings_translation_file.cpp msgid "" "Multiplier for view bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"視野晃動的倍數。\n" +"舉例來說：設為 0 就不會有視野晃動；1.0 是一般情況；2.0 為雙倍。" #: src/settings_translation_file.cpp msgid "" "Name of map generator to be used when creating a new world.\n" "Creating a world in the main menu will override this." msgstr "" +"要用來建立新世界的地圖產生器的名稱。\n" +"在主選單中建立世界將會覆蓋它。" #: src/settings_translation_file.cpp msgid "" @@ -3259,33 +3417,38 @@ msgid "" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"玩家名稱。\n" +"當執行伺服器時，以此名稱連線的客戶端即為管理員。\n" +"當從主選單啟動時，這個將會被覆寫。" #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." -msgstr "" +msgstr "伺服器名稱，當玩家加入時會顯示，也會顯示在伺服器清單中。" #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "網路" #: src/settings_translation_file.cpp msgid "" "Network port to listen (UDP).\n" "This value will be overridden when starting from the main menu." msgstr "" +"要監聽的網路埠 (UDP)。\n" +"當從主選單啟動時，這個值將會被覆寫。" #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "新使用這需要輸入這個密碼。" #: src/settings_translation_file.cpp msgid "Noclip" -msgstr "" +msgstr "Noclip" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "" +msgstr "Noclip 按鍵" #: src/settings_translation_file.cpp msgid "Node highlighting" @@ -3293,23 +3456,23 @@ msgstr "突顯節點" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." -msgstr "" +msgstr "噪音參數供生物群落 API 溫度、濕度與生物混合使用。" #: src/settings_translation_file.cpp msgid "Noises" -msgstr "" +msgstr "噪音" #: src/settings_translation_file.cpp msgid "Normalmaps sampling" -msgstr "" +msgstr "法線貼圖採樣" #: src/settings_translation_file.cpp msgid "Normalmaps strength" -msgstr "" +msgstr "法線貼圖強度" #: src/settings_translation_file.cpp msgid "Number of emerge threads" -msgstr "" +msgstr "出現的執行緒數" #: src/settings_translation_file.cpp msgid "" @@ -3319,6 +3482,9 @@ msgid "" "speed greatly\n" "at the cost of slightly buggy caves." msgstr "" +"要使用的出現的執行緒數。讓這個欄位留空，或是增大這個數字\n" +"來使用多執行緒。在多處理器的系統上，這將會大大地改善mapgen 的速度\n" +"在稍有臭蟲的洞穴中的耗費資源。" #: src/settings_translation_file.cpp msgid "" @@ -3326,18 +3492,21 @@ msgid "" "This is a trade-off between sqlite transaction overhead and\n" "memory consumption (4096=100MB, as a rule of thumb)." msgstr "" +"可被 /clearobjects 一次載入的額外區塊數量。\n" +"這是與 sqlite 處理耗費的折衷與\n" +"記憶體耗費（根據經驗，4096=100MB）。" #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." -msgstr "" +msgstr "視差遮蔽迭代次數。" #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." -msgstr "" +msgstr "視差遮蔽效果的總偏差，通常是規模/2。" #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." -msgstr "" +msgstr "視差遮蔽效果的總規模。" #: src/settings_translation_file.cpp msgid "Parallax occlusion" @@ -3365,25 +3534,27 @@ msgstr "視差遮蔽強度" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." -msgstr "" +msgstr "TrueType 字型或點陣字的路徑。" #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "儲存螢幕截圖的路徑。" #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." -msgstr "" +msgstr "材質目錄的路徑。所有材質都會先從這裡搜尋。" #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "物理" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the \"fly\" privilege on the server." msgstr "" +"玩家可以不受重力影響飛行。\n" +"這需要在伺服器上啟用「飛行」特權。" #: src/settings_translation_file.cpp msgid "Player name" @@ -3391,33 +3562,35 @@ msgstr "玩家名稱" #: src/settings_translation_file.cpp msgid "Player transfer distance" -msgstr "" +msgstr "玩家傳送距離" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "玩家對玩家" #: src/settings_translation_file.cpp msgid "" "Port to connect to (UDP).\n" "Note that the port field in the main menu overrides this setting." msgstr "" +"要連線至的埠 (UDP)。\n" +"注意在主選單中的埠欄位會覆蓋這個設定。" #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." -msgstr "" +msgstr "避免 mod 做出不安全的舉動，像是執行 shell 指令等。" #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." -msgstr "" +msgstr "分析器資料印出間隔。0 = 停用。對開發者有用。" #: src/settings_translation_file.cpp msgid "Profiler toggle key" -msgstr "" +msgstr "分析器切換鍵" #: src/settings_translation_file.cpp msgid "Profiling print interval" -msgstr "" +msgstr "分析列印間隔" #: src/settings_translation_file.cpp msgid "" @@ -3425,14 +3598,16 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" +"雲區的半徑，以雲立方體的 64 個節點的數目計算。\n" +"大於 26 的值將會在雲的角落有銳角的產生。" #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "" +msgstr "提升地形以讓山谷在河流周圍" #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "隨機輸入" #: src/settings_translation_file.cpp msgid "Range select key" @@ -3440,15 +3615,15 @@ msgstr "範圍選擇鍵" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "遠端媒體" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "遠端埠" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." -msgstr "" +msgstr "以自訂選單取代預設主選單。" #: src/settings_translation_file.cpp msgid "Right key" @@ -3456,39 +3631,39 @@ msgstr "右鍵" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "右鍵點擊重覆間隔" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "" +msgstr "河流深度" #: src/settings_translation_file.cpp msgid "River Noise" -msgstr "" +msgstr "河流噪音" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "" +msgstr "河流大小" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" -msgstr "" +msgstr "河流噪音 -- 會在接近河流最低點的地方遇到" #: src/settings_translation_file.cpp msgid "Rollback recording" -msgstr "" +msgstr "返回記錄" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "圓形小地圖" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "" +msgstr "由客戶端儲存接收到的地圖到磁碟上。" #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "" +msgstr "儲存從伺服器接收到的地圖" #: src/settings_translation_file.cpp msgid "" @@ -3498,14 +3673,19 @@ msgid "" "pixels when scaling down, at the cost of blurring some\n" "edge pixels when images are scaled by non-integer sizes." msgstr "" +"由使用者指定一個值來作為放大圖形使用者介面的比例。\n" +"使用最近相鄰與反鋸齒過濾器以放大圖形使用者介面。\n" +"這將可以讓一些粗糙的邊緣變得較圓滑，並當\n" +"比例縮小時會混合像素，代價是在模糊一些\n" +"邊緣的像素時會以非整數的大小縮放。" #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "螢幕高度" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "螢幕寬度" #: src/settings_translation_file.cpp msgid "Screenshot" @@ -3513,27 +3693,27 @@ msgstr "螢幕截圖" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "螢幕截圖資料夾" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "安全" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" +msgstr "請見 http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp msgid "Selection box border color (R,G,B)." -msgstr "" +msgstr "邊框顏色 (R,G,B) 選取框。" #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "色彩選取框" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "寬度選取框" #: src/settings_translation_file.cpp msgid "Server / Singleplayer" @@ -3572,24 +3752,32 @@ msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" +"設定語言。留空以使用系統語言。\n" +"變更後必須重新啟動以使其生效。" #: src/settings_translation_file.cpp msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"設定為真以啟用擺動的樹葉。\n" +"必須同時啟用著色器。" #: src/settings_translation_file.cpp msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" +"設定為真以啟用擺動的植物。\n" +"必須同時啟用著色器。" #: src/settings_translation_file.cpp msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" +"設定為真以啟用波動的水。\n" +"必須同時啟用著色器。" #: src/settings_translation_file.cpp msgid "" @@ -3597,28 +3785,30 @@ msgid "" "video cards.\n" "Thy only work with the OpenGL video backend." msgstr "" +"著色器讓您可以有進階視覺效果並可能會在某些顯示卡上增強效能。\n" +"這僅在 OpenGL 視訊後端上才能運作。" #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" +msgstr "迷你地圖的形狀。啟用 = 圓形，停用 = 方形。" #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "顯示除錯資訊" #: src/settings_translation_file.cpp msgid "Shutdown message" -msgstr "" +msgstr "關閉訊息" #: src/settings_translation_file.cpp msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." -msgstr "" +msgstr "要由 mapgen 生成的區塊大小，以地圖區塊（16 個節電）。" #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" -msgstr "" +msgstr "坡度與填充一同運作來修改高度" #: src/settings_translation_file.cpp msgid "Smooth lighting" @@ -3629,14 +3819,16 @@ msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" +"當移動與東張西望時讓攝影機變流暢。\n" +"對錄影很有用。" #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." -msgstr "" +msgstr "在電影模式中讓攝影機旋轉變流暢。設為 0 以停用。" #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "讓旋轉攝影機時較流暢。設為 0 以停用。" #: src/settings_translation_file.cpp msgid "Sneak key" @@ -3644,7 +3836,7 @@ msgstr "潛行按鍵" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "聲音" #: src/settings_translation_file.cpp msgid "" @@ -3653,10 +3845,14 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" +"客戶端從指定的 URL 而不是使用 UDP 抓取媒體。\n" +"$filename 應該可以透過 cURL 從 $remote_media$filename 存取。\n" +"（當然，remote_media 部份應以斜線結束）。\n" +"沒有在其中的檔案將會以平常的方式抓取。" #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "" +msgstr "靜態重生點" #: src/settings_translation_file.cpp msgid "Strength of generated normalmaps." @@ -3664,19 +3860,19 @@ msgstr "生成之一般地圖的強度。" #: src/settings_translation_file.cpp msgid "Strength of parallax." -msgstr "" +msgstr "視差強度。" #: src/settings_translation_file.cpp msgid "Strict protocol checking" -msgstr "" +msgstr "嚴格協議檢查" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" -msgstr "" +msgstr "同步的 SQLite" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "" +msgstr "地形高度" #: src/settings_translation_file.cpp msgid "" @@ -3684,6 +3880,9 @@ msgid "" "Controls proportion of world area covered by hills.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"山丘的地形噪音閾值。\n" +"控制山丘覆蓋世界的比例。\n" +"往 0.0 調整一取得較大的比例。" #: src/settings_translation_file.cpp msgid "" @@ -3691,6 +3890,9 @@ msgid "" "Controls proportion of world area covered by lakes.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"湖泊的地形噪音閾值。\n" +"控制湖泊覆蓋世界的比例。\n" +"往 0.0 調整一取得較大的比例。" #: src/settings_translation_file.cpp msgid "Texture path" @@ -3698,25 +3900,27 @@ msgstr "材質路徑" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" -msgstr "" +msgstr "會降低攝氏 20 度的高度" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" -msgstr "" +msgstr "塵土或其他填充物的深度" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." -msgstr "" +msgstr "伺服器要監聽的網路介面。" #: src/settings_translation_file.cpp msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" +"新使用者會自動取得的特權。\n" +"在遊戲中請見 /privs 以取得在您的伺服器上與 mod 設定的完整清單。" #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." -msgstr "" +msgstr "Irrlicht 的成像後端。" #: src/settings_translation_file.cpp msgid "" @@ -3725,6 +3929,10 @@ msgid "" "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" "set to the nearest valid value." msgstr "" +"節點環境光遮蔽的強度（暗度）。\n" +"愈低愈暗，愈高愈亮。這個設定的\n" +"值的有效範圍是 0.25 到 4.0 間。如果\n" +"值超出範圍，其將會被設定為最近的有效值。" #: src/settings_translation_file.cpp msgid "" @@ -3732,34 +3940,39 @@ msgid "" "capacity until an attempt is made to decrease its size by dumping old queue\n" "items. A value of 0 disables the functionality." msgstr "" +"液體佇列可能會超出處理容量的時間（以秒計）\n" +"超過時將會嘗試透過傾倒舊佇列項目減少其\n" +"大小。將值設為 0 以停用此功能。" #: src/settings_translation_file.cpp msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." -msgstr "" +msgstr "當按住滑鼠右鍵時，重覆右鍵點選的間隔以秒計。" #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "" +msgstr "這個字型將會被用於特定的語言。" #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"物品（丟棄的物品）可以存活多久，以秒計。\n" +"設定其為 -1 以停用這個功能。" #: src/settings_translation_file.cpp msgid "Time send interval" -msgstr "" +msgstr "時間傳送間隔" #: src/settings_translation_file.cpp msgid "Time speed" -msgstr "" +msgstr "時間速度" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." -msgstr "" +msgstr "客戶端從記憶體移除未使用的地圖資料的逾時時間。" #: src/settings_translation_file.cpp msgid "" @@ -3768,19 +3981,20 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" +"為了降低延遲，區塊傳送將會在玩家建造東西時減速。\n" +"這將會決定放置或移除節點後減速多久。" #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "切換攝影機模式按鍵" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "映射貼圖" +msgstr "色調映射" #: src/settings_translation_file.cpp msgid "Tooltip delay" -msgstr "" +msgstr "工具提示延遲" #: src/settings_translation_file.cpp msgid "Trilinear filtering" @@ -3792,38 +4006,41 @@ msgid "" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"True = 256\n" +"False = 128\n" +"對於讓迷你地圖在較慢的機器上變得流暢有效。" #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "" +msgstr "信任的 mod" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" +msgstr "會在多人遊戲分頁中顯示的伺服器清單的 URL。" #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" -msgstr "" +msgstr "不限制玩家傳送距離" #: src/settings_translation_file.cpp msgid "Unload unused server data" -msgstr "" +msgstr "卸除未使用的伺服器資料" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "使用 3D 立體而非扁平的雲朵外觀。" #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." -msgstr "" +msgstr "在主選單的背景使用雲朵動畫。" #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" +msgstr "當從某個角度觀看時啟用各向異性過濾。" #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." -msgstr "" +msgstr "當縮放材質時使用雙線性過濾。" #: src/settings_translation_file.cpp msgid "Use key" @@ -3831,11 +4048,11 @@ msgstr "使用按鍵" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." -msgstr "" +msgstr "使用多重材質貼圖來縮放材質。可能會稍稍地增加效能。" #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." -msgstr "" +msgstr "當縮放材質時使用三線性過濾。" #: src/settings_translation_file.cpp msgid "Useful for mod developers." @@ -3843,61 +4060,63 @@ msgstr "對 mod 開發者很有用。" #: src/settings_translation_file.cpp msgid "V-Sync" -msgstr "" +msgstr "垂直同步" #: src/settings_translation_file.cpp msgid "VBO" -msgstr "" +msgstr "VBO" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "" +msgstr "山谷深度" #: src/settings_translation_file.cpp msgid "Valley Fill" -msgstr "" +msgstr "山谷填充" #: src/settings_translation_file.cpp msgid "Valley Profile" -msgstr "" +msgstr "山谷分析" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "" +msgstr "山谷坡度" #: src/settings_translation_file.cpp msgid "Valleys C Flags" -msgstr "" +msgstr "山谷 C 旗標" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "" +msgstr "垂直螢幕同步。" #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "顯示卡驅動程式" #: src/settings_translation_file.cpp msgid "View bobbing" -msgstr "" +msgstr "視野晃動" #: src/settings_translation_file.cpp msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"以節點數計算的視野距離。\n" +"最小值 = 20" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "" +msgstr "降低視野的按鍵" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "" +msgstr "增加視野的按鍵" #: src/settings_translation_file.cpp msgid "Viewing range" -msgstr "" +msgstr "視野" #: src/settings_translation_file.cpp msgid "Volume" @@ -3910,23 +4129,26 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"4D 碎形生成的 3D 切片的 W 座標。\n" +"決定了會生成怎樣的 4D 形狀的 3D 切片。\n" +"對 3D 碎形沒有影響。\n" +"範圍約在 -2 至 2 間。" #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "走路速度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "物品材質..." +msgstr "水的特徵" #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "水位" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "世界的水面高度。" #: src/settings_translation_file.cpp msgid "Waving Nodes" @@ -3962,6 +4184,9 @@ msgid "" "filtered in software, but some images are generated directly\n" "to hardware (e.g. render-to-texture for nodes in inventory)." msgstr "" +"當 gui_scaling_filter 被設定為真時，所有的圖形使用者介面的圖片\n" +"都必須被軟體過濾，但是有一些圖片會被直接生成到\n" +"硬體（例如在物品欄中節點的繪圖至材質）。" #: src/settings_translation_file.cpp msgid "" @@ -3970,6 +4195,10 @@ msgid "" "to the old scaling method, for video drivers that don't\n" "propery support downloading textures back from hardware." msgstr "" +"當 gui_scaling_filter_txr2img 被設定為真，複製這些圖片\n" +"從硬體到軟體以供縮放。當為假時，退回\n" +"至舊的縮放方法，供從硬體下載材質回\n" +"來軟體支援不佳的顯示卡驅動程式使用。" #: src/settings_translation_file.cpp msgid "" @@ -3981,6 +4210,13 @@ msgid "" "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" "enabled." msgstr "" +"當使用雙線性／三線性／各向異性過濾器時，低解析度材質\n" +"會被模糊，所以會自動將大小縮放至最近的內插值\n" +"以讓像素保持清晰。這會設定最小材質大小\n" +"供放大材質使用；較高的值看起來較銳利，但需要更多的\n" +"記憶體。建議為 2 的次方。將這個值設定高於 1 不會\n" +"有任何視覺效果，除非雙線性／三線性／各向異性過濾\n" +"已啟用。" #: src/settings_translation_file.cpp msgid "" @@ -3991,74 +4227,86 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"地圖產生器要在哪裡停止。\n" +"請注意：\n" +"- 限制為 31000（上面的設定沒有影響）\n" +"- 地圖產生器以 80x80x80 個節點為一組的方式運作（5x5x5 地圖區塊）。\n" +"- 這些群組有 -32 的偏移，從原點偏移 -32 節點。\n" +"- 只有在 map_generation_limit 內的群組會被生成" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "" +msgstr "是否使用 freetype 字型，需要將 freetype 支援編譯進來。" #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "" +msgstr "是否每個地圖區塊的節點材質動畫可以不同步。" #: src/settings_translation_file.cpp msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" +"玩家是否應該在客戶端無距離限制地顯示。\n" +"已棄用，請用 setting player_transfer_distance 代替。" #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "" +msgstr "是否允許玩家傷害並殺害其他人。" #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"是否要在 (Lua) 當掉後詢問客戶端是否重新連線。\n" +"如果您的伺服器被設定為會自動重新開啟，將這個設定為真。" #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "是否將可視區域外模糊。" #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" +msgstr "是否顯示客戶端除錯資訊（與按下 F5 有同樣的效果）。" #: src/settings_translation_file.cpp msgid "Width component of the initial window size." -msgstr "" +msgstr "初始視窗大小的寬度元素。" #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "選取框在節點周邊的選取框線。" #: src/settings_translation_file.cpp msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" +"世界目錄（在世界中的每個東西都儲存在這裡）。\n" +"若從主選單啟動則不需要。" #: src/settings_translation_file.cpp msgid "Y of flat ground." -msgstr "" +msgstr "扁平地面的 Y。" #: src/settings_translation_file.cpp msgid "Y of upper limit of large pseudorandom caves." -msgstr "" +msgstr "大型偽隨機洞穴的 Y 上限。" #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "cURL 檔案下載逾時" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "cURL 並行限制" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "cURL 逾時" #~ msgid "\"" #~ msgstr "\"" From 57b5fe3c0adc652ec56e4ac796bdfc91ace5a326 Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Wed, 9 Mar 2016 17:45:13 +0100 Subject: [PATCH 379/531] Translated using Weblate (Indonesian) Currently translated at 47.9% (415 of 865 strings) --- po/id/minetest.po | 274 +++++++++++++++++++++++++++------------------- 1 file changed, 162 insertions(+), 112 deletions(-) diff --git a/po/id/minetest.po b/po/id/minetest.po index 071d6e2e..a46e4f33 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-01-26 16:32+0000\n" +"PO-Revision-Date: 2016-03-09 17:45+0000\n" "Last-Translator: Muhammad Rifqi Priyo Susanto " "\n" -"Language-Team: Indonesian \n" +"Language-Team: Indonesian " +"\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Sebuah kesalahan muncul pada skrip Lua, seperti pada mod:" +msgstr "Sebuah kesalahan terjadi di sebuah skrip Lua, seperti sebuah mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -30,7 +30,7 @@ msgstr "Kesalahan muncul:" #: builtin/fstk/ui.lua msgid "Main menu" -msgstr "Menu Utama" +msgstr "Menu utama" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" @@ -38,7 +38,7 @@ msgstr "Oke" #: builtin/fstk/ui.lua msgid "Reconnect" -msgstr "Menyambung ulang" +msgstr "Sambung ulang" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" @@ -63,8 +63,7 @@ msgstr "Server mendukung protokol antara versi $1 dan versi $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" -"Cobalah mengaktifkan ulang daftar server publik dan cek koneksi internet " -"Anda." +"Cobalah mencentang ulang daftar server publik dan cek koneksi internet Anda." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." @@ -139,6 +138,7 @@ msgid "A world named \"$1\" already exists" msgstr "Dunia bernama \"$1\" telah ada" #: builtin/mainmenu/dlg_create_world.lua +#, fuzzy msgid "Create" msgstr "Buat" @@ -160,7 +160,7 @@ msgstr "Generator peta" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" -msgstr "Tidak ada nama atau permainan yang dipilih" +msgstr "Tidak ada dunia atau permainan yang dipilih" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" @@ -176,11 +176,11 @@ msgstr "Nama dunia" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "Kamu tidak punya sub-permainan terpasang." +msgstr "Anda tidak punya sub-permainan terpasang." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "Kamu yakin ingin menghapus \"$1\"?" +msgstr "Anda yakin ingin menghapus \"$1\"?" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" @@ -188,7 +188,7 @@ msgstr "Pengelola mod: gagal untuk menghapus \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "Pengelola mod: jalur mod tidak sah" +msgstr "Pengelola mod: jalur mod tidak sah \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" @@ -213,9 +213,10 @@ msgstr "Setuju" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "Ganti Nama Paket Mod:" +msgstr "Ganti nama paket mod:" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "\"$1\" is not a valid flag." msgstr "\"$1\" bukan sebuah flag yang sah." @@ -224,8 +225,9 @@ msgid "(No description of setting given)" msgstr "(Tidak ada keterangan dari pengaturan yang diberikan)" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "< Back to Settings page" -msgstr "" +msgstr "< Halaman Pengaturan" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -233,7 +235,7 @@ msgstr "Jelajahi" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Disabled" -msgstr "Nonaktif" +msgstr "Dinonaktifkan" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Edit" @@ -244,6 +246,7 @@ msgid "Enabled" msgstr "Diaktifkan" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" "Format adalah 3 angka yang dipisahkan oleh koma dan di dalam tanda kurung." @@ -266,8 +269,10 @@ msgid "Mods" msgstr "Mod" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" +"lacunarity (celah, opsional) dapat ditambahkan dengan awalan tanda koma." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a comma seperated list of flags." @@ -287,9 +292,10 @@ msgstr "Nilai yang mungkin adalah: " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Restore Default" -msgstr "Kembalikan ke Bawaan" +msgstr "Atur ke Bawaan" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "Select path" msgstr "Pilih jalur" @@ -311,7 +317,7 @@ msgid "" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"Pemasangan Mod: tipe berkas tidak didukung \"$1\" atau kerusakan arsip" +"Pemasangan Mod: tipe berkas tidak didukung \"$1\" atau kerusakan pada arsip" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" @@ -405,7 +411,7 @@ msgstr "Tidak ada deskripsi mod tersedia" #: builtin/mainmenu/tab_mods.lua msgid "Rename" -msgstr "Ganti Nama" +msgstr "Ganti nama" #: builtin/mainmenu/tab_mods.lua msgid "Select Mod File:" @@ -421,7 +427,7 @@ msgstr "Copot pemasangan paket mod terpilih" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" -msgstr "Alamat / Port:" +msgstr "Alamat / Port :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -446,7 +452,7 @@ msgstr "Hapus" #: builtin/mainmenu/tab_multiplayer.lua msgid "Name / Password :" -msgstr "Nama / Kata sandi:" +msgstr "Nama / Kata sandi :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" @@ -484,7 +490,7 @@ msgstr "Baru" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "Tidak ada dunia atau permainan yang dipilih!" +msgstr "Tidak ada dunia yang dibuat atau dipilih!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -512,40 +518,40 @@ msgstr "Mulai Permainan" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "Awan 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" + +#: builtin/mainmenu/tab_settings.lua +msgid "Advanced Settings" +msgstr "Pengaturan Lanjutan" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Advanced Settings" -msgstr "Pengaturan" - -#: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Antialiasing:" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" -msgstr "Yakin ingin mengaturulang dunia anda?" +msgstr "Apakah Anda yakin ingin mengatur ulang dunia Anda?" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Bilinear Filter" -msgstr "Bilinear filtering" +msgstr "Bilinear Filter" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy msgid "Bumpmapping" msgstr "Bumpmapping" @@ -554,34 +560,32 @@ msgid "Change keys" msgstr "Ubah tombol" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Sambungkan kaca" +msgstr "Kaca Tersambung" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Aktifkan semua" +msgstr "Aktifkan Partikel" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Daun Megah" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" -msgstr "Gunakan Normalmaps" +msgstr "Hasilkan Normalmaps" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Mipmap" msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Aniso. Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" msgstr "Tanpa Filter" @@ -596,7 +600,7 @@ msgstr "Tidak!!!" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Node Highlighting" -msgstr "Pencahayaan Halus" +msgstr "Node Highlighting" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -611,6 +615,7 @@ msgid "Opaque Water" msgstr "Air Buram" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy msgid "Parallax Occlusion" msgstr "Parallax Occlusion" @@ -620,14 +625,13 @@ msgstr "Pengaturan" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Shaders" -msgstr "Shaders" +msgstr "Shader" #: builtin/mainmenu/tab_settings.lua msgid "Simple Leaves" msgstr "Daun Sederhana" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Pencahayaan Halus" @@ -839,7 +843,7 @@ msgstr "" #: src/game.cpp msgid "Exit to Menu" -msgstr "Kembali ke Menu Utama" +msgstr "Menu Utama" #: src/game.cpp msgid "Exit to OS" @@ -970,9 +974,8 @@ msgid "Sneak" msgstr "Menyelinap" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Gerak cepat" +msgstr "Toggle Sinematik" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1422,7 +1425,7 @@ msgstr "Lanjutan" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Dingin di Ketinggian" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1434,8 +1437,9 @@ msgid "Ambient occlusion gamma" msgstr "Ambient occlusion gamma" #: src/settings_translation_file.cpp +#, fuzzy msgid "Amplifies the valleys" -msgstr "" +msgstr "Menguatkan lembah" #: src/settings_translation_file.cpp #, fuzzy @@ -1457,8 +1461,9 @@ msgstr "" "servers.minetest.net." #: src/settings_translation_file.cpp +#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "Memperkirakan skala (X,Y,Z) dari fraktal pada node." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1513,15 +1518,15 @@ msgstr "Tombol beralih pembaruan kamera" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Noise #1 gua" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Noise #2 gua" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Gua dan terowongan terbentuk di persimpangan antara dua noise" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1592,7 +1597,7 @@ msgstr "Awan" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Awan adalah efek tiap klien." +msgstr "Awan adalah efek dari klien." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1616,6 +1621,9 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Daftar yang dipisahkan koma dari mod yang dibolehkan untuk mengakses\n" +"HTTP API, membolehkan mereka untuk mengunggah dan mengunduh data\n" +"ke/dari internet." #: src/settings_translation_file.cpp msgid "Command key" @@ -1647,11 +1655,11 @@ msgstr "Tombol konsol" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Maju terus-menerus" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Gerakan maju terus-menerus (hanya digunakan untuk pengujian)." #: src/settings_translation_file.cpp #, fuzzy @@ -1678,43 +1686,47 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Mengatur kecuraman/kedalaman dari lekukan danau." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Mengatur kecuraman/ketinggian dari bukit." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Pesan kerusakan" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Membuat lava yang tidak dapat diprediksi di dalam gua.\n" +"Ini dapat menyebabkan menambang menjadi sulit. Nol menonaktifkannya. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Membuat air yang tidak dapat diprediksi di dalam gua.\n" +"Ini dapat menyebabkan menambang menjadi sulit. Nol menonaktifkannya. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Keburaman crosshair" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Keburaman crosshair (keopakan, antara 0 sampai 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Warna crosshair" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Warna crosshair (merah,hijau,biru atau R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" @@ -1722,20 +1734,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Aktifkan Kerusakan" +msgstr "Kerusakan" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Tombol beralih info debug" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Tingkat catatan debug" #: src/settings_translation_file.cpp msgid "Dedicated server step" @@ -1743,32 +1754,36 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Percepatan bawaan" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "" +msgstr "Permainan bawaan" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Permainan bawaan saat membuat dunia baru.\n" +"Ini akan diganti saat membuat dunia dari menu utama." #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Kata Sandi Baru" +msgstr "Kata sandi bawaan" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Izin bawaan" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Batas waktu bawaan untuk cURL, dalam milidetik.\n" +"Hanya berefek jika di-compile dengan cURL." #: src/settings_translation_file.cpp msgid "" @@ -1786,15 +1801,17 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Penanganan Lua API usang" #: src/settings_translation_file.cpp +#, fuzzy msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Kedalaman minimal di mana Anda akan menemukan gua besar." #: src/settings_translation_file.cpp +#, fuzzy msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Kedalaman minimal di mana Anda akan menemukan gua raksasa." #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1805,6 +1822,8 @@ msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"Deskripsi dari server yang akan ditampilkan saat pemain bergabung dan pada " +"daftar server." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" @@ -1824,37 +1843,34 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Menentukan bentuk tanah.\n" +"3 angka dalam kurung mengatur skala dari bentuk\n" +"tanah, ketiganya harus sama." #: src/settings_translation_file.cpp #, fuzzy msgid "Disable anticheat" -msgstr "Aktifkan Partikel" +msgstr "Nonaktifkan anticurang (anticheat)" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Larang kata sandi kosong" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Nama domain dari server yang akan ditampilkan di daftar server." #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "" -"Tekan ganda \"lompat\" untuk\n" -"beralih terbang" +msgstr "Tekan ganda \"lompat\" untuk terbang" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "" -"Tekan ganda \"lompat\" untuk\n" -"beralih terbang" +msgstr "Menekan ganda tombol \"lompat\" untuk beralih terbang." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Tombol menjatuhkan barang" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." @@ -1866,23 +1882,25 @@ msgid "Enable VBO" msgstr "Aktifkan PM" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Gudang mod daring" +msgstr "Aktifkan mod keamanan" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Membolehkan pemain terkena kerusakan dan mati." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Aktifkan masukan acak dari pengguna (hanya digunakan untuk pengujian)." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"Aktifkan pencahayaan halus dengan ambient occlusion sederhana.\n" +"Nonaktifkan untuk kecepatan atau untuk tampilan lain." #: src/settings_translation_file.cpp msgid "" @@ -1892,6 +1910,12 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Membolehkan untuk melarang klien lawas untuk terhubung.\n" +"Klien-klien lawas dianggap sesuai jika mereka tidak rusak saat " +"menghubungkan\n" +"ke server-server baru, tetapi mereka mungkin tidak mendukung semua fitur " +"baru\n" +"yang Anda harapkan." #: src/settings_translation_file.cpp msgid "" @@ -1900,6 +1924,10 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Membolehkan penggunaan server media asing (jika diberikan oleh server).\n" +"Server asing menawarkan cara lebih cepat untuk mengunduh media (misal.: " +"tekstur)\n" +"saat terhubung ke server." #: src/settings_translation_file.cpp msgid "" @@ -1907,10 +1935,13 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Nyalakan/matikan menjalankan server IPv6. Sebuah server IPv6 mungkin\n" +"terbatas untuk klien IPv6, tergantung dari konfigurasi sistem.\n" +"Diabaikan jika bind_address telah diatur." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Nyalakan animasi barang inventaris." #: src/settings_translation_file.cpp msgid "" @@ -1919,20 +1950,21 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"Nyalakan bumpmapping untuk tekstur. Normalmaps harus disediakan oleh paket\n" +"tekstur atau harus dihasilkan otomatis.\n" +"Membutuhkan shader diaktifkan." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Aktifkan Kerusakan" +msgstr "Mengaktifkan pemetaan suasana (tone mapping) filmis" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Aktifkan Kerusakan" +msgstr "Aktifkan peta mini." #: src/settings_translation_file.cpp msgid "" @@ -1951,10 +1983,12 @@ msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Eksperimental, dapat menyebabkan terlihatnya spasi antara blok\n" +"saat diatur dengan angka yang lebih besar dari 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS (bingkai per detik) pada menu jeda" #: src/settings_translation_file.cpp msgid "FSAA" @@ -2242,6 +2276,9 @@ msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"Jika FPS (bingkai per detik) lebih tinggi dari ini, akan\n" +"dibatasi dengan jeda agar tidak menghabiskan tenaga\n" +"CPU dengan percuma." #: src/settings_translation_file.cpp msgid "" @@ -3117,45 +3154,51 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "FPS (bingkai per detik) maksimal" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "FPS (bingkai per detik) maksimal saat permainan dijeda." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "" +msgstr "Jumlah maksimal blok yang dipaksa muat (forceloaded)" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "Lebar maksimal hotbar" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." -msgstr "" +msgstr "Jumlah maksimal blok yang dapat diantrikan untuk dimuat." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Jumlah maksimal blok yang akan diantrikan yang akan dihasilkan.\n" +"Atur ke kosong untuk diatur secara otomatis." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Jumlah maksimal blok yang akan diantrikan yang akan dimuat dari berkas.\n" +"Atur ke kosong untuk diatur secara otomatis." #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "" +msgstr "Jumlah maksimal blok peta (mapblock) yang dipaksa muat (forceloaded)." #: src/settings_translation_file.cpp msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" +"Jumlah maksimal blok peta (mapblock) yang disimpan di memori klien.\n" +"Atur ke -1 untuk tak terhingga." #: src/settings_translation_file.cpp msgid "" @@ -3163,40 +3206,47 @@ msgid "" "try reducing it, but don't reduce it to a number below double of targeted\n" "client number." msgstr "" +"Jumlah maksimal paket dikirim tiap langkah mengirim (send step), jika Anda\n" +"memiliki koneksi lambat, cobalah untuk menguranginya, tetapi jangan " +"mengurangi\n" +"di bawah dua kalinya jumlah klien yang ditargetkan." #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "" +msgstr "Jumlah maksimal pemain yang dapat terhubung serentak." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "" +msgstr "Jumlah maksimal objek yang disimpan secara statis dalam satu blok." #: src/settings_translation_file.cpp msgid "" "Maximum proportion of current window to be used for hotbar.\n" "Useful if there's something to be displayed right or left of hotbar." msgstr "" +"Proporsi maksimal jendela saat ini yang digunakan untuk hotbar.\n" +"Berguna jika ada sesuatu yang akan ditampilkan di kanan atau kiri hotbar." #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "" +msgstr "Jumlah maksimal blok yang dikirim serentak tiap klien" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "" +msgstr "Jumlah maksimal total blok yang dikirim" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" +"Waktu maksimal dalam milidetik saat mengunduh berkas (misal.: mengunduh mod)." #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "Jumlah pengguna maksimal" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "" +msgstr "Jumlah objek maksimal tiap blok" #: src/settings_translation_file.cpp #, fuzzy @@ -3209,11 +3259,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "Pesan hari ini" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." -msgstr "" +msgstr "Pesan hari ini yang ditampilkan ke pemain yang terhubung." #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." @@ -3221,11 +3271,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Peta mini" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Tombol peta mini" #: src/settings_translation_file.cpp msgid "Minimap scan height" From 478e0a0043cef8fd4b104f2808c9cbaaed44b1f4 Mon Sep 17 00:00:00 2001 From: Elia Zammuto Date: Sat, 12 Mar 2016 13:59:34 +0100 Subject: [PATCH 380/531] Translated using Weblate (Italian) Currently translated at 47.9% (415 of 865 strings) --- po/it/minetest.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 08603e9c..cb9e1f34 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-01-25 18:13+0000\n" -"Last-Translator: Paolo DGZ \n" -"Language-Team: Italian \n" +"PO-Revision-Date: 2016-03-12 13:59+0000\n" +"Last-Translator: Elia Zammuto \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.5\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -224,7 +224,7 @@ msgstr "(Non è disponibile nessuna descrizione dell'impostazione)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr " Date: Mon, 14 Mar 2016 19:34:01 +0100 Subject: [PATCH 381/531] Translated using Weblate (Romanian) Currently translated at 23.2% (201 of 865 strings) This is a merger of 2 commits. --- po/ro/minetest.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/po/ro/minetest.po b/po/ro/minetest.po index 6fc32321..78777674 100644 --- a/po/ro/minetest.po +++ b/po/ro/minetest.po @@ -8,28 +8,28 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-10-27 16:46+0200\n" -"Last-Translator: PilzAdam \n" -"Language-Team: Romanian \n" +"PO-Revision-Date: 2016-03-17 15:28+0000\n" +"Last-Translator: Lordmusic Player \n" +"Language-Team: Romanian " +"\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Weblate 2.5-dev\n" - -#: builtin/fstk/ui.lua -msgid "An error occured in a Lua script, such as a mod:" -msgstr "" - -#: builtin/fstk/ui.lua -msgid "An error occured:" -msgstr "" +"X-Generator: Weblate 2.5\n" #: builtin/fstk/ui.lua #, fuzzy +msgid "An error occured in a Lua script, such as a mod:" +msgstr "A apărut o eroare in un script Lua,ca la un mod :" + +#: builtin/fstk/ui.lua +msgid "An error occured:" +msgstr "A apărut o eroare:" + +#: builtin/fstk/ui.lua msgid "Main menu" msgstr "Meniul Principal" @@ -38,13 +38,12 @@ msgid "Ok" msgstr "Ok" #: builtin/fstk/ui.lua -#, fuzzy msgid "Reconnect" -msgstr "Conectează" +msgstr "Reconectează-te" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "" +msgstr "Serverul cere o reconectare :" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -65,6 +64,8 @@ msgstr "" #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Încercați să activați lista de servere publică și să vă verificați " +"conexiunea la internet." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." From fea6e37e0a98743466c0f12ae111358cbb4dbdc1 Mon Sep 17 00:00:00 2001 From: Lucas Montenegro Date: Tue, 15 Mar 2016 06:17:38 +0100 Subject: [PATCH 382/531] Translated using Weblate (Spanish) Currently translated at 46.1% (399 of 865 strings) This is a merger of 3 commits. --- po/es/minetest.po | 65 +++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 68c98ebf..ab97b1a8 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-02-28 09:11+0000\n" -"Last-Translator: ShadowNinja \n" +"PO-Revision-Date: 2016-03-15 07:22+0000\n" +"Last-Translator: Lucas Montenegro \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -17,11 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.5\n" #: builtin/fstk/ui.lua +#, fuzzy msgid "An error occured in a Lua script, such as a mod:" -msgstr "Un error ha ocurrido en un script de Lua, Como un mod:" +msgstr "Un error ha ocurrido en un script de Lua, tal como en un mod:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -53,7 +54,7 @@ msgstr "Desajuste con la versión de protocolo. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "El servidor hace cumplir la versión $1 del protocolo " +msgstr "El servidor hace respetar la versión $1 del protocolo " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " @@ -66,12 +67,13 @@ msgstr "" "a Internet." #: builtin/mainmenu/common.lua +#, fuzzy msgid "We only support protocol version $1." -msgstr "Solo se soporta la version de protocolo $1." +msgstr "Solo se soporta la versión de protocolo $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2." +msgstr "Nosotros soportamos versiones de protocolo entre la versión $1 y $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua @@ -189,7 +191,7 @@ msgstr "Modmgr: Ruta del mod \"$1\" inválida" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "¡No, porque no!" +msgstr "¡No, claro que no!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/tab_settings.lua @@ -214,15 +216,16 @@ msgstr "Renombrar paquete de mod:" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "\"$1\" is not a valid flag." -msgstr "\"$ 1\" no es un indicador válido." +msgstr "\"$1\" no es un indicador válido." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "(No description of setting given)" msgstr "(Ninguna descripción de ajuste dada)" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "< Back to Settings page" -msgstr "" +msgstr "< Volver a la página de Configuración" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -250,7 +253,7 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" -"Formato: (, Y, ), " +"Formato: (, , ), " ", , " #: builtin/mainmenu/dlg_settings_advanced.lua @@ -296,11 +299,11 @@ msgstr "Mostrar los nombres técnicos" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "The value must be greater than $1." -msgstr "El valor debe ser mayor que $ 1." +msgstr "El valor debe ser mayor que $1." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "The value must be lower than $1." -msgstr "El valor debe ser menor que $ 1." +msgstr "El valor debe ser menor que $1." #: builtin/mainmenu/modmgr.lua msgid "" @@ -528,9 +531,8 @@ msgid "8x" msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Configuración" +msgstr "Configuración Avanzada" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -556,19 +558,17 @@ msgstr "Configurar teclas" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Connected Glass" -msgstr "Vidrios conectados" +msgstr "Vidrio Encadenado" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Activar todos" +msgstr "Activar Partículas" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Hojas elegantes" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "Generar mapas normales" @@ -581,9 +581,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Filtro aniso." #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filtrado" +msgstr "Sin Filtrado" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -627,9 +626,8 @@ msgid "Simple Leaves" msgstr "Hojas simples" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" -msgstr "Iluminación suave" +msgstr "Iluminación Suave" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" @@ -644,24 +642,20 @@ msgid "Touchthreshold (px)" msgstr "Umbral táctil (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" -msgstr "Filtrado trilineal" +msgstr "Filtrado Trilineal" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" -msgstr "Movimiento de hojas" +msgstr "Movimiento de Hojas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" -msgstr "Movimiento de plantas" +msgstr "Movimiento de Plantas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" -msgstr "Oleaje en el agua" +msgstr "Oleaje" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -1351,11 +1345,10 @@ msgstr "" "Soporte 3D.\n" "Soportado Actualmente:\n" "- Ninguno: No hay salida 3D.\n" -"- Anaglifo: Color cyan/magenta 3D.\n" -"- Entrelazado: Soporte de pantalla en polarizacion basado en line par e " -"impar.\n" -"- Superior Inferior: Partir pantalla superior/inferior.\n" -"- Lado a lado: Partir pantalla lado a lado." +"- Anaglifo: 3D para anteojos de colores cyan y magenta.\n" +"- Entrelazado: Filas pares e impares intercaladas.\n" +"- Superior-inferior: Partir pantalla horizontalmente.\n" +"- Lado a lado: Partir pantalla verticalmente." #: src/settings_translation_file.cpp msgid "" From fe042a02f1035eb58c6b29f10b00ca6e7e0d006e Mon Sep 17 00:00:00 2001 From: Rui Date: Tue, 15 Mar 2016 09:03:59 +0100 Subject: [PATCH 383/531] Translated using Weblate (Japanese) Currently translated at 51.2% (443 of 865 strings) This is a merger of 2 commits. --- po/ja/minetest.po | 234 ++++++++++++++++------------------------------ 1 file changed, 78 insertions(+), 156 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 238f09df..68013ff7 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,16 +3,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-01-14 08:53+0000\n" +"PO-Revision-Date: 2016-03-15 09:07+0000\n" "Last-Translator: Rui \n" -"Language-Team: Japanese \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.5\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -36,7 +36,7 @@ msgstr "再接続" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "サーバーが再接続を要求しました:" +msgstr "サーバが再接続を要求しました:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -48,15 +48,15 @@ msgstr "プロトコルバージョンが一致していません。 " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "サーバーのプロトコルバージョンは$1が適用されます。 " +msgstr "サーバのプロトコルバージョンは$1が適用されます。 " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "サーバーは$1から$2までのプロトコルバージョンをサポートしています。 " +msgstr "サーバは$1から$2までのプロトコルバージョンをサポートしています。 " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." -msgstr "インターネット接続を確認し、公開サーバーリストを再有効化してください。" +msgstr "インターネット接続を確認し、公開サーバ一覧を再有効化してください。" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." @@ -93,9 +93,7 @@ msgstr "全て有効化" msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." -msgstr "" -"許可されていない文字が使用されているためMod \"$1\"を有効化できませんでした。" -"文字は[a-z0-9_]のみ使用できます。" +msgstr "許可されていない文字が使用されているためMod \"$1\"を有効化できませんでした。文字は[a-z0-9_]のみ使用できます。" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -132,8 +130,7 @@ msgstr "作成" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" -"minetest.netからminetest_gameなどのサブゲームをダウンロードしてください" +msgstr "minetest.netから、minetest_gameなどのサブゲームをダウンロードしてください" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -214,7 +211,7 @@ msgstr "(設定の説明はありません)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< 設定ページに戻る" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -237,13 +234,12 @@ msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "括弧内に3つの数字をカンマで区切って入力してください。" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "" "Format: , , (, , ), , " ", " msgstr "" -"書式: , , (, , ), , " -", " +"書式: , , (, , ), , , " +"" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -259,7 +255,7 @@ msgstr "空隙性の値には、任意でカンマを付けて読みやすくす #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a comma seperated list of flags." -msgstr "フラグはカンマで区切られた一覧で入力してください。" +msgstr "フラグ一覧はカンマで区切って入力してください。" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid integer." @@ -315,9 +311,7 @@ msgstr "Modインストール: $1の本来のMod名が不明です" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" -msgstr "" -"Modインストール: Modパック$1に適したフォルダ名を見つけることができませんでし" -"た" +msgstr "Modインストール: Modパック$1に適したフォルダ名を見つけることができませんでした" #: builtin/mainmenu/store.lua msgid "Close store" @@ -438,7 +432,7 @@ msgstr "名前とパスワード:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" -msgstr "公開サーバーリスト" +msgstr "公開サーバ一覧" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -480,7 +474,7 @@ msgstr "ポート" #: builtin/mainmenu/tab_server.lua msgid "Public" -msgstr "公開サーバー" +msgstr "公開サーバ" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Select World:" @@ -488,11 +482,11 @@ msgstr "ワールドを選択:" #: builtin/mainmenu/tab_server.lua msgid "Server" -msgstr "サーバー" +msgstr "サーバ" #: builtin/mainmenu/tab_server.lua msgid "Server Port" -msgstr "サーバーのポート" +msgstr "サーバのポート" #: builtin/mainmenu/tab_server.lua msgid "Start Game" @@ -503,7 +497,6 @@ msgid "2x" msgstr "2倍" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "立体な雲" @@ -516,9 +509,8 @@ msgid "8x" msgstr "8倍" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "設定" +msgstr "詳細設定" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -529,9 +521,8 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "シングルプレイヤーのワールドをリセットしてよろしいですか？" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" -msgstr "バイリニアフィルタリング" +msgstr "バイリニアフィルタ" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Bumpmapping" @@ -542,21 +533,18 @@ msgid "Change keys" msgstr "操作変更" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" msgstr "ガラスを繋げる" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "全て有効化" +msgstr "パーティクル有効化" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "綺麗な葉" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "ノーマルマップの生成" @@ -569,9 +557,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "異方性フィルタ" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "フィルタリング" +msgstr "フィルタ無し" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -582,9 +569,8 @@ msgid "No!!!" msgstr "いいえ！！！" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "ノードをハイライト" +msgstr "ノードのハイライト" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -615,9 +601,8 @@ msgid "Simple Leaves" msgstr "シンプルな葉" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" -msgstr "滑らかな照明" +msgstr "滑らかな光" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" @@ -632,22 +617,18 @@ msgid "Touchthreshold (px)" msgstr "タッチのしきい値（ピクセル）" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" -msgstr "トリリニアフィルタリング" +msgstr "トリリニアフィルタ" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "揺れる葉" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "揺れる草花" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "揺れる水" @@ -757,7 +738,7 @@ msgstr "パスワード変更" #: src/game.cpp msgid "Connecting to server..." -msgstr "サーバーに接続中..." +msgstr "サーバに接続中..." #: src/game.cpp msgid "Continue" @@ -769,7 +750,7 @@ msgstr "クライアントを起動中..." #: src/game.cpp msgid "Creating server..." -msgstr "サーバーを起動中..." +msgstr "サーバを起動中..." #: src/game.cpp msgid "" @@ -931,9 +912,7 @@ msgstr "キーが重複しています" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "" -"操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してく" -"ださい)" +msgstr "操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してください)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -1321,7 +1300,6 @@ msgid "3D mode" msgstr "3Dモード" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1336,46 +1314,39 @@ msgstr "" "サポートしている出力:\n" "- none: 3D出力を行いません。\n" "- anaglyph: 赤/青の色による3Dです。\n" -"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応していま" -"す。\n" +"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応しています。\n" "- topbottom: 画面を上下で分割します。\n" "- sidebyside: 画面を左右で分割します。" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"新規マップを作成する際の初期シード値です。空にするとランダムに設定されま" -"す。\n" -"メインメニューから新規ワールドを作成する際に上書きされることがあります。" +"新規マップを作成する際の初期シード値です。空にするとランダムに設定されます。\n" +"ワールドを新規作成する際にシード値を入力すると上書きされます。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "サーバークラッシュ時に全てのクライアントへ表示するメッセージ。" +msgstr "サーバクラッシュ時に全てのクライアントへ表示するメッセージ。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "サーバー終了時に全てのクライアントへ表示するメッセージ。" +msgstr "サーバ終了時に全てのクライアントへ表示するメッセージ。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Absolute limit of emerge queues" msgstr "エマージキューの絶対的な制限値" #: src/settings_translation_file.cpp -#, fuzzy msgid "Acceleration in air" msgstr "空中での加速" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active block range" msgstr "アクティブなブロックの範囲" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active object send range" msgstr "アクティブなオブジェクトの送信の範囲" @@ -1385,12 +1356,15 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"接続先のアドレスです。\n" +"ローカルサーバを起動する際は空白に設定してください。\n" +"メインメニューのアドレス欄は、この設定を上書きすることに注意してください。" #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "" +msgstr "4kスクリーンなどのための、画面の解像度の設定です (非X11/Android環境のみ)。" #: src/settings_translation_file.cpp msgid "" @@ -1400,7 +1374,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Advanced" -msgstr "" +msgstr "詳細" #: src/settings_translation_file.cpp msgid "Altitude Chill" @@ -1408,7 +1382,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "飛行時に加速する" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" @@ -1420,11 +1394,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" -msgstr "" +msgstr "異方性フィルタリング" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "サーバを公開" #: src/settings_translation_file.cpp msgid "" @@ -1439,7 +1413,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "クラッシュ後に再接続を促す" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." @@ -1450,20 +1424,18 @@ msgid "Backward key" msgstr "後キー" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" msgstr "水が揺れる高さ" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "基本" #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "バイリニアフィルタリング" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" msgstr "バインドアドレス" @@ -1532,37 +1504,35 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "チャンクサイズ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "クリエイティブモード" +msgstr "映画風モード" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "クリエイティブモード" +msgstr "映画風モード切り替えキー" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "テクスチャの透過を削除" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "クライアントとサーバ" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "上る速度" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "雲の高さ" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "雲の半径" #: src/settings_translation_file.cpp msgid "Clouds" @@ -1570,7 +1540,7 @@ msgstr "雲" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "雲はクライアント側で描画されます。" #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1578,7 +1548,7 @@ msgstr "メニューに雲" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "色つきの霧" #: src/settings_translation_file.cpp msgid "" @@ -1597,14 +1567,12 @@ msgid "Command key" msgstr "コマンドキー" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" msgstr "ガラスを繋げる" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "サーバー接続中..." +msgstr "外部メディアサーバに接続中" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." @@ -1657,7 +1625,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "クラッシュメッセージ" #: src/settings_translation_file.cpp msgid "" @@ -1673,7 +1641,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "照準の透過度" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." @@ -1693,7 +1661,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp msgid "Damage" @@ -1701,11 +1669,11 @@ msgstr "ダメージ" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "デバッグ情報切り替えキー" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "デバッグログのレベル" #: src/settings_translation_file.cpp msgid "Dedicated server step" @@ -1717,7 +1685,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "" +msgstr "標準ゲーム" #: src/settings_translation_file.cpp msgid "" @@ -1731,7 +1699,7 @@ msgstr "既定パスワード" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "標準権限" #: src/settings_translation_file.cpp msgid "" @@ -1811,7 +1779,6 @@ msgid "Double tap jump for fly" msgstr "「ジャンプ」キー二回押しで飛行モード" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." msgstr "「ジャンプ」キー二回押しで飛行モード" @@ -1824,12 +1791,10 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" msgstr "有効化" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" msgstr "オンラインでModを検索" @@ -1888,7 +1853,6 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" msgstr "ミニマップを有効にする。" @@ -2083,7 +2047,6 @@ msgid "GUI scaling" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" msgstr "メニューの大きさ" @@ -2122,7 +2085,6 @@ msgid "Gravity" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" msgstr "Mod" @@ -2163,8 +2125,7 @@ msgid "" "How large area of blocks are subject to the active block stuff, stated in " "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." -msgstr "" -"Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。" +msgstr "Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。" #: src/settings_translation_file.cpp msgid "" @@ -2258,7 +2219,6 @@ msgid "Ignore world errors" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" msgstr "ゲーム" @@ -2646,7 +2606,6 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" msgstr "メインメニューMod管理" @@ -2724,7 +2683,6 @@ msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" msgstr "マップ生成名" @@ -2749,7 +2707,6 @@ msgid "Mapgen flags" msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" msgstr "マップ生成フラグ" @@ -2766,12 +2723,10 @@ msgid "Mapgen flat filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" msgstr "マップ生成フラグ" @@ -2784,12 +2739,10 @@ msgid "Mapgen flat hill threshold" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" msgstr "視差遮蔽マッピング" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" msgstr "マップ生成フラグ" @@ -2802,7 +2755,6 @@ msgid "Mapgen flat terrain noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" msgstr "マップ生成フラグ" @@ -2819,12 +2771,10 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" msgstr "視差遮蔽マッピング" @@ -2845,12 +2795,10 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" msgstr "マップ生成フラグ" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" msgstr "マップ生成フラグ" @@ -2859,7 +2807,6 @@ msgid "Mapgen fractal seabed noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" msgstr "マップ生成フラグ" @@ -2872,7 +2819,6 @@ msgid "Mapgen name" msgstr "マップ生成名" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" msgstr "ワールドタイプ" @@ -2897,7 +2843,6 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" msgstr "ワールドタイプ" @@ -2958,7 +2903,6 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" msgstr "ワールドタイプ" @@ -3306,17 +3250,14 @@ msgid "Parallax occlusion" msgstr "視差遮蔽マッピング" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" msgstr "視差遮蔽マッピング" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" msgstr "視差遮蔽マッピング" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" msgstr "視差遮蔽マッピング" @@ -3325,7 +3266,6 @@ msgid "Parallax occlusion mode" msgstr "視差遮蔽マッピングモード" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" msgstr "視差遮蔽マッピング" @@ -3401,7 +3341,6 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" msgstr "視野範囲変更" @@ -3503,37 +3442,36 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" msgstr "シングルプレイ開始" #: src/settings_translation_file.cpp msgid "Server URL" -msgstr "サーバーURL" +msgstr "サーバURL" #: src/settings_translation_file.cpp msgid "Server address" -msgstr "サーバーアドレス" +msgstr "サーバアドレス" #: src/settings_translation_file.cpp msgid "Server description" -msgstr "サーバーポート" +msgstr "サーバポート" #: src/settings_translation_file.cpp msgid "Server name" -msgstr "サーバー名" +msgstr "サーバ名" #: src/settings_translation_file.cpp msgid "Server port" -msgstr "サーバーポート" +msgstr "サーバポート" #: src/settings_translation_file.cpp msgid "Serverlist URL" -msgstr "サーバーリストURL" +msgstr "サーバ一覧URL" #: src/settings_translation_file.cpp msgid "Serverlist file" -msgstr "サーバーリストファイル" +msgstr "サーバ一覧ファイル" #: src/settings_translation_file.cpp msgid "" @@ -3627,7 +3565,6 @@ msgid "Static spawnpoint" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." msgstr "ノーマルマップの生成" @@ -3743,7 +3680,6 @@ msgid "Toggle camera mode key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" msgstr "ミップマッピング" @@ -3885,7 +3821,6 @@ msgid "Walking speed" msgstr "歩く速度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" msgstr "テクスチャを設定中..." @@ -3915,15 +3850,15 @@ msgstr "揺れる水" #: src/settings_translation_file.cpp msgid "Waving water height" -msgstr "水が揺れる高さ" +msgstr "水の揺れる高さ" #: src/settings_translation_file.cpp msgid "Waving water length" -msgstr "水が揺れる丈" +msgstr "水の揺れる丈" #: src/settings_translation_file.cpp msgid "Waving water speed" -msgstr "水が揺れる速度" +msgstr "水の揺れる速度" #: src/settings_translation_file.cpp msgid "" @@ -3952,7 +3887,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Where the map generator stops.\n" "Please note:\n" @@ -3964,24 +3898,18 @@ msgstr "" "どこでマップ生成を停止するかの設定です。\n" "注意:\n" "- 最大で31000です(これ以上に設定しても効果はありません)。\n" -"- マップ生成は80x80x80ノードのグループで動作します (5x5x5マップブロッ" -"ク)。\n" +"- マップ生成は80x80x80ノードのグループで動作します (5x5x5マップブロック)。\n" "- このグループは原点から-32、-32ノードのオフセットがあります。\n" "- グループはmap_generation_limit内で生成されたものに限ります。" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "" -"Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドで" -"ある必要があります。" +msgstr "Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドである必要があります。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "" -"ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうか" -"の設定です。" +msgstr "ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうかの設定です。" #: src/settings_translation_file.cpp msgid "" @@ -4001,8 +3929,7 @@ msgid "" "Set this to true if your server is set up to restart automatically." msgstr "" "(Luaが)クラッシュした際にクライアントに再接続を要求するかどうかの設定です。\n" -"サーバーが自動で再起動されるように設定されているならばtrueに設定してくださ" -"い。" +"サーバが自動で再起動されるように設定されているならばtrueに設定してください。" #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." @@ -4011,9 +3938,7 @@ msgstr "可視領域の端に霧を表示するかどうかの設定です。" #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" -"クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効" -"果)。" +msgstr "クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効果)。" #: src/settings_translation_file.cpp msgid "Width component of the initial window size." @@ -4024,7 +3949,6 @@ msgid "Width of the selectionbox's lines around nodes." msgstr "ノードを選択した際に表示される線の幅です。" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." @@ -4041,12 +3965,10 @@ msgid "Y of upper limit of large pseudorandom caves." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "cURL file download timeout" msgstr "cURLファイルダウンロードタイムアウト" #: src/settings_translation_file.cpp -#, fuzzy msgid "cURL parallel limit" msgstr "cURLパラレル制限" From 0e0906fddac0101f6f7696f8107322c7b0047e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno=20Teodoro?= Date: Tue, 15 Mar 2016 16:20:58 +0100 Subject: [PATCH 384/531] Translated using Weblate (Catalan) Currently translated at 36.6% (317 of 865 strings) This is a merger of 2 commits. --- po/ca/minetest.po | 58 ++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 6064e4e0..31657fda 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-02-06 01:25+0000\n" -"Last-Translator: Joan Ciprià Moreno \n" -"Language-Team: Catalan \n" +"PO-Revision-Date: 2016-03-21 19:40+0000\n" +"Last-Translator: Joan Ciprià Moreno Teodoro \n" +"Language-Team: Catalan " +"\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -224,7 +224,7 @@ msgstr "(Cap descripció d'ajustament donada)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Torna a la pàgina de configuració" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -252,6 +252,8 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Format: (, , ), " +", , " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -508,19 +510,19 @@ msgstr "Començar Joc" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua msgid "3D Clouds" -msgstr "" +msgstr "Núvols 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -529,19 +531,19 @@ msgstr "Configuració" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Suavitzat (Antialiasing):" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" -msgstr "" +msgstr "Esteu segur que voleu reiniciar el seu món d'un sol jugador?" #: builtin/mainmenu/tab_settings.lua msgid "Bilinear Filter" -msgstr "" +msgstr "Filtre Bilineal" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Bumpmapping" -msgstr "" +msgstr "Mapat de relleu" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -559,15 +561,15 @@ msgstr "Activar tot" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" -msgstr "" +msgstr "Fulles Boniques" #: builtin/mainmenu/tab_settings.lua msgid "Generate Normalmaps" -msgstr "" +msgstr "Generar Mapes Normals" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" -msgstr "" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" @@ -575,15 +577,15 @@ msgstr "" #: builtin/mainmenu/tab_settings.lua msgid "No Filter" -msgstr "" +msgstr "Sense Filtre" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" -msgstr "" +msgstr "Sense MipMap" #: builtin/mainmenu/tab_settings.lua msgid "No!!!" -msgstr "" +msgstr "No!!!" #: builtin/mainmenu/tab_settings.lua msgid "Node Highlighting" @@ -595,15 +597,15 @@ msgstr "Ningun" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" -msgstr "" +msgstr "Fulles opaques" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Water" -msgstr "" +msgstr "Aigua opaca" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Parallax Occlusion" -msgstr "" +msgstr "Oclusió de paral·laxi" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -611,23 +613,23 @@ msgstr "Configuració" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Shaders" -msgstr "" +msgstr "Ombres" #: builtin/mainmenu/tab_settings.lua msgid "Simple Leaves" -msgstr "" +msgstr "Fulles senzilles" #: builtin/mainmenu/tab_settings.lua msgid "Smooth Lighting" -msgstr "" +msgstr "Il·luminació suau" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" -msgstr "" +msgstr "Texturització:" #: builtin/mainmenu/tab_settings.lua msgid "To enable shaders the OpenGL driver needs to be used." -msgstr "" +msgstr "Per habilitar les ombres el controlador OpenGL ha ser utilitzat." #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" From d9da543c5f210ab4a98dfdc49b90dbb5d28b446e Mon Sep 17 00:00:00 2001 From: Thibault Noel Date: Tue, 15 Mar 2016 21:30:07 +0100 Subject: [PATCH 385/531] Translated using Weblate (French) Currently translated at 89.1% (771 of 865 strings) This is a merger of 2 commits. --- po/fr/minetest.po | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index edf55b88..5d3f1da6 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-11-08 22:26+0000\n" -"Last-Translator: Jean-Patrick G. \n" -"Language-Team: French \n" +"PO-Revision-Date: 2016-03-23 11:23+0000\n" +"Last-Translator: Thibault Noel \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.5\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -85,7 +85,7 @@ msgstr "Dépend de :" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" -msgstr "Désactiver le pack de mods" +msgstr "Désactiver les messages privés" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" @@ -510,7 +510,7 @@ msgstr "Démarrer" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -519,20 +519,19 @@ msgstr "Nuages 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Réglages" +msgstr "Réglages avancés" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Antialiasing:" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" @@ -566,9 +565,8 @@ msgid "Fancy Leaves" msgstr "Arbres détaillés" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" -msgstr "Normal mapping" +msgstr "Générer un carte normal" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" @@ -581,7 +579,7 @@ msgstr "MIP map + anisotropie" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "No Filter" -msgstr "Filtrage" +msgstr "Pas de filtre" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -1326,7 +1324,6 @@ msgid "3D mode" msgstr "Mode écran 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1343,7 +1340,8 @@ msgstr "" "- anaglyphe : couleur 3D bleu turquoise/violet.\n" "- entrelacé : polarisation basée sur des lignes avec support de l'écran.\n" "- horizontal : partage de l'écran horizontal.\n" -"- vertical : partage de l'écran vertical." +"- vertical : partage de l'écran vertical.\n" +"- pageflip: 3D basé sur quadbuffer." #: src/settings_translation_file.cpp msgid "" @@ -1409,8 +1407,9 @@ msgid "Advanced" msgstr "Avancé" #: src/settings_translation_file.cpp +#, fuzzy msgid "Altitude Chill" -msgstr "" +msgstr "Altitude d'état de froid" #: src/settings_translation_file.cpp msgid "Always fly and fast" From 975020127b85fd9c2ca880be1be50e5306a174f6 Mon Sep 17 00:00:00 2001 From: akiyama akira Date: Mon, 21 Mar 2016 11:27:00 +0100 Subject: [PATCH 386/531] Translated using Weblate (Chinese (China)) Currently translated at 34.4% (298 of 865 strings) This is a merger of 6 commits. --- po/zh_CN/minetest.po | 64 +++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index 00ab2b0f..7924a127 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-12-30 16:01+0000\n" -"Last-Translator: Jun Zhang \n" -"Language-Team: Chinese (China) \n" +"PO-Revision-Date: 2016-03-22 07:59+0000\n" +"Last-Translator: akiyama akira \n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -25,7 +25,7 @@ msgstr "Lua 脚本错误:" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "错误:" +msgstr "发生了一个错误：" #: builtin/fstk/ui.lua msgid "Main menu" @@ -216,7 +216,7 @@ msgstr "(没有关于此设置的信息)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< 返回到设置页面" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -499,7 +499,7 @@ msgstr "启动游戏" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "两倍" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -508,20 +508,19 @@ msgstr "3D 云彩" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "四倍" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "八倍" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "设置" +msgstr "高级设置" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "反锯齿:" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" @@ -554,7 +553,7 @@ msgstr "全部启用" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Fancy Leaves" -msgstr "花式树" +msgstr "华丽的树叶" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -594,9 +593,8 @@ msgid "None" msgstr "无" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Opaque Leaves" -msgstr "不透明的水" +msgstr "不透明的树叶" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Water" @@ -615,9 +613,8 @@ msgid "Shaders" msgstr "着色器" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Simple Leaves" -msgstr "摇动的叶子" +msgstr "简单的树叶" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -626,7 +623,7 @@ msgstr "平滑光照" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" -msgstr "" +msgstr "纹理:" #: builtin/mainmenu/tab_settings.lua msgid "To enable shaders the OpenGL driver needs to be used." @@ -642,19 +639,16 @@ msgid "Trilinear Filter" msgstr "三线性过滤" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" -msgstr "摇动的叶子" +msgstr "飘动的树叶" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" -msgstr "摇动的植物" +msgstr "摇摆的植物" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" -msgstr "摇动的水" +msgstr "鳞波的水面" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -1337,18 +1331,21 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"输入新地图的随机种子值，不填则随机生成。\n" +"创建新地图的时候，将会覆盖原来的值。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "当服务器挂掉的时候，发送给所有客户端的信息。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" +msgstr "当关闭服务器时，发送给所有客户端的信息。" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" @@ -1356,7 +1353,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "空中加速" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1372,12 +1369,15 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"服务器连接地址。\n" +"留空则启动一个本地服务器。\n" +"注意，主菜单的地址栏将会覆盖这里的设置。" #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "" +msgstr "为支持4K等屏幕，调节像素点密度（非 X11/Android 环境才有效）。" #: src/settings_translation_file.cpp msgid "" @@ -1395,7 +1395,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "保持高速飞行" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" @@ -1411,7 +1411,7 @@ msgstr "各向异性过滤" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "发布服务器" #: src/settings_translation_file.cpp msgid "" @@ -1419,6 +1419,8 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"发布到此服务器列表。\n" +"如果你想发布你的 IPv6 地址，使用 serverlist_url = v6.servers.minetest.net 。" #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." From e79c2c7791c7ab0e4949c49aa739ddc9d91d77f6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Wed, 23 Mar 2016 11:22:57 +0100 Subject: [PATCH 387/531] Translated using Weblate (French) Currently translated at 92.4% (800 of 865 strings) This is a merger of 3 commits. --- po/fr/minetest.po | 57 +++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 5d3f1da6..c455609c 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-23 11:23+0000\n" -"Last-Translator: Thibault Noel \n" +"PO-Revision-Date: 2016-03-24 13:23+0000\n" +"Last-Translator: Jean-Baptiste \n" "Language-Team: French " "\n" "Language: fr\n" @@ -17,11 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Une erreur est survenue avec un script Lua, comme un mod :" +msgstr "Une erreur est survenue avec un script Lua, il peut s'agir d'un mod :" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -85,7 +85,7 @@ msgstr "Dépend de :" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" -msgstr "Désactiver les messages privés" +msgstr "Désactiver les packs de mods" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" @@ -220,7 +220,7 @@ msgstr "(Aucune description donnée de l'option)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Revenir aux paramètres" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -513,9 +513,8 @@ msgid "2x" msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" -msgstr "Nuages 3D" +msgstr "Nuages en 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" @@ -531,14 +530,13 @@ msgstr "Réglages avancés" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "Antialiasing:" +msgstr "Anti-crénelage :" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Filtrage bilinéaire" @@ -556,9 +554,8 @@ msgid "Connected Glass" msgstr "Verre unifié" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Tout activer" +msgstr "Activer les particules" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" @@ -577,9 +574,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "MIP map + anisotropie" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Pas de filtre" +msgstr "Aucun filtre" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -592,7 +588,7 @@ msgstr "Non !" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Node Highlighting" -msgstr "Eclairage des blocs" +msgstr "Surbrillance des blocs" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -623,7 +619,6 @@ msgid "Simple Leaves" msgstr "Arbres simples" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Lumière douce" @@ -637,27 +632,23 @@ msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé." #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" -msgstr "" +msgstr "Sensibilité (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Filtrage trilinéaire" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" -msgstr "Feuilles d'arbres mouvantes" +msgstr "Feuilles ondulantes" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" -msgstr "Plantes mouvantes" +msgstr "Plantes ondulantes" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" -msgstr "Liquides mouvants" +msgstr "Eau ondulante" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -1421,7 +1412,7 @@ msgstr "Occlusion gamma ambiente" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Amplifier les vallées" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1460,9 +1451,8 @@ msgid "Backward key" msgstr "Reculer" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Hauteur des liquides mouvants" +msgstr "Hauteur du terrain de base" #: src/settings_translation_file.cpp msgid "Basic" @@ -1498,11 +1488,11 @@ msgstr "Touche de mise à jour de la caméra" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Bruit de cave #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Bruit de cave #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" @@ -1592,8 +1582,9 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" -"Liste de mods fiables qui sont autorisées à des accès insécurisés\n" -"de fonctions même lorsque l'option de sécurisation des mods est activée (via " +"Liste séparée par des virgules des mods de confiance qui sont autorisés à " +"accéder aux fonctions non\n" +"sécurisées même lorsque l'option de sécurisation des mods est activée (via " "request_insecure_environment())." #: src/settings_translation_file.cpp @@ -1601,6 +1592,10 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Liste séparée par des virgules des mods de confiance qui sont autorisés à " +"accéder\n" +"aux API HTTP, leur permettant d'envoyer et de télécharger des données vers/" +"depuis Internet." #: src/settings_translation_file.cpp msgid "Command key" From 93997f3c29948c27c75e1973dd11991fffe5b041 Mon Sep 17 00:00:00 2001 From: Ian giestas pauli Date: Thu, 24 Mar 2016 00:52:46 +0100 Subject: [PATCH 388/531] Translated using Weblate (Portuguese (Brazil)) Currently translated at 70.6% (611 of 865 strings) This is a merger of 2 commits. --- po/pt_BR/minetest.po | 421 ++++++++++++++++++++++--------------------- 1 file changed, 218 insertions(+), 203 deletions(-) diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index 79878355..638b7727 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-02-03 20:31+0000\n" -"Last-Translator: Bruno Borges \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2016-03-24 15:09+0000\n" +"Last-Translator: Ian Giestas Pauli \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -152,7 +152,7 @@ msgstr "Jogo" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Mapgen" +msgstr "Gerador de mapa" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -223,7 +223,7 @@ msgstr "(Descrição de configuração não fornecida)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Voltar para as configurações" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -511,37 +511,33 @@ msgstr "Iniciar o jogo" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "Nuvens 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Configurações" +msgstr "Configurações Avançadas" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Antialiasing:" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Are you sure to reset your singleplayer world?" -msgstr "Um jogador" +msgstr "Você tem certeza que deseja resetar seu mundo?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Filtragem bi-linear" @@ -554,61 +550,52 @@ msgid "Change keys" msgstr "Mudar teclas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" msgstr "Vidro conectado" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Habilitar todos" +msgstr "Habilitar partículas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Fancy Leaves" -msgstr "Água opaca" +msgstr "Folhas com transparência" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" -msgstr "Gerar normalmaps" +msgstr "Gerar Normalmaps" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Mipmap" -msgstr "Mipmapping" +msgstr "Mipmap (filtro)" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" -msgstr "" +msgstr "Mipmap + Filtro Anisotrópico" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filtragem anisotrópica" +msgstr "Sem filtros" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Mipmap" -msgstr "Mipmapping" +msgstr "Sem Mipmapping" #: builtin/mainmenu/tab_settings.lua msgid "No!!!" -msgstr "" +msgstr "Não!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "Iluminação suave" +msgstr "Destaque nos Blocos" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Nenhum" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Opaque Leaves" -msgstr "Água opaca" +msgstr "Folhas Opacas" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Water" @@ -616,7 +603,7 @@ msgstr "Água opaca" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Parallax Occlusion" -msgstr "" +msgstr "Oclusão de paralaxe" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -627,9 +614,8 @@ msgid "Shaders" msgstr "Sombreadores" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Simple Leaves" -msgstr "Água opaca" +msgstr "Folhas Simples" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -638,7 +624,7 @@ msgstr "Iluminação suave" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" -msgstr "" +msgstr "Texturização:" #: builtin/mainmenu/tab_settings.lua msgid "To enable shaders the OpenGL driver needs to be used." @@ -646,27 +632,23 @@ msgstr "Para habilitar os sombreadores é necessário usar o driver OpenGL." #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" -msgstr "" +msgstr "Nível de sensibilidade ao toque (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Filtragem tri-linear" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" -msgstr "Balanço das árvores" +msgstr "Folhas Balançam" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" -msgstr "Balanço das árvores" +msgstr "Plantas balançam" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" -msgstr "Balanço das árvores" +msgstr "Ondas na água" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -754,9 +736,8 @@ msgid "Provided world path doesn't exist: " msgstr "O caminho fornecido não existe: " #: src/fontengine.cpp -#, fuzzy msgid "needs_fallback_font" -msgstr "needs_fallback_font" +msgstr "necessita_fonte_alternativa" #: src/game.cpp msgid "" @@ -1028,11 +1009,11 @@ msgstr "Volume do som: " #: src/keycode.cpp msgid "Apps" -msgstr "Apps" +msgstr "Aplicativos" #: src/keycode.cpp msgid "Attn" -msgstr "Attn" +msgstr "ATTN" #: src/keycode.cpp msgid "Back" @@ -1055,12 +1036,13 @@ msgid "Control" msgstr "Ctrl" #: src/keycode.cpp +#, fuzzy msgid "Convert" -msgstr "Convert" +msgstr "Convert (tecla)" #: src/keycode.cpp msgid "CrSel" -msgstr "CrSel" +msgstr "CrSel (tecla)" #: src/keycode.cpp msgid "Down" @@ -1068,7 +1050,7 @@ msgstr "Abaixo" #: src/keycode.cpp msgid "End" -msgstr "End" +msgstr "Tecla End" #: src/keycode.cpp msgid "Erase OEF" @@ -1080,15 +1062,16 @@ msgstr "Esc" #: src/keycode.cpp msgid "ExSel" -msgstr "ExSel" +msgstr "ExSel (tecla)" #: src/keycode.cpp msgid "Execute" msgstr "Executar" #: src/keycode.cpp +#, fuzzy msgid "Final" -msgstr "Final" +msgstr "Final (tecla)" #: src/keycode.cpp msgid "Help" @@ -1104,15 +1087,15 @@ msgstr "Insert" #: src/keycode.cpp msgid "Junja" -msgstr "Junja" +msgstr "Tecla Junja" #: src/keycode.cpp msgid "Kana" -msgstr "Kana" +msgstr "Tecla Kana" #: src/keycode.cpp msgid "Kanji" -msgstr "Kanji" +msgstr "Tecla Kanji" #: src/keycode.cpp msgid "Left Button" @@ -1120,19 +1103,19 @@ msgstr "Botão esquerdo" #: src/keycode.cpp msgid "Left Control" -msgstr "Ctrl esq." +msgstr "Ctrl esquerdo" #: src/keycode.cpp msgid "Left Menu" -msgstr "Menu esq." +msgstr "Menu esquerdo" #: src/keycode.cpp msgid "Left Shift" -msgstr "Shift esq." +msgstr "Shift esquerdo" #: src/keycode.cpp msgid "Left Windows" -msgstr "Windows esq." +msgstr "Windows esquerdo" #: src/keycode.cpp msgid "Menu" @@ -1148,7 +1131,7 @@ msgstr "Menos" #: src/keycode.cpp msgid "Mode Change" -msgstr "Mode Change" +msgstr "Mode Change (tecla)" #: src/keycode.cpp msgid "Next" @@ -1156,7 +1139,7 @@ msgstr "Page Down" #: src/keycode.cpp msgid "Nonconvert" -msgstr "Nonconvert" +msgstr "Nonconvert (tecla)" #: src/keycode.cpp msgid "Num Lock" @@ -1256,19 +1239,19 @@ msgstr "Botão direito" #: src/keycode.cpp msgid "Right Control" -msgstr "Ctrl dir." +msgstr "Ctrl direito" #: src/keycode.cpp msgid "Right Menu" -msgstr "Menu dir." +msgstr "Menu direito" #: src/keycode.cpp msgid "Right Shift" -msgstr "Shift dir." +msgstr "Shift direito" #: src/keycode.cpp msgid "Right Windows" -msgstr "Windows dir." +msgstr "Windows direito" #: src/keycode.cpp msgid "Scroll Lock" @@ -1276,7 +1259,7 @@ msgstr "Scroll Lock" #: src/keycode.cpp msgid "Select" -msgstr "Select" +msgstr "Tecla Select" #: src/keycode.cpp msgid "Shift" @@ -1284,7 +1267,7 @@ msgstr "Shift" #: src/keycode.cpp msgid "Sleep" -msgstr "Sleep" +msgstr "Tecla Sleep" #: src/keycode.cpp msgid "Snapshot" @@ -1340,7 +1323,6 @@ msgid "3D mode" msgstr "modo 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1411,7 +1393,7 @@ msgid "" "screens." msgstr "" "Ajustar configuração de dpi (profundidade de cor) para sua tela (apenas para " -"quem não usa X11/Android) Ex para telas 4K" +"quem não usa X11/Android) Ex para telas 4K." #: src/settings_translation_file.cpp msgid "" @@ -1428,7 +1410,7 @@ msgstr "Avançado" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Frio nas alturas" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1440,7 +1422,7 @@ msgstr "Gama de oclusão de ambiente" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Amplia os vales" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1461,9 +1443,8 @@ msgstr "" "minetest.net." #: src/settings_translation_file.cpp -#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "Julia definido: Valores aproximados (X, Y, Z) em nós." +msgstr "Aproxima os valores (X, Y, Z) de escala do fractal em blocos." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1474,13 +1455,13 @@ msgid "Automaticaly report to the serverlist." msgstr "Informar lista de servidores automaticamente." #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "Voltar" +msgstr "Tecla para andar para trás" #: src/settings_translation_file.cpp +#, fuzzy msgid "Base terrain height" -msgstr "" +msgstr "Altura da base do terreno" #: src/settings_translation_file.cpp msgid "Basic" @@ -1491,9 +1472,8 @@ msgid "Bilinear filtering" msgstr "Filtragem bi-linear" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "Resolvendo os endereços..." +msgstr "Endereço de bind" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." @@ -1519,15 +1499,16 @@ msgstr "Tecla para alternar atualização da câmera" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Ruído nas cavernas #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Ruído nas cavernas #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" +"Formação de cavernas e túneis na interseção entre dois ruídos diferentes" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1538,6 +1519,7 @@ msgid "Chat toggle key" msgstr "Tecla comutadora de chat" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Choice of 18 fractals from 9 formulas.\n" "1 = 4D \"Roundy\" mandelbrot set.\n" @@ -1559,6 +1541,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"Escolha de 18 fractais de 9 fórmulas\n" +"1 = 4D \"Roundy\" conjunto de mandelbrot.\n" +"2 = 4D \"Roundy\" conjunto de julia.\n" +"3 = 4D \"Squarry\" conjunto de mandelbrot.\n" +"4 = 4D \"Squarry\" conjunto de julia.\n" +"5 = 4D \"Mandy Cousin\" conjunto de mandelbrot.\n" +"6 = 4D \"Mandy Cousin\" conjunto de julia.\n" +"7 = 4D \"Variação\" conjunto de mandelbrot.\n" +"8 = 4D \"Variação\" conjunto de julia.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" conjunto de mandelbrot.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" conjunto de julia.\n" +"11 = 3D \"Christmas Tree\" conjunto de mandelbrot.\n" +"12 = 3D \"Christmas Tree\" conjunto de julia.\n" +"13 = 3D \"Mandelbulbo\" conjunto de mandelbrot.\n" +"14 = 3D \"Mandelbulbo\" conjunto de julia.\n" +"15 = 3D \"Coseno Mandelbulbo\" conjunto de mandelbrot.\n" +"16 = 3D \"Coseno Mandelbulb\" conjunto de julia.\n" +"17 = 4D \"Mandelbulbo\" conjunto de mandelbrot.\n" +"18 = 4D \"Mandelbulbo\" conjunto de julia." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1622,6 +1623,9 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Lista de mods, separados por vírgulas, que podem usar APIs de requisição " +"HTTP, que\n" +"os permitem enviar e baixar informações para/da internet." #: src/settings_translation_file.cpp msgid "Command key" @@ -1633,7 +1637,7 @@ msgstr "Vidro conectado" #: src/settings_translation_file.cpp msgid "Connect to external media server" -msgstr "Conectando ao servidor de mídia externo..." +msgstr "Conecta ao servidor de mídia externo" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." @@ -1684,11 +1688,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Controla o esparsamento/profundidade dos lagos." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Controla o esparsamento/altura das colinas." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1699,12 +1703,16 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Cria poços de lava randômicos nas cavernas,\n" +"Isso pode dificultar a mineração. Zero desabilita isso. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Cria poços de água randômicos nas cavernas,\n" +"Isso pode dificultar a mineração. Zero desabilita isso. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1802,15 +1810,16 @@ msgstr "Tratamento da API Lua rejeitado" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Profundidade em que você encontrará cavernas enormes." #: src/settings_translation_file.cpp +#, fuzzy msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Profundidade em que você encontrará cavernas longas." #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Velocidade de descida" #: src/settings_translation_file.cpp msgid "" @@ -1838,6 +1847,9 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Determina a forma do terreno\n" +"Os 3 números entre '[' e ']' controla a escala do\n" +"terreno, os 3 números devem ser idênticos." #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1868,9 +1880,8 @@ msgid "Dump the mapgen debug infos." msgstr "Mostrar informações de depuração do Mapgen." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Habilitar MP" +msgstr "Habilitar VBO" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1932,7 +1943,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Habilita itens animados no inventário." #: src/settings_translation_file.cpp msgid "" @@ -1951,9 +1962,8 @@ msgid "Enables caching of facedir rotated meshes." msgstr "Ativar armazenamento em cache de direção de face girada das malhas." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Habilitar minimapa." +msgstr "Habilitar efeito \"filmic tone mapping\"" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -1988,30 +1998,28 @@ msgid "FPS in pause menu" msgstr "FPS em menu de pausa" #: src/settings_translation_file.cpp -#, fuzzy msgid "FSAA" -msgstr "FSAA" +msgstr "FSAA Antialiasing de tela cheia" #: src/settings_translation_file.cpp msgid "Fall bobbing" msgstr "Cair balançando" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "needs_fallback_font" +msgstr "Fonte Alternativa" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Sombra da fonte alternativa" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Alpha da sombra da fonte alternativa" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Tamanho da fonte alternativa" #: src/settings_translation_file.cpp msgid "Fast key" @@ -2019,15 +2027,15 @@ msgstr "Tecla de correr" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Aceleração no modo rápido" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Velocidade no modo rápido" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Modo rápido" #: src/settings_translation_file.cpp msgid "" @@ -2059,7 +2067,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "Filmic Tone Mapping" #: src/settings_translation_file.cpp msgid "" @@ -2074,9 +2082,8 @@ msgstr "" "Aplicar esse filtro para limpar isso no tempo de carregamento da textura." #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Filtragem anisotrópica" +msgstr "Filtros" #: src/settings_translation_file.cpp msgid "Fixed map seed" @@ -2123,9 +2130,8 @@ msgid "Font size" msgstr "Tamanho da fonte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Avançar" +msgstr "Tecla para frente" #: src/settings_translation_file.cpp msgid "Freetype fonts" @@ -2183,14 +2189,13 @@ msgstr "Gama" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Geral" #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Gerar normalmaps" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2199,11 +2204,15 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Atributos geração de mapa global.\n" -"Flags que não estão especificadas na string de flags não são modificados a " -"partir do padrão.\n" -"Flags começando com \"não\" são usadas para desativá-los explicitamente.\n" -"Flags 'trees' e 'flat' só tem efeito em mgv6." +"Atributos de geração de mapa.\n" +"No Mapgen v6 a flag 'decorations' controla todas as decorações exceto " +"árvores\n" +"e grama do pântano, em todos os outros mapgens essa flag controla todas as " +"decorações.\n" +"Flags que não são especificadas na string da flag não são alteradas por " +"padrão.\n" +"Flags começando com \"no\" (não) são usada para explicitamente " +"desabilitá-las." #: src/settings_translation_file.cpp msgid "Graphics" @@ -2214,9 +2223,8 @@ msgid "Gravity" msgstr "Gravidade" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Módulos" +msgstr "HTTP mods" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2238,9 +2246,8 @@ msgstr "" "desenvolvedores de mods)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Height component of the initial window size." -msgstr "Tamanho horizontal inicial da janela." +msgstr "Altura da janela inicial." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -2256,7 +2263,7 @@ msgstr "Pagina principal do servidor, a ser exibido na lista de servidores." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Quão profundo são os rios" #: src/settings_translation_file.cpp msgid "" @@ -2287,11 +2294,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Quão largos serão os rios" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "IPv6" +msgstr "Protocolo IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" @@ -2405,7 +2412,7 @@ msgstr "Intervalo de envio de hora do dia para os clientes." #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "Animações nos itens do inventário" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2424,35 +2431,47 @@ msgid "Item entity TTL" msgstr "Entidade item TTL" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Iterations of the recursive function.\n" "Controls the amount of fine detail." msgstr "" -"Julia Definido: iterações da função recursiva.\n" -"Controles escala de pormenor." +"Iterações da função recursiva.\n" +"Controles da escala de detalhes." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Julia set only: W component of hypercomplex constant determining julia " "shape.\n" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"Apenas para conjunto de Julia: Largura da constante hipercomplexa " +"determinando o formato do conjunto.\n" +"Não tem nenhum efeito em fractais 3D.\n" +"Intervalo rugoso entre -2 e 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Julia set only: X component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" +"Apenas para conjunto de Julia: Componente X da constante hipercomplexa " +"determinando o formato do conjunto.\n" +"Intervalo rugoso entre -2 e 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Julia set only: Y component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" +"Apenas para conjunto de Julia: Componente Y da constante hipercomplexa " +"determinando o formato do conjunto.\n" +"Intervalo rugoso entre -2 e 2." #: src/settings_translation_file.cpp msgid "" @@ -2460,6 +2479,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"Apenas para conjunto de Julia: Componente Z da constante hipercomplexa " +"determinando o formato do conjunto.\n" +"Intervalo rugoso entre -2 e 2." #: src/settings_translation_file.cpp msgid "Jump key" @@ -2470,15 +2492,14 @@ msgid "Jumping speed" msgstr "Velocidade de Pulo" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tecla para alternar o alcance de visão ilimitado.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Tecla para diminuir o alcance de visão.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2491,15 +2512,14 @@ msgstr "" "html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tecla para alternar o alcance de visão ilimitado.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Tecla para aumentar o alcance de visão.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2777,11 +2797,11 @@ msgstr "Linguagem" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "Profundidade de cavernas grandes" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Coisas relacionadas a Lava" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -2800,9 +2820,8 @@ msgstr "" "- Opaque: desativar transparência" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Menu esq." +msgstr "Tecla para a esquerda" #: src/settings_translation_file.cpp msgid "" @@ -2868,9 +2887,8 @@ msgid "Liquid loop max" msgstr "Limite de iteração do liquido" #: src/settings_translation_file.cpp -#, fuzzy msgid "Liquid queue purge time" -msgstr "Tempo de limpeza de fila de líquido" +msgstr "Tempo para limpar a lista de espera para a atualização de líquidos" #: src/settings_translation_file.cpp msgid "Liquid sink" @@ -2882,7 +2900,7 @@ msgstr "Intervalo de atualização de líquido em segundos." #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "" +msgstr "Período de atualização dos Líquidos" #: src/settings_translation_file.cpp msgid "Main menu game manager" @@ -2912,7 +2930,6 @@ msgid "Map directory" msgstr "Diretório do mapa" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "Flags that are not specified in the flag string are not modified from the " @@ -2923,14 +2940,18 @@ msgid "" "\"humid_rivers\" modifies the humidity around rivers and in areas where " "water would tend to pool. It may interfere with delicately adjusted biomes." msgstr "" -"Atributos geração de mapa global.\n" +"Atributos de mapgen específicos para vales (Mapgen Valleys).\n" "Flags que não estão especificadas na string de flags não são modificados a " "partir do padrão.\n" -"Flags começando com \"não\" são usadas para desativá-los explicitamente.\n" -"Flags 'trees' e 'flat' só tem efeito em mgv6." +"Flags começando com \"no\" (não) são usadas para desativá-los explicitamente." +"\n" +"\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que pode " +"causar algumas falhas nos biomas.\n" +"\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a água " +"tende a ser represada em poças. Pode interferir em biomas que são sensíveis " +"a mudanças." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills added to the flat world.\n" @@ -2938,11 +2959,11 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Atributos geração de mapa global.\n" +"Atributos de mapgen específicos para Mapgen plano.\n" +"Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n" "Flags que não estão especificadas na string de flags não são modificados a " "partir do padrão.\n" -"Flags começando com \"não\" são usadas para desativá-los explicitamente.\n" -"Flags 'trees' e 'flat' só tem efeito em mgv6." +"Flags começando com \"no\" (não) são usadas para desativá-los explicitamente." #: src/settings_translation_file.cpp msgid "" @@ -2953,6 +2974,13 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Atributos para o gerador de mapas específico para o Mapgen v6.\n" +"Quando biomas de neve estão habilitados, pântanos ficam habilitados e a flag " +"de pântanos é ignorada.\n" +"Flags que não são especificadas na string da flag não são modificadas por " +"padrão.\n" +"Flags começando com \"no\" (não) são usadas para explicitamente " +"desabilitá-las." #: src/settings_translation_file.cpp msgid "" @@ -2962,6 +2990,11 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Atributos de geração de mapas específicos para o Mapgen v7.\n" +"'ridges' são os rios.\n" +"Flags que não estão especificadas na string da flag não são modificadas por " +"padrão.\n" +"Flags começando com \"no\" são usadas para explicitamente desabilitá-las." #: src/settings_translation_file.cpp msgid "Map generation limit" @@ -2980,21 +3013,20 @@ msgid "Mapblock unload timeout" msgstr "Timeout de descarregamento do mapblock" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Nome do mapgen" +msgstr "Vales do Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "" +msgstr "Parâmetros de ruído para o calor nos biomas" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "" +msgstr "Parâmetros de ruído de mistura de umidades nos biomas" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "" +msgstr "Parâmetros de ruído para umidade nos biomas" #: src/settings_translation_file.cpp msgid "Mapgen debug" @@ -3002,12 +3034,11 @@ msgstr "Debug do mapgen" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "Flags de mapgen" +msgstr "Flags do Mapgen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Flags de mapgen" +msgstr "Mapgen plano" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -3022,32 +3053,28 @@ msgid "Mapgen flat filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Mapgen" +msgstr "Flags do Mapgen plano" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "Flags de mapgen" +msgstr "Nível do terreno para o Mapgen plano" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Esparsamento das colinas no Mapgen plano" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "Threshold das colinas no Mapgen plano" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Mapgen" +msgstr "Esparsamento de lagos no Mapgen plano" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Mapgen" +msgstr "Threshold dos lagos no Mapgen plano" #: src/settings_translation_file.cpp msgid "Mapgen flat large cave depth" @@ -3058,9 +3085,8 @@ msgid "Mapgen flat terrain noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Mapgen" +msgstr "Fractal do Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -3077,47 +3103,43 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen fractal fractal" -msgstr "Mapgen" +msgstr "Fractal do Mapgen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Mapgen" +msgstr "Iterações no fractal do Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "Largura do fractal julia no Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "Componente X do fractal julia no Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "Componente Y do fractal julia no Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "Componente Z do fractal julia no Mapgen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "Mapgen" +msgstr "Offset do fractal do Mapgen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "Mapgen" +msgstr "Escala no fractal do Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "Mapgen" +msgstr "Largura da fatia do fractal do Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -3129,7 +3151,7 @@ msgstr "Nome do mapgen" #: src/settings_translation_file.cpp msgid "Mapgen v5" -msgstr "Mapgen v5" +msgstr "Mapgen versão 5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -3153,7 +3175,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6" -msgstr "Mapgen v6" +msgstr "Mapgen versão 6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -3213,7 +3235,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v7" -msgstr "Mapgen v7" +msgstr "Mapgen versão 7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -3380,7 +3402,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Menus" -msgstr "Menus" +msgstr "Opções para menus" #: src/settings_translation_file.cpp msgid "Mesh cache" @@ -3416,7 +3438,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mipmapping" -msgstr "Mipmapping" +msgstr "Mipmapping (filtro)" #: src/settings_translation_file.cpp msgid "Mod profiling" @@ -3652,7 +3674,7 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "Range select key" -msgstr "Sel. distância" +msgstr "Tecla de alternar campo de visão" #: src/settings_translation_file.cpp msgid "Remote media" @@ -3667,9 +3689,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Menu dir." +msgstr "Tecla direita" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3725,7 +3746,6 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" msgstr "Captura de tela" @@ -3754,9 +3774,8 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Um jogador" +msgstr "Servidor / Um jogador" #: src/settings_translation_file.cpp msgid "Server URL" @@ -3993,9 +4012,8 @@ msgid "Toggle camera mode key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mipmapping" +msgstr "Tone mapping" #: src/settings_translation_file.cpp msgid "Tooltip delay" @@ -4119,7 +4137,6 @@ msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Volume do som" @@ -4136,9 +4153,8 @@ msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Texturas dos itens..." +msgstr "Coisas relacionadas a Água" #: src/settings_translation_file.cpp msgid "Water level" @@ -4247,9 +4263,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Width component of the initial window size." -msgstr "Tamanho horizontal inicial da janela." +msgstr "Largura da janela inicial." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." From b22d6bf8cfb5be7344814d55188a543590f96d85 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Thu, 24 Mar 2016 13:23:00 +0100 Subject: [PATCH 389/531] Translated using Weblate (French) Currently translated at 93.0% (805 of 865 strings) This is a merger of 2 commits. --- po/fr/minetest.po | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index c455609c..fc6a0882 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-24 13:23+0000\n" -"Last-Translator: Jean-Baptiste \n" +"PO-Revision-Date: 2016-03-24 13:27+0000\n" +"Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" "Language: fr\n" @@ -1496,7 +1496,7 @@ msgstr "Bruit de cave #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Les caves et tunnels se forment à l'intersection de deux bruits" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1811,6 +1811,9 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Détermine la forme du terrain.\n" +"Les 3 nombres entre parenthèses contrôlent l'échelle du terrain,\n" +"ces nombres doivent être identiques." #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1905,7 +1908,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Active la rotation des items d'inventaire." #: src/settings_translation_file.cpp msgid "" @@ -2031,7 +2034,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "Tone Mapping" #: src/settings_translation_file.cpp msgid "" @@ -2156,7 +2159,7 @@ msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Général" #: src/settings_translation_file.cpp msgid "Generate normalmaps" @@ -2228,7 +2231,7 @@ msgstr "Adresse web du serveur affichée sur la liste des serveurs." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Profondeur des rivières" #: src/settings_translation_file.cpp msgid "" @@ -2261,7 +2264,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Largeur des rivières" #: src/settings_translation_file.cpp msgid "IPv6" @@ -2378,7 +2381,7 @@ msgstr "Intervalle d'envoi de l'heure de jeu aux clients." #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "Animation des items d'inventaire" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2758,11 +2761,11 @@ msgstr "Langue" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "Profondeur des grandes caves" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Fonctionnalités de la lave" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -3256,11 +3259,11 @@ msgstr "Mapgen V7 : paramètres du bruit de la persistance du terrain" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "" +msgstr "Profondeur des caves massives" #: src/settings_translation_file.cpp msgid "Massive cave noise" -msgstr "" +msgstr "Bruit des caves massives" #: src/settings_translation_file.cpp msgid "Massive caves form here." @@ -3403,7 +3406,7 @@ msgstr "Message du jour affiché aux joueurs lors de la connexion." #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." -msgstr "" +msgstr "Méthodes utilisées pour l'éclairage des objets." #: src/settings_translation_file.cpp msgid "Minimap" @@ -3534,7 +3537,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Noises" -msgstr "" +msgstr "Bruits" #: src/settings_translation_file.cpp msgid "Normalmaps sampling" @@ -3690,7 +3693,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "" +msgstr "Élève le terrain pour former des vallées autour des rivières" #: src/settings_translation_file.cpp msgid "Random input" @@ -3722,15 +3725,15 @@ msgstr "Intervalle de répétition du clic droit" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "" +msgstr "Profondeur des rivières" #: src/settings_translation_file.cpp msgid "River Noise" -msgstr "" +msgstr "Bruit des rivières" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "" +msgstr "Taille des rivières" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" @@ -3963,7 +3966,7 @@ msgstr "SQLite synchronisé" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "" +msgstr "Hauteur du terrain" #: src/settings_translation_file.cpp msgid "" @@ -3985,7 +3988,7 @@ msgstr "Chemin des textures" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" -msgstr "" +msgstr "L'altitude à laquelle la température descend de 20°C" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" @@ -4162,11 +4165,11 @@ msgstr "Synchronisation verticale" #: src/settings_translation_file.cpp msgid "VBO" -msgstr "" +msgstr "VBO" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "" +msgstr "Profondeur des vallées" #: src/settings_translation_file.cpp msgid "Valley Fill" @@ -4174,11 +4177,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Valley Profile" -msgstr "" +msgstr "Profil des vallées" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "" +msgstr "Inclinaison des vallées" #: src/settings_translation_file.cpp msgid "Valleys C Flags" @@ -4201,6 +4204,8 @@ msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"Distance d'affichage en blocs.\n" +"Minimum à 20" #: src/settings_translation_file.cpp msgid "View range decrease key" From b534b94eb95d4b7d337434d5d10a5424c64d5f5d Mon Sep 17 00:00:00 2001 From: red-001 Date: Thu, 24 Mar 2016 15:55:48 +0100 Subject: [PATCH 390/531] Translated using Weblate (Polish) Currently translated at 33.7% (292 of 865 strings) This is a merger of 2 commits. --- po/pl/minetest.po | 78 +++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/po/pl/minetest.po b/po/pl/minetest.po index 275c99d0..c380b136 100644 --- a/po/pl/minetest.po +++ b/po/pl/minetest.po @@ -8,21 +8,21 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-01-31 17:19+0000\n" -"Last-Translator: Amadeo \n" -"Language-Team: Polish \n" +"PO-Revision-Date: 2016-03-24 19:38+0000\n" +"Last-Translator: red-001 \n" +"Language-Team: Polish " +"\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Wystąpił błąd w skrypcie modyfikacji:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -50,7 +50,7 @@ msgstr "Ładowanie..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "Wesje protokołu niezgodne. " +msgstr "Niezgodne wersje protokołów. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " @@ -204,7 +204,7 @@ msgstr "Nie" #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" -msgstr "Accept" +msgstr "Zaakceptuj" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" @@ -220,7 +220,7 @@ msgstr "(Brak opisu ustawienia)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Wróć do ekranu ustawień" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -404,9 +404,8 @@ msgid "Select Mod File:" msgstr "Wybierz plik moda:" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Uninstall selected mod" -msgstr "Usuń zaznaczony mod" +msgstr "Usuń zaznaczony modyfikację" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" @@ -505,29 +504,27 @@ msgstr "Rozpocznij grę/Połącz" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "Chmury 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Ustawienia" +msgstr "Ustawienia zaawansowane" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Antyaliasing:" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -535,60 +532,52 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "Pojedynczy gracz" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Filtrowanie dwuliniowe" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -#, fuzzy msgid "Bumpmapping" -msgstr "Mip-Mappowanie" +msgstr "Mapowanie wypukłości" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Zmień klawisze" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Połącz" +msgstr "Szkło połączone" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Włącz wszystkie" +msgstr "Włącz Efekty Cząsteczkowe" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Fancy Leaves" -msgstr "Nieprzeźroczysta woda" +msgstr "Ozdobne liście" #: builtin/mainmenu/tab_settings.lua msgid "Generate Normalmaps" -msgstr "" +msgstr "Generuj mapy normalnych" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Mipmap" -msgstr "Mip-Mappowanie" +msgstr "Mipmapy" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" -msgstr "" +msgstr "Mipmapy i Filtr anizotropowe" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filtrowanie anizotropowe" +msgstr "Filtrowanie wyłączone" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Mipmap" -msgstr "Mip-Mappowanie" +msgstr "Mip-Mappowanie wyłączone" #: builtin/mainmenu/tab_settings.lua msgid "No!!!" -msgstr "" +msgstr "Nie!!" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -600,17 +589,16 @@ msgid "None" msgstr "Brak" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Opaque Leaves" -msgstr "Nieprzeźroczysta woda" +msgstr "Nieprzejrzyste liście" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Water" -msgstr "Nieprzeźroczysta woda" +msgstr "Nieprzejrzysta Woda" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Parallax Occlusion" -msgstr "" +msgstr "Mapowanie paralaksy" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -621,18 +609,16 @@ msgid "Shaders" msgstr "Shadery" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Simple Leaves" -msgstr "Nieprzeźroczysta woda" +msgstr "Proste Liście" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Płynne oświetlenie" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" -msgstr "" +msgstr "Teksturowanie:" #: builtin/mainmenu/tab_settings.lua msgid "To enable shaders the OpenGL driver needs to be used." @@ -643,7 +629,6 @@ msgid "Touchthreshold (px)" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Filtrowanie trójliniowe" @@ -1020,7 +1005,7 @@ msgstr "Głośność: " #: src/keycode.cpp msgid "Apps" -msgstr "Apps" +msgstr "Menu" #: src/keycode.cpp msgid "Attn" @@ -1059,6 +1044,7 @@ msgid "Down" msgstr "Dół" #: src/keycode.cpp +#, fuzzy msgid "End" msgstr "End" From 5cacb815e1cf85242d07a89990f38dc6d2913085 Mon Sep 17 00:00:00 2001 From: Fernando Reis Date: Thu, 24 Mar 2016 13:49:36 +0100 Subject: [PATCH 391/531] Translated using Weblate (Portuguese) Currently translated at 34.5% (299 of 865 strings) This is a merger of 2 commits. --- po/pt/minetest.po | 288 +++++++++++++++++++++------------------------- 1 file changed, 132 insertions(+), 156 deletions(-) diff --git a/po/pt/minetest.po b/po/pt/minetest.po index 3341618d..f70e378f 100644 --- a/po/pt/minetest.po +++ b/po/pt/minetest.po @@ -8,29 +8,28 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-01-14 18:20+0000\n" -"Last-Translator: Ian giestas pauli \n" -"Language-Team: Portuguese \n" +"PO-Revision-Date: 2016-03-25 10:43+0000\n" +"Last-Translator: Fernando Reis \n" +"Language-Team: Portuguese " +"\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" +msgstr "Ocorreu um erro num script Lua, como por exemplo num extra:" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "Ocorreu um erro:" #: builtin/fstk/ui.lua -#, fuzzy msgid "Main menu" -msgstr "Menu Principal" +msgstr "Menu principal" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" @@ -42,7 +41,7 @@ msgstr "Reconectar" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "O servidor requisitou uma reconexão:" +msgstr "O servidor solicitou uma reconexão:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -50,27 +49,29 @@ msgstr "A carregar..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "Versão do protocolo não coincide. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "O servidor requere o protocolo versão $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "" +msgstr "Servidor suporta versões de protocolo entre $1 e $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" +"Tente recarregar a lista de servidores públicos e verificar a sua ligação à " +"internet." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "" +msgstr "Nós suportamos apenas o protocolo versão $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "" +msgstr "Nós suportamos as versões de protocolo entre $1 e $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua @@ -84,25 +85,24 @@ msgid "Depends:" msgstr "Depende de:" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Disable MP" -msgstr "Desativar Tudo" +msgstr "Desativar MP (mod pack)" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable MP" -msgstr "Ativar Tudo" +msgstr "Ativar MP (mod pack)" #: builtin/mainmenu/dlg_config_world.lua -#, fuzzy msgid "Enable all" -msgstr "Ativar Tudo" +msgstr "Ativar tudo" #: builtin/mainmenu/dlg_config_world.lua msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" +"Falha ao ativar mod \"$1\" porque contém caracteres inválidos. Apenas " +"caracteres de \"a\" até \"z\" e algarismos de 0 até 9 são permitidos." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -110,7 +110,7 @@ msgstr "Esconder Jogo" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "" +msgstr "Ocultar conteúdo MP (mod pack)" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -139,11 +139,11 @@ msgstr "Criar" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "" +msgstr "Descarregue um jogo, como o minetest_game, do sítio minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "" +msgstr "Descarregue um do sítio minetest.net" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -159,11 +159,13 @@ msgstr "Mundo sem nome ou nenhum jogo selecionado" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" -msgstr "" +msgstr "Semente aleatória" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." msgstr "" +"Aviso: O jogo \"minimal development test\" destina-se apenas a " +"desenvolvedores." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -171,7 +173,7 @@ msgstr "Nome do Mundo" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "" +msgstr "Você não tem nenhum jogo instalado." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -212,43 +214,43 @@ msgstr "Renomear Pacote de Extras:" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" não é uma flag válida." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "(No description of setting given)" -msgstr "" +msgstr "(Descrição de configuração não fornecida)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Voltar para as configurações" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" -msgstr "" +msgstr "Navegar" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "Disabled" -msgstr "Desativar Tudo" +msgstr "Desativado" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Edit" -msgstr "" +msgstr "Editar" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "Enabled" -msgstr "ativo" +msgstr "Ativado" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "" +msgstr "O formato é de 3 números separados por vírgulas dentro de paréntesis." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Formato: , , (, , ), , " +", " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -261,52 +263,52 @@ msgstr "Extras" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" +"Opcionalmente a lacunaridade pode ser adicionada com uma vírgula na frente." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a comma seperated list of flags." -msgstr "" +msgstr "Por favor, introduza uma lista de flags separadas por vírgulas." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid integer." -msgstr "" +msgstr "Por favor insira um inteiro válido." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid number." -msgstr "" +msgstr "Por favor, insira um número válido." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Possible values are: " -msgstr "" +msgstr "Os valores possíveis são: " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Restore Default" -msgstr "" +msgstr "Restaurar valores por defeito" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "Select path" -msgstr "Seleccionar" +msgstr "Selecionar diretório" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Show technical names" -msgstr "" +msgstr "Mostrar nomes técnicos" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "The value must be greater than $1." -msgstr "" +msgstr "O valor deve ser maior do que $1." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "The value must be lower than $1." -msgstr "" +msgstr "O valor deve ser menor do que $1." #: builtin/mainmenu/modmgr.lua -#, fuzzy msgid "" "\n" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"Instalar Extra: tipo de ficheiro desconhecido \"$1\"" +"Instalação de extra: o tipo de arquivo \"$1\" não é suportado ou o arquivo " +"está corrompido" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" @@ -318,19 +320,21 @@ msgstr "Instalar Extra: ficheiro: \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" -msgstr "" +msgstr "Instalação de extra: nome real de extra não encontrado para: $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" +"Instalação de extra: não foi possível encontrar o nome adequado da pasta " +"para o pacote de extras $1" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "" +msgstr "Fechar repositório de extras" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "" +msgstr "Descarregando $1, por favor aguarde..." #: builtin/mainmenu/store.lua msgid "Install" @@ -346,16 +350,15 @@ msgstr "Classificação" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "" +msgstr "Procurar" #: builtin/mainmenu/store.lua -#, fuzzy msgid "Shortname:" -msgstr "Nome do Mundo" +msgstr "Nome curto:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" -msgstr "" +msgstr "Instalado com sucesso:" #: builtin/mainmenu/store.lua msgid "Unsorted" @@ -379,26 +382,23 @@ msgstr "Créditos" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" -msgstr "Antigos Contribuintes" +msgstr "Antigos Contribuidores" #: builtin/mainmenu/tab_credits.lua -#, fuzzy msgid "Previous Core Developers" -msgstr "Desenvolvedores Chave" +msgstr "Desenvolvedores Chave Antigos" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" msgstr "Extras Instalados:" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Mod information:" -msgstr "Sem informação" +msgstr "Informação do extra:" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "No mod description available" -msgstr "Sem informação" +msgstr "Nenhuma descrição disponível do extra" #: builtin/mainmenu/tab_mods.lua msgid "Rename" @@ -409,18 +409,16 @@ msgid "Select Mod File:" msgstr "Seleccionar ficheiro de Extra:" #: builtin/mainmenu/tab_mods.lua -#, fuzzy msgid "Uninstall selected mod" -msgstr "Remover extra selecionado" +msgstr "Desinstalar extra selecionado" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" -msgstr "Desinstalar mode selecionado" +msgstr "Desinstalar pacote de extras selecionado" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port :" -msgstr "Endereço/Porta" +msgstr "Endereço / Porta :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -431,14 +429,12 @@ msgid "Connect" msgstr "Ligar" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Creative mode" msgstr "Modo Criativo" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Damage enabled" -msgstr "ativo" +msgstr "Dano ativado" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp @@ -446,18 +442,16 @@ msgid "Delete" msgstr "Eliminar" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Name / Password :" -msgstr "Nome/Senha" +msgstr "Nome / Senha :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" msgstr "Lista de Servidores Públicos" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "PvP enabled" -msgstr "ativo" +msgstr "PvP activado" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" @@ -486,13 +480,12 @@ msgid "New" msgstr "Novo" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua -#, fuzzy msgid "No world created or selected!" -msgstr "Mundo sem nome ou nenhum jogo selecionado" +msgstr "Nenhum mundo criado ou selecionado!" #: builtin/mainmenu/tab_server.lua msgid "Port" -msgstr "" +msgstr "Porta" #: builtin/mainmenu/tab_server.lua msgid "Public" @@ -516,90 +509,79 @@ msgstr "Jogar" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "Nuvens 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Definições" +msgstr "Configurações Avançadas" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Are you sure to reset your singleplayer world?" -msgstr "Um Jogador" +msgstr "Tem a certeza que deseja reiniciar o seu mundo?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" -msgstr "Filtro Bi-Linear" +msgstr "Filtro bi-linear" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -#, fuzzy msgid "Bumpmapping" -msgstr "Mip-Mapping" +msgstr "Bump mapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Mudar teclas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Ligar" +msgstr "Vidro conectado" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Ativar Tudo" +msgstr "Ativar Partículas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Fancy Leaves" -msgstr "Água Opaca" +msgstr "Folheamento detalhado" #: builtin/mainmenu/tab_settings.lua msgid "Generate Normalmaps" -msgstr "" +msgstr "Gerar Normalmaps" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Mipmap" -msgstr "Mip-Mapping" +msgstr "Mapa MIP" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filtro Anisotrópico" +msgstr "Sem Filtro" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Mipmap" -msgstr "Mip-Mapping" +msgstr "Sem mapa MIP" #: builtin/mainmenu/tab_settings.lua msgid "No!!!" -msgstr "" +msgstr "Não!!!" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -608,12 +590,11 @@ msgstr "Iluminação Suave" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "" +msgstr "Nenhum" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Opaque Leaves" -msgstr "Água Opaca" +msgstr "Folhas Opacas" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Water" @@ -632,9 +613,8 @@ msgid "Shaders" msgstr "Sombras" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Simple Leaves" -msgstr "Água Opaca" +msgstr "Folheamento simples" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -643,50 +623,43 @@ msgstr "Iluminação Suave" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" -msgstr "" +msgstr "Texturização:" #: builtin/mainmenu/tab_settings.lua msgid "To enable shaders the OpenGL driver needs to be used." -msgstr "" +msgstr "Para ativar os sombreadores é necessário usar o driver OpenGL." #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" -msgstr "" +msgstr "Nível de sensibilidade ao toque (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" -msgstr "Filtro Tri-Linear" +msgstr "Filtro tri-linear" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" -msgstr "Árvores Melhoradas" +msgstr "Folheamento ondulante" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" -msgstr "Árvores Melhoradas" +msgstr "Plantas ondulantes" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" -msgstr "Árvores Melhoradas" +msgstr "Água ondulante" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Config mods" -msgstr "Configurar" +msgstr "Configurar extras" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" -msgstr "Menu Principal" +msgstr "Principal" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Start Singleplayer" -msgstr "Um Jogador" +msgstr "Iniciar jogo solo" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -705,36 +678,32 @@ msgid "Select texture pack:" msgstr "Selecione um pacote de texturas:" #: builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "Texturepacks" -msgstr "Pacotes de Texturas" +msgstr "Pacotes de texturas" #: src/client.cpp -#, fuzzy msgid "Connection timed out." -msgstr "Erro de conexão (excedeu tempo?)" +msgstr "Erro de ligação (tempo excedido)." #: src/client.cpp msgid "Done!" -msgstr "" +msgstr "Terminado!" #: src/client.cpp msgid "Initializing nodes" -msgstr "" +msgstr "Inicializando cubos" #: src/client.cpp msgid "Initializing nodes..." -msgstr "" +msgstr "Inicializando cubos..." #: src/client.cpp -#, fuzzy msgid "Loading textures..." -msgstr "A carregar..." +msgstr "A carregar texturas..." #: src/client.cpp -#, fuzzy msgid "Rebuilding shaders..." -msgstr "A resolver endereço..." +msgstr "Reconstruindo sombreadores..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -778,7 +747,6 @@ msgstr "" "Consulte debug.txt para mais detalhes." #: src/game.cpp -#, fuzzy msgid "Change Keys" msgstr "Mudar teclas" @@ -799,7 +767,6 @@ msgid "Creating client..." msgstr "A criar cliente..." #: src/game.cpp -#, fuzzy msgid "Creating server..." msgstr "A criar servidor..." @@ -871,7 +838,7 @@ msgstr "" #: src/game.cpp msgid "Node definitions..." -msgstr "" +msgstr "Definindo cubos..." #: src/game.cpp src/guiFormSpecMenu.cpp msgid "Proceed" @@ -886,7 +853,6 @@ msgid "Respawn" msgstr "Reaparecer" #: src/game.cpp -#, fuzzy msgid "Shutting down..." msgstr "A desligar..." @@ -975,9 +941,8 @@ msgid "Sneak" msgstr "Agachar" #: src/guiKeyChangeMenu.cpp -#, fuzzy msgid "Toggle Cinematic" -msgstr "Ativar/Desativar correr" +msgstr "Ativar/Desativar câmera cinemática" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" @@ -1041,7 +1006,7 @@ msgstr "Voltar" #: src/keycode.cpp msgid "Capital" -msgstr "Capital" +msgstr "Caps Lock" #: src/keycode.cpp msgid "Clear" @@ -1133,7 +1098,7 @@ msgstr "Shift Esquerdo" #: src/keycode.cpp msgid "Left Windows" -msgstr "WINDOWS Esq." +msgstr "Tecla WINDOWS esquerda" #: src/keycode.cpp msgid "Menu" @@ -1269,7 +1234,7 @@ msgstr "Shift Direito" #: src/keycode.cpp msgid "Right Windows" -msgstr "WINDOWS Dir." +msgstr "Tecla WINDOWS direita" #: src/keycode.cpp msgid "Scroll Lock" @@ -1331,7 +1296,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "3D clouds" msgstr "Nuvens 3D" @@ -1421,9 +1385,8 @@ msgid "Amplifies the valleys" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" -msgstr "Filtro Anisotrópico" +msgstr "Filtro anisotrópico" #: src/settings_translation_file.cpp msgid "Announce server" @@ -1438,7 +1401,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "Aproxima escala (X,Y,Z) do fractal em cubos." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1449,9 +1412,8 @@ msgid "Automaticaly report to the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "Recuar" +msgstr "Tecla para andar para trás" #: src/settings_translation_file.cpp msgid "Base terrain height" @@ -1462,9 +1424,8 @@ msgid "Basic" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" -msgstr "Filtro Bi-Linear" +msgstr "Filtro bi-linear" #: src/settings_translation_file.cpp #, fuzzy @@ -1618,7 +1579,7 @@ msgstr "A conectar ao servidor..." #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Conecta o vidro se suportado pelo cubo." #: src/settings_translation_file.cpp #, fuzzy @@ -2077,16 +2038,21 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"Distância máxima de geração de blocos para clientes, em mapblocks (16^3 " +"cubos)." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"Distância máxima de envio de blocos para clientes, em mapblocks (16^3 cubos)." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" +"Distância máxima de envio de dados sobre objectos para clientes, em " +"mapblocks (16^3 cubos)." #: src/settings_translation_file.cpp msgid "Full screen" @@ -2185,6 +2151,8 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" +"Dimensão da área de blocos mantida ativa, em mapblocks (16^3 cubos).\n" +"Em blocos ativos objetos são carregados e ABMs são executados." #: src/settings_translation_file.cpp msgid "" @@ -2235,6 +2203,9 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" +"Se ativado com o modo de vôo, o jogador é capaz de voar através de cubos " +"sólidos.\n" +"Isto requer o privilégio \"noclip\" no servidor." #: src/settings_translation_file.cpp msgid "" @@ -2268,6 +2239,9 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Se ativado, você pode colocar blocos na posição (pés + nível dos olhos) onde " +"você está.\n" +"Isto é útil quando se trabalha com nodeboxes em pequenas áreas." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." @@ -3280,7 +3254,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Node highlighting" -msgstr "" +msgstr "Destacando cubos" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -3416,6 +3390,8 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" +"Raio da área de nuvens indicado em número de 64 cubos de nuvem.\n" +"Valores superiores a 26 produzem arestas acentuadas nos cantos das nuvens." #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" @@ -3616,7 +3592,7 @@ msgstr "" msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." -msgstr "" +msgstr "Dimensão da parcela a ser gerada por mapgen, em mapblocks (16^3 cubos)." #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" From 0fde86dd93d77ad3ff2662a049eeb90ad432575e Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sun, 20 Mar 2016 15:43:38 +0100 Subject: [PATCH 392/531] Update menu header image --- README.txt | 4 ++-- textures/base/pack/menu_header.png | Bin 127202 -> 1628 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.txt b/README.txt index c62143ff..86536f6a 100644 --- a/README.txt +++ b/README.txt @@ -382,8 +382,8 @@ Authors of media files Everything not listed in here: Copyright (C) 2010-2012 celeron55, Perttu Ahola -BlockMen: - textures/base/pack/menuheader.png +Paramat: + textures/base/pack/menu_header.png erlehmann: misc/minetest-icon-24x24.png diff --git a/textures/base/pack/menu_header.png b/textures/base/pack/menu_header.png index 5fcaf122bb6a0d335241fdcde583f46cdd600237..0769a01866fae7a78096cca79fd9a8e830317d5b 100644 GIT binary patch literal 1628 zcmV-i2BZ0jP)WFU8GbZ8()Nlj2>E@cM*00qEFL_t(o!|hp1Pa9Vh z{_bev2lkAik-$zD>4K6(P1HSAm#r$bQrA@;RsKR2xRMiu@>nE`E~_+A)T9ALX{APu zR27AW@Ct-d3mT{tUO}XRF~+EPW^9kg!P5nv%N={hP%~0do3rxc`1{T|b6)qF3_p5k z%*@Y&m4qZAdbXXgpAGl^V$96V(f5SokXT6|8fzybeZ3VJ#>NH!U?rJE^sK#(n>?oI zx(<)WWBKeghCK%VVrdEE6Td@I6bOQVyr#k9_2Tly^M?6g#)gNCyFc6m0LbYyLiP0k zfXS&p5RJ9N2}4e&F+Dqr=vikSmIna-T$V8Ybn+kb0Du?@S)6>0Q5}O%t*&BWVF5nB zA8IB80I2i%Ag9x~eDS>Terqet2d^j!2**K6Bme+ud6UEmgO%-g*aWDRM^2}y!>=*6 z$KV0L=l3HR2*5Cm&DK#YB9qM`K0bl?_ymH%AOIkf%~~Gl#;aHKwG)P}>)YzY$0u;9 z5R}&B0(rUH!|AxWu^Lhb*W{#OXkw^q`I!%8J0D-zX3qW1z{m9rD_IdVI zU_70gLZMIq0BpxIzp#kQm(CmErm!QA9ma3*INmyV5V>3qgjm)GYs*tqYU}*-=a%n| z9ywCsZ~x#B!cC2~7;f0H7kuHp9uIHjOT2Yv~01m&;Cgo=#3y zp->1sor1dbwp$BRRhb~@p5UYYT(_lu*4Eaj0>^Ric)fHEv#r?Y-KuUa zmqT%5!-A1oOKpAc0*_m^mW#PHvl#2^>yG;W6<>IiGRj=&2*+8r`|{;0t7*t;n&rsB z3X73qoNQjP%&27}nYf4{9Aw&H>vef|BInVq8* z%`SK>M$6mHAcWgC?zQ;B8^t2czI-LBil$dggW zxbManUe|Sm>g(y80D!T09Pb`GMz00$-M^367g0RyeMC1@DUqO#5A<{!?;JadiODIj z7d4-sIF2u`TrtkHwUM3hm=_QLY6|!ZcHY;g0wTjre4#(}i zrMVeOX*NoUMAhnY!;XQTZbM40R*aK+F$5Ol@Zm#{5((RQ?A90F>+?aDWe`Fj2m+lc zUwwUzoIZ8Z7#Mnt#l;uo){X0iX@L1~Os5tWU!Z?*$bumV0_LADU@RWTnYK1;$3qCA z3y`IaF+6q{(y|0;S)z-RSs~@}Y~P66Jn9ecqS{=tJDOqc#bHQPy|bk=00 zr?(f+o=scyUM?>K0PHa6-?qu5qfR-G*#T_^5oi>^fTVgx#fT~ZDwLWB7>ZCxRWZH-M8Jb8*5|W$-u0K0 zlXnB2pe`Z~WipRRoSOB>)R{uMIA5dRJrpG5IA7VA^ah$%G zwT}R7$0kM;C=A{Y()Xn11=iG+SA>+6;Zk0L9yMgyCn*TbHC&CNMhRpAA~jVHMFD&@ z>Uo+YIjA*zV`BNN`ZAdtATQy+Cc>*$hsN{y(VniZeX)jyF#tR9$BAl@KuLfiHGCzD zD|3-TFlWf)dM=}SE_V>1H=Q0N`9LH7SKr?T;6{2+Qa0EhNu7JD3Q(bjh*VG;ldC*c zS5&DvQH6-_i~6dILN2ZKyvoX$>=GcgSS}x>wY%fij*;Aj|CR^=o@;M@q~3mz_zey? z&fbKzZvj|@6i?*lcrJIjuBJGG%O9KXNbU{!#m?!)-j6lt&16Olc@-hY6&ZY$%RLDe z=0V4~Xsx}8%|Us7c6LX8dU`fQwZ-M;bl)D z=A1F+B(?+*71uo-kHzkXuFr{TabV)jn`cmZ9cRE;JBH8^A;1)Y&aGHK(MRX{ePIms z!v{O9;@kD-g*93uNk$W)nM@?jv^1m9Xj&TeKWViTX*yD7q)ui=qfBO|N2HS|YLXxV2}{go zjEyn2@s1a;v5nWIaFvaha#hX!ee3V2Q*-tX(amfv+KeDxdOxN_{6ueZGAEi0#;cG}AAx8J^)hf_{DWij^09((NJxx4eu#n|r{bNr7wNy%AP%YR(6lM@Arovet6}ilTK>>nxDn}t#5s6u^zT>-@Yhk|Ni~WWuJ@r z?RtF7eQV;lgXckF6Ye zrK`5q&wK89cy^+SodAWkM?Zawyk?n=kNZDf3dQ5;6MWNUv6moTiQ3r zyx;{ZC!BD?$~)fij+MLbzI)|`FMMJ3RJS%(Z|&&2#<=h6U*lLkwR_Q~JMOrn`Wu7l zR?o^AXPmKe>Bkow=WoVHix}e+0AoxH(vF>tM6*p_19dp^2dMphesUuf)|{- za_zMrv$uZCf@k&X-@CVs`8xIGFJJWi+;h*ZkIhpwrasTg`jzht`qkJqZavppIQ7(1 zo5$v~ac(}NS*`I!nO#?2d1dRe_nPb8t?b6H@?wfs1|vj0Zf@+MmB0FnzgW5Qt6%+R z+U{E0w(VUBn{Rsi+sA*_R?a)`yym9;*L*bRmDQSTueFw2iorZKGCo^7wTHhaIj z_OmHMeRyQF2hFPN=B@g6kMXH(4~}Q+M{Vm~%-1O6 z5C6@-Svl_HlVAGKefPcY#4)}*#{9kQZEst7)vI3BxJ2LTYvWis)nRO^r~2DZ%}wj4 z`K<2VX@50Ftqc7!fAz_pY#uACzgy$=t$G&qTf1GAd*+#E_E~!xqsndEtkc$C-&a@T z*Y~wyv0h&Eq8HWf>Z#4Owf|Rt??wZn9nD$m0L`o&%~fsgv$ihw*7KhCyxP|o)n@0n zwX&dZx7~Kz%FQ?5+}h~f+SdD(-`deX=R@ze4{CSwYkxNOt%b$7e&ZY8XbqW{>Z?7? zMSoYWF>78bZ&8Oi_*a8Y4?g65@j0)1>swd0kMDo!mwu_=YO_6J?yI{w)7HLgj2f54 z9De=lUtje7*I^t0!hpZeO|)Rym# zHT3Yf8~48Jot{~&yV0h~i;t|Hqn324wQLd}>SM)7bY+<6S+?S!MKG^VIj&Z2P3K zt331A9~@W@Y94w%`d3>XkAGNx zR@Tn(`?qerbx~edYqfQTzWm$Y|NWJF@4ox3z5Is3iyb-MdCz;^Q+;UrVr>B-H6Q)I zeO%ko&(=zHG#9N2yjL`%-<&0lkv-kK^mp&oFEp(F^oc&V_gaI^0e-Ntymj;oU2GjU zAGPa>E3Rm5MANFL`KkQIzID*JS4VT@_tsH;>+jmzbG5(mYJGI~ef89a#GHAlm<;ld#3jqyapiRgBj}G7A2u%K9p_z7R@ULBXIw{_nz~XQ%>1&*`0Sj z{xhL-^SSi*t`kpuXN>M;V^i%O1mpFCfZHetUhMM&o72_+A*gwch;?WLtBx->kFH-j@4Wy1;1f?A^X;)o@BIAd zSKdAt_BMa@XhZ+6Z5WpRcCcfL>t~-4ocdFr+r*7Ue|J!Hu=QU3tIf5oby_{frM}hv z{;rP^p#hUbV0Sd;-IK(*rSh-&(wA0V^P1NrC^asXT{(@JgTB4w;I;?)zB(gPeZSZ* zl^0=fP&Ss8rHsBqkovyy?VY}haj5O}y*bCEzjmyP#%}-PkH2TM`s4PNUi_Ga&iZ(A z@-tytrMvT?fb7XmOu^{`o7%je{@-m5^L}nvdRZt}3&- z>qGtPaBE%kT!$!SO6#JwImG(AIkeY$uK8}S_y5Xm-Bm{I@9q%9hJINUuD@NJ#T+DZq9+8>+j04Pis$1M&DuDD0(VmvBt-E$1EH(gyhQaJpyNA zR+|XfwYRJHVx&@Z9zE(fc0AX6&8q`_Tz$87jMuU4|2wa{uJ;LBJ=eOat(9-wYcu-N zo~%t2QPGX+Zayo!acoUcCUnTxPUSTx%5MxR6EhXk@_u8hj64ZT;{m4~6}_sXoS%4qHNTXi-6Jx@UwvldfbTPPMPv-u z+G-D1r*ZH9)z$v6&g_xKsj_N6!Ju}c&8_|VU~drIYinbPCLhtqg%@7f+DHjoJ@^lT zNaIvpwWTsDt8yy8XByw;zqWUNG%k&0{Y9fGXnNPWsqKB=9QVArXgnIbgzDBw3WgZQ z%J2R9*gk6b8^i1zV=|8DI>a;7PGY_q<4FBaKRV8u%PX4defU4 z_v+~R{%#CgBlwucqMI_fHuXK;ruyn%o*~yHr9^Du&cTnkH))p_D=OUn<}d^(DWN_xS@4m4)MekVAVy4UA&)CwzgD8 z*Ulw9+B!aK%l)JOt;_axZ9ifBU0DZ~#-GJGHqHlh{M4a@sUPTUWpQcw{NTq<8|&`p ze(vXLH`+icRvp$w-&5YVZtdUNQlBc5Fj;%*dkUb+TTkZSKXZy#tzOTOA1I&g z!S)jcDEe8u2wu*8`!hvAO5xh%4DL*A{W(K=rYpk?V_9Wcm%UG5Zf{g~{qOzm>Y`ji zFYtyvXY3e0s=G4m+uGEa*5AIbofJ@nZvAm?QFQfv6SAg4P^1KbZE2 zXA3#P-yFA@E2sIRHK`8PGlai#`n^ruGqmlrU^m@#(_zLmMxnJ@o0p&N1CKxcD{C=0 zgBV8WV?4k4&2Ls_1d`RUbwYzoGfjY~&e~p^9TJFK{qEh$>etI1!A6p7m7~rd~zIx@VtFCH&wx4QK^M#pkkhB+D8_j9$ZO*H&=NIdgR`@Gl`O3;Q z!&==~IJjFUS+82J^&Lu~`{Ii)?*D{<-XU}t+y3tE`ReQL@7jZI_jhGi7X~?HQ*{z* zSl=qYzSeHY0m1=gSD)&3a5hGj-`F%4gpk_P=Q<@>m%UVdwZ$CS%UzG|-Mcof=QS_Y z)3_#RcEDeI?X_rObTYbAoz@3Nk3y|af?92jrl3Xo#X?kjSStw8J>OcW-o^)w>AimI zo#qpBTH6-m(d7&!L^`|s9zCc{^_yT@dEJy+(N~H%beljKed#jK6nL0rRyx8?_4iKe z*IZXNg&5|kdV80a-P)qe)}P9558DGh+l6jx8=6^P8>{+e&aI0P3u1epjSq!)cb1Nr z$G+?N_ILAMds#WF&z}0&$39ly+RKfFxoaOfpPW6-Ic5$j2aRE6j?ZcAdmm%jO>yY_ z#bj4@&sP>pI)=R8+Vjrh>a33XRX-}f^14~eD1s>i2w)Un)m<6QZS`6w)@0vd!YdbD zsJx!(H>ecrn{}L$$oXH4kA=XA<{Jxp-rQL?-Swf%T8j=gr_EJ$)&APvxb%Jhx4(>8 zWwy?oyFIU;?f?2!-SG_l&5GAP>I`YU^j^O?i_th%*)GC;b6)$}&;3RSKqp&QwXwe| zgOaViRlA$-+SB{J+wa}|cK!9&_ilZwJ&i|wF)w)V&anFIyr>>l)7G%Mj5gB^p7@*0_m(_3kxUuYf>bbtB_;4mr0$CT8-F{*bZq925 zltSZLnLSs3?8k-B3&qmqJR-DF3>i!NBYH^@+l3!P@9_)JEZ${_g=mZBO;+lZ4ESYA zu-brcslMJJWY@0NW99aYb~5}Z1Fz#;sttJa{`P+BxOL%O*JeE7>a($M&My|g=Lq6! z3;4CKeQgb|<4NhDP&K{@rKNH>H2_U$8=?+$a5s=N<1A2>*95Y((N3j_Rb~U&ggOux z7J(NI%jmcgP~Ja2F71r@nJ?$}&Z&E7Zj+jxe{gLr;?NwL0~@f#*F4e0(YE&-&2n?z z_bt-qIDsbuz*5oO25iniCn}Hmp7k-J)MjXtwXmzFc?ZK?>&%(w@r`eM;|oSd&fAxk zd&iC}gfwgz92S_`gFw)Hfu^+9Sj1{ykU5&6%1Jw1+Z?EUSKDZ`A|$<|ya;R?zB(h+ z9UjbZNAPQy7UfolAQ%a#VPjT#;D9U{tSYq9wIl5rqJWq*rtOhF``$P=x6MUmRjxg1 zA4YT{xP4;!dgu8=n7-?dJ6^Hu!@-*0=a13CX&q;FOWkJ8bx45LG(XL4eXM_tL%*jz zZ~O=hS@RO`QX2GomW}4Hu?TY3yNxr!q&a7S276{52H~rIOy^=QFp}1?evIn~Kd_iM zs3;*Q-kvpDSSJ{MdoH;1t6%-<_9!Jw?TN1SeE;uR z<<5%G>ggb-d7rJz#|~)U5y1z!aiAl$i9iHeP4FkUVXiUeeb@62bBs)FVYy>LZw&3% z&N=PGRMr2UsZ4^3emW~5Nx*8sp)hEKhQ=v+(C^@zJ=grww$tvjc-E$1`n91tdJhwY zHugQ&7nbbSYP>^ru=0WJRyJ!w?^L$Gd!ALCFwyV!3`VVTK(Jd+){5uslWEM1zh}04 zw&&1I7BR|>>S^s-hdoo@5?II-2L55z(UEmZyO9ZFq-HUYW! z8dJ(ON?!Z5I-5HJp!Pef>Qnti$ILm%e$R6EAm~ww5RBs&K;OG66RLtju)iyx5KQ2A z?#I;D-U;aul3{JhvmQ!$Tf4H5Hin)dL^Kx^Uj1I1Sk4-2%zw{!-oEa2ufv>k=dmVh zZ_m_T%6B|c<6Iv)KYBLdsCt_J_*~-;%Gm!~ANUaOMuY2j`w4oA@Eu(WdDa=y{~-aI z8;YgsYTlxC6a%%nwy@|sSE9SUyO_r=G`u$A`&iCqD>k%+y=H8=cyzn6SUay+5Al$! z#1!acfZ7ToOwp52T3>1dgBE2!1qlRR_>Bss${R~Rmz4PF~myfaA z`S4)~LJ%5ecosKIGZ0Jc7wKbm4zL+b+*(1Lca zbw6*{uKy}H@ZM2&1UN>qO~O|c#MI_gK0%AmMeE4n%Abuj9fM9#FeV6a2U&!j&k$$} zW}0`{0KLHH+`_LFj*iuG@Fe-KPFI!nE>(c(sx!D{p?2YK{XIu`_wqR z=!`QuNKQX%2>SNck7IwS2VENNTo9Nn#o#V{!T8*Qm{{AC87$U~c?Y{^X`=c3(BRTo zHSW z4`?clH>-S1?95!#?#94$m}6|MaR(RpH{T9SFAEFW-+@_OtxK9{+Ima^#>O}r1N)i+ zq_*%YquB+8i;*N8VMKzQVc@u5V4AAGHbw*byY^wsNdG6A7YerOuB`SZp+Mi81O4kJ z*ca?WdIYzO30!-LoOTd+B>6BD4P1Nby%ML@w*v8y) zDR8D>gnO5u1U_v%k1(z*db0wFH4XjL7Qz{(vGUPWdk*7FxZ|HoX=^{R(o@oBaZ^75 zwfdlrdKS!>lEPTFCJ6gotfBnF` z&rk}3#G>h!UV5qZfCr$+pbY6*3O&4qeTLzupo2CNKcK!*5Y9A??`CyWC;#N;#yYG_ z3NGj_bdb&~{?oI;{Gt?f{iJx3|f+(rBNUqTgR>8vfa52^%Bpk#LzfoHo2vDMo%P&C!W@KW3R zj;kTmTVn<0PLb1lXltKnFJ1zY13%q6g!e9%>)s<2f{sI=qE)?P|1}QKQDipqRnMZ? zcwgfw{>6OZ$v3lfJ{t??s>1j-{zL=NQARH7zEAKxk}Oz(7YZGK8EK zZ3nzVCPKk~3{;EuvFB)*C!Y=k7;)?QG{wz(btBde8==)J>#UWC)_Cv5gGgC7He4IL z`fN@@E{GfEz`=ls&~|~9ISlw(fqNiC-H1QUcFa=*r|ZcvPLsg7ZNs`u(^4HV04%RG z_zr|w`O>}4IleZt?y=bMnXpIrSMbGy|2O`uDa~Wg(t7cIs;-v}#=YyP-Mh~kAAdW$ zAU@aoYhK4kZrQTiI-Zy+0)n|GB-O7NY>=1MiFG3Y0PQ3C(pVY~RxrLfgceXA%py1= zM(q3f&lj3@2L_E_8|ye`f`;9pFkASdo!#Kj+R+74%EC%9QMt`|>!7hB{Pirxxb=d8 zPGQ&@B{a;|)-KF`f?&UO;0bU=bKScjN)%1CxjjfJRXbQuvpUlb&wfy|-yq+q<}2nU z2ED_(vElE3uDb{nUk*W`p@_@M-(d{s+i@Sq0_ZGu46ZtEp_UY!IAfq^LA(DR<<7weqUK0>Cu{`Xu81bkJW=#u%f-=jP05EFz; z3jI(e{YEhxFVpqJG`95-|1|q3TlXNa6q^hjl}lMm`6CX9JzN{CcM3+rQoo_`)t7Og zy6k;Evw|yGja;{_66d*9fw(6??X4^Pk;%J1I#?2~feg~xL?2p9$t z(C?I=&R0S?mqrSd`owZC*kJprU++rxK^%_acGL#Bs*^6Has{=Ai+vQ=ncT7la$oMfi3BP1Xfaagf&euYK)n7Er`% z!4!YL2rn&MEIa)u~L&S|%X3O|{nJ!`*vpwij1P&yE6(fdIWXM_b z%kLL4!LX#UZC%ouIha@_C{}2}37oV?phgZO5J*hY+A=^%kaP#;l;>*;%^gOB71QCw z!eD$7WZEZ$#OA5Fh_Mqfu>RGr-f2$24Evq`LuG(D+CvUuLQ7>fu9aDku==rm>(-(; z{vF{Tr1r<5H0geF%a&b}g>x4EF#P&93+5Pq2b^GK4s^<~2t8&4BaI<8hqFb#Pl8MH z6P@c&YA!YtIO7HqI2&J#2AFjRM(uUzvG7pPf#>Nn-#?bLpyw%YTK^rog1U&5$rl?9 zPMJiI%r-$LkpeM?UBgr`~Uj__Yao1>w?fe0iPy7*0F|C564)`<2Cd%z{7(>fESKf$ZAXETGyL z{Uh{%%DK1>v8sZ3vMP&4S=$Il_Il6o<7YXU6$Ro91gUF})o;uu1s0_};SfZ!_8JQo zoahRLiaPq8ki%L@@i_aW*008-dFUO?D4#!l>V}fxbErONl)s@PDE=D1#;LMJ^A_RK zS|r4aatnspWgM3N?RWsNXX^x0PWYo(txWrpuwg%Ni)o!w;MTXsrS(&v2sD%(J;x8Z zGAVSLckp@2C=hHG_&MMV;f*pF{e_5Pv@zF}Upoa1izY)d)MpAqhyX~I83of#NU)Z{ z=PAr7sv8?h1AD-nTRW}$#-uYdh&&+#z0RclcOFB#M>z!^%eQpz1_ar<4cL z74a9%bj{4o0W##Xg4DXfzs9ydyvdgf8Z&Nji3kdADL4V>5eB5qN^<}&FXS&@JCg-I z()R>hmYW7AMyN7vnpcj6-*v_*r6p&-xK_g)xbdi@5-?AM^fF-`a5I0Y`1DJ5&gXwB8PL(c|hLfAXG>Ms>LKDN-^&BfdYagWhkP zY0e3e_RHcEeflT=dt9uECY~z+j-E0p>%GFhsL!e>rqSrsOZAPHh))oNx@T*`HPJwJUhTzCtRamPN?s^8C7g_`pYu;w4Czw50F2Ru^4JyMtvxo~wr97~=p0^fe z|MmLVEr^x%-Cm0M#F&9Hay|X7j6#g+T6N1`x>>`i?oQ)A}kG7hiik{cRoeS zYH;LyX<+IY2EVevteW87@ot-5RH+653`=Cr-Xr0&?yy4q&iJ^XGl_|Jw#NLlS~tz< zNZ|jvT^;UAC`t3ezscd!_|gFT&ZZM(P;@!rzy$!n;5C1fCT|uBXjuC{rUw%(unSFn zTIaRs<_zB)48hv=B_R^!xHj|K6M2&M-&*Z&o43PSV2y~LfI67AAR|3bum+QDT-wNu z0jN-achFRZwpUKMXuAlS)}K9yX$9*+P!U1aNero+d|&?Zm-+vIYc$>wFBUZ#(hhNo z1WZ3atLo_)j8H;SV?i^$_zjbG#@OTc-F^3KmhC=hUp+_G&ef-a`j@V$FN0TgHGh0s zh2NLPp#G#m6}num!}f9s+c1J8ABfL3oA zZLbgZ7-o&;nZ;2m2#_k8`~C(=t1eJDc_+akJ78JQ>o2RvY-s>jb$|&7GpDF9rmW*` z>$Nq=lH9r!@CQVYRfe_6exW=Bm2F=I)9?EZ_uj?WNTtF0<1h_U+TYb1BYQv_C8S@lQc$JR*#SoJloF?NFV)GrZvor^s~m=Fkz zvd_8K8f|~qPeK%!G^?P!%d!Bb*K>qH@M`(6|N5{0x)cW1hZHo@di0C{7b4$A#|cIl zlgiG&xiNum;mf}a){!gCNorJ(9`*D`pnmC2dxsOxy0KFCzWiwpR}sYe z4vZEfz%LFV5rCySK&J{+)B2$BAmC(auP-yq8ZoUstT(M0kw$5n`VFofLo%o30rz61 zoc%-`GHploy~i5AmvkiApl@R_@4E5cbDjb1VmOrXa#G&wQCK~5Oa&L zwrOAaae#Ew@U!yNug0W4X4$V^u)aPUpUJn8mXv0jpvNK`1A@tn{tK|v-fn!O4gB*Q z^b{|~hGjF~zUr44KiUQ&O2Cdm>o-9b2niM$Wd=*kqTT#5&2<;Zvy@S^78f{l)ik1v5pkJ6)drSYSLzGvMiRDdYk;#3gXGH35&R9H+3k%&8`Iyz4 zGS6P-&)WWENi~G5XVz$Io3gR?QH~H=>N|mMWsLLH}EC6nWtIEX>+hU8UD(4fI`Y z6`>d^g2h|_8n8r6FM5iG)HhJ)7I}o~AV1s2rZMVV>+GuzZW18Lvt?UCdoe@M4@yId zajpRJy7s(C_Gl6To%PE*EX_Sf07oyR0jeBp$9&pf?Z4`^mhAx$*v4G|H?#n)a7IC0 zM3>JgSYOe{=BzQOtWj|KDgK&H2u5eKD=Cv179C5Xu2$Ley zu_#M%0acJN76b@fWn%==)0YD4al3ZCBYN~>hz7mtraT#z?wF8#Wx>uc0dv3w%p1Q> z8f;d4IrsSO5I`{CU99Kj0%k!I zoQd+l{scqovL5(9vo2N!D>O)C^Af|sat%2``_0$X`oi!@eonBGCWZB(Hp;gcjkx5J zOEA9_ZvKxRFs#;f<+IXK9(J+DO}^NK$jYPyjIObCupHDcXaWcl7Jh!G(a*+| z5}r_i@#EKL4>eEdbBrY#&;6+RZ9YME34Wrv&%R(R`7zMZij<#~&-#k7hdQ9xmwE%U zsXS+2yc>m+9Fnu5fHkVRQtW_uc8kIcR?H%rfLI$T1}cL9X8%aDQeISqf30cjp8aeE z`xEupdKPh%)tIHSa}od1?fmc7rtUdPDQGeU5B`?lDmXnKYs#T6!nE^fhJfO=1f~(2 zq;Zz>7BAHp8+*!2?q`%)6s}TffSo4(E|(-#AFQ#IF}R zQeIW`1fAkm)Y-*=f*)jf=)Jy^UWc;6zCshZ`&DOS(OPM}*CuW-U6fi-N$ttjQ_t~V z@4MPkUph1DCw_Y7^`LF=C;dNqQ2Qw?K*js5PfBV?#oA`QQb;u)U9yU}1jL+WF83^l ztUX;q^;zItnV=@L8GLm_HN?z$rh%KohKsIDDi11Vb%ggmer-^;b6d2`h^=MQIYjMu@B_ zVJiunvlC>Gj}FL2W5JIB zlP^(oa{$JUKt{OgBOgy1HgL7ta`>IYP@7=F|8x_D&U5O&S^a|!>;QWKTLYG0|1W{ml!st|nu=5lP@;1^)@|EBV2UeG`)FCVhIhy7oY`PEiIpzLq9XLR`KxGI3 zeBk(w(nPXq@vEwgjn*@kT)|H2hjnVrh$?9R*st;{%3De(7pk66-UXhGkre0$B-Y-l zt^^gdfxrT`IfbGpkcmEPd@%xYn1NJQZofI7>ND7slpP(|8KMX%?TYrZwu6|W0fNu8*7;kr=DD4VwM`lpXY;zi zGxf2$y5{K4e4LxZ*-~uY?ak`o0!09(KYoD8Y@A4h$9=08CqM(3CRvI=EzO4eXIX zE$?%EMweOq`W@6h#YHzd(40}aQ1TE=C!P{o6TFnmQT+`18V}U__JJt1 ze6sN!l<^?6#SF#>xQB5HA)}+7`ke;ZVJ-Fs+&D0dt{EnJkWX0y7{;Moo56WO z7)67F&lhxt#Y{>KJ~!R`bRz0tH*+2>ZRuKDFft&ujGl)=4q)zT2e@71L8Dw*1Q#&b zp65#)0S(I3Z>;?tEcF9y7(5JwxIN2Jf1OZ3doAK7O(bS9E9cj*zyA3fiOX~4BfZhL zd}vd_9_5wdON#(Y!vF$aAEPJrQ-rt0L2e()^11~cYE8v7HxB|y@Po=f zf?xw;KEsZz1H>AWO9|9mu;$fXa92!$pekU|ppxryhJwY`UJy6**?wUe;?L!v2HWg% zXj>}e)NGqRQ&|!5_EyZQ@hQr6caJ&l$I1W ze9S@WF_$6~3$XNrD7BNo>7eC1gjUr@kt5qH;BjDXtnK>I`^HXGO+qAQKoAWn#3)5D zmyKV{M{^V;xbIts&RhZAxJM99XyU=rVvIl!Yh&v^L6h~#{Ka3i9{Zlq2IfW~Du5eh9Lp>rlx2!lIvURUVb9=; z2w)H{qQ?^WC{|frxgD^S#^6zCh^Q=05=%T-XwRDa$`?GS%U(zz?OpVW^#skJtP=5* zl1nf+`*c<=Ll&?+q5XtGQO+B`#=knn;9wPE5fKfyzNnLuxo6s6l(=BE&P+ikSyXFh z=h|Y72r+AGt4o3N0D)7Vt)c3l=R-78zRi?(wWGb^d=sS;`VRDwTfpU)U%u$$8wPI) z{^_~qiUqFnFzMRG`da_nU!uf2&jr<#(o7rq4zp;^{*3aBQfLtP+s7$81pMOrpVEcE z2bmC^hol0Fr7)Vu(bx(w$NKAd#A*+TEUE zsdr6~+5^+Q$Xc`!Is3E%=giy%2^75zyaIHA7N$X>L8773K*1Jle2c&#S$Po~2eieD zh&H*w3R>i%Sv6qt#0mRcB+ahfM;-N_jE}#^5E}p(VGg$IUOt~C%0a0HIt0$#LEX-8{h zH!aYNZ{H&6HQ}{`Nm6n!!}=s}1uZJ(h9)isd$#loi~!;cVkk&V?F&Zjz!JnO#zyY7 zIhvvv4;EO3ssoZ2>jW&ZILBcMBcGHSon3i`&M+P=h) z63qDN5jMCg@Q)-2S>Mt~7$*$6++^+N+DSNe9?TI$S@aqwiSt`qt>M}W`cCkvZh~R^ z-DF76D#P3}|x^Bu1aAN-QJtrYOh#a^-;auc#ux;~> zA*;Wvlrdhlolx3YHM>cyQp7Lk7HXtAYfJ4H+;HC8=r~9@M!L3vKSC6=X8X61=&lXvl@&p{a_j^|#rLN)M+j_&tfQs9*`m65NV$b45`HV{;()R)qxmlj2yo%Nt zV=)41lR1Hw1D}@jozhI)6mtc^2enl>cyq8@h97OfYYQrA?$NN^eo`Dmi8>FAEuIk-g*mTI!mVookxsuYXkksdt0o`Gg zGnFG266rgn(>BajFOW`Jae*=pGei6K{qmAP?bkOJ7@t3FQEG?K_lmJtj%h#$PQo3_ z`!glR=HJpn>y!VZh=Q~51M(->jWSp#lt-H?%>(NMs6?OEhQnTz+I0eFQEI0}&+6Fw z>!5SA^Q|30eyW?b0%I!g77eior?rvtBmzbQ9UD%CTd*@42&B3D_BMKP$2eh2VM%CXg3C<`i+Nm1_EbXSh)C=5iY^MIuP4qGu$7t zKpF~46o)>Am1vi<)kc0aeW)$<2?Lnb5YyzMB;a2PPD|**K-Kpc8;Ue%9w8os$KnX; z7_G$Y%+P2)HRx$pz222d0R3tlFR<`XdB_hE+y;l%=yXKiUi~ORH|(OJN|wFXp|zu~LEa_DnG&BrwJTiSccWuMq`X3bz>|%@2y}1R=XJYh(SBi+o0) zSj!YCJqOv*ID(TW*kJN&qq^)jkViR)`xHn@tOM&PdQvJ5=ZC;MXaoN<=p<+gkz&zI zaSiZx6i>#l_t6->&yOsXKb@8=DMJyoRo&f!QGpwRDS|*#ln|~2Me~1(68&vl`dxno z2x<<|W|6Ha1ECct;^qKEeCg$yh4|_MubkawAj!}WLY17`t*vMk1QxmpMd0dL?Fawl zlZf8fE9g0RDi;d0)%&%R;zaalmPnD}duKe@cYMy<_go09Whjculp17K+Jn~;{wYbL zAKlS1!Pi)n^{aP9{s$$s5A>N3O0gO(>QkV<_Cjq!L!{XuW6b{Mtts;p9k52Cos@N4 zJD@fQ$P`K5nbUcRs4kUEZc**++D=%7)@i*{5JIn@HT|E@HS`h}j=pDMHs6d#+C%te z44Th~C!yUo6FTvQTc3^4BH3;YvLG-xFz8JLEVEP!HjZcey}@Osf|Cavn7R?w{5aDZ969d3V~UeM>VksmA}$Kipf5iImUKMo~hOhHBnGBnnG zXP*hV-S~@QhnbIfIOH5sa)dQMAR)r`%hSf7<_@0_RNx zL7&fo(An*3#>0#d9vpB|0B1m$zXFK77?VTz6PSu$Cg06|CNRnRb+8uPnkCHv4Az1vp#8UYJ=c2EZj85p2m}zy46s{$7PVGTCHX&% zC7;eT=@(yoG3{#Q6RhWmxEPtr14*W7=07XHEyhhSldPXHCDLoK)MFajzu>*bl*Sfp z-@!;2$KZkNOE_LTMeY=Zb=}xKIKJ;%ZGe{yAlRE+YC#Oq0{aF0kw74D6v4;2C88o9 z+-Oz8Q{VMFt0`uk-=*Ak^W0(tJr_e_y*AFQBj^}9PPxcZ#NyO%S-zwQ@=oQ%a0p-m zPAq6#{WGSNz^o92=q~#ym}1}8#>r<;;&%LiR4W3@*njm&lzVxhV;I|yt-01Qno9T+ z+=qo3JQAa4V=~dRxC=ak2N9(bZ^H5)eQ2Gs=z){kC#?6u?dwzh5F{w5W6Bf}<10hn z*ya^4Me${P8-w2AFKPc^phdr|p4w**QfBsheGvgz)LHH@v*m4FfDy_puwoW;)-dy) zyNA8s{wDa!-$)pv+%_iyjy<$z4@la<*w6l4n_$ngKm{rep)$w#fWWe6?fbq@0YT7H zKV(qnhNz!h0$i+RU1C_^HCm4;rCFL;#<(2_V3uV&+S(in6gK%Bf{u6Av_8Ng1por8 zWkqa1_5AG93KcQ?)UsrCCV~O?U1iP)1au0Dz#ghx$`UE{1bA|OQIbcK+LzTwaX0(4 zgO;+InkUd+#s@i{DRtx>x9|8(Lm;jnm1BKVoP-ptZBqT<<$4d)R(*{fy2GWVn~PK^ zoMZs}4`sJ`t&ey^iU#ei?e^v4PZgAPvpk%u&op=AY~f_Wk3iM9HiNuxeHvJ~=|GVX zBZP{%7Oq(Eh6tr#6gIWURUL*AH(DN=jmjm#zvZoOUAg?yOV^Iwwd)0A;1b98&-pli zN`%ghc~rNJ>z^+O?ilxXzx&<%phUDpyfAqLIR3N_5%91%ZG+9qDgrV=b54_4S>`{j zX`8Qd`i-WX7O*log6qQ}8kAw)T;;{0HX;-4_Iz!?+NpS zCIXy8g@Dx<5mp4^07WD~WJzfpViZOCGse}|nvPEKI}_<~ZoBn7uGR*~tHV=U2vOQO z`;38d_k97RqMfyk*0wpL48f3LQfWw8{AulHA(wAs);kd^DU-k-MQ{bT!Tiv)g7-)t z{ z6rnQaRP@vKRrSOq$pgqTXI~3u0n#rJN6a@!ac#gzVK}mw()Ld|Aq52k3ub}G@I*iA zC)!DI$NFzBDE+{>dY%$$j({ndI)!fQy0uW5IB8TIq1v`Z-pY^N9G)DT&>aQR`r0{viRxa!43S3HC+@{LC|V1 z_%){o2ps}_Hdrm>25FAsDg1M{jap~I7|U6M*n`~kYzIkqgD9Xu&s2B$0=r&z z+G(F1w=TG7Vg7Ec!vE#TVG}T`x|B1ccb@tgW+dk%S zZ1Zgc%CK$g@^j0!ZGSX=e)DGU#R`d5+0~~Acv2x?ItcSE!sZq9E~5O7cf6xT-@n6hZ*5J2yNo34w1 z+r>)LnrRdDdC^4|8H3g$SSewX#a47d5gi>OF_RGiLT+nS$_{V?N{=RD3oW{!7MO11 zp#2EEHQ$B6f*ZCcX-F|{X%-{$1r@5Sd?^TEa(Vy^gc5X>;wjp2(zqagJWGhy1CHl`yU)CJ}liu93d27bZ9eU zj=O8O{9_9kP!~q5{>c}M=G5QDlclkX1rHPqvu4~HOS#*!3eupnBoQ2Dg3QuQ3(W!_ zLt6cF&Mg9(XrgAE(wLzaom34l|Yx2eBYcpqUgXwYm07i9tInfDJ7!c-RcdWffx0oE4|6 zHQAO5tE_Nacj?%@IT87>vfmSkEbmdJfYlcU*Hs=n>G( z_==Vs6UVKgHC`EwJ?lY&R`b(%5+YcKYg5)Ibu|9HCn9F^OR(W;5Mx#JLl8fyOnRR6 zwRZ4ds*Uy08YQ^aZnTTw&@MN5(4Bx+kPGUKGpv1Ywi4uD#8#cwO}4-oYr_ zPlB41vaEGi8(GNZ@4a=jud9uS=JT^9$O-P#%^#a$N(vHtkTQthcvrCuSa%5@{Q4{3 z`P-a88?YEw7v&$cOFp@+L$tbeEZ7x`y7Q_v+C27sbJ1L(pN&I(l5z;TVHUV31*FlT zSfD8FlK!MV8uxgD`T;85_u&2n#roUtwZHymiLL*=8~@PS!Z)&P+NWE_^JuGm9uEk~ zKyfEc5{0UG2!tasTcSO!*T%R$*FJ%h1h@prC7?q-k_{?b)aSlytx^KABoYXrG`UPP zH@#OIqTkJ7Yp8eQ$r=+e0{Xvm3F56bav_t>N_s1~q@(%m^}g3{^q_HMlmoBsz1qdF z(bzPGpa1;lTPyXiHV8h{SPS$OFBgsOee2P<*CuJPoT2>E>tkgJvX)i5Kc3OGbrY+m z%Xc>UD$OXLASP_S0u2f*eG}h8#puA%OGHdk2Y+J?6$O=syJtnQ>;Dm682ifXc?>%V z|D*`ksCyhDG|q0hovQy=M!$Xq$ZficQh4b7=bZDmpZe05e(fjGa{0b@yyMC-Ag^7W zOn+TIo2Ru1({v+rw~xg%Yx-zOY&Z}Oj>|O3b52Socban=ZJKOBq|6iINWgRWs1Mw$ zPth=?4sdNB*Qk&AeywL{4{0Q6XM=0O_lv4%jdmmc{QLS{x`v>Ats&a@HXlYz)Y$sb zA=O%JtxLJ!z~}hhbH?oPm{?Fsd#Zw`=z^8Q4+&A>ZzEAP-wY8StHZ(WP?fU4-ip8_ zXjV4n8sP%fGtVN+(LPf!5drj}2fb-{lSLraTqz4EJ@ ztq!c}H2k!!@+`6_AgG(v)DQcemcITp4}DS`5+YbLdlsWY8DULwAX5&~;K zx=E4~$=P@l2nmQi(i}Q(nmftQIW(+NZzPK;=+sS?l$=dMTh-AGmJt z^X*-NwK22z?9U0hOekh`tNqq4G?K9u{T9TXpwHh60>bln2v!mb+x9ZWb7PpW*}LGP ztl7P5S_quoTM0PvjLvdM0!SbHB;l39PV5l-fHlrqmi|Zot<^~>&i#bqOb{(D2r>J$ z$-1W~sZ4(9^%)Q4+%S%_vK;gi@<4kbI;6&;WadIZVc}ehrZNtocZ6nH2IMQokI6{U z*tGsYX!}1awf55@vnE>4#!gaAVm1SG>n!dY{G$LnV0wl1aS z6S&7-tc;Y0@o|m0^k$;(5`KHWb4ZS9Xc$pj#i_A&&;klj`?wpLfs0wUGn#U5wxXJg z8TkZ(N8w!E?HlJ{<5yc!P_*8t_v4;R8D>SxHtM*~a`gqC4B^kCJ4bw%C-pz9GEk(N(ZvVX49vYXiy`-Erb>iyfSB436s}p z;z;Aw&&l}r{@@Q(u?JIxV%{Q;!aP77Kbh1eOq+D&1 z-3gm-J?EU5?Ugfz1$l93j6OU#Hg@0-+edA!fZy8#clgBs|EF=v_3(TS3 zoCw9t2aMUB#tjvI2@5V<#X1tULcPuo}TNFq00D)%t2r zjpzAr!u@A85TJfUt)tS)tFDKF|1EuWzk2b-uYC90-~Qix?xKtS#m&}n{!{B9(yfE~_k}Nfp}q=u;_wsL%DPx}LhevL2$WJ=Spx|wJ%^#{|Gi(^DXK7&qF3_Ct=*U)wEbg!9oQdbADnL2}dlVV46KgXdzT#=Hwv+ z{at5$Ml&(h&8tZDP%12<0^5M3$Do_1p2at4PxMAq-s)zdPl3l`0P@Sdr}t{F{grZz z60l3EDNJl*AetoxnU9-ug*7>gVr#{J*_sehP`6O*s6!wr{-xY(`lOhd*FIrB`crVSlq7@&@NWLY&|q9# zxZXJXoNui0A`J6Acb1x``rUYIOSFriZVwQ|MLTvzu{w&351wgU=Ln+JOVE^lhN1$I)#|Y)YLB(r8ZxHN?X0?lUy3Q#M###_pkxuHoHd-{ zvm37|5^?Wxp@{x-A+&ya*4cH_LRY>E0Dy^J2z50U2aj9h`d*PiFvAP^HH zj7hSvF5 z(a^HY(O`&(N^6Ost}YuE#H59>eW{T=av2)@$niG|+KEe?y^z(2<|X4W7y{>(Uw+rS zUjO%>|NPf}k_66Uwr%@gvo>EjHr~s|;rEJhs1dr3TOLNN6oj9hqhBu>nx*5%MwF;l zls-^6K`k(Hf}e=C*1~K7bE+290_F637E{LMzldX)FX7F<$&9G4!(!04=uzkJW=Syd=qlzdjTCHFv{C zivs9lTKK9vOt6t32 z;$Y_Aa^|qYu#?pwR;RUhoDqN(AcGZEd6|YHV10FarcW ziUR>%*5%fW_BdZe;9FhpP0TmpPrwpNIhx@ZC4xU%r@iK=cFP4z@Ir^>+?<2&pusfj z2|WdmfVjZeNl69X$pXk%&}@P~%S~k_FeF&jRx}dx-@H*?1li=niAkaW zNjO}<=?EKqAq6iXtc#R8E5L%+Iom`ZO_^RF8tdi|Ph?NE)0 z6$4LH-|=n~6y`QdI;OqyT9fzz&pP7>q%6fOycAFNy)!c5fdFYw@W&N3vvM%E1gXZb zawfQZib~Kuz^>lKAX5^7zZ%Ed)r}7&u(7V1tLBL?ur8QW?G$`Q`LzpwioO!C(6(-8 zHoEQ{t?uYvpAagPX)LFLyGh*?kII^-e!&g7kl>dDj-lYP=lJaLy>{^(q&SeD5+Xuc zqxe7d6TCz~bq2V^aUt~0%JVrdFP@_|uwKqc8@}We^3lHdHfI|p5~R_r*r{Gf9dsDK zxG_EgIzmZ?20?KW66F;}@8{Sv&icj*UnF(}g(+Xj_M|-aeD5p2XP^N2$5syk+uVb? zizQ*cpfB*ygy31RjK@IVxGmbd0>!mPn_JPs!Ln=1_Wy`Hc;Z<=YM=d8V-dQ{wjDAx z#-M=ZNg;sgW(m7A|L>NN4^H2 zMU{yW)xXKYN$Q}%p%Ifpp!ZozMfGfLihu_GQ{VF!Nl0ivR8RY>d2LTLPmSS%aGZPY zxvdQhZS56A2=mYHRFYs;<8^QrLM%=JfrZ$ww3@MFg3clPXg%MTD> zh_-uYpDZ=ifx)f+ZyJ_ZK5TPRWpG8P2$oNWTz%qTk5P;9Y^?ciqIuR5A7KnU|B%Y9 z4%&MCodZav74A7OqUM2>-N6@=+WrB-;YSI@ff=HxV9{?~wN~exv7l#jGVJ=-y67Nl zjrTo8*qMO=B)VL5EcN*@Rwq5K@fM+{eIV0c?F%9=d@>3#)G*gRZf-5xirX z8yA9G<*~fZ^CYMX>m$KR;3a6BtH1U&8+6;DDOY7o0ZZ-7q(gN;^cdsj9Au6#iAI2J z>ys#_H2SRc^_>6=Dw)>3Icm=}FW{@yrF<3xG-QU-_qV+rO=#`2l4DMtw^9V9G>W$K zPb36kTtP*x)%r{UObJkb`IigSA^|*wmDCpXN8*0kc}kM@b(;J4zyJNvG#KZV%PzZ& zrLnJ~g%qpcgRC7GIC=Z#ymAl>ECeivAtcRe-zJ$L2yL)7Blqs&)p2791(s5^ZcBH1^Fgs~TjBv!_dN6T(gViCYwx z1gV9zn-VG|MRQkvW5J;)Qd5G0U$fppCe#-E*d5C=>pOe*-rJ`O+79!a74)9>mO^w55#_@X$mC!s86WlKcz+4^v<{Uahnip1EaaS&p}SruqgF#mIK zAg~{SPY{8KQJtX$;Iq(eakl}R5TS-?GKH%reDz!JW32cNL?qhuh)RUFwsojfe+wRC zrmt@?7C!;PX8k^DDY-P^qK|<_(t6RV(NNNKVnQhb2%r|xIw3;@Q}8`Lgy5@`0GMlG z;u~KUKZG%2*YBWolm-raMA9e!nabahCQFpp^$QVE5b3r}A?Y;;9N!h1%D$oyAvm<& z5brj1>yb8@pw6lXlEELccdRkF99vKPMG&9$dyddN2J+C7u@TIqHHtCB$VsA&Spn5B zFA0dfV~x)mX!(;`>oasv-&g=?ARVY3;C+HU^*(KzNQyMy7%tj&mJRg5-m=f?>kCU{ zJnymKeYCf=-`u0`mXa>s!_*#2XV3NkVwI6*Vv(Xw6r~+G7%$ZOnaAr%g48JDf4Qde%A+SMJPGY5wsgbo24oR^9-?rgs890 zO?6TDvH*5jM}nWtbe`rMvqhl7aAM9WvOpgj)5?n}gkqV~X<^*;JDSZkqB{Ai+nXd# zbOZBD0AV%geP@;SSa)5sKUJU26~P+q?C<83g;xYkYdtyzLC_dQf1OjVr&6ebLbDFH z_Ua>gK#3$h51J>)48Lvp_V|?>0|7^Bt3Y1n49)8|mN5HNenScZ@1sxr2L*)`UHgvP zZtMF;AKJHX@5VC#y`WGtN41rO6@rPSljSx#$A`SN-`|ZDYgRX8M&+}b&1e$o;8>2J zGMev%f3yir?p=rt{3rise&KRE)|TF-1Z$mCo=?aH`=s}s(Uh-XtgRVJKQx@hnPpB8 zMAkS_#wk@Oe?)k;UgT`uJLYT_cJPRE1_@Af3VGJ->cgirhWI%$1))sz;e@2hHqTtO zC@CA~%4w|l1^2zZX0LQMRi3qH&OvCc+pY-_H=nhPSKJ1iTP(0F!D5`Sph|70{ag*8 zS)gKA@V(PKFQ!vEubJP8i!#QCcV4KOS9GBv2I0-S`b;*L_k_Df97>b)k;^zf=nHk0BTG;e?!tUKK z?2mhw0ee{15HO+E8>jvT6%=d$W7T&>C1j>=jzrEA^0@KKGL?oajS?6XOuy)7t%DYN zo3}X<{+iG$5-7;Xd*A!s#oY7JpcMn(rLPV){HnxQC>R~0Ky~L2yOw#gW zkU#K&543j+>Xqi=DEsSaqu6d9%xtG0_;BzuY+Ymx;^*R^!GzK(YQJ#>OX54#yI_Cy zTcp>Bu>Hp0l~4k@Qn~z8qMt67U5bY+`4o1Q+kO>c731H2BdD=b3o?RHac~o;XDvPd z3xWj(6{NhfSn|#~>n!Oq(x?i<4yMGais5doAxfY|HU z0%q~|r_^ErVa2PR{I=W2G{BWf$=GuuWC|3a{TRt7mRjn&?!W)SlTSSHou!asePvSrwTU3?GsP1Pr={b&&O9_G6j@M2Q4W=mc38?4#$K%gQ?Y?6Wbnod?l53SR=r z9H|&nOn@XX&bjB-K>$J3MK12#VEvbp3T-3=iL`4Uv2?PC)%NDsnv*w9Dj&X#6npIj zE&!}-mGhOae5H98;naTXJ=Sb6T=bX{iA9RgJSzncQ8GZepv(0QG}}1(9n+}}K4pSa zu_o5X_>KOr)#wrB#TJ0*$w}AsYB?vTVj{L03Sl z;S2hk3l4=sdjSm)!Lr}cS^2m-BdaqS3;`vmBxQp&q%Yv@3&?GX+^kjm_FW>ndnh3j zrO$lIt4}~mR$&o51>d1Wt*&^Uo=<>oJ~}@^g!ygaM=9%^F>{_&C?{?Rl>^4^c|ta~ zGPE{6O*#!qI&lDMbNjiyQr%KL5$qeI%4~ngpC zkP-s2bvtw9{zosW%idKtYbJCGB^Uv>vRSd)qawam4}r4t23llY8XFK@7HY- z`^-0km;DL-sXdG-pZLTlq9G7;XeKLg`?>cj4+0P`iZ^e5xmJZJGWzq-43PaTG;G9>WCxW zx`1UJ4${y81P9-O&`16Yd@5`<3)z^kP{G(^3J6DXZN+5tE(jucMS^JWw9sQ5)l-{j zIz<;|L5wiRgs~J=Z|wn7(l)S++Q6#1Z61>Yliwq_0KX^ejW0{zcL>1P^Kq+A`4SNd z7IQ>})rmESrZxtw)IFj^+LZhR9M1ig^5QA-FIMi_oN9=+lhB9wfe_MK6P#EcMfr{C z>U%^B6Kv1T^T)EOZ`Ow>nhD+!7QrSWHvAq0iee>-@EX71jRGlwt%3Rw?)W}N-|VmX z-WbL8X@Z#@$q$wQL~EO1z-o<#L@)SmS*H$;{$^DKH?Q3K0IJj2c*gq(Iw6RUnn}9+2 zjPTbcu*w(6`dNLfcLY_?Ai`&TkS;66r1^@u6a1u0${9>s7eB8VYAFgUn#euCdM0qs z&@bp1elo`QizDSpjPAZi9=Ye#lTO-RSzu-?MeTiXH+6|fsE-gDqP<3A=Cl&?`58UI z5b$H1_xT(FQJ*C2hvWgd#8eT6jEw+A&<})UYYU@|`C=*J-xF<42~i!aETF~a1(X(Z zQX5m`=>zL2tv+qP^PzVLt*rLug|(LQt$kJhI-5k+?F`~0XY2{k=sl*Cl@v`ainz0# z1&e?{DL{cMS2Ad9?PdL`U6t2)!%c#pDEAevJN3!hao+He#7Igb;*4r-@I59hi@@3# zRPK956mgcK`qy(5U{az`ZbUP{rlq2xL=-@dutE?h@2zOUly_*L^Bzhgr9bom0|e`- zJkrKQT@>Nh4tmhoKl;QI_iRMwvA`QMJW%6g{Zq=LdjyaAX5Q*Q7cp?l-Vu5JM*FA^#bhmr&V_AUXt1auZ~6 zwqaY)%->A_2Y!sY00A^;${Zy8p;f87_4jzSTfcn9vkU1EDS!1j+G5{=+b_SP=;Oz4mLTfC2(xKXf)@47{UxMx8)BGAI+IGq9yX>=*#{L?Oj_Nl!a+E&Z-tzlQ#4?+K zq?uFjmfBcUNY+SDtJ-0mwq{abH3qE030j2Mz9ab1*0$DIQ#%~{8v{U#+;@CKy1#G7 zK;a2Qm^ph5V?*;w*vEi~x`!D8#hv|*>X&(z-%+0kULrX*m-V~78_keLfYl7+&I%=X z6*xWrH-0S`8S9*;mqt1|9-~|&LY7$37vTf$9<* zokQ0T_=gPWk`koxr|gjb z&f03d^&A>2A|`*qeoJAPz|lCcCV?%R?>VN0$hOg~K6_4{%=(J1i!iH=t+VF2wt+oU z^rDruhg(Prh~|EdC@U6({VA&Q&E>cqb>DUGz1N|WF8dGf!=f}rE1luS&dTPd_b}6x z9Z*UlcSd9RMb3N{IwRIXYrQ(!JH6ky*0(ZF)ug~aP~W69Sx1kZvQ*geLO z5)-VRg;~yWe4jLOTu-ca&bQ=4$!7v{?n4i;kE(M1cuZ6{WWCPKJP4GEd z76-ZDPMp3)%%lAWy~Wtk6j|If+Jc3&7FYpUW*S$1OMHjAX-~9CfC~Nq-5@I#V|hil z&1&EU<{Rwqy1MJE{!U za~9}%&1*mF+-l_s5)y-69bM*t00K6LNf*Vhbr8XB?at9!J51X{t^4*s#FGV0peNca zr~=wH=@ELy!A?V0y{)01#n9TH_93_)E0fd@tQjeaP8juMog4&n_bBh-*`4tj2%7#M z9Cha$X{`VdSz<)Wli!y%pI>18WyuEfqFL@YLJg|~sF^VqZBa0+egluQCTNlS9?{sW zZ#|2!Q&J=tTT3$>3`33f&G1$0xOt;h?h<|2x^=KhOF|%HZDD=juc955O*m~_YXjvH zMvnkT*adr)EWG{S_{98y&35xY5j>&tQxr&fA`nY!UL@C;m+EFA6gY)-T0jnc)<@QN zjJ|*pw*}1{4~}*}T0n#?%V1@o_!tFDjpXha77RzfIS;`)G2`{W8E_;5R5`+MoazI+3uGR}{MeSzc z5-XsoW?cn`?R*mvnbMqch$38{_()N*)#mD~eu`OEO}@o*njEPr;H`YMb~?t zr4s~G+7wZLgCC}BFlH2w;H^Q~fBn~gT?(U^*wz;YpI{Yw#+lPItv}Yv?#kCc5X06U zAxQ*M(O?&KQPdbOZFi=Ba|oPG#)IGa&K{GqZFz>K2%?a4Mz$APPYJb@YyIDToaf6r zo}=>f`J)(`)2=v67*Zf&pb>gUN-lM3AT{YGC?em3v+7mI7ko9JWvAi4k!jn+2D zod=Zgf>TjOYIA)@^MkHKqu4jBql7?;Qan#e1{O29C`ErZ7A(~Gsr&D}*O=Zn_R+~( zmx_SsG*p$dM1FR2389C6A zDKi6?E55Yx02GzxlM7bk4J{y$5t=Q4C8GmnugJvEBXfG3XeH&SvQ}5{PC|`2$Ey5)t~w=!XphK z!LRmrK(XqwR!C3_htCOGpn%2>vpUKAwXKMBuee+uI)l%i?{~fQAE7TBCLs++1jm6dC2nPAV@bJMb~q92@g%NLHK3` zB*6EclrbG>i#m!bOm5y_)>=EX41CZSN4PMm1eb{O>~nz$5lt20YaD4*5gpnx!hgi6 zdGEK{g^8yb(=UXXrLcEeYn9V@R7U%>GHV-+Ab1DiPZZ89!R;^bm-l=;s7@-r{`96YY?b|v8g58ZF#yNj(5kSG~z|vSQDIEwKw5maGW2OjJ^@a7MepeQy z6-Ey-LpXApMfn&-cN6qRzc%>t5;$v9?Wk|H!91|$fKoSxgj(=Ohdel@04J=S4s215 z=d=!d|0wfjzb}FtMN;br^V#nNzWPY%AX0J~bCF?b)LBw16EjDl1wzRubWY!bzQw5U zHRU7S*tb_IA9G&$tS!zV?UmbYodxm9!wg6Mo1e>QKlb!vV|}$yDNAQ13WySzmORqc z%YsDN*6)~7iXwX%4I^yLem$+@#t}0wl4Z1lZU9#=p17KZtm(k$f-!KL7X3sPVC)#L3@$a1Rq)-G0M#&CK`Oz*$>_;<%j6? zJ=;2uJ{fyCTze1gmv=Sctumk!Sf^RLrU>t~AsXY1sgD9M6$w0rtLU*H-4Fq_m*8Rz zqzsB4%IOMjp3)&Dd+kC?I&1sQ`;>r$rfz~hMH^lWe}k6Q77*_GfQRU;Akb6NF-AR< zz$tfr7gT_}%L3i-LFJ!{7F1?`H>b@_eS@y4tx!nl4x@rGfdqm`v9}VW$3+p<-jTwj z_ED69rdGaO(*4edl(N4vDfVQBkk?j#K|)|G!i1voR89zb} zwh`jmE1(YMq;_P1DQ(3oU-FVSUw+Ls7ZEm%#ym1VO2174=az#9U%k*AE`50{bOJS) zGbeKX76K|*P>n5rOacXspN$=1YiwvxBGQ!!e!+i+<)}}ZIR};b2I&I%!9a>6%fACL zOmOWvJ|GX?cOUEEI!JA6ab<$s*8b0b{_|;2X|@xp76-4C~Xioxm%^yh*)9Px^`^c`jT9- zp25B{b~DU+$I|*OD2+fr#>AfBV+cM*i0}LU2J>Xu;FrUXQLr4oRSwMA_nB6EhI&hu zo?`83X)Qs<`;-pyYeF(qCMzo|f95}Fd*O5n_u(E_4HSPpd@GzD{*2U^_zzf8~I^E^G z0s*ftVEt%J<Ibijv!n*7oEF;i}Wr(;@aQYYHTaJz1aTeQ_c6fvgGX4 zj`{)>Q@trnprSCn=w0RCd)Hm+zRg*%WCWn?&?y0+xCl6l(E(6j%2R;CV2=h~xp?|#Mh@oarak&!^m z>QCW6Bk!zZt}V5Re?G*cm@oa#5?8U)*-07zIPLz&}YFB1qNd!r39`l zJmT!P-uJC*!I`?aEEzXvL~F+UP<-(R#zRQiHl44Odht>C62SwFP0!)iT33xl_0(^{ zTAjiDhL+>yAR9rJ=OC99>iR_?MnP9BmB%;oZ9fzXr;==3;m_-^%_h27&j`+81JOFs zx`9@)kkPJymT*euy8=qvC6qqqoM6C&?jQnbL&RF7eS#7oTn=a0`h}o$Sfdcs=56ES zQr+JOr~Oe{I|-Z3)fk)KK9DtRjQKg|oD(sU7cas?yCcLo?Fh}8#m*U=utZZ7fi;$m zYhzC%DQJNdEMThOTJZn1C1xUqg_Aqy<$g2YEZH-hH>SR|l+aqataJ~{O)tKA zU>_0D>Jy!kPf|CyZgsLIP^1uu1?@>l5;fQ1Rb3#c)(-;BucUW7q*{v!M55F_6>4Di zi|C@I6AiN8_{KI*oW4OJF;4^o&ipi2aQ~I(aFrX*;X*?#Ql!8U7-Uvb!efVR0U^2s zdFXeCIUkhT+Wd<=$y&g2y=D9M7bh1lhJz;C?b-xRyKBdeBhaPh0s?~8mIWR&gOEC$ zatg#72tTBQVP_z(68xOFY>aa%SL5)@lC;t6tD@KPiKc8Z0P57@sAYf|v z_UUJHO{nDKMbM`ZVr8)x?CIXE4b^E)VG;yXOPHiEB={*?;I;nNhJNe4#<}lW2aOM( z!}?lVFk%EkP)xAlnAB)l^TOf;nkPB6R9XaQ2ef_Nz6CXA>1IK@X)w=Sd%yeL`N1~Hkle{_OzeJ6xqN+BgE|N0#YhV>Vc zhR@y%UoACJ|9|k|hi{qBgq}w)DbcHg@d9&PKcN~3oZSR8L0PyHyYA}0wjxS>wvqN zG#o__?stLb+Rv>yiqpyx@n4&w;|b-I;k8+=)NkB=`?W7R`Q-N=y<^AGcaL%T)Tcg` zA8~bf9*TksL6GC>XZ?4Up~@n62)j)Iz?o;x~x9XX?Yb`ZVbW zGWcPFSqEwe0@5cfgovZG29iG8IIN=_=@DM(Jo=pv9Le0ogLVjv!as(KzkQ4Y>sU@3%mE5Yk^NF9E8J`caDXV zUl6}d8aJBs`~g5}H~JG3G+DPWzv}L?p=q-ko7zMxjj{2rMC_s*3zon-Zv9Yru!cHl z`!Z}RpE|kZ69caSJ45&)@U)CV=F?)azExlS;n%{aZjN*olObPau+5kw zK54Afhz+8Ok;Tws@(^%PH`a*uKYy_fIX-!;7KFY&rMo$;pX{$0w*GWEIkz8q-;I-vtMTz4I& z__023{N^{mcH*(ezWMm0k3N0hXm`xHbTk+ldjZ^&|0*U*8Xim=_&pe$$kO1?6d{yz zosX@j+FQBMJaY;uN)8rpDK%m&6KraeU=^TYAf_00);1b-{(C)xp0FMZUW0aePumFh z&Sd+AFpIgKed|GRJEK9Q1>>?-s=IPnc?f2Fas}(@JL^S1L~CYQlmz|WQO_rbuYM5D z>u$aE-@W{WFZ^|k8gvQ4qBdsnukFnb0mPb%zH%)QIK(|$m1;vYfnu+65>9)EZ)*MT z@8%1X9n)KV6oODXpmu`pm>+bzOMB69DNjV9h2n6Qu#7?pfd8`6P*gyZH1=So5E}M& zZD`+^r~1#@THEts6de}Ku`?I#TRem_6^aI5(R#wa+5;50{SCTFP*irmL4H7maI?XG zOQ9ryC#6B}+B1Yd?rjuM=v4dxnl1Pl-)ntai}sfT^#1!V808$e{l5D?d&ViJ{MymW zK78myA6og~2R~R{lz(!7vnD$4DD>x)ZxmP7yQsE(qCbRHKJW7Kw+3V_0L`r)ko@{f zvB!;IodvV9D9tIQ(FCw{mOu2oi-0U5uvjx7=X|@pgKw&jkRT~WC>G}we&TfqVmQbD zplE|!n)7dpF9CKgCIH^APkc1`17Uyk040qo%%_bp92p_Mm!502qWuT zH^{5;Ye9R)2FIKr2B4y|v$cBW#SPXXA}PU=P>1oU{pw;35FL(Ivfu#x9cKjzL9}OR z=rG6xZ9;<0Li4EIttE^!O*CjAn4*J><{bteM3n}YcE7f_SwSSM(-{sl?@W8J_Bh;V zk_i2*aQsdP9DUM$N)pZIPlP%QnndYx0P43xR;G`0E<9$zxP*s_t$Q?;XjOuo;Y=>bhz-s3&B(? zSGafr8x1py7G)fzpxlH~ku>(LmlzYYPz1`^QaY#1piq;5AFTrImI6XR9_s`WL4t2q zV(`j@U%t2!&R4egtJ~SSj$W{=f=^3=pYqU|!#cy2rHdjMErWCt+-wdq2p-LKhN83a zq`ZP~sC)uHHy&{T_{+Jj8cKxgufF=wclPeR>W(|_{I*Tv%&U!!S9jLD`XYc7S_i?! zDwfiw?;%N=Cu0Sf;1dmY?nrHex6z+jN$keJI{P41?2*bc*XR_#W@j703nWj#B|(NL zbo@{snN;Csy#<3(en-S*0Z`8_`T@YlxkZT5q1^M=o;ZPrEo zs((d??r(evMHK5GzslM`(5wypO@WL@A_Pan;t^XzP*SogumZBaH|CIZ^^b7sTp@UY zuR>(;tp?W@1XJKfiWK~fIiaLMODWpA!KaOX^;om`pxOilLa@{3U9Hiv-cxJ`t&P4o!=!O(+^o6Qn*QTs$OZ)G+M8m6Y(Z}DTsI_@ zT$K1Ss0L>z+6H_Jx&2%~Qx#;r9xA(Vk=+k#>8Pj>#Hp{$|t3?Tc> z6W2KWDc@5HIS}#agDBH1)P16{5Kk1h+{i$iDGxw;Ddxb<#X4Ci0ERGo!9V;%bM>7Y zZ@>M2-bBDW^aBZ;l2c)-;QRTN@eyfq2_`YOzLUd9lv#%`4Om#~G<*nh3x<`2X0{2Y zX=E)U++y?)z}~0z6sSPBX@gvwnpBB(SxEW>e>iPyvHdF3c$yEsbDhVLU+t_-XV^)~|>~J}`6s!`Uj{ zXMN?vP{kN=hXo-~KpGamZo;Guw?3uEG7l%XncyEABkB=+`W?*4UgJ9`uT$DBA@@ao z!}vQC`yNApL3bcw&PAU!r=Hbb3~==k+W5%vSK>cf5RtdO^{tH;3s*2>>201bHA?rU z`)mGmF9l9Q4222!hrk8`7&zqQp`;WLMN*&%8cfhmehc!o5jruwVEgs0{pa9!FjWTO zakGGIvsHz~iWF_wf@dw^w3@H8m{3T`0H2|rHESqwMJ4CMp3 zqd*b-SfaI+7vsn0*;;X+Q}|JofxLpogIKydBf92P0nP+Igz8sEeK*g1Uj!EF|LEH7 zOIX-#ci(-<4B;EkKJ=}7?)m%e3DrxeS~RjxYXc+0IsmC-E@mrObxL0#I;PYjQh2cz zg3M7~fGkJnLb(u%_+Lklqf4UJg0IS>$}-7qLS8s11OhQ@H)R{eZEZIvlndaAl(eiU z&SDBL0w3Q_XFSDe7bHw=;9A3{SG%3%&Lq)#y#whZZ)vpN98+RK&m?SK_T?|HJpA47 z-gL=TR|O3_*j|L{m}vmPft6QX;P-RnVG8*EmMovJ*t(NS471JBKshAeZ{yv2lzW6$ zsD}I}?RCCnG359e0!D$ADk3b^@UIX$_jFgUqv4<;+^@Tfo7R*9myT6 z4=j83F=0}WwZhA61)uLNajGz1(%w<;TtYRp)sxi5&? zEnuEJjp(QJHS>AJCBeM(eZpb$sovfbaB1G}SvIe``s)1no_zSR$M%||Yi_*p6C=jP zL%AZXjpsh{k&och#d(kh2d{&+`@i;pSa+6WH0rZ4fvk$ZWN`)^mlIuJ%xFz(k8-Oz z%qNQ~-)QNN_(n29)L#l*@gP`)`>r}fv6f0sG+}2m%Pvbh+B^r+!`rPx&6%%goc&n+ z`R?~jYm8e-mzWHcx8{1@>lBxu^fEP|u@E!LSfBz&`z{)m&Bvd3;^BMu?)|-S4(`Rm zxPQuNJIXY?qm~_!kL0V==DeVt| zhF_ubD;q-qqQ>WF4(-lblE7ImsMXPy9iyyP%9{I!@3*;mYMK${^vu!s)O)qlBEmrQ zon*O8H-rbJkgGUqo#EOKb8`p^~H*Zsi{9A8CQmO z!^;b{!S@4P3l^S*1*Enw&8t9MeXu}R56vZ5Z|xw6IQTHR2xD`a77-KUpkXm#&2(c1 zD@Sk*s00xNn|lPGb`12Q@9iPc7Qt2=NMJcM!M)dED80ckONQpa{)o984ZGGx0Fwi2bkqeqtwn{P<%M- zW@sQrvGxie!bejm`PL(0sKZXEe^zt*jFz1hr0>z+1S;Bp2o-3R=tk?5FW9F){b?F- zR`&ABu@uxF3`LsK_8my9{la&pF%@0gp5vRdC|BM#kVe7BFw_Ez)=O26Q8;{$y>-2}mvqfC4?8X8FkCm8Zgg;WZ^~3iN zE3WwSl`b@Sa<4#ltAm1@1($~beAJh|M^E~jr8v4Is1QD*_K5s?ZF@0=(_@b%g&dgfgEKP1n&U>o@-Oc# zB$$3Xo1M$8XZ#OeImjN0Z%Q4Jx9z7Q+V?CA;0HeN0Z{aHIe+u%YrhhvotgGS?~8lU zy9vMO30OVYy0s(nIT&(dK=~#BP-Rjk;>B7&_O|x1Og9H|C07RP9A!EoP1Nkx?c=#t z4S_Ge=Pt+CzDFL}d)vMDe(I&Cp8B8d9`EfLW&Z8o{_V=|{Lb&7hj_zvaA2-N#)YiV zJA8k|RDcQ*{E`x>&kP_8D3_0bM)i?@C13pF%H4O~dEoeyPyXa*F24A_r^&zhJ^x>Oh7oGnl>CJmA*f(lyAe{vkjYps zpE_6v2!#$)f^5%9eZq1DR)_)S^Tvlj)Hs$m#8R$3a3h)lM0g!kv>Q|y6ywzK{%X*@ zf|G1+;dHJ3kR#N(w+{H|2lkKlw!wqDH9oYM;1rlk+Q>E$e-j!Fnjrp7Gwev99}v0- zCFV6P5`msZwhI&6!mWORY6Nc(_(?=l`5kiYg`Ff2YA-z#2z=Qi#lBGXgyH ziJ9QzTN?#yz%+=kTR((=w@xsld^1?L_*#HFNXJF3K- z%fqa_QGJb-LktY90|3U~)!!_{2txHIu=gw>3XBw^&{(AP$2_tY(Q*m85|iMa+R|Lb z^spSH1#O-rx~?p_x-cL!ln`@85%6SMv(|`x<(`Gk&F`)R`JHm8fb@aHvQ(l!4t84j zKDF8U6F!|%ioY5m2ONzM=%!pFj8VAfEiO{RTqF zZ;0i#o6-p_5rNTqq?qDzLAa5WzP=GoSY;aj<`pA7TM;26Fox}eE%otm{>=lUJaF0r zeL6HRz3#fdh_O0t>8^0mMHe*|BCfVi!PCLcs-r%3oyN9j(oI8$;!nAmUp@fY;q6QB5mJ;+U^n^1zm=zZ2ZbI0#ho6#vgXwr4`E~Q%n zi}VuCYw;E+2O&ZFoq|9>lh$$H^KixY@_JxpekW>UBBW1RS)V zD^tYb<}ez_GRj{RABU%7ap%tTjT>%|0%FfBY_f1tGCHSOyts075hN&12m<0zFpe}H zEY-7rFW+kd7a=bJ<{t*6kRn5XulBA4{j8Q;5Ey5=j5Etx^uF%|cWe$Rcqr;?v%pN; zfWR+nJK>@6>lyixDUtXvw`{rA2 zx%z>t0Vq+xtMLK#nGpxi3S!NbfLjH{3AznoL~$`&rajYsopa{fhv2d3rhK84 z491U(nsZlVZ3qbH4pwe^m?Ew5MUN|s%tqM%R6~JtV~2GA~#!lEp(a^0g+n7B9^ftVvNAF5N~0rLB1kRl|4rVoMBTeotPGZ4G2q! zp%B*?SXS7|puDhgzz7JV)hS=&*45Q5#zx|27l^UL2oVNjX~V`?vTA8-ZO0H+KSriC zP!3KInF)%_qF=eJLWQ|+ToFPMksJU1AFKox^?T=eNnk*#`oxIyDTt}UkoUVhOi~Jg z@9=S`jhLI}qH^m?&x?2&;p#UBOM5m(sCjC>>I=9qtuoDZWn*%z9Ryv}T#SSRN^l-~ zQ#8%{?z!h#`$l{2;Qsx)`Xb@A{ef9!jj!$C=IBe~Lz~|`ci6HZbkK=FiV31@u$Ebe zL9PjU)kny#UJ(f^pYKL6v8SRLRWfVr1?i}43JuBss|yn?hapR?AVp}PXR5#XH|NkJ~YGcEM^cPSusEP$xqgn)=c|FG)DWWbz3<_)sFVEQr6DKt1+ritPa+1 zN}<+Zzqck!;}a?&n$$d1ZqJMEM_{L&?dGQ?>2(T{>Jf}Z>JGsdN?u<76E?dAf-_HR zqrSc0y#4kMzx>57{;gwjNmyDhN_Qj34~7?0f(ftw>Z~r7LUb7XkFOslrnM*+ECH~; zG5;Wqp!JOv-+k#%SUg0P6s)JRDQo$*RbIkHZKPy^OtSaU3GNA{p{k9bjeVEU1WsK& zl*z31lpFR){bxNu*UT-{g}i{RmFRQpAgF3>A|!2WE6WFA8STzj_wtJ_Dp=5y-@5b8 zkMA3h=?#Qs6`xak@H=JcQTU=Nw?A zZ!GxgQV>Z?S9v0!_7487x-sARi7jB7 zbI{qwzPaFXGv`%puQZN$AIhToA)htH7zJfYxPF(0E{JTf>gK2MpP}X=$IFp!uDi5V zutFB|=pIyx%m4zg1+f=#SDGk1Sm&M`=dAVpT^j|vf{+4L#T(+&@CuCsW&Ew9JzZbF z<(Bgaoby(?{u|%;%-e^?_2^OgeWOnw8$wHCQrUbo<+Buw%GuX=wAZ1d2t$k?kbS*J zaO8s2cPR#-Bnj}nmmtb=356qug>~L|_BTsBi+E#R|L4>x(b2}6po{mLc?Y~HmxtbS z#!4Fqg*h88KzJ!OxiE2`>(d!Fr}*QN15(^~lsSTmQCL@}09*F9AX^j-j~8+K=9^1Q zef<}|@|C}zGj_~>Z*o6-A5Mh$&=Qs)8j^&&O-_ep9VU&__KW`7LSYi;-_W3Skg%#X zD1=i7H#2bG+oWlETR43W7F!ui)|g^i9c{uK)0Fm1ZHpNp@PME$d;(8A5tIM2jaC@9 z;rU^~XqBg~lTSM7yuQePlc34J6$T%}$WNB`%7NVhNu$WG1*A^Y#h#_fk#?cE?P?5Z z5;438LWI7959A}pDgq(0R^N9x_I(?+cWF_kbRr0+=xj7il_}rPy7k&xBwT{I+T=8M zG~5wXxxhf}zy~5K5ePZqTGOmjwWD^owkxA?0hgeK7lB!F_udnl+dA96ge4s`&(r>M z_|bM^Lcl%jDUky~D>!=#vmXI$eBtkfyr!9?QDfP0kVJ18ZmH=iIG zpiGiu)6Dai1nFd1KPIhjiiCM@J-wgws(UCSj;0~29T*<-#xh*{FyA7zMSuE^wLcob z;w!HgYYzcN@SB)6dDt)rkP>`|Vme~bC}${zHrw-uCfF_k7fhLd+njt_e`{Oyp_R0! z{6`$BwB)ROttop)yU-TCjbQjJCG{oCV)QY(jS+8O)jo9EVJ7GROHS)MfwJ)y#7V#} zeFN_-e_Lxh+QBc0a0K#2GmX}mgX&2LsEvXZ#jy3RITnni|K~H-b;GT<{(q60P40t3 z;Jk96Ozt`MsG|;T9d)I##}H!X+WQo9AYlSKIn($6^HZnvfLf6#Us@W%lKt4lt%AEm zHwICHb%Hn=+88vZ0{lh4v)0T=AA3}^Y5s_fS93TAD2wiZScB?D!)u!WXwmbYC3K14 z+1jb?^%<0#Uns3UD`TIHksPJnwY_JeG5LstU&oNOfBA?~hRLye$rrw`a_1d)9J+f% z)4ch%+pfYGx%mfD01;m5drA+HOpP_BR@?~46nn~km7a-JoAOQo9e&s|+#4(~#YW|W zyE=y&KZpdWY{b(r=dHK)l06`I`9#o#b|@vu%gql0E#h&24Snjd%X8;%{^oC_*y?<29NU|e!i*u^0$Nr-<<$2C8S1;{vpMfd z88gSg=thshqI-vo0L{~S5%`P12l`6cCrBAZL+|2?8Xu{|pg+Y6;XWwN#hfaQJC!`Z z@?%nXv-VQtRwkhp4+A-3UY#42SsT0U3urV*3}-bZ5cvrN_sZete&IkeJ+XiPch0}) zqRz)d&+z`i^Kc@dOunpHHa*J#6D|Uad2doB9c@5jKI$}$iU|iF0L|_1-mR>Nuf^HG zbA$)6rH$&lHkdHv2z~8tQ^D#Bo*^$`?}HqQ;<)pOBVM|hb@PX8;aqjQx2>(cCT(8S zR!$|FEEsa(>zU}m$hyo04O`<2N>@MS4iv%AK?$-jrMQ{>*El=3iJG4XGR;q)piL|$ z7-v{@3^ENltsNLEYjuvwd~4P=TaR-4MdYhfq`jCF!V}Av6fZ(=N1)n>G17f@7}x%o zsoujJT4w}3VYe|9v_TXZ9U1~_xpV+i=fDG}1Sv;6%r8dO-ypqGoDd9}Cyh27c!!h~h%{$$sf8Tcgku&W?}#!8N-0Vv?Y)Sagil($lVT7yhpM{|ZMHX#*s|rc z+Ejj8<5K?!z!VCgK?EC?LxMoh@X3=;Q@|(CIhGWfcrYtkVa!%*i?Be52T@{`ceyaR zgg&q|G&5#{HKqDN_0ZDl2k*it#5{;pjH&3N%!78A_dH)@k$$scMyI=bzj0x?O(V|I z=FsIUOTkwg`u=mD`y4t!sUg@y-!*2vmw?Dp4sN&3x>n$a=A-^M#-f8_eyfx4-zVh= zKN)p(*H`F;%ZEQ!*SGJ!`zEP*Huw~~w_Nbmul^tBopsi~KK=R6-+If~JAd_8f3@|Rv*^+bqiV)ouK4szG`zm<;_#y#blU!`%h#<0-)eb5I|CC zU|eE2YDZSBn3SIHS&^e#L-H8P=g3Fb+7U&u&z`BBF<-qWP)1B`!cE^p3U$^}4D{K# zDmrfCBwulL6SVrjlxtlCJW$N`YrpsZ=+m4U!AYl;kzo>lweKHKIj|P^*JaJ-^AJh3Bl)$RjQj?5ka_q@G-QeqpKpF7Idxg?M$mZ z_>(zW<(IznC4T6AM_`xBR~~JO=oI&TU+|IHN3H}tiX&nT^U>s!8?V5Ph~UYZ78=`gz`Y=P?+_D@%}XZ{YpwH*}T^3Dz?Rteo)tYw^Jle^5sS9g@~d`jhHO z5##(4X}a-gPcGI1{=oXC;Ov@nYcd4!RTprqy-Fd;&t5tc1{TVW>f=rb!GX5dE=Hfu z4Kf(C1%8ve6vbXN-dXBgWelQ7s4dpFvnN0IiwBA&*Mp0%yz<|gWAp8A|95X9fIfSH z6H{c9%6H=sZQ(nBMA$=+W*?q80w=sP*aM3KW}sX0``M2{PzJ;igpx0&8*?rKt8n-% z0kwyZi3ocf>pLKJ7I5X@!T;{PXP^CFj#Zk}bEs=Z!>#;quPRtwmR;dTK9;s&jL$Fq z@-O!ts|GC(cmjx={C#bd4!*|3;ureb#z8z;g!@}EW`YlEUS*oYzDr>sLK*>>rdGa9 zho`zW!U0)b}>%pkrra}+@Qeg%ADu@q4_sFw5@n0%HM35E$=4z=1wNIv6bFAHwGV;n5I z#tF+w|aOi2jfp-bxUft%gc}NKA9l6G8bA6=s?m38w_6hAO z=1@*jv|2vhEPS-Pb1*sZbk;tacNQa7D|DaFQ|pOF8vQ2>vp99xo4yAvvp0QjO{yEj zk$}+J{f*!FjYX3A;Um9i%+3=I%uNK&L!*pGM}qUec=?N7^j{pmYuDw%QuI4ZQempjdhWU zV+6av;(H&mr8BXyYObJvtbd9-=n1g{Bv!8<1fyt!NR8ZOAxyM#5Z&&^htRZllymU~7py$;=%cq>d-Kf~QY_4jvdj9zboV!_f1mnHdCT`* z$|-^vC?#Q&)!Vti|2;)%zjr1;%O*z6M-1s*hP#)3L#$CTe{*F#J-sm4VDqqg_XLGdJLtTQkWpS2Ds84Y;Sm6XF zQ%-Yio-31K06&a=GSuJ=Kz>=Hx~}lr5}ZfIqV^Ku!`x8N^~ZI$-16CX9)JAXPu#tG%j2WnpZUyZ+MBhbGeY!Vibd-> z8r0ZHqr#;i0jfR4g2_drHb<)xEaRKnTWBNXQ_42}*p%o3bP@6vik`0KhC-Uvo)Uu} zEq57+y~c)X3I3H!7WW&u-H}5P7_Sh)-Byf=CN8)g4F&Te8Y7!qKs`bA)quCL-V)nz69}INV;XW=zi6)(Z zhasi)BT%N5>X|k{M7GV*1|S%Nldx1sE-v_#!vs^#JmmifF>8=0g?xc9`ho-0|2c9Y zhKnGE$kY6+V{ipjp&b+k``zz;chB+XV^v3>Vi>`j5P4-*cmfyUxI<4rSjgmZbHG%l zb#6^#{P<2|7+I}Z9Yh}#omQF^f+;96Sf`}Rf)Dk7gsQSq4DhXRK!cF7Hi3|=JIEvf zf5kXBlC*}O#}`-raaVh=a%&Gpn)bHwONePcv)0MAJ13FHl(5!OuGFX6+$Tmx0&vNf zvpTRC(nJz)1cPBwao`yw1k#988zsv;02UFjkoB+qAfPB zg1ku>-c@}pC0r<2=(=MLK01P~oSAZgAgB-E?&ELQ#^3vGt-sqBS*K^Fc&sysnZ@4d zd;Vn!uf5avF+|J#Q$V$usg^RKwrz>|orKf1f`0`?57J%4zro->kU;k2lXu29J2+<& zgLzusTW=ZA+LNF6yt4c+Ttj&fc33SiHV$=`e{@1rSE*`5?`^O3owN^> z3UZ=R)DeVQ!>t1;rXWz{-GjuaZtI61Wi+KZkC9`MfuaF*m6tCoa~9aXuWmF$pFw(A zD55(MH|U?T(LJmH2sy<;uxKXBllW&X`4&C^r)zRwXs=TvH#b;|SB zwzG~kkRZS!D;oXmk|h>KeeWF2I!4&9%sH1P3w7&R+gODAj3)lspZ@8BZ$SS9&Dqu7 z7|+kb-^z0S9*<@;evR|w5{8F-G9EM9vJ5cA$`{Q$Vrfxc?R;8}(~j}IGPZ)^w>IK` zCSH5h+TcdFJZE-{GK)NW#ZXYC82IYdSO5FyW^>hTZqUl^F%J)qe8zwDhBMFnA5Yl5 zd-cAtuK)bc|Gd3KKw`Kc3|2N}CZUS2V|V-{-j6li`CmY{Iim8q^do|ciPB54E1E0g z3_}#&x%aYU<4yT*_ADzQfe=0FcRXk96qlyDMdfYH5ts?q`om?Ae`mCgu`IeuK-G_E zO8jQ)5^v37DR>qm5{rMoQ*uks)ZAY%qR&_N)i>Y#f8O`N19#Ym=GmOj_ePq!F{sei zXA`A%*8E8l3=3?aX_{zM=8k|<@uidqwLzMlR@27wWdWgakT%GoYIfLId=7IOUXh_h zxTEQ(-Rf_LsLh9{gR`+-oc+#suDosdh!AuUeGp3Uovf#69x$FXdVFwL$kMzJg!oVr z$mJKKX%ac|rDMZoLZ=a&7P;t{d?-QWByE$=kJs&+icfKE3{7(4|9Nrn6>-{KnAn; z)Gj_Wh&Z7QVS|+qp4j{G^Lgu!%f}A40$BnuA zPlrOMa<`YFW(jr7n!h)pyZ$YiBiiN!jt;*Da@!~;hH~fVZ-lmS5%>$Ns`bzss7-`` z_Gxq4{1VRUziUpYPJqRDN=1}asEa~u@|~_80+1967@Ql&#fbknNFOet&mjO+fp?&_|teIvldpE@)(@2Lb%b9cqH z*M8`nH@)e9I{v7mj@dKDIps?*W13*$+0F*Pg^tv^B11m=^zMLHn)wD~SZcMCE^ zP(ovztJU#60pIkaiv`!17z5`%fe#PBPbwwtS1-7r-ws@N^UZ%T`t&&M{8I@um~V7| zpP^is(G&jh&Rnq-1Zy(?Vk1CUpf%{CU~cA2e#O2cNQ1^tk(`ZPG@&_95J>^^O!s1f z$Z@-O?K-nw+8gtAX!DuhTCrY zBlBX8pbd80$Kr~|Oj25}~{`>EF@Z^&(dET+do^?#Z-x&8&05NbF zui2_gd5t&6tJ{-k1w}T<_C`O|uI9-YHjh2eSGM_1wt(QXPos6tP0?~0jN+-B)&1QX z;b%&@L0Q3I0Z}Jw!klVIo@U681km%(KfkqBc@$vIdF2{A>qP1#XdkixgB_U)KY}O0 zhaXNcR=~d-ZaB2(p@%NJ^X|LvKrh{!37WI8`D`Gyhc@{#VoW;_)7FH>e2BouqL*c> zj@sk|4|rxte&u%*P#|Hm^7=GTO%x)F5DOJe!-1J)MXam_zUM3mkOYSqytN3bgwzOl z?V&NV(E053j5!6Aes1559!pddVg#cqjTl|6$u}%@zJ4h?*vdb>x5Ks8*8S{=gX+4NQS-B2e z)@>Hbh(cvk5_A_m5<@CVZFl8k&=C=HBA*mXdF2tfgI}>UgG16v^9hz?lVHlS*Z0O< zo}?Kc=CAoe%ml}gOSSJXW%&TU>s{{> zP9Nk6p_4eA^+ou42O#)Xb%Ao!mV8Ap$<3?%+F0>(YQH0J{B`6!>-Q8oy|0YxZr5MdGJDxtseexHUV^fL`3Po0s%dWfb6OM>y=%a2Qq(O?K>yt8OarZl)0?&D`yWABaZag)9 z2z}H4`FHh6xU0a!meRw5?7>k;gj-&}Cmwv@fxCvK^1Jf^sy`TA8hhUl#%teg_uTV$ zXPk1%e?C&Btg)zLgbz;4B8$&K45NXVAdhH4)*gGxvn*0uJ0lWI>Q6$3&vF0#uyVCl zQ-pwqi;DZf4}Ngv!yo>zB;@FF>#ey>80@`%WAR@Xi^2H-IvAaX;;?U86MX3?M4UIB z!dT`tu1O2%`nnyhmsVB$l`v={fvJaG}l!8Nn;TIAuQovy`GpfVk=<^h0bZzq%+7xSjBcV?}N677%F&Ue}Isc=Ax* zQjN#>wB`~umwUd?zUz}n*&luFc@pZO-dpaQLxa}rfB3P-?iy>Wb${sK_-_1|LgLWD zaaZqBm{dN2;83&EcPaZSaJe53sdFrd>guu5M?JFl;fEhs?xQEVMfj#WC3u*-%dWZR zZ{G8^x4rtrV~#oc#Ecdx=azdOQi-y@*0GYe|5wmKzhz19H!$&Wv&Qy(-|tGf1CqR? zsZddS#=g6L{Pvr_`J196Q;e@mfy7;liy9>wcf6iQ8^osIic`5zOO+4VQn?}pS7&89 z$NAIm8+78^gWuSizy1==d}zt@9yj_vpDi=u;K|Vj^lveK1&a(FGmY;#-FpgB!O|EEQ2U@_hf;RtBIk+Au~ z(d^2(*wx16sLU#g8D>clpo7-9_u;2OieSKLGy0C7g_H(Oa_yxxh>*k}N4%Kg!I1cL z#B|PyTjh=G5N^`c_mc1OW0S;M#4=hK%(ev5#vTJoEA3!(Pz#t+T@nCG z3Bo6@vSItd8063c8SFjbn+aotEwIeW?Kc5d9MCo#cnXC;Wk#smWNkKr4gbOfX76+p z9J*HX;he54Vh5K{F>q|m8;c}Z7A+UpE~jo5@9H!k9Odhqv6Q=ub$f<8)b=hyD<2EF zuMoox0%vt$j;-MYg6f#lQV=S^)f{XhlL{IEae#0&w$jZ|wy=z+07%=$sU9J+2Ma0Q zbJ7Xfzgckv6qs{Zv4XL%nu{QYQk785^i1o;8j?elK-zdGAU6lKv9bje>AU7G!rypB zd-%Z6<`Jm)G7GZ6@>E|~a#(sm@@c*u610eXc-q$j01#|39h61{KjTT^V6Se5BoVAc z9=*y&zd(%mJX?p2OYKF+%u}$(lmU$uf2Dp0Ijr2)K6rb5YCil;86ekV;r>PVV|o4m z$-CEJ%htNy?>*P*?!5swY=THqnp3D1IC`p7P}~&ARSs9xQ&`ChJte71DwQ%-R+4we zle|cd$;+ftCzTkjis&hWQc(?vqJZ4*f*>A1R0Owd*sujQ?A@1j&G@c0Kb2?A*(0+S ztDA0`Q9XLiIp!G8c&`8FfBpT}6_lHWPQMcfV{rPS`8WDdH=Ci2G>g~Hs;iLAa?FR! z^6A=Ned<$xI>q?kb=T#~Po5Z>i-(J3-s2UYKuloHJL3S;9x3bkaVnhtTTIO8`Dye2 zmW?gYU%4E!-cDoDS%srTDV7?`)(58NtrIe9bEEkllRcuPj{BaxuI(M&Cr>iE!a^(U z62xg*dMJnT1vdXMU@<-yx3~8uYg~(CL{Hn&_R$Je~8dD!U zaNm806Ti_(%Z~yk^-*Mr>qf;D48_~1H|E08grf0Iz|S!HFt7BD`o%T#9wX~^{YqMst%vr2`7Bt&Jq(#ai#^0XX zTTEpG!6${xrB4%7{ z#Ag98ir8^sqhaf>lo=r7d-s@l7m}42F#-16i$Pzv@eo9$Ibk)$pt4BFL&Tl3b~o9( zmylmsO@3OPh-YPEBqEm8UEE{Lhq57+Nz+iDB&;?T-BC!EuCqpqW#EAzaldglkI)pUInW4*wA^#s%%s8~ z==XW<=$(`$tpRmUa9~*!>r64i5})8*e>BGReX*s=jH#-RTJOb_ftv^X#9fcVinViO z!hnNuV=^BtMSo9cU2(7PH~wHzan8i0INd|wywJU?R?k2G=tti&{e7qJ8vw61wR5p* z{q4KY9b4|{`}BFTus-$Qef;B}D}Gh{G;f0eQPjRiNn)<@k{R>Ub{&1SpP;AQtKl=4 zCzTJ$)%xRRn#R5FUwZ5N-~YeOw0rCPbavEC$0VGmZQI(8@!a0-$L+(!(kUe2e8TD- zcVr?toMLeIk65S4f<3w9?-yUzm|nVa<*U^;NqW_XvDwexL2l1Ogr*-9w;|mPAMazNYJdg<22M#`+jYSHH*WRUVq@ znZ~=n?jzK4x5lr0T?E6k-;X}83!KJi#`1M#gTT3%+`jLf&V-rm8G7mO#$%37qM?T= zHhIZ(E>o#J^?SefKaG0AZvoghV#El;6Pkk_itX$GHYydE^h=BZ;?;QxRyHLaWmJcd zm!1)>=Y5~N@4nyr)V=rq?OJw*Xy8N_9ffFhZOUk|J+-aBTm6lG_IYaL(eF#}&1llW z(U~QCv50o=PsiT=6g&N3xrvSQ`WRnzqM_!(CIF#R#c(z%5jL@z5kDIX0dU1_Y>dCt z;Vt4iGYz~{3T}^Tm1T&p(FelH+dT&%&}lb z8xGyMm{JXhm*l<`&#UQpR z0cXJE_U`KCxi4HV{pn&!`%PSGb?lnpXD(LaeZ&d&jF>%nR;w3_ z_v#dr^DzOidP|ny>fSOp32LlD-YuDZ<6iv|T6@2k<2I5OwmDM05u1e3#wRN)OE#2H zR;!o>bF24Y+$umwp)xwZeNINm82eoZipiIKyp zvIOE2e)=q(28)=OKCt!8$I1%rja3>55y4q-zxkW+!+Os0 zNYJbP36lcjYb(YKBzkL->vYe`E6d%D1+)GEl;u9@kGKg#YHiFD-gCq49g-|VaIRjJ zQyD;jfKzdyVj-9Mp_BuyL5QETfNZ0CH6fMaK|gia00D3jED83k_2?94xAj!}xQbg3 z=2_#%D$DX)ySbouV36If_RiC~){Z@JqZ!|^eyfb`j3DASYqrl9R$Xj;wyw|AhS7pU zJG~h>zMBY*6dwea#wt44+-eS5qhik+=jcb4AIc1|r{<5`lduok`+-jNoktF4jmLtN z2i@Oi?t^pf-rt$dvyQLN&e`}QW4$hL#+p&6u@aB@k)t~-7(B3eZ&1_-DT28mR7PGy z;Q8#(bjkhD8M6d z+T6Gt-a-QB;pTC2T1SKs_YpWo`naC{%(btXUiJ>Lh?|f6x6cy)v;aUO#=&z3L%XZsnPuQu9=P zbGx=!r`Dg?@a|pGTyAW zeU{f2J?VXDjP=Cp!g?V5N0ZDeG}giG+ML56LH|t%=cOWC!6Dvp?cB`3E^ah~tGpRO zb8kjV@3eV3SU53BtBlmhm|>z^Tg+|tXSN7W0wvd+xcXwVEZZ zdDO|Hr_bUcqkEJcT*_L5F;eYsC%k0DD7Q8#liOSH2awXurG+t=XMh%GzV5GaUXR%{ zz8ELhw}1w9YFqs%?yt3hL9CsCgfO1K4W*!=fE2odPDbk?@3N8vpwf60OB*e!Tr`Iw z4n4DH0{E+MPqh{|Ti(sL8^0ds!AM3=1MO;%1V>BC4=aI1nvzuL1ouU`34ySU$@hie zpq>2|&9qncx3Oq!anq^I;Y!w^X5l__pBj6bsLVR#?PD%@gtDdPm zxFv8^D2ve<9-VMEE>C6A#BEXvoPmB0-`A8r)*;Jv=jF~mk5*1|!kEv^?enJ@s4m!S zMg&p|wu4s5h9*7=daC5NJtxOa8z8s0Asq$ghHxSndkt-}O%;X7dCT1Txss z=TZBpUgEE~>4`6`9Zkya<;vPdj6rQ!5zRGRnd0U=ad06aZ=0;{Qh z{Vv)6KmDiww6er{1n$u9^^3&cz>t*7ErT1epzofEsEC(hA+oNbFf_G5d{{?qfMQ?k zUrY_xOcn&FW2_flXCdu=0&8Q9iD4~cu`*U%I^=l;G9%X?AR|CR07Hzkx^Xw
30 zAc%pJKwiuZsQJdc`!TR7D4IWFq&xe)dDtAc9waoc55#$kTLgZ?x?7vfQK)p?TkL8U zZko>e48V@LuWhxvYa_ZSZ8i<3^~Vz4_1Vp$GAIlv-?+M4yZQ;eLL2Kx7VR;{x9933 zbX6QF7faSsp%G%5(RF#0Th|l}a?d$7Bz$%(<^;~ux=`JK7|vbiiXegscKAMH;Z(mH z#;_mGSvZBe*msRxbGeWe4ATo=_`=ppv^Ceju1mjzp7R{y7S=omnjSVU_!D>Fq;ak%~V_P4*Cauz$ism-H3hOY-QB%^T(Oi)#l&TdET9tU@{|c&dsxdryI^2chx2eQ=N*Ps!gOwPxf!&1k>;6>p~<%S)$s-tYsPI0T!4Aj;(tKQdp30j!Z`V{C%Ws0BaIeGY+(5#mARqj1U zlbBVuqqflcVXQH!)jNhUrkd*?aHkmj(bAT{L@OApmJCo3QjFZQj)@jZ@D)c4=wld+xxzSB8z+#xKTB%v(%?I5&u}+|7RKr+%ty zCC-+bM9fV6&i&y;>X6EWT+6xyREh=a}5LVCXSDSiH%wzyWwK1)8^S=2X(Qh70eL`3UmPBbHmQ9>QeJ$3z z1A{5HH71#WT{-AQeWLypQ8Cj{J)upq&{BGEnVVrC`mpF7Ea%PFm>aIY1V`y7fE-vu zXl&zEpR}eaM{4UI{J|e|U+cc>+?xTOVYnpWR$kYHL$rPpQg~d9ZhY(RH0uo2V(#x5 z1j@x31kU|cA=A04we_4fuBJ&DV?0+Gtxb%)dGIy1i^6JeR0zw%)|!om#xyr?S^b+o z-IHr(b44mCI0TJzYY=c&0C+%$zw@B`Tbs@6)}OdE&j|4lTg+=IYf#T*wJVq4+T7^8 zzQ>_+&aycpaPAvVp%Iutp%JZd9uRMS^P5}$_#X;%7Pk6~dw%`NgXe^|QT$8myzi89 z+?)x!x%PLqCpT8&3As6oDMMSvb?Dq+<=m(Yy20yl6gYR*&h=R8tx#8`O`>qE-{eNc zTh=d)9bTYuvNsb%qjSwq@t&38o)ML{v823>CyZ_i<>}0YwsrQ}*S@yjf!A4Y)ghX^ zGDb6@2xqrM9-dj?M3**$tvPr6b)R$g{p;yd(ACq^$<0a-*A`PA(fuI?*jfi}*#0d% zptI|QN%8BvrlgdMUgFyUOBwg(pp<}Qh~CjXLJ$kPsf>7@u0?A~{ib32GgiYJ7-E86 zu3IOY)IuZpwUE0O6DVPG*IAfYb66t@Q(b3LWL&y;?DjrROU_cF$zc4<=sBo-`v8Th~{ea){P{wWE5|)QX)0xX|ylpT$Np^Q<tEcQ)?5OG5l1Z(7z(?n*sROU?Dvm^WUv3qwM{wV{E`=4xtOP;B)N_8)Oo zZ-Qq14y-1|Q1ag9z?cd^o~P@Mv@8a61JQVLlU_Sdb~r zI%`jiA?s&?m)I&X8<>r*6U;-K?4HJ<`v`wA=)jo91n#pawJ0-XNOj@54-J`nEM))< zdULej0EB6`4b!@09fknjn&3r&EtbgnMZg9ie|KAjX6K9C2Q{f`RntR(+&4K37oq# z!sd>)IX4J}3uU9LuAi1pZlsmYQt%8OMPvtxp2ir43!IC-lS3M7?y-ea#Xm{)H-w`} zFUU)gk{#c|Q?z^Fue9$o;F&){CJxre!{^h}N!Oh-9wElHbIql8m440(o2QTARKrCj zuo%^8ghb4%oP`7yS|iCxx$Izs0oQP^94(PjGV~jvM6OG5gJML1r9@n4u4o{u3nW$6 zf&{E4N_B`ZiHoyA$iE1c&cw7?V=M_fa_<37Vezzy_^opUp^33g(1e7?ddRXFgKGnV zCfNZ|P~INk4gi5_7ppNsr#)hC!FhM`Ssw)hu_fYExTDy3$2@MVMFe4GR3^rR%kF52 zCV+NuFTw;@#t|d46j-)bESxMXgl=)82+2qQC<36mb`b0bOFcB;uF)n76z^2u#;kXx zd8W~?yyhg}2yVT-dk&>m{V|6$s*P!VZBwjX;(d&h@#C)Px_Hs%4lo>O(c%L89#h(L z`j)%7cmiuc`U80`Yp;3&LMo7@3}Y2kBMGD zL9VQxVNt}~NsZFjcW>{f1R2wm^g9JvW7zNB3uvpq)&T1);G%vrx5R8fwN$_6r#U+t zAJ5$!5L!Kf92={R5kN}q$?A+|p?#QTT3YiB z1L7}ccTRxtch=SF##>d?Pn~V1>v1Wa>x|sCQ|#u7fV1T{?Yz!{^w?LS6Yg5W_B!4e z1QSXhYXS4qApv@Ox|r+6x@YV;4punsvdtk%FZ+%J=hY<_b=LS&jnJ#iS;EhNa_m@( z-6X)w2%D^%>QQQj$|f*!QEn}saA5_eM}Zn`f+!7ii@SPW29;+o5R)$sywAXigeVCQ z5Z;3(L(J{Fm{IvH=iE{C_h|&q8@?Xr1y1YG__(k2)MhCyO1W@(#@JJ&km-!aOZgYw z6H*~;fKV7cqi6w?Xph3*;RE54SZ98BoqM%?7E<}K;`OUvg?faMU$F@Jd`8#E`Dfk+=vT5{PxBB#S8G&gWNDjRhxSS{V=(4MLqxn;-@blh?ZlM}ot%+z?vT z38Tl|mZqU=F<-Q_U5mkz&O#~?nqiv+A_F-Wz)Bkl3r~VJkeJ#HT*riBu_P$=9HyK_ z0qQ7s#meg*u~vwlI>{SYS>iTrRsfhfxnov$iUAB}f(c6};Uh*vjzqDwT=-Z-dl%+L z;$%p-m8-qn8ZkZybH4*Zk^o!Vsv99o3}+0>wTMyo({8e45pb$ca|7~h3ps@a!AX2C zfFQBNEa9x=EISb<={GvF6472!1aM1h{0NM+oZM&~TNroodEx@aAhT$(_(_$+f&h+R zOqF)C7IPC3yUP;IjjMS}DWosNgw{_8DYr4mzO4PNy@akdacj7FK>;I%F^1NB#r%rn z6&r|=<62rdT(AjyquUB}*-p%aTv**>403C0e5w<4Th>4zJ<*)L8-GAkVp1tI%=NyH zOt*0)oKfglACQXYD8B^PwCwd~?~gX|qUf5j<<-y_LXEa=xZOfh26)jN&W(@a0SdEZ z`@L8A0eXOzRF>Gi?#aE`v1%zCEi1RGz&UQLYl5b8-KExsItrUxYc8CA-yD~;_!?0| zo!(zN%;l`^)=&bXkcj5E9D&w5rIi?abC_2R1!~tQak(85N-^#PBYPO2FxDqw4+k5V zlrsyQb8$#B!e-}~Z&j))0*n~_=6*tX3MKtf`zZN@vR*g}AzsW^<76#5wSBdpZ&88s;2Men-<7K!6eY%iQjT?9n!T*f(8HlP+gHYT zdb|i;txLu{SLSGHJPcmR*jOvZ2*{S~2loEPUdQy=d|VGhFh;k&z_~wT-Q3;aQhT^b z;5-wU-29wY_VzSx)icjI-aL&vpf9{TMY#+JJO*2T{gw76eu5`pf16`t77gKK{WS;U zhbo&)Az#0FXbw_DZ%jFIodnMP84LF14GP(LkEVHnb904)?&tTM)+i>vBc{Gh1w)oA zSb`V?Fav4;J23b(@&alh+i}H}Y#L!~=y1WVYvO15Bw6g|<`t6$@td?{jq# z^xX5kujgtvVU$v!GGb&avvG>iuFS51v?=jA%^w1y-i{-7a>Yp|tbz{A) zUWBsBX9aE30pKv?-n9954YFYOvJ?qCy;cIc>ePD>G<9dWWKoo6fWRa#sP_QWV#yy} zjaiMwiMDQgj#Ut#mE4c@LqHb&-ZSQp*x=?m2=V%{zDl#lDo}qnKdWcu^^O=T083pX zkk$U~<>KD^nw!OT5}c))>0Mmcnm=NY30C^5_p>;nHJC#&)hz3|6ABH$*s-Eg4oMZn zf+)_h@-Xis>R}ANxnV=btOCfAr7JKyzlZN|V83hNtdjVrPCHD>iQ%P#OWn_-|N zjY(t73t$b53?LadpvFB5sNEdXu?ixv2|Vc3U?pcqb@lyVhH=u4U2T|gWx^D>W`k~U zFU$&@XHQ3=9PbBObQJ&?%NL6@FB?d-jj#QH>!Cc?l!_Q;9u>g*2tmyy`L8iu9fT){ z@6v;HjX>O=Zmqv&VDz1*p9`K--nxZzXGS~kS$(00A~uJqmd;>p8PiT8pWx%duV2_q<6?~NC8tj^<8DS#X|bUn^1fUKj{b!g6u z^}7(*-rz=zE{W$ff5qR6F>d_A8Ntg5t%{$d;N}@63<4mWHN(mbIUFz}bX#E^gCHxU zNqsA$wq2UBLa)%9Gq}~BPC%V6cYa-sV?`KQ7dYorZkVgvr?7A?&LC`_@0={mk7S%M zS6I2N^LUoQvj9d%ycZ7<{1-aNqXd|jbVkAqng{V)tylXqFGPkXInXKp(fx6|ZN3VyI$JSt|)n5XUgM z4JwyC){Pc)1KHrU@pZ7mN$^gyFV0e|7~&x%NJKs+yZYp^*L%7B^=@U`L~YxsTB29?LY%~`}#YoR#>f|kq&`3Ff z`2&M*98M$`uX7N-sZN-Pm<&J&1YPdO+A6I_^{M>EgUfkG?Q9Md7f`ZDS&iTfSB_ zb9S@uU6f+gm6D9`+FusQ=ts;ZaHJpq@gMK^zz14WC*q+cm4E6}pUMJS|Mp$_7w-6C zm1=8alM)K@X7j1*==s=y5y6fyu{)=+zfP7-$Ktwx%8U^I^B@R5d#7vNe-Yz!27z<^ z`#kf6fg*4Mj1$KkU52 z;fe49>65t7Q6foCMls)7>^?}tt>YB=6vp-_X^`~sic6|;Ew%M2^gqP2=!Q6JXjW;ywKuVyN7p{a6qoPJhz$`uphFx;{`gRBhk!`XaGzbMuNcw`^ucV z{Pm-k^SL*jr*)-0GfHh8wYwz72xkLA2`0CO%8VYsp?6=-kc}*OMbCUA6IWz%*2{nmq zShcI)yEjIi^+oI*E!c=YDhQbmH%%zZuOM~zBXkJ~y`$^(4>x2MTF8O*8H)|*cEC!Q z5Y{MZLrne_Tc071jsh*WVq?hlkA;yY9g-|%0~b$ypYTTzX^gf^)~zicx!A^K$#o_+ z4PX@aC4w9@VDS9~d}opCchRq2TH=;cl;Mz_bj}A-Sl1op0+Z?WM>obag7~D3~%5RJb z;k7Ul)IW1#r0LN65kg~PcErpC=8*UMpwi-6LLb~l@cx?d<+v2&QjlY3__y* z<1N)S9#r@P{7lcw&xu~6zbk8T%?)nvGzy@zth>4EryQ^S8CN~u7d(Ud0nlQ!Pnd=N zr%aLVEi~EsjFPx9WbKUB_L+5xCkQJlut$mrz)y`CFPX*%Pl)CN$UDDeUnW9td{!9v z(_8z`ibi_|G}BQ*p#ILo4Fae6cwxpP{Lq=Gp1xdfsA|>oW?Q zr$?y`x?hP62BNH!F?$Jj4L|~rxIeiolkl^Ci~}CiAAt>hQu27IIk>#Cel}pNZ84HD zO=$=)fCjPwk8p@Vg96ug1irGGEL?WeO!lrAur}ccRrQf`lJ<(LTffyVR;dx04sa2- z(KcRIUvXMoarFbsW|Oaj_L;jJMu3|obWSmzEHh%%#Bi~4RDP2_CK_{2Q(ardOad;6 zdA1N)+v?Nah4B{CSo<1_`k7lRriWFW_FW8w_}&gKMD>Y!u}&SBi6craSKDQOR2OcU zloefvF3X}yXd;jni-vJeu=&VGKEfBjGNdaZ_;C@Ykrp?_4XXPj3?{HQ4k0wIy402` z<@if&Tv{zh(5W=*)iJA82)gpv5=h0bMhu%{)*zw1If>b;4&16))<>63E<{~NcoEy$ zD{i6rDW`6K+vIzG+<>`)bv7Q*ez}5+SK#iBS)k0Y@%I@Nc|si~q2KENe($+H#|#5& z;5osS5EzrPA-r;(g({a7ur=l$v8K&$R%^^1MMi6_In#HsL9FK7bDKY`%buT$MZU6h z%|Q!TWsP(6sy+o&f&pUXWmRGsr(h#&8&k1-QeZ$e?p+C+EW|ubxRxcTwx0UD62pm! zx`dIkaczn*IRhiR;rixH)&}eEOq|Sm{=AWSS_ctwE}W-knC3w*01{!K?jUed;>O@a zd!p6A>8yWDbZfKmrC@1IHMjb$y|>tOE@p56T4MuZtrTGP-R=R(BBw99*gYu-<&@)6 zIG_Q~xQK1+ugwaDO&~fLQrDucrzvaP}KFz}9ZRJ7#j`VHUM}L*IUV*Q4L(V*kv0b-$zb!amsB1Fk5S zIZrJ>ck*RNn|a3IN$dY|Xo@+OF~I)cJQga^GmR4~6c=1+P#T-Yqx~9CBc8B(fFI`B zL@~FjcsV^2e|j|A#hC=o`8>BH4ISU*o^A2%!VjDSO)MI1oPZ&}m~@TI3CA z1iDl1xrEUMw82QAL{I_$5Jq}G0j|N!l|`P%-UTtPd&Km0-gD1A+#OkrAW&i6nsl`z z;iqd71ozG+i~7jT2dpQn7HwN)v%1LV7tyjgN9<}Z#uczqjDoZvteWzFK|HHZV+yKg z*Ti$CUF&!8B5iop>8Sn=z!AMeVq*+#CnmyQOmg=moYk(hI(_H1$Dh5vi3ryY8gMR@ z-A`C=u848r=4*4X0KrmM#zh;dG$M|e-er6vK|iLs=il|NcU8agDR!NEA+%fwur{ae zfnHqS`>p~}gvQ!u@vp`18K>%z@Y6LwSiA;|FOB)= z0RX5A1V5z>$nDlmHe5XF{>TTjlQ$WzV3Ce%euh}!Z?ZVtsP>1yWc#RL#d?{Iv^!e!)dgS*WlYCv67W?);uIFE4UDPl zH!T0yI(WxA^R!sg;uAF2PtPq*%P=`SKclf%&#MH^?PCVYz6^wq%QH{>R^+HkJL6H;#+ula-7b6C&kAiPZ>D2wwvOqx} zLqDv=*>pdrXHE}KZ}mL8Yprut$>R5k2Zi1VjlHwIA3Yb39IXcmNda$N7?Z4?kZl

ih6tRM-+L~&J_-CgONBr0w#F`AqVckxq$jhdQe3Qpg5rIn1rTY4 z;^pli-j_EP_gzX8Y3V3|!$*k5BoK??9AnV0jQi^i5;)i0pZ%R5>%;3VaAJj3NrVZr1}Ptaz_wTIs|UA2?79M z>L0>+bt1sFfV-Xm-!*~-2Al8+mDFZSz#N&lu7j^9Ah7JvG$#NM{Ai+SptzTgaeB?W z`pt&b7$j)Ze0II(<*%z;3YW&dcj`+qyBH8Iwd$YdYGI|S2N0~vPa)Cw`ZD)ako>G$ z1Vx(fKGWpZKI2&bwDHz22p~7r+CXVgd0jJ4>%+zgm=PCx7Q^aLzr=XkOlRv9+C@-|Nxi5`~*eWrqQoD%N z<$6`WRu;>JO@~sYHjXIGqf2?8E0U9x7Zh1v6Oh`ABs7;xlai0CA;t>wZ0o8yhuP{g04!FT)^*qV zE*(_suzTdzZ7=IR!e6+%3r`?a3`&WWnBUH`3!MHcYkvma(YTG*`mn(4)jt%Ekh+EU zKwQT+^gH1b;D~fZDZio(XhG{Vg`bcO77uxVx%zhylKhPaf%MN?1ur%ef3@?qcpTh> z_2|35#%J63ETIqNgxCLgQp!oW;_(r}b~=Hr@w{RHXx~rC%C(ttCZ)Z7qH&G3QrPv5 z${;MnyV(O|VouUqKB`t!U_ z>_gbb9XB*~a;NthU}iD~fWX#kw6Fc02VL|J|6{K7SG;DQxz9rM_MMmAz`Ih~#p_6o zq9K(vtmPR+-5CW=G^5OGCdH2{i(&`VSvQHM%~&^K{n!e}P@3$DHItSc;ITr4okOzE^;w7NEn?zgFm zZK46~8X|*1WnDAD#Lt02wyE`;?;Q|D0mX0~Wo0r3+!}$nu-bKUW8?3~atMk&XRZRe5cf%W0JYg%M0l%L zgi^BdQ3+yxaTTUK;i49B4aE-ka0sfM)&NGAu-W^>p#kivYlo(vCtw+bVJ??Rj-X>&G z^LaDlHVU5W!scl}fllKh=A9U-t@3boVL5kr1po=^n!Oh258B9cD5YBC%_Uv(dIA%d z+3pu_J-B$9^OS31rK24}1^PWgd^iHbY>Hu<@2k_JFZ#SG0s3-d01yXAskWm{C%^;y z&b<-<9br43;cahw8{P)fnb5)tVs92N3y_ZBdUOgKf&2|0L9AHy?fCb;?b{wdmAQ5G z^5v`3V#Fvq2Z8g}J2ob$hy41;M{e;1IzP>`=w37p|AGcLj06YZbJCm<62#HghgtA@ zj$*Mrrg4JfL8-_Sj53Zgm3Kri|0(zmCIIMIBm( zc5d>z+TS7dFq1Qp>`LD1!cl(iYRk z+9l{7QYGfT!4e}0`4Ge3b&MhRKxsv?P8gs*H*gIycTJm}cq&#C!p4Xc%UzKG2tWbR zhu9gR88sOrW2hX~AD|%Ia9M5$pDcFX7gN~#Y6op|?_&*S*(LC>>dI|c+i6>k0UvVK z9d0>=bJSeRj+b*LTUsS-8fvW6Z3Zten;( z%U{n(AESMp0J7>=n=O~k7^T`m`)nO>CAOX_ha0KygjW5FA>giF+p?TScXDZ}U1CnT z!HFXu6MSoPb&BA#WH$e^-1a^IJ%m?o;uI7FU#>IO8*7r-O0;8^xmqm8jgYRKab2T@ z9pY38f^CFiN#qN)ZdsY?EA>x+Zq4!P;9U@H?Hx3}T>s5E>7yJ^`JV6jH$G3Uh)E&; zFiq^;>6r#?Z!x)19u~WoJLU54)L;9D%kPhV%ws-&b#L!oX>zxwvttsTcK18?_ICHC z?-w5Nh^yO+#pRu;@?SkTxIES6@&t0Tx5{vxg%LaDCVJp624^m2^Gq81c?OEWnK@?{ z1I6{6b&g`hdK9niXnwShh`Xm8?K^A+dFaFuH|MPj^OR6zPD0LZeo+ABGTvNRalv-F zwttq?D8_HYIUZZCj|ErX(r(#T?duY_Lj$j0xxGVkMyDupp;_`G5u1+IcTH+83Mw?7 zVw9rHeg-i$oP{i9?ki6 z;j4Mnb#$)%S${WgDG7|3bztAn=M)N!XLB{hVb|hMJ$nLuw6kNxYM|I5Xn1#Z0-{%) z+H>$L-}}TT{&(N|o!@z7G4*+LuzqiB8i!gp{S8{~5W?K{#fzVv-tpg0N`&3Xo%rzb zbZ%e1d^pXK!%NfW?&Be#XyJM#8720`5bmaMXcgKb1|J2cY@^Cg@t!1>a_0-%*0f*K&!v2B&X7r%OgJf@YBULeq-CWQM5!h|d?zuFBEkd*`~on+gcgdT1$m0ueO5|!N~ z7hK%r1;ZWF+xw)qU^M}sj&VR3CG?i#viov}?Ymr<{a(8Os{q5Htz+e=jtK~a3qqWC zay?|}vjKJ=!HJ7*p9%c(VA9+W=n-nx8{>Se$z2lqy&(^$=UY82m)x2#Kw!%WO7akL zAC!WI2C{>Y!&(VNu?|^vSNb!Tm8gunvbi@H>-Mmo>hzcRZlyzT-!J%h zANkMz(I5TMm(HN|pM7qQ5p(@ixkXQ(CS^f5@||U5zeMKI9 zr}%2@dxmleD*TYzO1xWp9XbmH4%PwdpScT-dlsBx69~pxTpwzP?^-k@BwkouB#y0y@Qbd}JiDilbKV2!>;mV!b`?V&QDf0* zP+C-3H(QLw0|F)ypD3>k>l4J*2DkxjkQ*QZW6yLiR~GSk34|EC{?fuD!cvQfU5OdC zAw--dVeb7g-(zxg1c&fg88jS(AW7>_fCdrxf65A;I0Ob5%6WVV2b#Ct(ot-h>WnC+g`=d8fF z+p}?Fg(7rt{}sR6$2Jwg)7;g@gNtWGLEbWPYY7R}nI>Aw7@Jd8 zu|Na-#tPlU3ktF+a%`{1F6{^#ix zueh=9Wb;DknKkvB)1r9a7U68_H;K%7ad4ZqAN5=P-TZAos1IBJEb5&+Stw2XPzvS%i``YE&=g8FHGbgmifS2U$6?cmrD4Dvz+r}+Sz&Hv|gXc3#xTLHU58@ zs{POO@%75ByLI7$ee*;v&Bh19HfuA5iGGb<)z8MmUfw;FYj`0FS-@Eg4+Ig`(e}l7 zBv}U-Cwi_uu-~JzkDu1xfBi51#W84KLhRDBih0(Oz{~# z*Y~d1DfS8=bwI27ZcYSXl!7x!tMXF_j-egjGM)dSLD1I(;65)Zt39Z{WYOa_UK@V; zpZ(a6-Sd0D|NHNoQSuDeZb;r&GRw9m4d=nd?d>fdA@wu<>NT%<&ADek``Kctf&EdM z;irs`xb%3P_!HPBQuD}U(B4exhhILrpQk4eHF^Ijb{%(|KYw8c%*W~anUt)jaFh1= z%mU};W4W>?qx~g>OdoxK-)kWU^#6f?v({$mUV~= zL%;QxE2=>hxSv4QGu5AaUca$Q^bT685e$Hf4Hs3Ylw1|XW)d7a6RPC!1Z>j=9$_Ej zGysDLY-f!maAE{(9NHR#(L|OrOzH#i2blE6sAt5QaJl3n%(b94kI1_9HES`203_bN z8^`)D>vH{BU6d)mVv7@i63`oSL2RK7!6riB+>THT2kq2|8j3l9@@q`F7LT#Na!01j zh$zrp+sMWQ;DW@fe{-?2-P?BpD8^4-ScrL@${Phvu9RF)`@O!x#M`vEX|!2U2-FVa zW>c&mbAbg~WV3kv>t8R%R-A3^rcIaFo%m&n&0lJj@(Qk){gl!+qii;bc#jg zjbPKpkP(o%Kc8@m(%<^U+@^T4?g5aocIpH1xYj3^bTo&OtUhSmo97+kDdjsQ#Ih7s zW}o{F!wB{q65^;0r2(HiY}_p4lcg>pn>+Ri7iE1$8_PAQ`qg&nq>NuDB^Z}wIdRb% z@w?_8!5lD{+_;n|)(^oHDAJYOnd|2)^UE0QyNU-~x;EFg`r|t%1wnJBjai&4v_~%S zw7_DDS+6l*F;2bfaT6{2SO4-~p1XYM($7v+|BrR)4HrD;UC$0r2i&k(;PiPlu4YnJ zebIOUMqw4}tnci_)(xRw3Mi?MqMH<)14tZeQDb4uxrbTH!V@6Z0=lBqj1d)&wC1`s zo;N_?^m(zV@40NEw)d{3>SF$uL(h{cRknoDDE)^dtB#07NKw+Bd$)*`3tLxGK)$je4v@eYXR)w6MeFy6TJ zKAu;+&N`GQ6&jR!m=5p+peFau-iPPSV*+xw+y&Rm+lx1QTOp`ORH-96RkfB1!8 zXu$u;RP_62#{34*%Xy%+RXTIIN!^7Z{L9>EY~Yj_o7NT{lh+spdhMo|md0--jAq2T z;pvzmhvG;$6h$z8j?%f`AKsAL^tuV0zHj<`qXbTa?#qIPoI98F7Fo~aoiT~~&a%}r zO>%^_MIte|WUH0gVhe2&liB^{u@rQr-hiTMowwOr4zD=6$Nl0n3Mi{z|nIv!mfng!zs>=P;hONGco0KYI=fobc zw9t+bJ^=IRhc*;~r^SXKbuEot_w~N+jhJ%zrRBt|^j+T6-cPID__hcePw7(n4D?2> zNik>KG7YN5d?b zyXGV}M%IO+XAmHMB#x~mV?)sGZ|jKQSzWkCR$s`Hw9huS1c~}ed}i07C{}k&O7)A- zi5qBarIF#9)mrZPm>5=fx#;9jWr4F{b4l*qfQf+KSm(5eS?8-i_i6xK%GCx6EI?ja z+=7~~u5IiDOYbDqQILq8>i(1;>W5kDGZfk0$x}dj85(i1&DL*oD+?ZFR%KxhxL#r2 zD8yJ2X;bHzT(pG3iC_n1yA54Ev==IH<46I-TSHtXWgG1_cjJ^SV;$Yk;;9ZS_mmUB zW(XuKT4+Mmbe~)K~Tu7MjM3qD}mCo(RoLE@AB{z{R?5KO-m+EW|}i zbJa*gq2;CL(F!CnN)#zF67p}t6 z!6SpqJ0&D+0YV4*P4N>Q{*yoXldPP0l*Xv{0zqV15u+$ppAslK=-q@SDLq*I%#rS4 zffY;E`??P=R(l9Sa)fg`Zr(u@pFtHq`*`kiIUJCf33PeEH6D~G)sHa6BA>#(HnRM+ zKh#I{2_6O*6GbZ?7Ht&n)Nl3w``-7ybMJlcdmAVC6co}u%PWbeOMMOZgODp{uGBel zLc^V)L=<{nWfA7<3r0<+asd=6$=Jb zNq=y+#2^zU5|Zoh-r2$vyKoq2(2UA@bSb3_Y0S+%RxmEdU5Dn&os!!v;ZS^T?V(g4 zu!z&6K^61X{ndl3E`~zxusbhaTnr#F3;jvZh-mkhpvg6pV8f*fkz`fl3SOT#Uh=0B z63l6_jI48nR;ZO+gpCi2eQo37&BZuDSIQLbredD^t+_~v;Mvw#a}483NVFCSC^mTO zxjt?F=QhhyU76x+YfI%df4IA|oC$d<;bpYtS3sG5fHDxXdJie`WWL)b8j8l z=g}!1LgKvJKe`9Al$&Q|wBMGamav8Puhsvoz!YZ?;OFj1sIgDhc2>+nU?{m*_Qmtt zC+iRU2CD^^+xiThjZw94!;EPCM2mTWv1s90ghxcTxaeAQ(l`;YU{2tfqEW41f=lZe zy+xn2hZ}UyQcAX;_MNb#O#l)x)c~hv)}sDD-F$ZeK+cHlEiMy1h=#oT-S4i=?Kg}F zlqda7khd4|8o`4$CiRuHYAMbtL!2Gu{-{vpgGg&z2>1AyfgW8E6j*22mBq1}MuqU{@Hh#6cev$r+7ZpV|*#PcC z{j7f(+vE}Nx5|gh(ETj>`(xX`zVveQaa~brSJAbfHbTu5zRLL>hP|2 zy^Fh^yMU5vKar zfBn~cM|t2H^Mv!t%aSsp5Q~@SIX>+eX^5!R*?no%Y%W`KlhtC^XA&+OQ-r^M>N*gN z=0(?9;Lth6)V8Vjxi(cEOD-!cjb*}HR9XGUVESSyyu;}`>~I;St7)QP#dKf zKmrvYBOnoCHq5Eo+qyZLS8sp&+qq)IkNRKiHfDvjop!#X@oLSoyo}0?ybJWj zD2#KdYTniVt;Oa+W57Ke5+v6vn*#UVlrztL?sJ=eJyV_Q+xiG_S#7OOX@RR3LAibr zlV}`!CPh%!vm~_!y1(aViMjQcqN4U^DJ1LzA{k@32xYBPYq|c2HlUMG!EJgU{NM*E zDXO=Aq;!$rlh)k&i5{?IcO5gO&Xi5iZ&^ZtB(x@TwQmmedvmmBsyn4qeJKVC4WOg| z))B+s^J1wee`awqd=En`1Cfef<(GTnfH^A6+b?rE(-oc@wQmAm}sC2Vj2``V>P@t)pp;4N$o^ zzxmCr-O6WmVcmf$p5=~W0)l5Ja5R8Y)jv9mZdb3lwRm_|OXm`8*ZxS*C8Y7Pp^QRH zScL0?3>iE`8q4a<3!pKBblzA*PtAw=r2Bz6Rz5*3>!#RVX>!_6gqlc&gGN&faj(Wh zwC~goioV96&$(6;lI$ArxsmGc8X@B?yF zMu#CLcaGLQpi&zYe_tQEyn)8xK^ZOVwe<}!G_LD}#y-OtY5!_XH|H`kw9gUpDb0B_ zHqKJkak00KSf{zSQ%cdW%;tuk`F;jEd1H^QQ}{z06ayf>gYYHMF|9TWlKh;6)La*V zg!C8D;O2n|>~D(+^Ve?#wl+(yq*4X|n`rQSuAXhAm32axWVU9Bd()fV6w?{e>^%|J zCW4JX8i2~;8mtf6P{gLPqOq3Ai+Lh8!vutE#Wkh+R6iP0F|qX%ce4n^@BQBIRnLN) zoA42}>LjL()sr^H8L^Th3Ngmy*H`@oIMkVDZxk*O(iT-xcFxBhW`IfGnVu z!@bAG90N&!0!qV8i>v7X8sv~JWweNh|25`g0DnZcy3jy!ixSvRvt`VCx996C)~A?n zn@#2RJEnx|MH@gHTYU~ib)6CpX;G{t0ujI)akpdtQ%p#G)4e}9fktro5@X2XMf=-z zu9-F-uD>i+&=92^iV^8v$k1boo$AuuO9-bSCQK#(CunuHImN6sXT*tMsA8JLe%Y7> z>l17NLO~JisI2PPSWx6>BaJ%&Q7%oJJmg!nrm<>Vi*sc)HumCxJM|-Q4}ve|!sZTi z2x6l3RNMQ$$^c6?-*3txB+$xJasX$d__JnW@VTyY1=N4yb6HB%zct#}v=Q2P8(VQi zwMCqF_n~RrCAk!KP<&Bj@!X&kqm754-Nq})P_6wk1tiFI zUFcBzQ_sh2r<{a@Kfe}F5303#@9y5-A$p>pI?)2*1Q6FLJgkBG@3pUeZHiHr;ra#; z78=_3_HHQW+>9w)PK4=ny}h-5sw|2MJfhT94mlTvIpC+n3Ci>O#y7q(UMAYdyw1Zc zjng0$AI#B5-_Jk~Z?3?(2|0=ut^-43!9xQhV9?~yvPLu^FE$VWdt&|!jNEnz2|^&z zu2@OeOqg+j$7sr(*t-od=9v2^O%*qb&KA#m-t!({L?>KXXtlV7YBwfboiSlzFm2LY zj|m0bQ6d0{B!NTxjhG3929sOa;@~=Cnj;F;IbpdnLm}*7)|YtSW>{Tg4yuzx_YfV`BrVT$=R8 ztuao?P~WIm*D&-@)ne%7lceMzaJ3mwER1!Bh)iIkedFTWa~Kt_u(au2w*m1y$Q=pd zZELPIWo#3|TZ4^DiUk^E>)3`)t2(-q+89Q6rB1@6d&IEP#?$^+PN!U)V{kt}gvNjy z87n4_0I@E>DMo+@37Y|UNX?X$vS-DEV7k|sDd17sR~d~{@8RMOJdL{#B@ML7)@NhD z4YFrP6wR(To~*y-S2MP6lNs#-@h#^wOG zc=7l^I;`>frr$cFWq_s}nB2~r&g|THZG8x$O$LlDr4KqwaKzm3?y=9XegcfEPh&Vw z&}G7Z`#@#dw^}Q$_vjM3D&{&G)V1bTYmN|ia~Yt`KqFyQ1V|&jOKrrL5IUm;6fa!u zIw*=fH|7ndWa}J-BtjngCX|N)3nMHib|-JJ7~J}v(g*+?ehRNdxd3NCn7`0p>pFT; zz0q|cJC(s;z`EM|)CbK2#FkrSpR0@Y3ys@abeXX}g`Z-;e6 znC$PEGdk-hv|aN_Iv$qKETxTA^%YwT5VNvdw>{UMobcJ)0BBRYtb2xo_J!)2&{`ej z`|UW`+uJbiH=T~6k+rvdyS)a_5N#t|S{p*(2;M?v#{H=AYyHLNL`UnVl;XVm>NAQt zMlpMBea=l8J+&|1N_5h3<56lc8J!Xn%gIGJN>~wO%~B^ATgQnrppj|7y5GXJ$Z1Ux zYeJ3%+=6QH^_LkNaS%UkT0POa#$G;cQI0FQOKs9N`k@ z!KJD)j1LVQ2A!*heseE3Rk5^E(9qTmNQRxPWZWWwrEocx2ejX4J5DG__6`mRY~E*1 z#(;By80QsNUhxdHgoJOYdgR(7kP#lG?nqc-4Q?)qag-t;<|M5zB2t+&Jd1%*)SlW5 z{6$CE=v_NtQYS1=mq=E`Y}%8k-YckEllz2tv|6piyc2fo-%2 zh!qABR5{{50Zdh&+QxE5S!7*c*m{5CRlipbOJZ%0wltm;L&k5G>1MI7&XBpQr#NH^ zAgOb>cz19U?>=$vz%p2DV{}-%`%a0)9Tu}zSy?p+=-t zu{l$wK;o=?Xp6NeIC@t7>M!jU&lrjujJiC`uCHv$7v!lNbH06JZ`NE9*M(0SaI{c- zcAqJ}giN&d@?4;FF?SogXjt>M-v^5w51;O79-v9hgXTX=Dn)D8xFZ76>34MamL3D4 zL)Den5l@-g0ll?;;=wcuF}0a8r#=Q=$kNNLvydTt$mo&4b3sfe1*aH3${m)syo$JO z@*FbOXdsUn!W6ne=}2h9+hKxvid26dN{u5LRUcH}_PEL-bYQSeNhy4+$1?()h~Ye@ z`P2IVtD&)eqr}w@keCT{VjrU=@p|0<0mn4f@q4^&lw+LqDG#XnD&=bJH@5gM>Hg|R zeHFhox+mMi2zAXpV2l*>6n{LAv|V^h>zU`6{Mwb#(KrFK%#vAo-V@&r(}Snpm}izU zy?&zAJB0=jM1{>| z@F4?`XY9o%Vw&-%LSgDpGEn?~bEi;*_F>BDZW#OQn?~S7q;#xBChjdpuMR^Txyf}x zdTX$H7O+f%+(Lk~iE)z)rvqS01Wue3W(>oE*b_RNNWBm7>^_TyW}kJydoY=-A2jnV zrU(g?R_-T+I6@~EBLXG@&f-fbSj z6nG2b7Ljd28y`$EL|#^_F@_e%4k1)5873$9j5fjEnZ~Yfz>^Vir@DzLbbSCVLxx~S(>*XxQus*L z-hFMjlo*sk;uvf=Kotl#fV61k31&3T6i&S-q7A&Dc~Bo>wEByQrL5xq#0n0@Hes9h zL1%Nh{;1tH;@pF}M$wee3B0KJnLuS8^geW_K4{|rZbn!}3s{07(qR&s_t6OJ4H9?l zgchtnFhr}zLcgO;a#MO|C&iEJ0AXm$2Ny1MkoN^`IoeGzfI+S7+MFA`*mm9w)@AP- z!BR#@e;YElKkIzd1f#8ueSZ^1xcuePUVm{(r{)$p-iq%>;L*i8V%k=?LWN>5-!Vs9%0cy z*dK5L^nJWW{mN^GB9BtA>y!m(BLy&Fk>awGl9H!ge;JFS3(bYDODp3Zie#2wnF)BZ zwg08`s7|dBKsV=&{p#@DZ2Bv>316fw&4K7!sl5%3Q=rs}Gpa*(2lt#hOQ19#enJR<8OUW_b67Mj z_7;7EM~fCiQpXpE2zFmO3l=d%4YNfvhXC}9VC*J~!Dk`FuwtkMJc~tQ?Wlar8kDI% z3rrV-DVM06lLG83hi0w!CWOUY$)6;qloh1O+;d!0SvC?rdPW+A%CE0p@{*TinXB(; zyb}KUjf+b}0kNttDu=6t%?$!uM5n%jKwJCUgaRM}kOL6MX2%-RI{~QxE2(b%rMd0- z?v3EruiSYe@XZGa<5`Q21G0|^aAj_K*%6uM(OobFs8^0*fLD5?ss?01(z4fEdb- z`ZFTf_z?`aNJ8qZe=Dm^s5!(XmU~?N#od(<)<)ECJ>M81x=;$HeMq$7>%edU2mQA3YD%2t60j+7CAi25C_L1PW1h84BX%4`hqfIP<=U)QXR258p=o2jPJ1sVYv9|fcb}z-fbhwpX;ZTyC-Bs7JqLBy=CCyk{tC*gKEccq8W3#^4*|P2iCwEc zZ8|J@ETOMx=FWUv*i+!wc4i3m3nk9lDmrVCLdjM$NKKw z5JkH`cQW1qT!QqI`WtGBk^EELqNmbcliYY?w}ccXFU|dQQg%;d?r_D zbWW0Nn?>a{&e0VXLDt!k`Bx@^6HS$0cG0m^oK#jDP{Lc~)mM~wwZHZO%Zw z%cV#GR3ET9gJm~Xx$jU)0ZXb(U}55V#eq@cP<#M#<2p0~jBw`!VnwND)3vF$_E^lV z1IXY%@*_XeTIl}VuNxDfYa>{b_2syeEH<92IW2FOc+P_cQY`qAE(u8yM!*$M93Q4s zydMRF{R-obnFk1k-lyDZ4nktZlyb48ti+%W-Wcm(7dJm{b39s$9T-L43MoJ2<%=FA zU_jC4lGpd1!F<J=j!s0+DGPYPP%u`%_yU&A z>cd)P9Y^2o=R9~=U(Fdx;FJvF62-HoAV=?eo|TY0ptZO#-qzyA{G9W1WC5kN14=R) z$8D98k!$n_yeC}*qf;m7oInIF?Qk(&4 zLf3gC8Dqdw+QyQ}8ZNAA%$1Lq=CM;f8%IV3v7qsledo1^Zs2<PKNnuY z%F!mmokCzc0u1ng8y=>eb{4V2v2VPVH&lh|Tlvl|wunZ5+*V zWnuVj5UiBi5`jn%88;zH6rd;)FN+7MP6^C_BDm7Bc8l#HXz3I1=YV0hR{bco0mD85 z(6<5xv>ZK)%+0C(>*bo1aaC@3C*QK5!>1t0D@69#Pnj`Dwo#+_cJj_ zm??36m?gA;<=Q$mH!6pPO#CtTZu<;ZC{`$ny+NR9G94^qhxYobzi-E5F->|L97Pf3 zSaU?If48;%n*;LnAxAM$&Djq5v?~J=HKm4B4*`YrTXVeMfT4`8pZ3IYZr_53N|~qI z=rKmL^+rJ|L41AGnyY^apoB6YL((NkZ-VZP;T;_mqEaTXrnNV>_w!6ZJEZ*Lxzk!9 z_@IkG%c^VlM5CgEwS%%)Of|PpdxSN`P#_#bUgFAA_m{owWj$Zn0ByKgk85!hH1}79 z&QmG{4tKd`FZ+boL^LN4A2E-$frkdSd}{-;Jmoarm9Qw6F}@8?qR$DJlmIM}Jp+3~ zncPrWx7#CDk!j_8ZO*hW$469m<0MTD1me-k%%jZT5$T_&R4K)xuLPjRtoq}zE4O;$ zEqR{FupovXehE*B=mzB5F%<0T<;xdW#(wWsiKREs@rGjEg{28Ckn#u5-@dP(y<5w80Drd}0HhKlzjsoYZ1qLBL?*a=ZqDhm3DXH@a zA~B*3NF5KovFn%*OciFx;;TFsj|OIB{0XU^WfA03iE-kJRsPCc9=TrHWC@tuC|H|p z5?L62=4XB;VkYKM&^+(}#D=C#zDq8tG{8r{nYi3gM>nXRsSa`mMs!#eJ6hbGT}ue5 z-R04G-RoXw!|IxL>Bkf9P+TU`PPZvoaGiuYiQp*&>gUF$`XY2%ZEq2f=?FPa7o06w?DaFyc9)AcF-5V#770GFY_7 z7&d67;)P46^YWL!oW_qES_1!(aAJePFl-$jR$293pdtjOHX4?B8&vO&VPN$f1!&3` zmRs+`z{C*JXzNqS$0>dYTm)U-1T^X9QRM>LX-%~Wg{TJHNf`t^^GjUh82=RE4k(5T zi9R9#T5AxIDGMU<+}&xOtx1B6m~Sp_(v0*@G>OHUaNL@JGT8j!a!;uMB#ISCjEz`X zpcB!pHm2rq_geq0H%yvi6gbV_gC%p6@ zWzcwQN1M}b`prSu+^LKEjCs9HVmP%Wh}r|L`GW!m(?hY>Z`|ZC+xG6}aEc0wDtk%S z8!Nd|S*BUUSk}7Fx@es>PI*$K6g6Kc2oG1=a4YpEfz!d|JDSiuF1^!>U;JV~XBc(@ z2L%xeAZ5F?W6weh?PFv9Ztl#*qKl*BzFApl2ElLyrr~W>Il0@G(>I#NwVfc;Nr2`$ zDt4ZGedCK(SGS(0Fh|F`hl?+diqU;~ujV)A19(j9bL$M_-g^!Vn7%hxwN38!XnOOT z04XkR73QmgCexod^pQ;1pe4Y#S5v6W> zTKh3;DZ0~f>B8)xC1-RH$4dUGt+ly+!c)XMv=3A2v--~xOoF?ihxD)FWxf^V1K(# zYe*OopGhFEpAshJzr^r1mcXE%`OIg^h1D}$Wmz}{p)Lp-&A-a;K9+4UfUNzjNC`B} z2OEUcA-$JnzD=jU;s!7gjj0&v5mch*Sefc~+ErsJxiu8h&fk31tBwWGrJMDo<+|Bk z#_$|5B?<1+8ffm7YG7|UC;xV`l9V#!=YRg^+w`;Cne!|pCsGA_ZS`v#bI+LT&HLIG2tYIlqo++P z2PK5OV7-T;hBBsc!9YMfq}1s5+R<31J?~n5);w)&i{-9<%~haRlt;9>+$x1KxW*-0 zOfU;R1kFBEEO7;{4{68ii`F|K7URl`1Hei5Hs^Yt;=o$0E%h-A3e7zQfcScTTRZUw z%e`%DCI{f{k{Sg{?LNgDB|(ZiDQ&pK^?P%p>(I5iB^zt=epC+2x!K%`j<&91jsaU) zS3Cf^)_&GFHrIF_95Te-!UsM_C7Zj}oZQaueeZiyuCSQ34x5uauH;14=hkp1S9XG) z5S03pr&r&B@~}>`G*fJk;UaJndOvGu7msk!~x z-W+Yhqv1)ogagWorZwL7TiFKs%LAr%cQ4^zTswfN-cLYj&TvIdDbRi z_|*3E?&(u`#``Zc7xAvmw_8Z>thWaA`vJ+qt@4xzp*IV_ee|X2GaN)&Z z&+AzNm;Ej4T;qMd^OmK-OOHIt<@VkFim`3qOevn{huBRqt-OaCS4hV29Pr*_c8d-c zW|(zCC4|N!1;(JA*Nk((x6&kVk1EU*NG9+1`;!jfu*rSaJh@}VeS+R zZa@K^bS(nRC6C76Gc*>D&5yqUKR7xLS5yTS$C_H?;?%gVw%|rYI07o6x;9pKi*B@v z&|-C8q(v+T3%%Jf8Qw=h;*$H$g0d+I@WfkJ`1rvvY81cX!h!UVFCoChE|* zK+kJ4>T?UK_BA$wrlAwczs7RcAs1wIfxuT8X|p46G+=zvt1Bd1IY$Yz1XsDovYPdK zn?f5SKlm)1GepbgI0_U5d+~@E2WYdstFdbn$;wHHss3WkDhD8zwgYZq;i^sIglRz$ zByKd2PzlF~Z*y{?{+Po0Q`}>9uYUE7xduqd9N^jubV44f+SK}J{)q3xl(RZbVZN#_vi%9mYx!e1{ZyKlH_?2Hd_n7Ik<8f2_Hy#opFNNbQ^m!3*{}$&-aIAim zJ#D1b5jazQ+coIO08R*J^5!;1tsRU4SMOnCXg$<_Da9J2`Yvr|^MuP;_W)XGzKcy8 z#}>Lacj4+z5rTP`wQ!y(!-u&;}^A+iP_A=6jlqm^5SsN*-W# z^@(-U97y=AjmA=23IF0dc_aYnf~^1#rhbNLV-Mug%hQ0c$#d!8c1NjQznH+u3OFD& zA(AYUne`ixv?&p%1~CmzOrVZzAS#1KZ?J|{7G_eeB3eOK%Lb6!A0PypD8cKMcg*xH zt$!c<*vJ0&FFp8RNijDbkN%c#x$BLd+-1K>Cb%TFR#^(k->e& zQ=amQX;S|qt~F`+(u`(Fj9_G02xKTtnpjybG}RT_Wpx6r9iuNPFim*R$`OeOQy@Uy zq==Ar4}zPVtz4!X&-#Yzfn%<%VjQ`K8k;dq4t~QTcS{*<4g)hAQ5A(L<-|uf~j0puVo(jGq)R zjXf&@0Sg1hl8WZ=sF1g}vs|NcchQ=njlhmpj-IQd#vF2DMq(D!xjqPBhlhkY-Cs$* zBhHVK)x8&d7#@4ovxz^T-~7)^>&dlLa6kBtrr zmy{SOAsQE{st7M=84l{*D1pp|Sx_bsx`{N8HNj!P`qd$Goaf00s>q z99ch#UqmPHG?Y*Tcd_h3jI4?10a__-n7qAQa`WDx41|hVU$dI{&G+g-`N#vKvc-)F zG3p)B2iED7Ybgk{+4}D}g0wn`8*C2rEH~PO+v*!%LBY_uJ0obES}^c^1+|laU|a~5 z_Vns&&y)g$`z#>|SQ$%nzZpLQ1`i>r=P2AEeN!%T@o7bJr;Y>(h)0;%S>N zDcWlTTm<1gz#H*5KpcAp2xaRp-ng-s1`zNe?2>rQ_P=-l3dCqYZIm?u?+T}*y+_Cf zI$T@ZzcY^1&v(ifve`zCvXID}0_gIepg4X78uLpUmOkIPkGA9cT+-SH-kW#a@G zj}YIQ@H%_~H)h_LWA=gG(_U8{lA(?bO~=ZR-gWo1SATV`eYd5Bljd(LP5r@vxPzD? zd1dM}ZeEzy1_%Nhq)90toJf+{x{bUwmfb*#Ru5Bu_! zZ5X7*m7Sd{eYlwAX&D;J<)Rd^r^yGK4dg@Y!KeWt;F{n7 zO7zLcCg!eV=iuN=Gws5JEp$L1z(B`rM%ZXpXg=latPbjq2?6{8jdeh6Wr2?I=vvkx z42;w=xw_Oo3I@UaG<_h}^|csC@A&`CT{y;TN?6T0EC*u!NN}=|^qs}F&xAhn&KOo! z^SgSoK#F%uQDCl9qF@jz2V+)k505KtgY>y)#UWM)R^Zk_>x;WKVlTfa_t>mW6d%=T z)Q~rpHYQ4h7>r(ax8)#U;GPcLL}E!;~_ma=3ieCNVZ#Hwkg|S9GOyTYopc zlr=2!)vGcSE-Qn=gL@2%M~sSNaH$$h)d(QYdsUAr^oRA(>#+aiJTH`z;#M zuvjWot&jReswj%^j4&e~0@W8V6pw^>TdCEAli=CvAGxV{icnH@zYHI_xA#6uAGBio zo6w~;0^GfIU{q5_lFFOtT=7~I1gR!w8y4crt%Rk(CP?6-z2OTjUJlcgrX|hz(eqrz zI#>#!?EBnCeq}l^fF0GpMOz&JBGkS%;NE3}WnBU(ZE{Ib!E#soB7C)% zYg|HdzhfY|a&T?4@nOpEoBFxqau>AAu?{z$M03!G>czqpq3d&XX_FdqYt~k-Iy7=N z8=yLbQn?MA3tR`~?3B6!L8ENo2Ga>8v){$T^n1)cK@6c=tO?Y|47Pd@9@_lsJE(%q z6@m9$zgP!ZNNAp_YxS`yb3=^D=oztmKu}@?SQNO;&_-kGYctG!lC$yQ3Ml@yatIED z1~JjSOZ<#Y2jC09iVsNc|uamO7M4=kL<{DfsyoEWz-aP<;YW1c!FBG6J}Mgz`O z3S%ffiwjomz?fzUGu|D9X#It`>t1fp)|WiBjcI=Yx>ZK~Qr}Wq0bv7>)HUf0tbegZ zSz{WH+D{-JtQ^t%-8JU+HaO;(Z_3pE?q-!)_8Xz2{^~n-F-lB;FswPP4NArCjn=iU zfRWg@x`yd8-#ervq9BzlUG75)xm*2^>-liG1~Js!{qY*Ljr9=2E}yR$JaknUL(2L3 zI{E}>fD10*9()ghq=V(GIUh|Xyf(HN`~-rY1tv$JwGVW1rEYwyFLZleVfdQfZO%vu z*1Iv~Vt@&8o$q|-JKG~`f9R|wHyL28aQR<%3eGM+Gmddf7)@9Ie@ zB7PQtS;B@sh1x289G(YqEs!Eu2=Ro?iKjj7Y4(`z#pfmfLxE=<@15vdCpSupK;C}U zqrMkoZ`}c2?7IECvFV-0$^M;CQ@bkL+=UE3Dm4aii^V#*#NV|k0!A21-IpD<@Cv-h-LH`mbM_}j{oLtl1@ z-rYUnU#RnKCU9=vpv4*0fw{s-Q-VQmGPa=7${}jBWpdI0yAkJPax&e^;e?R@njxl; z@FsyZ8pSzEPeQ{qLb8wA*QL%(#U!s z-c&zhAQOHX=lZ+PEfj7jgcd@(MMaxP8(294>068x6t0!$TI@L26M^Ca30j`gqmFU29$F63H7%)*!qeEYK$$$lnZ&V4(#8J z2e)vF(lLdWd4i_1F!7FPtfj5FmB-?a^XErz18C%98jMj0MQh-7Iu5HnC!czA(U(osl zm^R5XrPV0<0SZT6h~C*x`O7UFDxw@xihY}%jsH*@53kn%M~}}P{(50Vw9_=#f1>5lktM=Dv@<%K~}A0%J29(Qcz7wZR&c++SM~+C9hG+q;0l5nu_Uz~anv@s*g8%5=|| z7D|25x87-PwqDUpKvSC!m;4h`ZK$ zC*>REPC}jZMeqt@l%cFjfwOlbz+TLE0#Q6BFdp%+T$Ncq$9b*4C_++xWfe_ut8W@7 zJgNJ*ns%KfmDL_Vq&YFBkK)~Bd|5Xs4MrDudyNo`p6gwm_{Hw007APxuMaw*smCuj zRzg+80FS7)$~4cV=pj7yOnnJIMGP#D#oi%gqVpTz5NlSS;^mD~f9<6d8fch)?lUX- zsK6W3nlOfq%4&NqL0w-aJMp$^KKEM~EyrceSZHrgms(oXV=X*JkC16|!7SC$(l!vV z#P<*yJ3S|-Aj=DPOiZ2yjmZP$-)GDyw;j13#rptjQO=lf_|Uo1PG>ajVKJEyQ^g0; zRzhRs$3Mn}HE|$=(h$)~jycc}B}sqfyVM5pX%+#E*QJo;axmAXTxt{A zDu?hGxJkq!!I33S{Rn3gCL@RzX!U1t<8O{IcOb}6P{D`y9-4GYfi`5wm^6=KNm;Z@ zwXxDB?$W&*@DOCp)#S*StlFZ_3D@F0#j)6sMu02na4;7v2N*INFQo(Jz&a7`BFeFB z2MuZSIMXbH;+j2J27Ym=eiXk%(~ z>36X|m>20XOfv3#!Aq-0vOUq<_cvSW`{zi^10&! zrefvjegIhFY%$gtGcLH&2(fI_`s)|{NI8j#22N%^vZ{R39J|NLRC}wmQ~F7c-x244 z04fB)+_F!3ooXTjd5O(e zz$?+{_AVF~lw8sC`Va2|kc1#YFyUHGm>=RImD&Ah9%h+Z~x!|F(_O~|T8-%?`*A;#1Z*8aGp@im%Vc(z}BgjSbC|cDSeg}^p z{m;sdkA?tU8+g8*@BoS4S0`(}HQAi#Y<%Nsn}gj?Kvfpo4tHbWAoh32!q$_#<;_hgRd{ID|5BLos3<3Ep=rl} zr^_&`#ch;_b8C~-?6;UAgTrzlhnxIcfLEY`b+Te&@Ebh9KV2gpQMB zT;32!3zOR=YY#!r!n46yoW_auh`;o=&+tP9yFl+6)Tcp!p%E^FK)y}P#dOku;#jtyL0CW3peY6{%d{d z6IM+OK0-!l#&EJ+u@p6)l7fr9NKmNHUH6wq0s)Nx*M?oW`+IvB{BizWojI?p&d2Gw zhiiQ02e829sd-OuB20)~1c+d55g_Ga64k-jT`Qlg7|zip2h&ezYz&MEW|PuJ>@K%ffK~c|RfM&g2LYr@ z-V_ut`m*00(YEMZ^EtW~W6BM;lV+bsf!H95AW944%L)`IL2uMRY1l-u4<(L1KSx}8yK7i;Kk z{O8l!4|y+bIE1r~m}AIdPGtW88{ZwaRGkmh;NhtM^UmQNI7;^o}MEbWiCwnlN4CW{4@5%Sw`E#DLZe zqcpmv^4YIELPL|UXT>;;t~7gTBulvd@WX%0RZ*K(Eb!X1J#i)bHL!Xh828+B4@;_z zqJ@EY_M61@G&C*BQ26T482akf_kNE!HompL>zH&ds&ZD*m~*#d1-8%y_jipCy#X>O zL2vs=_@nhbYTw5`_Ax1W>N~_^giS}3N66}~*>JeywAu7*!V2P1dBAr@7eGRr7{jQYLL)v-BMDiIbxb!C|+q;a+5%FBCTzkXXs%VYL5pD4_v zvS2MIG}CHV{+LHmdL5Q+7F=zNR`nMM5rGZhgtAzx2+YkROmn~!ydGH5o#K}yw&t$R z9ZfyNBF6xUL86>AhSnHYPidvl7qsG-G0Nyc;Jp3aXdRgQ1E`D8v?*?RudtdlF3>Rn zmB_itC7tC3aEX}aXrOps7Md~lDrVbUrMQrjRu08)0MH<75sehPCB}*em%X6R%}>^i z(PM@}h{c&D3qmU7WvG@cYe0RX-xRxOH`+tE;iXV{l!)WKLOdvt0kjc-@h|olf;Mjk z%3n$fX#AlLSTzrF9i|Mt7S{oDV?C)|Da#V<@WAi7)~e)ea7mS9mUbgudMVobreO)%#$O5V$F=c6WBj z3kSD&?0cFzp&-JZSfTN^$rJ>5${uddEXmeI{n_=#b;Rwkf3tpfPxGkHybT%2N;^e~ zfX5QUIV+ppE-{>kV*{t-{Fv*D^@l$?ixw9VX6H`9wvgCps5>njfHDAu8t4|0gtnDU z+Z|z#sP=wP{kc`V|NZYj;fhvyT-X-d+pAWX%hx!sbavlV?q_TGBc=&Kc$B_Ga%5IJ zxyNia0?;8$vSe0gNT#%GHtx|HECvnJDb|Db>UFPq%`p<*m%jAz73-4vJGC|Q@;)of zAjnm2M2jV^-+?4y_QgW3##c7BwL4AE2-U5BgAX)d`4j({{Vz0Kk7p@9N;AzcFtEln^BJ=bu3M_2`oZroJ7 zKY*+jV{Tg@QUHor*$_E>+;zY;1k~C>U}Y7h6e|9+&xDoQ$%TtmLZV{GqpyAKYe!d9 z{n9hW3Wv73uC82bUHNN19!vr!O*nVn+V#Y@)e09df;3Gz zq+{+(2>|bY_q%O)2^uj*)*Y)ouLI0%XEck|8-g^(Gv)%lLbD+I0y3+N#-Kj#8RLa% z?YZW2uDSJV<#B84`J)g8D5l&KY0C-9T-q^N?|8>MSai4!Vt$S-w8zND4-bmO+x;-_ z{}E+yeUW0QzKt#ePq81etYDOQEHs7~q~@@-S6L}+C=bxMPWu62hP!QwV@ww%^U<1$ z{!CNkR%S#)LdWN@=y0d!mW-x!@I&BJ zGnSPhoP`%mzY!2I(hz5(7mat%#b5QEXBA~HL{c;!;&JtCk7Pllh@kYWO@tR-TS*+3 zZcwh(!@v3Tr$6$EPkrjYnclVY_$;qJ?QyzB$x>7yXodfq=>a$NEXxC^Vu| zIE*nF^IPMu@J`x8@EY+D@H{;W5!ifZ2;nV;E+ov|vYrgnSUi$~PM9E^3qWD!ketvg zk%UHyS(e`SyyrcwiJot7Yt7_Q5FPG1qeC<~qlM=g)+j)Zu8}3~TpAtjzU!`k=XQzV z+}a>DyCy#s<_050KtfbU*G0kQ1{IPljZ@loaY%g28}u0D%BO9RYY6HnG|mxlB+WqI zBYa}KR)Gpe*S{-HO!2CacK?^Z{Lv#Kv(y%~;3Lp2yxLfu2#n%Kx%Zir1TEG~8+y-R zEMvaZvu6+znmKMd63iA0^6t02?by}t!3RI1UDsgxo!l7rXl*fxl3KIGMI>3vx?cOF zr5WM6$6TDOIJGH3l7+jmi~w6$v_!R`d`@qh+E6_r`ZVlPzli_&vp@SY1d|4GPAkog zj9Vpm|HiG)HXP+(ek&h{l{rjMp*#_f+B4mYL9Se}lr-Yvn(7Mzxy_};!@^l-X6;(g z4%32h#f3;GsGq`vW*t%*P#QVKXy*D26EEn$4VmkXdJ~HD4Z*3k`CGsBTj$>JhBpud z3Bl$9>bEni^jH@<&Cguczbr1dIgpSk-9dCAW4lqFp1{L%Jk@Q|b}=D+d$8L%}!! zx1i-UpF6EHF15x`pX&GMh1hue39axk?aX~R!Qj%RznJti< zPHDGlSNmA~T)QRk=j9TuHK!qu6DlDG^OhJf0$3=y;sSc!=f8 zj(A+L(J4X`WbiA|R>F#OMbYHGH=c5-noAU8gjF<^aE!io{@r~4pMIXNy2*d~zWYA$ z@xS?-e>HhG>^v?v=BdxC?=St*FV%*a`)CK`eF7iP7}mMyCM0fPdXzAYb2Kpe*L{@< z43fZcMCavTPc<`kjB*U@(cpfu_^V^h z_s+UdHgAEMCei~(6LG4GJfkgQag+%ZO~~FIQGosm2@X*r++eb7-YhxtIS~Ro#X3oC zQ4A?d+Fm)C9(W+YpwCVd`qBnr)3qJB+Bz_vTz=aS5yRR-bJsNtY6~VJ*!K~5NS;1< zgeV&~(WNS)F|J#ZHbcwa`fy+QG%OzlaUxgFLnvo8|~1 zzjleuVjTtkLNGwo)U#{iHZh#s=kgM$9&IM|V`cy0AO2xhi$JEzx7M>EsGZ8f=`NS#kwPiLVn~5)%vdewLQ8*>rNmO_}_iq&uaFe4}FM$N*M3{EIDo5 zS>@X7V=k;s>ko6+yC_5Iqt*sAS1zsSTyva-Qf{ra7*26xXdst!-XSc_6mD7ZJ9<~l z=)2zau5-WkYrl51c3v}iKx7Rh@PcTU7@TrJJS1yj?UEu$8)KkoUb)3rUT(ELUwf-> z<5EA^j2jnuhnuUIv#iN6g_J6_rT27TZrXHvPxtl=0jKg}YHM?r&c?j4J$nDN4v#F^ zSFQ{K=WTE41i842Zs})QbNT+7jYyJ z=*6?1^{ndA7;!%|Ah+~*Sc?xWV<~H2`)_A7fl`>8q%y?I)jF`*+)gFVN5MyFXm zyN_VUCAT@>n6$oHi^kX98ojD+ER>CF?`~aCFgE6mkyz@HFDZ3W@2hR?(Y3cVR(ZUV zq+J2b291*d-e1bO>iE%+t^>Q-+4-C69kaap{oecU|C@jN$xr@IQ{P>=J3)NeC%^cM zzgU~m9|{z-k8&&nMdMY!MOPXRpm4RRbrTOEK96-;nl<#Y&oDjYZUw9;CR#Wdr2FdG zyZX%K+`FoCJZ9tEzMpb2UZXLJ_V+pO10henSIj=3IY3`xC&LKAupkI>v}j`X`wItuySnZCTeP-^k_wD3#KUv0lIXaKknG61kZ zPrtzr7Ajhlh!^W-i>Coe81P*8BFeONpGlI~w4vdyS zC)8RoX0`ExIJ7T)(-^^F_3B*-YoAy$nt$<$Py8R(ux?60fiP=NNHu%Lk2aFqK&KphG@-Pi zEh7EiZ?v)1xf2w5?dW+-aVIT%M7l*y1@Qba90Na7R-*# zv^saKF`)_M-b_0StV*uQu5%|HQ9+F(w@*Th1n12^R#HM|Bl4K=224}^*3!RKm;irBG3_Hu_>(uF5cEwr*tHg2ZVRbThEC}1oqJZ zEGHqSzJ*XIUXb#I=R$O>4T<7}YyFV4on@!ZxQ&ZIea-Yf!WE2LbPo_#hxw+iEb8+6 za_bw{cXXsMgW6G?CP?i(dg}YW%UjC|Exx+X&5fAh%B1LOAH8Msa6+ja(xMzp zZJ= z&l9ocJX~5o{S}8EEn+?O%n8f2ltUP89&7SE1K6=IO0CsrE}DNg?e`sD{K{88_jLe* zIlS-w`~PzK`^(?+-QWG6-TkOX-8l)NM+)p;`ITQe_j5n@bNVAX)n{?;(ODQ16tay6 z&?b4&8|$tMg^I4(J6I>tO-jNODWD*g%RXRT389HTR~Jg>=2?7&a;uNMCi*Gu6@|3; zdtOm^OPC?@R6tun=+Ap^XQ*4U~hXg$tKhBrb~yA>3CWHOZsbA)h8fOIyQo74z31vfo1$S6l zj-TTLP}UA@ai}D71Q<{&MY*9 zI)YfgN@+ph$0W1H(=c;U0UA*Ik1kP2#bH86Tb$MQJeJZnsS|6O-p4z}&S-fTfrnn0EH)C>v9f)f}Ae63g zTjwIhHKws{zBEQXgWhn*_0H%U#5qa_ZZhZ*kBm+V4VHgkPts7d23HSOZ-krK(=7QK?zP{RuHZ*TqNI9&UaCS+MX}^ZMzdANhz4|ME8pSkR#}ms)+c zeRw!p8||CI1}F~3n0LxJ`&O1QN(}oGOEb4KD2tfh%10ZUe_YAMJ#pJ@vfq-(!TJ(_ z*C>c_L8KU`SR_z#oihemIpjf=E~a(Ln$n!E48qBX*MQb?vF-itYu&JNR(9hgGXNm~ zTB#)R+}0~kp6uveW7XPB(BalAceeeidi0z4($*m$BEOqM%IN(cJ6?-j`=Wkzo@(sZ zpBc|F#a%+@N2fZz@*jWacfR7^f5H=DFpp^bFaPo{pL@kCUIC||%M@yBscCqZaH$o8 z$-AWT5>(|e2DGK$fe8^-c>@vx#p!iMkLznl-1c7{ES1&1)jKM$?-Zvzp(xvV{BWN| zFFVG3pq-SLTyEV*`QEkO2m1j)9U3wUL$E6F2JlAc(^tpx7DB0&$5qw>>1gb^lu1$o z)n9#P{e}x+|KcSmhMFwUU-W~=7VuHZpQ>VwQ{3Pu zZK|Mij0o)vHw~aIb-dIAgaIix_}*6r?TQ7L3tTRMX`wJntP2iEPX{HaUyn5-aI(O3 z&jrsuc=hV1j_Op}izPHN3#FJ06DlGRA*T&t)ir74hip;DID`5JZOxQl8``i5YxPZK zHsS00`|iCr;pEHHbC;{{N;(vuO+rk6E3116;H$tX(l1zStWJFU5j$f+^8ztc!fSb0 z0f2B>Y?H115z*dVfAN7g)&x}>CMfgDPRNe6BCG*|8uKVgPE7~~h*B9WU4(`)ARbc$ zZ4?7$gC_)dMvRQjx91X)qynf<5?Fd~zuB0oC`3~2a8y=qGlXwBTWLhamhc3S7`pd1 zF3lfq*jyx=j{qX7Ti@GYrPFAfFgi4$+GQPf54T&471wq?XzTNj(1|EUXF9F7Zr3y}bvf_wUWR<9%Zv^D#+FG|rqnWDDxXlx+BwE7Sr z?uXnH>z~#RFBtSBdXy`EM~c<%#VY}AiylP3dItCwH)u*gR%Uxs->XOW0C9mvOb|>V z&T~jiHaaHN8LM~CQ}8yXfWev{EUDewUqVRV$8ZHgQlCdWiuU;Do`B=w#cL*8oW zGrBykJqiLmR`;`BGYkR0?0aou(L{fnx3!VNion}`Q$L!wL!9I-cc`2Bq|X{BVFHx= zt*6F~w+NoB&j8rS8`2q3CDCYP!fpy%Y%T0NbDV9 zh{dUK?3p%)7z;o%Tr<_3YmWBX@K^x*9&?XbT>%YRbL}Q@ZVw8OtuHkN2{i3<2+c#=c8woz0l&JoD$^T|FQhQy zqR;w7!DEedoi_sTo}Rq4n9gwAR`~c(mY8o!yx$o?|^Y151=k(!K zlY8w?KjE>Dz4J@Uc*NiR-QUe?C$~kR5zxO`@>w&-9OC+k^|R}ghZOVnN4y86p8VpC zfA6V}(dX7q<5^!*K5(6-KvyUHFmELQjP03}0VC*?m}~Svoq@+0v&OTzYW_hoXQhPq zV0=3%RRO@&9v0kV<@NH}?OQwj(IF&i7F%n9EFnL!eV#(xm_s(EL?9E05B3~IHLH1i zS^bLt7A}YJ>)XXB&PRx_|q@59WS(<#P`_@M!|) zjD>S;oG+X|pA>Vhvv=|-$As5!)eWPFAI1pZRPfK#VJo zR*?3q_lt?}&aQJIhf+IGy@mQ?pb5rY48_NRzZa`92-XtwN6f_d$jio+uJYAQ{#%H* z^$DU!0I}8x->ix9!rE9Ua-8O&?}r0I^!D(5YwDlRPnMZ0cV4(~=X7NKO5l(ZKn$xk z*9K$RdJx;q3f(xwP!M|h3v@$nTyAd|MFK6Q4;Q0OV=A8^#S!;#^bN#427S!wTKNfs zwW<4UK(n;f=7$D||L)*M*ZVO2tW4&#dBpXnvgETxYe4_!8diT`Dm!9$YoBuDcf;gx z!Rxws^b|!Y;>1_loGA{oU^nOwFWo!$TBl1UTduLoF}GP^r~ayL{jNW_tL@is;uN#~ z^9ZCj{}^-PV)zNqXe*{1vSsr< z?+bf5rm=hMYvRMiRN6my`Ut1#z#mW&@$~5(=s13Z8zexRH^2GK(Vd>dQ&0r(_|i^; zaCEI-CmzB3DS7cwt+iv}XX&XEenM-~dff`FZK~HBUiZ4A_df8IuYCOaxKw)9xmoC( z+-pM$eAPdhgwDs^b=Mt~k*}NT#tViEGNmzqN|r%+Nk^+<2O7sBD*c_@?2T25yyz^Y zUkBlW_g|+R?$OW6^)AYNmPfb)+_kf4Hy`jil!`D2@LrVXj5hErctMHdmRojIAjx9T zUMtO2eJ38g17F@f=#BmBpno@+{-P~&F15m2YB%ph27>xp7+L*|p4smya)9l@Il%i? z1`B5VNox~t+X+O-GeQfcTWnnLyE_S-8$2{_JC|Bak%^mD<|$8kN)wa@rQiC_^2wZx z;j2@}xIaQnu>)LkSd|(OZa@LZG!PMI(BEkjyT1kAq-gNDF)Fu(g@_7_a_+611Wp48 z++^>s{{HV@`IIL;>FLjX<}=T|=e_SmklW;sKgS%0_7~yLH7z1NUBg`684+vZ#4t6n zmN9e}mxQ}X-~GL;ayl1nILk?UnAIg0mZ`t~?vtOa8K1mH{dZSR2Oy;VJ0JC^RFcN2 zegz~TC>-If?;|7tT39EtiXDw1p-g-k>*mv*_O$-CxEhlfpO_RN1eKRoPKpXHwzS4Q zBZ;^iW!1?BImSQQJP|(mrz*!r(EGuRS1z}}?j_8KnTP>L?5mr8%Dn}uFZU|tcTdEY z#RwzPnI*h;5_0P&(q(@T=*5_#rFkyaZ#G1@-AA~9bZea(HL0EMTEbE0rjJsja;d595rH!etTEAS8c@m-3K<~KT zLF;ZTAYY3$2Xe=i^Vp+fs^6VceZFHVd-STIux&lHMy)p>mKJDqou!YE-?`nog152kzrUQu zgwkNK?00LVchrYnk5=BBMS4KT_t$3%41(}`r+kkuec8)ei;X*_I3-YXtbL3%9=-q| zobDH!Z+=xybGW|*C|*O9u>jw?)?9B*9Pw_f?3A>Wg@?DcRqoJ2uRSc%T+4YBb<~$| zNqA2REuav91TV8f{0Hx#{?FBR(|Es z!M@;?X_=jnM zziB$7ZwxD=x!&ej`&xs!#kHx@?4t$pFL!@!KWgu5UiGT~ zm%V#?wJk04JMLVEy{kIfbc=KgBs9=SAP_}Mt3)ay1ZWTi0+{;{A=e=Ra%Jam*%0y< zFXXV%&S24l`~ z9`E};&-)yI&*g^{i82qbC?ex*IYo+W5-yh{T+5YEtW0uKd4-?<@Fzd{`t*A_E%CC5 zt8I^a_~`unwTTAG30~e(WplC3OR!wS{ExL3;VkfO0Q)lE>Pw3fP&_@Ir`|9?7`3J2 zsq)Mre-lvU|H^wFy-84N54o=CVl5Lb*W=mT*nAh?h}NU?1jhJf!YG8==)M1pPEbJu z%Io)-|Hoj|y_+xFmweQHlq$o|Yje>T5VS>g)V@8l^Z#eL;sfxQ#jj{*T3)*jEl%|O ztN-$&AN{B0C0G?&e3X1KeaoBEzBhgwpkb_Fe_GtFbeczO%{?$V3a|a;FMm8KKL7S_ z{pp|ngJ~S!d!M;ul+VVc-p8LE8-D*jqnE`(4zY+7|!SuNYH}An!Jo7?hH0q&tz}qC*Dm#*Y$jjIU~Y^1wyw$!5(v@q@-%&x!t} z>jdVe>>af9O5z--{6oi5=glcg{X3bh&)vbI4@vaFak6`GdjW00FtNb#OU3G z6`|gCMnL^8JZyDm%Az3l$#ZvXXN?SwdGH#^Wn`rnm&_v+lQhxsk{RScYj{Na-Ik|G z-cmv(Ydh}(qJx!U;fT_{z>v?ubghcl6GS*?YW>% zkyOiYWV&swzQ=pHemN;;XRADJ>%NPSKK8MXnbhhRN*HCmeynX1T57+PRJBOeB#W>T zYEw9&5<>7w@D^U!@A`(9C&m;bt7cpM+hpD(-gyLMC1X0D;lRQ}IF{!Ss#LB~_lPli zmx#GBmf+vM#!+LW_vu?YH-%Ad0;Pku9)fNE)gP0OA(^~;@q7u7jj2Zi-E)RWN{JTM z10Y3dAl`($#KymH8Ag|sklHbDm-?djP}dML9~8BI3x$p`n&jFi_n`0Ud&!-RFjk<1q4VaiwQS|u5=S5S_+&p22hLTL-MpW)*G|D zKhZ|C68~$GCIIlvcYXa2sO1Wc6F`oQ1L1LvMR~b+Z4(#oY|o?wHy%F!`Oino)fiQR zB*P69;tV($N}yGySoXXW@A|m&Yp3Y0ekXA7R&{RA>b)+$eMArbZ$JClznj8Yf4oWr z%{ekGebxzxdU!elo59e8LL&z~oUp zfuWEwGYe<`*WTX**2Q9dtU=wrmbC_X`G4BFKEr5N^sM!A{GmVjlfRddbZ>9I=gpVA zhbPS==j*WQ_&He)y14LLI?>b#y=PD}+gD_ael6Q>rO5foJa&_ZGDFRzVgHZ-hAt$r^kFR{?E6!`%Jpd9U zI478O%p?~xhPYX6C3#zg^LA~=W8A_(d#^E`dKB`OoAUrLw^7-g=Lfut0?cZ+g>SBC z`p;WCzW0>fQ^SoT|aI2XN3A7s(?OFCSp!NvM8m!uW(q( zt~|Yzg%s?pau`HVjN_uDrQh919n2ql*D zHy=KHeOlwr_AT1{(I5Wd-yTYn7)z~^{}~+`f6jyc%#vAKWPoWLLm^IZHeTXAwL@dQ zw(nj-U|D;GqEh-(_`0Ss5Un-2*M1w*6}ny?*f+lMjrTnF+;h=lJdWoS&<<~uZr z3u;0HlB7hF{3G9f@m^p1+Sht!0?fs?0*Vlp>{$>ud2{jB)$#EgZ#;PL+D$>=??$Mc zueVmwoX^c@P^cfnL^KgEZEkJLP=MFqfAw_{011xmi#EExv1Uwm&&DqV?8bECrLnI* zAgh1lB!gb}ObH{*9$350_cI7e;h?~iae%7;RRhw}f(O-R|8dGGZvK;}DFRElo|=cX z{j}iEKm-{s@gabNjGx`Jxi&dT*&2FEC8i#r#Ty*^E8CrPxm$Kx?0C=devC{C0b`E@nWH=$X?g;?n&Y{$@!cU$up_DOB zgE$7+L=zKbl_y*Y18dTX5ko#pAG=P0>AIpD(18_~e;-YgF7ud{^FMjSeo@mvx6wXMOg zpHjXeB4u5=zGL9C6Wn`mp1qz&5Rx>H0TP0{KdT&&C?0HK2|S!*Td#Pph5L1`@UF&L zgx`0nYXs`tI{<*`I~uonu2K}Bjm1a_lM@>L-2BGVAoyjD6>YgC@yB07Hg~zvzQ1D|NzlUqo zwiOVNEdt0!59s{AeT#A35_!?{YeXT(3Z4s>QQCorrgp?%j5DA(^>q`g5M;_b1YcqN z(6gIxfB--M?D>?yyp1Mt_lOcVfd(1lJd^dKk~u(qg!GR2J-{P?ld(ht-GQjsJpsS~ z8DcwI|BIQMN@&n73LW zt*gl>Tn?`lQPaL;73l5?_REWB>>Gebc$7qJ31x%~ukF?K6!jo??y=FLHXFAa6+tq{ zZhCyXo-g}7*E1ILbyPIlT6*66UNcG>*(-oW%@Lx` z+Rp$2sTinUMpa-$P_4;G$$o{1cYTU$G}73FnoK4e+D!29d(J?23p4MA z!Z~}F?TV*&qinj59G&xLr?v!aQ@^DsLes1NfPzRWPrwy2N^ngm=@_6PdAg8I6$r0? z2SKN26nYfn>R19!zq6iYVVjlH5q=~jaLdB8D4dlSM(zUO9igSrNtL4!!*9F++K{Kz zcorh89lEwPPrLF01bVp-6mH)op94*)$vC0`rt~N;)c3nz^rP?Oa66zZ`+jj#uQ{qXq`Y(8beLY z(Upjc4SbeI8wilX?`nmy#tMUiG8o^KOQKe2?^!>~F$3n60NZc*HnoMQfH92$J=F%h z-%yxYebJWXF$=o$ecKhzc~r_B0S;P}nTL;1NYJdgv@s$aY@8z*G=!bYX;y2t{~{ck zYbiu(yB4*iMliz%BbR6M*mcfGzlVsjC|{gcGnyi2)E?^D%JuKJZ){*>fP1%i%OfF#gt$kBJsnn-r)`^2r{?pX;O-osVP2c2h|0?EM+x zDXCi&#&@!RllS*=qqL%NbgriBh?UYfistZuj6UcveqekF*A@jaL5dwaA@iKy5D1U>|QJgY{ixF>+eFLwCV7~CQeP-T2)`y7 zv#2W9YV)oKPBk;W+zFIg=Rz-2pO1B&MN=+dLSBN72`#3Wpu^fv5bHRNKS5D#C*?6P zY08j#mg3bT49{hyS3?Q0KttTZG*=rL=p2~mxOIoZxp-XRV;Ht#`nKcmnPqWdwt8F7N3RZ32?}S&mI?&JBLe8we`>)=c{7D`}N?ppTGB^s{5_~W$$t2$1{& z9uG<~AR-~ia#d?P{X7fj+a~N-(aje6IwBOz=xe@JgRt|2jp7%qi>-|#-vd+(9}(US zsTE>f3ajvMVW`Gz&!`WgArTewIZY<4ruDyZ)jQ>d+89zBucGwzY?GGz@~HGacpjwb z=(F#J<_&PG_Y<-wl)U%gJ?}coclRo^C__=-V8ZQrzC&Iy^yc+@>(gzatgGvX@3}vI zhYwou#5q57vs<8m&f4{S2w#iF(F0>kW2P}5jmxj(-RF_y>1P}(WVUnbcezcx^unT3pxu7WpBapz&Xuv|l^+AFl=2l5r=R6{4(666}H6 zrsE3g%a>;Ck|QfMWQbCLC>|X)w>7T?amG>8tZ^Yn>5^6<`Q ziYBjStNFv?S)NTH-CN<@y*ws)&^3PBj%8UWos9f#lhyJ-LK}xV4PXkQf8(q1#N!!{ zK#S|U@dgj)OyP9RyQpwJ+O&?s z)wU3_lY95h^xs%qSePN;nEuO4loJX0aI}mo{@a4+g#Jl@?mSAWeg#4S9ZWc4|0#No z3Ez@GbEJK*D4ZB;W2CXjVl~u3h3qLjL_QxzDZI=(Ds0c7V!Q(b0=Cq*^Mdt!p)0IY zJdlhpiu|_(ymNG=PvlgpVcPvuCi|^ElW*&rWF)$=jM<=aIV+(KVg^ffA+R()@UDtX?IzSZ{uBO@%zN#Vs*dy}zXMD?qU zDV3vzvTHqq0#^Ii_e!X=2)&j9AVe9Gv5+I*ByUV(F@T^`3OiPn%`_C25P5kgKcsfrPi?hIZ zik^^T#5mIbB9H1fd4uw_VJraLibup3qlLn{2cE1ff-$KyPS-O=n49qxdCrW%hb%GS zC!u1Ka~PB09gGoE+E>wiWo8&zyFMd3rM0bEya}+~!u`#kwQ1*N%n|x7ItY$MbS<4DTHSodDUjd{l$N2xRi$>mJp^s)!7aJFbu zNYBcj053)3B9|DaMVLveY9BB~Wmsr{#=7y*qU$?1S1i@&V=~bxmo=R{Zt36iLu{2R6G)0 zD@3yUB8*v2?Nm7Dil$=rr^7WTqowQy6;AKtJ)pon=>KM>KDW|6`^+=vqlK)Mz)b<; z(Sp>~v4jWUJ|kKguMlOi^Ak|(hx)S+==!kZl(qUZVrpecqDV!6!a(Hj_FlZ4KE@<; zwGL+sFJ%isU*3zb2TGc}Ut_j$-1(3jg;nsh_rJCGl@DkvckdQT-k7uxQI?=G=5Vgo z;aeT6E^A|&!iRwqIM5fboBEmV%j+s%7D_4*0l66R^n{WE#i5)6Jfh?SG@^X7#)XvE z@@N)PyA|jKU0KoBN$W7?k2ionSdVO1m-jSwTTP}ck!^W-@g%kMv@Z*AD^ICBD~h;# z>0`){YRU?;V`$(tY-|ZB6mm2}sr6IThctsiq!f?OAi{tm>_&L|pft*@<6Y{w@sRQ; zKcsEXGMNg~W<=?`c*~?PD2-&i@WS9xgQB;;kn7xC9&+OckGA5Cw?gUMoqw3MWo2Gw z+`!A~qsC1AmvOK0n0H=OMl?{!cf7Wc&i1AF6kZmc$J0d&@O~JZjB?R|{O@=NK0B z8$6+l9UjibJM%=&6~$|MHAkgdRD!55rH-1<+s4z2ZW(b*#`&k;@$h(jbZVaCM3O2c z;vw2?%qhjwewY$HGg*R1uy?9#i+OC;Z-;_Xi%>!t=B!W>&^JpZLT>}8rBX4`D83la zEUKY7x^wCmiX~%o=V$QKmhnnyQ%aRlR+SX1y?w)NMyVYMU=D1-`qo;QoyLpVrfBel z#AGQjltqxrJd%Vt1j3?UNKYLgo*X(?odvw5l`sT_uMiVCPz@v&m+6JJ6Ts+InJb*9 zF;nMl5{Pf4EK2LBa1yHKA!N%9Ih=&zv)@~X-z}Spuro1y>I*a z?Opqh?$i5I&|>JU{{(L#!yShX8iNPw(;~+W9xjwizfe-j>BCsD1RcTUj{W zpm2^tgw=n?jtL*a`SeTUb_|7~_|^B6FW^C~W6e?CaG)P(f#oOoS2_u~v-h}FD7ABC?KHl*<_+~PI*0fU`(OmbNC3*%C^~>Q zBRXMJ24rOFDP(ZL6O@!9h|A%O zF5?vhR7A>Cd@Gh?Qh%oSbrf{~Ry-`j< zqq7kA{S8pdjow7}ok!2yYipjF)m^_ny76MZo$uSjv*|spmS~Nq9q=QMcu4ex)g}`s zFNFBdFp;s4A%p`!o<9tZj*Uh}{~OoFUeA}lL1v^A96CxZ!+%z!BXXmZ8U|Q~q-3U| zI9q&Y^i19*KSY1cjq+VN+&XVShv$us&H+7ke_)UC3o;iuPdnZ%4<{=;C9f?jT>vBv zY|#2OG@%q)U4y@gs0pwMt;Uqg!0W(s#KQnhwMh<;L7hgJQ;3y7ZQzUv(3Z2^Rsttq zRX86IfbFMn?qFKuzSXY%+fm@gdUJDTjPFwP(dB2<=Vc!V8556S~w*6xIu+F@Ox-VakpAN?^tN-#0-5&59@wXI6)EP?&22 z$Z$Oe%4|ZNFkoIhjGf0y;eLvP(n6K;P^dqlCSy?T8q-uiN;|Qf${CdV)weMQ0nh38 zgS92|5ruQNvI#V3q#^W$jvSjSoc>$UVBv)8kXnWflY;uc)tszN6~7in2u+)}zcDIj zwLTXf*H$~$uHXFTH$!6%bgA(=o)3sY5qMsR=;Y$O)n=4h$jM3_FzPf0&?RL-{Vs+$ z_jdoWq!7Reh_m%`;{o)0&w$R{zPww}bI<2R73Bahf#uu>oX>O0cLVoq+rLBMJi`~Q z+rn#S_xu0b(`mKHi;O?ccw=;3YKd_L#S$P}eJe5oAQ=Tq$Q)03$0?=2{s>Tvjvd2G z@YK!)s^eV`HLUh{P&f(cDUb1umtTH4J^~!6c~Oayz7xu|`KOfuOPyPxxAB_M7|=EV z5wecjzJyi=&*-zZ<^?53>F>e#vmM`I4?3LF;~Yi*p>;mwR7Vg@F1iDtp=LC6DYMKT(}+emE52jkU+ydT?g?p2<3}G7oNkT z+5S2h@+K=w*Yf1F_}{jUlp`pIf#BcqI<`&}J1ry-O6~01cGtQb^EMau-=v3gi^6%f z!NWOBDl^5^7Mf@tYRZZb=NJbMhrA!cM}1b`^t(Q#Yze82;js1!DH{7x-*lWs2e1=B zA;M7S^LiU6j27x}j$_h3ea&jm(v*-dzXq{4Zu(x{uD-MPNsxf%S%_KZ#*90+d#Av3 z9>xI~kXO=JR|~8A7`MDqGo|^clcCoRVW9~&Stv&YT>wSeh^G#-l1C~xnsUHX88Zw) zngY_j^`r3S5qt|GDex^}$8wq8OyRsFh~-Y~JNN}{E)?Fbt}btC&0mL&%`K(CC6< zuOK;Zva+7g$OX;}X3g_-|x!a>@o$ud$&$+T`T^g7A8&DwZhp`s* zIG4024QB3OWNpmCcxe9Xe@1LFI^z+;6HoqV{A@9gw%vs7a8M|X zhAp5L^CH89+?GKge)km4dB{rZ21dTv5Uj%6=BvJZ>p=6etkTyw%;K>kBPVuwQ7C8if{uE@meb zq<51Xuk;J=Ed`FEz>_2nzvIfF#6-qo-Wf8we~hVb!(0I_3FYh?c!Gr>wk4d89!{2P z=x=J73IkP4n0LATEbCB4>mPXq350!XAR#fjep6KH+xjd4rU|3(?|({7-@?-?^tRs^ zZ~arB)tsRRq<)JRM-#&1eYZD=aeFs5Ul!`Fk&Jmf= z^4Fey_G}Dk9fjN*P&jSzV%yoe5j^E~Eh{;E4+`yC3q;M$(Qsa~_*MPYN-j%J$B4{WBohyfP#GV)pK>H}1 zes5AZ@$I?NIj6SQ&Geb#|r%oNTYAU{t~;q-ndqjA-V!0eI@wo?A!{)P-2Ns=^uL?yb z8^D$U$~R)ksO}IyAiFi+Lj3P{_x<4ye;9v_H!^m^^MC?gKS9{1sCJ$5EF0&5IWybpaH=J0 zTnH`UElM#{pu1;6lO;s6+_Osc&CXGvoAS`uQg^Z6LNC=H?VdmQ!4IN^+9w6EeP+s| zF$=ZL8+m)zARB7bHaT?f+9ulQSwh%_vaMDl$G`)q zLJp#wXt~#8$ut6b4wOvd+zQLG zrWjM6dAb=A##*qgj407S?*es{k%w2dw&2}uGUNg7UbUr~oOp6$Lq5z99{uJ#Z|nLB zr>%8IEzWuF+8tOj0@djCQ)8k&=b?lQo*+}WU37sq8WZ@X=!pcZ#!Iw-mf|bC-D-Ar zj*=gZvuH2AmluvvjhCN7bcms}RxTT~2pmiq82lZWkEkx;vVD7o^OpLdHcB>KlYJbE?%H=ngcgHUPX?ZE69K>n+-m>^jv^Q;L4pmem|nWwO;$nXrEc3@aHh*E32+*BUL z{w;YCww?Hh!N3Go{}4>%+lU{xWH6{bDPb|TA&gmW4|Kh@aysjqek%+dQBi#ACt(Kt zMw~(vI=}lxxLK0q0GVh;&>)~UYDdYP>vu{7;^o@=2Qy7Jc=)8!&3Ky|!r%!JZM zkxf|ZJGzfh*0!}FFIvp1>oUCbtZ-ZSd&CZw)!71(i^7SXwkVuu zayx+qZ2)yZZzkZbJ6)qn_FH+IzFVGfebN}r00s4$hg(=&eGSdFYcdot9yEr9C>JId zU3C8@pfO*#aY}fXGZUTQk=?UrWo@nw=Zx?0^1eRxIfbr%tUtO|__mN%le`@Eg#Y^M zJKyX(C9pHUuQdK+GA8j^|qKOQzos+>_z26L6(P#Xc@k!Y$ph7JaQ}wVJbo*c5#&;5cKl#Z|*3aD^ z@E&hS{0%K$p~rm{&bdsnE!2I(y4(XqY>#p&+e_WeQaJW6YqxkOisv4=o8I%ZRXb8R zRdj&1U;me<9WNh&fyfH|9)WE{{3sh}ej=+$&1sB^PV5}c0HLMLd-0O^2KkFZygUG~ zn{DHKwN~Vg*3Of7RP$y0vG%K7qwQ!l9@f09++*he5+qNys#S~!^BC9O@!8t)6QB4* z?bf-BN*plwGhWNUe`Rdn4V2nA*@+ISA>{l~G~_RghQ^*{=a>w0|Kr2U0 zzGjO~1H;UfZ{a0l^+TZh<_BN^nCr~DX}wW}a~@i2#Yi`Xn~dGJTAc|)rF_MF>LVe5 z!k_CCR-5{iB2Twaj|u7?#h<4rBI`c=hu#TfN}WQ+hW5!P!)y+wJdJhyV8m4RW@Nr}l4*A`e8 zrPHL>@}QS{hlrzFLdTD+TP(gN;N|+_M+j~R@uRFYE|d^q7{T1z*2ns+iL>wL#i`$f zxUm$s-&l~d+&N>RcKI$m9E~r=9Q?>aNIY$OyiQe+Q>nZQkD|86Yk5N&2SqES6ep=Nv zhrFAsqIZm|wv15qcXS^8@{AKG8DH?N413W**FmV1uV~C9(4r?us|>~Ht9vq+UH8AdvCzxI2ltl_Q>5_ z?4x+@sc>>^+-ud2PK-{;Jkg~xU+_{OL*v~_W=YXuENyHtL<;BR3}65!8^~=mXK)}% zJrb$tPk8Hm*8^&mDn>>h5 zcJKN~$vsh<7d*Z7PI@>Oi+gPWrVwZV4nRpH;A6rp;TU7YAU3>fx>jv33AsEtfLJIj zlo=>-bs98BVVPMclz8aaawNNqSNw0MzqTqjl3}7&4g2)vVIHiVEq7WK$E{>02o6X+XAx?`X!eR_)3#$*8yDt zT0vtQJcMa$ge(lT`}Hjn+4~RdMwqXVSfRZXGw<4d`IEv7dBrHHJduREj`2hZD`9!o z-tzTY8k-bO-rm}?_W%@uj)asaa0r>@X%q&UhqHHyMkvvJo5%y8R=1T00XY@wjNJc2#nRvCRbXR$woTc}+C+pYUKg!2|{2<&1PaOQ>WX zm}rI}iPc%yZ8QeVpuR-|a&kI0hLOuV8CVGqA$KobW}S%+4c#@@fJr6PArP;Dud7NL5?zAZyCu zIpiF3ApkffPolRx9nF`#6VaE{1$0-$iM&p2BA1RK3%at^m&LU${$v)s*j4!jU+ zNYlXb%xh4g8!ydGqrsndjxh-qOaI9@QfC-Ic>OY-G(O1@T_=@FnWWZo$gg@hSBD64 zBUF{V0HYupV|-`0FS4g&utuUcM%;|lEigm|Tn&6r{%f?%z|WD=JpiT(Ro1>5Y#7gX z38nVZ(!%123DVLD;b6N7cO6f`{q;}bMQS->nrb<B!hDQb%suARGu4`Hj05aR7@$!195B}uPGPBXV zhIy`HQj*SjWZP1Hc|heYDm2cc;k$WX+lP7bn4u^A#p>2QyG|c?uF30hAq*}z3IpiP zIybZ&tuBQtiX&r}{8PNB?}#_mCxMbdl{GdX{Q>Z3V(9yM7<{|XnKASkqMeCGdnygl zwUl~B2J~);x0X-BE8WV9JfeQ1C4z+h>Ye+oR-p6I2SXtPk`Vf~glA}ZkdeD4&uL0S z^xZSMHep)sH4iNzca}TWx`#5cl@I#8b#1x*=(JXRn~_8fR{~ArGulv7&)Af^E6*!F zl)=K-@BHo~PceR~WQXGB&DX-T``>+>AAKaSH3oqOtq!QoY%N6@oT3>3Zo=HOp|)nw zBx|%VRCccUa>&<;cJh99O>G9XU5OdOF7#1GM|6!(MUU~b=(9+ao-dL~B-EgA+U_6X zzAeOdmzVKI%M#7ypT$gG+No@!r@1_KUFGwg+d{x|0_ zrnfJdf=tp%;f&^!HTtjonW#lr5z?`w(~Y?G7Nh<)10JJ)=kkK`cqWJ9zqP9fzPpH0%fl&rBZkV&E-xY1 zF)OHWwSJFfO4<_m9k0_Q-*%rG8-uoGjVEOF%zi_75;i#s;FJnQX!jM2F)`cWUN^09 zTIN=LtM}TKL$`)Yr;rEUBQ!`nx^g!ZM_?m_cy<2}i^u9Hfs$~c%#0F46bjaK3RUmO zyP?EJ?@8d~L9GqOFs|4%+gMoqWD12>VKA%oFqr7|Xl*Rgl zf~}rx6K`#jg4Ho?FHF^WwRvsEA}psuiJ8WPkR?JOAgPWkGn1g*|MDOyt2~@nz+O%W zxxAq!pY8(`jmN|NMF6OSDC9|wC%T|)tHs&3K*^LZuXIXVz-`^X$+d65r-ji1CQ|!v zL+!hr3g`aC=jYz@t=rqS%)cGrkDNh5Xoo=aLo?00-?`0~^=V2_^by}^%L~#tsDBF$ zt^XVQ-KYP}_sT^Xvx>q4x{AN{OhjES=b>8cwc#n=94$0Y#7p`f;Cj(l`*}8$;))jg zU0X8b;nxhJqEX^8MWl#Y;1y;-QkY*#1J4tHxY`wh=$KPq)Ct9MUNUHZg>zfF&Nf5O zKG6-=_jc}{U-nZh=W^O?-~RU>=Q>7J`=pXsny(6j7llL?GM=Kt4A{*Ljay1lV=8)O zjEaWi6U|lRxvqs95uK~wOvVy1AswS|@#J@rX&N7$9~}P$bhjAF#nhH^F*y;W45(Wz zJq6Gjnk=tfL_$k)gwSSDeq9^QM)&;}mRvu^L*t#m2YFKCLA~d#ti!p>^0!zIc&=aJ zcuhh8WdM&5ns^VyniG^-C?5*V4>12gJS0W)YyxUwJ@hR3Q^IQ12t$NIYWIiU_J4PX z#OekVPRmxoY6oLezG4)#$C{FDl|QKMS!eXO-yq(Fr2>cwOr?pj@u0s6rroo1S#j!9 zg|IO~b;%em3QL8K*)u|M)kYR&QB1a--?hRa@IPBf)_Jo zg%Z-;ap<8PPr>OMg}QbuOE#d6zEwhf7HBlb+a>g(Yf38bo5!5XXvX_?9%Ntw4d4o1 zh1#-r?Yqz$p`>ejpV~QK3q{9;o(feL!pYMIFh_p@zu9Y<)7D%V*iaJ1K33qfA$ozr zozVk7fF9TPBrNkFo0L;9`zD_Des{i*M998Pym>~|FU+tZv{m>Kq`T;#amd>)^tNpt zlsV&A=Ww2{--F^R*DIPMWbiiiPA13t%tR-5UfCSEcj~teHI9Ww8mBzk6x^;)c<#OB zFU#2`NNe}OQ@ugq9G1Pkox7FM`To1HtQg+?X?rW*tbvy`=)5G`6d1tzl37jHrnra z*WlSaQA3Ek{91})eFg0^IG@Px`zB7jgqTov^YnOozu%r(Bih| z+_2KQdw#ioD%Ae>+3n$^WcYu&?mHDQuKr3lWvF5fSmmb<70F6Bcm+tpSWc02v9K;6t#{e=OyQ-k4f#XnWquA-4@` zU|>cmO_ap;3mu*1sR>a5UL?^Q*pcxjsaz-o<+Jx@aZUkD38loT+4P>Zhm%m_{kuMa zLN2VfWc>!$-TSaK%A=*wMw66G%A+;~6N$a(PBz(;vVO@ES%EAwY5%A@ems)K|*aK%0cnmx9K- z+&LZV{MuBX01Xgo+RYwRagj*X&0T*{^nVpxb}BX!k77ATA~l0PReG2DC3IpV0{;rlHK=~ zIz&m2j)lpqhiRTk(Gyxfgt$`_8LXf{lV#+5hB|9*BHZ#~Dz~M~0x%KAS*Y%#a4bi5 z6KKx)P0-`v(c&N2;Sq z9vXr08t2U|-9z-6IY+t&KuL0aD-`O>arp3|_q9BMeEQ9v_RwGBmy~J7SRiQR&pe;) zlXuOCC!e}=GCsqD=ork7erxyWJ=q~yOPRUuA$J>Y17{uCVzp(?yWJ?YYlV}?rHKUM znp{6FcHxocyV3_@~y4ua@@6qh=Q5JJW20mVxr;bhyD5JZDHA57Pi0jQ zR@YGWfCrh-6OMUWTiw{AED9z8F_4vxr<*|F@`>QPA1`L#)3*p4?l+-~GNx@}EIp@t zVczPi#b9b5MZtOa0R}OC@YE%QwdLs-mcr{y;pupc4;V;m*7fMYd-QA(1m*N39I{-h zo7X!QuIv6OpglumK+ovf?%#L1AIm3Y?BX4NH?`qn|6IA%+oZXL)m&?}7II>&jgzs- zlGo7$(y{tSh<6iq$MGKq5BXDLVP?47fty;*;u8^#dPCooc^;Y4?6 zl>9{z>VLl(lb|biFY_iNDnLRqhMfPdZR~d+A@=bRfL72p581;h%}#CG=D_B&=&3dY z_?SE-RYxssjuQZXw3rF=kpm1};amfnKAh@JPCsJNnU&el!8A^ApA*4#FfM zpSLC{uJ!yHAQGzsm>5^rJZCixUKQuX{Hq%Y(4;m@k*Qr{Sk+7ws;93yj#c5@YE(6zRsP@H18`A42))eHl~;EkahD zIwtrlI_w+E5$qilc~>Wra@DuimMoJoO*ytea45WhZ=kgb@5s|xd)1Gf+qk(Yi}=F6 zojH3v_X9F!-_*hbD95q<2-mB2%A&+@5a`FOoI+W;ddKk+?uTCSi{Ing*&Q+%m8G~<&<7X~;&W;9~# z10E?FBf5#d5uVUXLfW*%Gopj&F7K-}g5@Fit?+hwanV@`($N%NVNR$Wfq{(Zy!~#@ zBc$?>Fkm{)``rI%t5uCYGEB7Aex(@Ds~p|v9o_)GwGh zn+z^xgkdSQ2B`lF>9>`Zl`p)ASE^;ioBuf?n)xP8k5e*~wAN&SJfaDCG=$_5F z({Ii@9?n94Z>7SyE52Pw?Q-pH%(4#MNti8IWrI%R*Et;z74_TS{x-{uNs;hRNntVV zoR0D6NVZK0t%GCc>RVAz#aKgk>&07_yAoS8_^rZ#8&k~BR6>rj-k zlt+XyCCIM{CoI3Lz#Rt_-}x-t^)JIhj445+{}iQ|Sd6NEZ^<(5cmi|65oFG1r@meI zuD8g6lz&QLY-~i}-LJ9JvBsTn;m(P1s=xHv&wjR?#uzfe0#J?|y1u>d5^@;>Y9A$| zd-8xKkOAQUe1(oqu6k&BaC^tz1zMr-+4`t<;#KGz0!in5`qQ6IVfMZ;z@8^8rhecN zt6y2$>(BO;$JlMrR&C!gA*eiAh1sI@o^wO=F%MnehCr&WAESf%vKcaB^6?MMyuQHv zDcrS7f^qE?PpK_@Hv~$dh)pPvxJ7N$Pu*{<|EacFlUCQh^2#e6CzQ`BAb)CuU$>MCA%!j;!( zsmzk)-4COBx}1f3a7habsVr(4H&&q}Gc=kP-_|FLS~<_*v_yk|5X~#mUbN6Lq3I$_L^7nn<1ds^ z(Fph_1691Lxg@?#xoj@f4+*@T2b@HNg}H+gyOEdP79g!#tRye+$X#KR<~nsE0dkt_ zc`>C%P)ybKZtjPkuhKx{GTBI;VOt3F2 z0`xxqrpRRotNnl{^&Jd7tYAP@f|JY}pA~_& zHKf*ZTTyE37?wZbR8Z9n()QPAG1(eWVtmZF-%Wao(TEMW^=O#q= z%oLplgGBo=7Y|bw#&f5aWu72O=Yzr&G1Lc?${1J7NBBUKs!}Lo+zF*Zg=%v!?_DR~ zMIK#@FJfv18YEPMlEsVD^_|1}#$y>{NT9khCWUpi#uQEbkkop%{I|wp-@p?OV!Zze zW-QlT)B6z`gei8ed_G=$iVKera3tP^&gUI9SsZ)+du!zbl4y!?9s!I=5n-X03Jcdh zjrGozTa~~VpCX^@;52ri^Y>vB($Az zO+b!mr-(xyZeJ^Y!227sr%*O_+t>LNLmrFT)3@_%$p3A>_Es{%gjL&ij}+N4zkCyK zg~-es-@7QGz#wFD>wS4mdq+l&#xljR=xS>-6oCxW;aY+H`x5$>R zlSKU_hrrWi2&u&@YC?R!Zu z2$v#>UU=aJ`*=d$V>xY3xz)?lh0&<3T;D4t3#DVAeTel!wIQ`*#SJMdo@RQKaqj$ z=R|8UCsXPxGiPAj^1W6bL%}}jFiJVr~%5;A_p$PUQU}3!Hy>wE1u4C zMY!pBLR3O@0&k3$#jq7rI3k!9g9KEug#9K}o+A05PZiGP@_Y=b1s*~$HX*XUv$t0;P9QP9|fwMPpS zc}ipLk*A@yf+88+Fu1U;3%|wW5*X`~CJ^75M-mbmL|dU=zJ;~4-*Q9Rvb3|>IX9uG zwmFpL-ZRgfw>@1mcJFNBgnk`gYK%3}c1);jeP}XKLWZ&_WV+w-u7pb050Lz#nf}Ye z0z$w`-9439s7~3;;=A^Gdv7^i-A8U1eyVH~Piem?l3jzo8}EI;P^+%%drYWMF&i(@ zDOB86!pevQF83O5my0il^NBA{7s_EPqXQJ#e%E(n-g)DOaMf`}4gwNm;TZC7i~|tq zHvu>v2pPL~X^vr}BsUdZvpO8F(){<42$Z$5&7)a_PTvBRQm&i`gZ4>9h~5bIwP!r0 z^Sc*(g7`IF9)BtgLJ6AqRQHn)CQ5-a&mhUDPRY14%hQD?4i*7VJVmMT#ef=}GLB@h zkbVKs5V%#VF|34Ew4C8NxvgX72RWnNPf0f5M9Lzp4xL$=D=E&cqMD@e4Myzv8yQ#b zD;yJ1d+;*M#Zq2)I63K{->Q|(IRYzVEX}vG9d9dW&?(Dbjfm;;D9H`VBFDngA_qZ8 zpQ5OF*s{);#Dr=oTL49`b9gHX8$@gXRD_wur0ZBN?!tMDtMW#6=7rs^W&Acy-ZS2v z#hRG3SM3ShNqAr@bk7!E0}@vHF?)2DH#PQp}u}hDQ?a2= zO>WB#Azbe^+T`*5`!yP4gmLJwXbE5lZ#nM>Zv*txR?aI0RxLANXcR!as{Y~WHt8}{ zbS|M#-mY&LLuyS>CL;)zh1Ut6Q|^R7DUOmR1U60`!>ElTe`mxUj#` z>K)&1KQJj}c<|#VyF6Xc?C;i|=Y*d46@x-XtNJtA7lvuPH|9!ri1r)987CTZ&B+}j zER}Mgc6Lj~o0KBpRINO7B9kCB3Ku_bEGuxo|fZJz;C~~qJ0_p z@P9Ne!h`@@-=N8UtGU}b09r(c$=4Ru(sQ~;`|xmJEl-!*RbSUaK_X}Hnl)aeTr?(% zN&x_5OfjMhscqXe<~~MLWe7Xoypb%|c*}5YOp2IE#*PPYE|5cv!}9}5ub4k`u{f_S z<8jewv<;EA?^TYdGIg~v-o`m#PE|=DgKWGtnK2sWgupMlmgDTX=br1{UE7L}^jzhY z;sTtHKl@PTY!8`-Z;nJtrKrF2-3m@RMR#={A zM`3v0u>m=h7qos9UJ4$*{?dP)BWJ8Fup5*A>;ri{g_f|or??V~1|TCLPK}R#s*^lvMmrv_H(Uj@doIiTULCxR|~?6Jz)a zuS4J3ewJXlh>R2jK?1nkO?}!V#4BI>bqpw!oG#baPOQfOfAsmqx!%t*8uRd0$bh}K z@!yswbu3}hiWk;*9dA(+k(E_WFry5>u$0W&Df$$Kj&2qGt__4^QnLF_C4yR(XJ^OL zdmf)n+a5pj9$kN&JY9C@HH!v8)Ad^++4Wgth;c1imo6dS%N)QWUvxyYA59QeqowW% zV9eYO;oR7R+!%j>k~t#j&O*cvY|aGW<-NypS*@doNcf?Y5UE2v#V34Hn^1v`IG17{7SUr5GcBAd$)=|OJ#k?*J3Ho^S&H>bM#wK_v zWQ*uAIf0Q`c^!zWK!!LUlG)*{kmbxd&8?n?poG*O>_T=C83lM$b%YecXs-D`*-Bfh z>&>{NG*mR+c_KQMI06{fTpDjRmv?UToPhu@$VeE^=se!$%D3#wLBEwboXVn59x0l< zQLLO$o*;Y5`C#d+V}wycNhI_`(u253_-l~|fw{`rijX3*I-0O137@s1c9?2;#spKLf)k_lkDDNiA9OZ%aov_6s2!&OCP3IEY0c*(BOHrh}@EmrX zb{tU0q9Y2YQUR`|@bHc*X;AyKY*HSfQ4$(^9)!6B8v;qITv*;dUgz4Fm#%h!a9jQn zG~C*eB^^DYze5QXUmXu#ZXwbXtG+420zM=kvOcUWwOP!*ek`oHYigHQUwu`d>gTQ% zn#cpv*yc^8AOghF{=C;$Lu%zUoU~;~0GD2$NE^tK+!j5?D-$*uON>=YN6+uvCNOPd z{8Bo6JAC!<%WHdz6iMOVUw7E>Q8v2#A{vme^wa{d2(?|tuo{_nr}&HtL(cQroht6%-< zPNYcxZEq1u?HCSfyqb>_bku(Y@Q1hIze2{N_r?_^5rR4IDP@*7UkyLNW^z5d4vlsF zWe)v1x}|Y&z{>n$#rU%Z?hwH+mNbDRDa4jnmyxS>VZ`Zo{8;;bvf5bhzKt*Ay2uCeQs=^c z5EUj`h|zL+$kBr;SBwbHqV+`TDFX&rjq;5Ts-}S-rr5VH-J?ZnL+#(3E=q_z0bfI@ znxRA>nOEc8njB6F=VC|xX0eQ?CNz6As!EHVN*~vI3H5 zk`sn0M3W*42uKopN(+KwoM6dO(t~xZZSO^RmjeR~g%GtV44-vP-T|N>xuJkEgf?KZ z5J!zY*89d)&*a$>gAWp4K3*jRvViq`jH%~!ErecHasV|@Y8SAqOd^zQ$@ek1{xiIc zo&@D<>NCi5!qW?d>t2Kq`G4{^+TXiGKRmyl-#4aY=->K+0ZC}>C|o^B^fYvvCH3^O zU4@#-X>66epP{7w5K3fXG^U}@)y8sTK$kID-_7pE8hP5;p&T0B2JedB+>{`y}| zh~JMUMeg{$_wRq?=Rf($Utb%nj@qt{j~5lYIG)y3#)G3Hb*>jj^>O?Ay*|&e%kDn9 z*k}Kd>)Y3H=U<%Hk;T7Czu)#vzny5va=(q=wVS2id(gWGLpk*#$C9sMaG1NuL_BB8 z?=&{#85fB)EtIQd1yN3|=6gJ#^U!~?9{DI5A=s?8&D&2rk^!&3G)i-ji5e4?$8aBg zsZZQK26mFB2FB%U}C2Qel}5^vVcyPC{`V)_yVN@;%!E63Q!+RY49_$3txF9*Vqf zijTkjkp1TQ^Rp2Mh=rzw1(n52=$;9e#g>&^j$?$@q{!nU97|X=C6Omd(lrGpVl7Ns zP9?7$Yj5`u5?Ssrlv+#oMBEfRMBe*WTdI2z$avs`nWtFyf3*6`!6S&td815pzn;Nc z+Bw?NyYQ|X*AP-yoiL!(x~6k^&YCb{4F}OJCvvQfj3&<+CskCjeEwB&)*N{ z{f+70e@Kuv8IH)WznVPbzxV$4|NZITmk*u66P}LN0BP|cDB4hs<0}xsfxF3X=S`O; z(Gp(~J}s|V{(kd+&k&vu?YsWzxbVA_uLLR49LJ}p%Y)8EDs^aWfRkc@R}{4q9he9D zW}tMf3|R5(u49-tfAAdPDKEYBQkO`(5Gpz5TJw6KPy695gn(VUU)=9s{Ka2T_&cxu z%}{)4j4U5-;tSH29;{1XTmS}6@5Yc2tuh=5)qgat{a;0=3`>`WTcsOBAVrI98J9+W zCkNi|)@W1v{n51kd$foi(c;N!RV2kfp8oxt>HGf9U;Xr_FB?;f^)-0HObTb{N=}%| zwcDh3bN1|-c#HcjHvLvh(PjOKl;^zKgB` zd@@53*|=?O-f?4DI+UFF?jenVOe}o4>x#I_us=F8+{YX&H@yFY&T>0JgBI5DzmQr0 z98-hU@cpjvd;^`JAeXHUVM%2XBp54@tfUI}b&XsH%kLCwNZ82o+P3El^GSFXGSEbr zH9}~B!FA_z>Hi;l_wr&}dFFAv%6LM8ZMsPygn&&(83q*B8ce3i9`PY`+w-a zAfwD0a4H_rfI&TS@OJd*Btqk?XCXP9TuhoYF|n$4ukSwVgKt^2s{#qxD^)I7wQH}v z*1O*8^FG(#Gv#XAL%iyj`U&G0(ZNi&C}MgW11>v_6$Z55d$wm9hcv9vy&B6FUYi)9 zukmT|aZyNs5$7rXfE5n9t3@X-s~E%nn3v-Q(|p2ka|!Fc_uqg2&a1D!+PjsNJ1yp^ zdok5gfYf$D+wK$J$)|tJ1D}v%xA6xY)4Lmg0uI;EEg$+V&ZW9@VFs`yuBtHt zh`_yw(!^Yi__OSzW6+Z8M^=sI4=ZxdiMtZ)FMixc49Skbc`R>3;Ot&BPkFtQfL|HC zi?G|;gJcZ+00SY8RqTAAlrg@^WA-#-#C$VTyjGC`kzDc~)bIxqmqc zMD@>wz+UD$$H+EUF8}OjJHNhu{XZ8ka8B)@u@`e)y0H52^5x5UV$^3Tpa?evd9lXz z8}F3HN6b5AfOvRb57CEcrFdv=gFVaRNW2$UT44kS3v_|>Stnkw26=4ZXP|yI-=c#o z5kf!AWp43+=*I9ON&vB;fa?f+Jy$>0|MKzmJ311t(|9%x=oAv3i-%}3K-`=?K9|@eF{^A!u&Qs*R$(mY!wa!1E6;Z#M=6E?@ zTMYQd>YcELW^~^za~q9sim2L=;J076*YtnCSEo;=HhpK}T__Uk^B+w6r{MI)#<;V1 z)n9i^_3C#@d!BzO0eFA$W)j+h*0*o>8>0=SaC`IJci#=YSX^QE)~~%QTGtrKT@Sdk z`#TATW9UcUff3qAyWae$F3rdKqWinn*yD*PB++{U=c12*MB9!3Jj)f0AL}rj0)ik^ z?vFqII8P~pWxRlNc07#$ehD#)X7Yf8UY|FE(6Y+IACrslbC}%ofKt0z^GD0p0YQyc zh2@MJ8BJWwEzk>uSf^sN8|W5E6CcXcM<0FE?*tKk)+0Q*fj)xL*g)Ps6XR)z8%+G? z#ImV<1kL~gZ^muhf-#ZUwsEUJ>vxu%#-}k$Nc20VUE<&b`}+T_x87R2+!1;J-EgZC zv-|%0?>85EJq>#noEX;@J1chIBXTS^o<9=D1SxfN_h>^4NjGLZ!QkS>i(GhVj-`EI z0qcA9idaOnBMcbZ{)(`L= z8cOBV@2v;vgeYF>uj(&3bM>HcFSe$3K(@6;xS4W|sa!Eiova}V0`*0LI6)sV9L|4O zjI#gh@70AFzy`tA#S+lhM=?+JsZ=@5ySwhXix&knKEh~i1`JRc80!GEvMR8QdM2i+ z_qLf(u4PFV=f3WHmUxH5MHW(4ke6S6dFQdm9%~*04B-s`A(}u*SZt1R=g~hj-D~B` zgAYCk1cGoaUuR=q|1~cH)oKkif7a{Z?YG|+v(4(c^X|Lvwr-jeJ%fSN=j;3Lyz|bO zP%cWqm6}WTQ%q6i_5S**Hd$w*1sCvFj1Isih~^ksiOTDX>STkbT&nB@rkiVH-Eb}``9BX+Yd&Q~^Qt!1fAy=74E+KfoU1zU z#QK@{SJ&D%Tf6n)i!Z)dKF#{4b;qKyrb7gg4(_;(381v=$(E|4Z)BQ-A$>>W>6GAW`T&r8`>Or?3{FP>px*h`!Vg zVJgi90(Z~p55ljx(|y9r#OkL+7mC#L_VC^Tl%{+2Ib}tA3Z-Jdwf8lrDMl%~S?rr5 zy@R0J7_pcWN^4*5CPM)@F~`fS8MLlivS*IMjZhotA?*Ticc%HJ2klE}1s zxTZ+OK{&Qfu} z33Ewh#fv$XqmnkB;Dr(84vx`0vcOuppmScPO=Ol9gq%?%mzXDogRwhTk)l6(iDmsIFb3G>EuLDlV?I{;Gd4 z{Hzi^%eCD)-dg;ovTa<&aALN_q?qH)u`5@u)UFtA@w~YQ*Ef=K4Q1;3blxsP;v3SulBgPXF~O9y;RSBubr*sXm;zUcYJIXcqb(z>XA^=JQcPv=ol zJG!^)=#8;)E)u2I1ztt9&3@TDs9jwL;g2~-3wWWRGu_j7v`pT)7|iBj_c!0_@9yRK zfQGiOq`YcO&^a_?wX9gAacr$ciW++!feffp{nu};3(PuYV**CXx%#ScXuY=9D6Cj6 z^0Vmly}ty zvZgsBrGpso)@Rqz7+^Kkt=|dX-P7FZ{XO4%0%xnO?Nj)=6kI7@36GRn#;R-8x3apg zPu@|id**xnyZ(+|6V$F=y;}V`fjhNUsyjt=eG@&3Hua3y=x8CjS^2fEI>=L9T>#DK z&wi^eOS_`zYXa=|mfjGvTotLyIn2%F(a_&7W%p=*j2h6Ijx>$6 z4LAUR4{M3LD

fi%vwV@vOY+^6v}?M zbAW&X9D&<4_b!U3>e)4bU&^99Vr}e{laQ;IIY=Pvx#l2Gnv?^zyZXcgHrA|qfV1jv z)@d4Qf+W{>Zqt}B3MI_@X~NKIDJZo8tMK?hJ6U5O)}mkaOMPW-a*Ko}&PvyKd8RqT z)icHwb^}-FzGJcnhP1r_&1hUH2@g)%zqXE2JFG>(b-?8)ldNw_IPT-<3EEk|*SGiG zcVB%)Q6fn{!3=<2<>8y+f5g=h5V+B%C`8Bl-u=AIdPb;4pO|T(0h9#ma`8w{KKbOB zCy;jw>uvjcO1j<$m`zM7&IgkJWgG{< zl0YcYGj6M0$8%IZAS-Q7Kx>S9uJ2rw>o@(cOzoHF5^^w$R`=)|z)sc{!Hwlte08Ta z#eKPb2d^crvU!9yS9bt!1jQ`h(SE>#__fNV^y3!J!*KLCgkLeB>GqE1PG??h?HPD= z{1ah|wJt%aLRL%WlMe;6etGkR$deO+xV}4P*<{A~5*; z>c!Eeb?H3~GMAK|V{zb8yKSxNLUKs#iz~E1xH*e^;!4nXNG)QaG){=L6ewx2TX>B{ z+CEHM?u0RemD~74&^ye9oO*~ukmG;qrfd--^;d&cGWw0EWqhdH&SSd~P-RcC|!}T%du5rOga@DFVu6v!_ zp~Rg4z5-ZaE_Wa1BBmAi1I0$|g@zeJmMfS1wY6K^NtT4>O^iiMT7B8OtDlV+^IRL6 zC%u!#m|_WXBI~6Xa(hMfCK&cRH!yDaEdRV}Ser13xeZo+>ySr=al{1l&Ys2WSv&F$ zx4$*7OoJnCOv}kHS{tiNU@k0i3FXZ>@o{hxqD2&q=)IIb{RY{%=MSYa>xi~yy)*CX zvlPGbyRxdpEK5<9g-DsaY?hJ&ckh@>MQ!Eh@C>Xm&0mB8pce5;yITHz{__o$p!fkY(w+|Fl>$bhC zvLJU0AvbM{6tDH^=CmA zFWYq(72NR$g-XxBu4pb-{{*;FLd9Pa?kVT+6n%0-jlL+W>-vKtf`BSkzWT<`jyZ07 zf7dH7o{HOa;SkX#F5M97DL!)Tr0nbd=7Ie5l$5arTP)3a65M<5y{)01&1#*i zd}|`Q*|lgSft4Z^jsO5wdv@a+-K2`~Cgdnx+3Fn#SmLKxfU3 zr0b77@(AM33fR3V2gH8HjI!difLNR=8^KLG7SU>)BUH43@&FR-T5uR+LD$E*B7)lI zrh+l(e+*A^X^bZoYeegWnT;{4963dSpi~Ez5ZYYYyzXlaM2LD8jCh+?{n2M_ACZBN zL&!58Tw@8^ge3Xds)u#pTK$xpTi1%$ViD%vo1j^_n0(e<){QZbuC?8U1vVWatuNdU z0dx_XO0eN$YMJ^S+AOqA$iA#z%?+;oBO+aN2f}R6HV>K`-KS5XzBXUY1^H2p8S9@U z`YaxwaXmV^3ChEYmWo|wX<;1!3L@o#`GQ`8s5h>x8QO|Lj+t?f`0LhuN+bef{lU^D zrnz@oPu0yDf`&}1ULQhEl4M z^ndF>PGHu3@nq2_mL3CSpFEh))e?nH3L$P_9o%CvmG!ax);wi-%KIU~0#i<)iZ)k9 zeF7*$KQ~tPde-xvGiP#R9xb5yZLtWo`fLvIph&8nl!;QC5a^n#qw6}Q3A!5n<*^{N zLe6KxENdxnMM^7HvdRNW*F6ae{YD_|Jp=`@g?JypW4vex%&jc~PHWV@gNC9m$>((dn1@g_awz9&?$rv95 zv=Dfgb(ZkadnhaMDBUlvw`MD%+Nh4`Kc11*zO!*^-lQ<T15oOpnd6p?$ZeZ9HPGl5FoH_6V{vi?fo#b| z5%OU!08&eEEde&f0tc0mwvKxO@DG+%Oax{@T;k!hC|@19)UtL&7$Z=$c8CzoB)3aR zsv|0xOq&3$W*eE!mV2&vzsf+UT1;urdlvyf>IMXB%sa?!<_Ib(EvGqH9V;WE0FAWw zb8~bwcf^|2p6VtIi=)i|<4aH>(2g#w5s2=s4|^Z0y_}>yUpW*c1Waq}!aP51-ZZw* zGy#|ZT!1*($s)u0nHCms4dK+d5|U~=7ZGEK8K+T000YLMh@dgn7nMoa-#UXhxagU) zEP?fV?G~3){egaT9f$kB!=Io{e5+=7g zD54a1m4V5j7-};!p1m6#HQwA(p@sqo;-X8@M?mlS=yfrbVwB7YIa|F4Vx!z{F-<89 zE6aKqts1})w5KzsjKU{Hq!?zFbOJQyh=&E_X!`=iPuD9;|8a-rK_h&FLaVXC0FQ1> z;vNZ{k)ckw2c1jtk^!2gzqo335VU!yV8)>{_pI@4y!9u66HTa0v@^Qb{1LNBa5djq zO8fu|5Zy3He+oOKoKs zpa?Kd)**LjuH^Q|`jG*|{={33p~Ak*P?kph%vv}#>{OwX^vyB}r~%*JZuq{vAMcFuY>qwg=c`fatR5l>C8`sLU;0TZjw_*~~q|>Tl0D;tSjpnk`;_d#E28w%~Ao&iP zQJcEJcUE0(Zr*v9`AZwvb?&m2g@HEDA`S_+HU^eOOj_2)$^+n|ug7C=W)S7ROuHC^ z58<>ipfSVL$jxR`7la;D^V(~#RlnNRI!dswoo#6KVVXz^AVLjy%8{Xuaj#6tiN!7* za%a3XcaJTiNjg|KDW$j$*6u#hihg`W@mxSQj50J@oQ2DqXv!eEHN*LpnWubS}=RGU*!rbk7u6Z4V zTYy$;Y}wMea$=r_R5RAYn1i@B zMPKSO0uwMHeT@DQ*86VGHa8pZ=uBn1A9xex2Z5#gdyo6%T~+VlbS%g62@66l;@UQ* zd4VB8K{2LMf@TZ6s`f``ns06i?yjXxzhFdFNzHQIjEoPjc2IlYsmQ=Dd}vEVLU-|@cbIyx_Y zA1Ic6hN7|hL!A~vh1cUv(sv+4wE@-xz`oT9F11TQrj{1PI=7z0HcQvYJD@pLTjhEe z=EN&aPHV2~(SyTmjw{X*{w`eOP0*4^7 z=3x%b@nJCc^RWj86j7v^rKKTYu|#Czum8nV*4Gj6PK2j11l-ZdMTZs*EOceMPME7q zi!a8J1*t{e?_xVxagRb+6Zxy%Lyi7AxC2&fwRQfP#w9EHAX1_xT|4~D7P@x zVqeV(IuqihK^XygK+_*$!UzDH4yko8kmjveI^HF$j64(|!ixO>cxB$P zXegTnUz}NMy7$EBRp$|Ll8YP^*XDEc&SpxP!y*!+lY)we3bbpA7m7pz5p>+H2VNpU zHWWWf%<9Do&~q#Z#;39=4!9y?mTFsbIC@h5^(>$$3~z0z{Q9onxb0b@4NoU4=TA7A^phhd^<@*#J!Gy$Jt`JBoEIwZas$V{myS_^2c`N!jefZsmev*sPH z?_kO3?)x*1rhGFu>n|P#+za7Pv@V)cP>x#z!a?k@gtmU~UhBF(uWYXTQY%oTc7MOO zhA8;GtN*QU-bIi|i$QKZQLu7_cZ^nAz&j9ZyO%YLt9zf-wZ0IO3H7%6p`-FVN*y9q zM(wEF_SOF9P7mM>;8f+=tHfVB2%KhoEDfEFq@Jq>c!u zNheftsbRqcCPahN|1lgaE-@yri zp&_|@NuQ524&rC?0V5?pU(dbp!VAqS3FP~&`7yeOdJaPsF^?!fz3e`DuYe7SSHpm0 zp~juUBj$yI=rj#1+pc5fDH>1+wYkC)=UC*U1s zigW=zFTSgH|KAL-w#)B#p$uuB8xDC5c^-sWP#^H(B8b&?!g+I3eq{WJ_{fy#%|XJ& zn{U1eaHc+DvFFZAa1g6ZLAdVI4$8<52)6R%Qj9(H&_j(`Yed{w@2*`GtYS9<@L|!l zh5-w~b)d}W4ye4=y*(`25`Cy_iY$OSymbgD>Z|^E5n(Cz=TTXEyU9}B%*FabJ;aSR zZ=*BS9ghHgA9_7ux3VDP*1uVayA~~}yw(i9fZHnT)QEimG_XG4(bqbtUbO=@fO*BM zEFL2FX_n~Pk~LXA;|}ql)vt9)q0S)CGqpJ$oXc|u#h$P>KvTT68mHdfbJZ*Uta{iVljbrvC<-ptwhor_+6no$aV3O8V63mq zaj2ihBF3*W>*K~7Bh&Yur|IMp1-Y~D`t-PV8C$7%Sd_cY)wB5<-ED3XGWs0@37J+3 z7-?;|i^lx)j@m}>sJ$5i3=r#1jp6BA#W}L#S z{sXDsy=X>b$tvxW#@*OK+3h{GJ?MS{0U#l35M$jKQLaIGq&Te&(rJxO2!o)BnL02( zx8z#8>qJLlP=KY?KaF|b3IJ*V@io>R+`YLQvSfsw+FT+uaIZ8k#U=HwT-F<>`nP$| zJ8AfNAOR>7bG<;z=9prpeuQ(-nwIiPe4=<(sOSAoVcR@RSgDWOJ6iY9Vf)>j>>2@$ zXMs=#agIQ@Dxa&qME`xamSI{@9*Hfip1rI8Qyf*7#;Kw3(r2|Fn4NEw6VLPS#o80fzv)nzwjj`FK%dfmHm)8*e1YbGwCqBZl+brbRJ0KnMtQF}F>0TIB|b3mD?inMRc63ZyvZKvLsQ z8kH6RO&(1m?K;=b>Jh>6KJJET6YU~jxzs}RoCVDe*2x4G3`G6f?^2&cAQ4!})>&gZ z(~7nD+885L^4N(x;XVgYfbyV2@O|&+k|6eqkGy!KP09}fCrexmR^qjmBXVZ8(5d>T~hEn-12~ zah|etV-|ov0Dgd$jPCWWQZ7^ua2+5VEKkNCGG28`*-?F^5u!0K7jm?{Hp#U~I0Mku zXMI_p^j>kmev1Zx-pBAr=|H>7BZh0P)CE~+3E`{(F+b7wfLQ9^ey0#>4M{K2y>cN| zx7JgZPL>(Sl09EtShQmt38b*{(rv__IG31Gi*=}eZobs#^;_-dsudlGK8aPU?Hw`Y z&AFJR)kq|H@KYE-}3eX5;(0HolEJM%G1B7PJGl7Ly3M3vm z^jj&0g_7)^g`tftq6g&-;;JOhp6`>z0y-YW0;p-h=$KN_-{R=x=aM52 z^9j+9`)=<&mMI{3a%teUBAx(}AT;CtZ$kiZByTGaqw3Jy0(gQ!=jzfm@hVc6K#{Fo z+Ri;fdn_nNU%x)JA7f#o|BAuw z8CFlqhmP9Eg<8B-ZNeM@6(d+fX_mY^C1UHSb=7xXEafDtAD~bg2QffUb1};__0_Af zs@`qHm?$x|T<%%itwX{+i>3HONSTzC@=A(}?u_9U&kW(Wu_thj@telYxscEaiNfuH zKyH91X+Cmq7b}yO5bqe^BqJKOI6dPD91YXVqXXcKKHzrGldZMie6!8~oVDlFc0v$AQOXF` zp9DAik1;t;;IzjR`k{^Ueh`xke3HS$evWUT{338!54=69M|1`^IvNDOFdY9lU+U{N`abKq3ZMB|fwN z@#o4J!<@!=dG6oQpq^QN8p64b+RfWX&T%{fo)M-1ugluYvk7P#y2pSf6^$IJ@oeJ0 zxhg}oN2l#$l@B!Nya=2p!S`cyA+$vhTZ9cvld+Dq2nC?WJTzDc6NF66Eu<})BZ=uP z&WJGdF=&olC;%8>YJg(!{Xf{CX*u(8n-0G9^#`Uc0!mnq=pbw?#as)(wR0onCI#e1 zjy{_OOBvym%VLMJ#61`{&o#zrK05#!a8Vo&iO$D(QOq;OD6JDv+(@#tA=rgw3X7LQ(9luhfD<=O@}TH$H$ttT6$ zgWv@`2k1j{v36Gf<}vF%0T?rtHKM+#p3pG?V2P)q9D-zPE22?%dQZ}EAL4Cox zjA4UtE2b;D#QGp@g8d-tMAyW%5-81mnrMm7S%NWd)&SS35p|uy#%Awe)m)aac@*jO zV0Mc)uGVhxUiEc-B-wlY(L9LO@?NN4G1`?wxhC$Y>&BSS!&1_CBoM`XcS3V!sh8Gj zk4x>s z`qFg**qDlk7aipf_i;*E9yt_QStwH=)voH^J&jRgVveU2=$+9$%4tG1MIp}@dnXUB z>WEL}rNt`QJGy3msMnCnjMoghhAwsu=#!j}T_dFOZh^cVPlHz(=`nQZ=1c-`WfEdr z|6F1zgUqqUlUp>;1~eGTxSZ6K8giOz8!)F9`)Wy^3mfVqbHbSSy>SD^CyN4p5xxv1 zTm3=#0CS^zn=AFFbDtm&dR{xfspUJm`f;jG{g~XnqUdc$H4cEph4Z=Nvqk>+_QNr6Hrjs zxY~(>OlvK%cXP8jW^-xtBJhc)!N^wUHiyc!aki0H4~TFPmgcHMtQQo_+E0VYEvB;i zpH{ukHjCaR4hCQVgj8ud`kt^Yxqto8_|!l8MI!I|nUaWh)ceKc>JOW8=K>C6f51vS zF|(}dgl9>_x#ttW2|e|zxHhh@mBErLms$(~0f)w#3n4%j-WOtK08?*p(|%KV-D@pD zT$g4Eso5ZO9$L@aLaBA2A!y1-8+j=RodAR;aesnm{n7vO%keO2O^mq=(Lst!8hh6B z-qSVA)!M~>&PllfAXwNHF^-`neve3Pes=zaBPw4pYp4D9-l!UCN~gM=PL zLvzpXb5u65%nG?+^|B_!?MZdhyMUxcj~Y9|M*quIN=Z1z)Qi^?SBc(6$Hw%3@hA2( z{4)@s#t8rzI@&$r2CGA#=x)~I{wGKaeZZqvE;m^~SpANV;&o_lrmSWC<*~JN3n!U? zryB1sYuuXRVoQMv+^Tuk_%vVZAAMmw@pPTM34vr%nDYGW zJp-)>KY!Y7$-hlzu~a6dc!EA#{4{VKVhKS<4=zEKDIX9YYOVsT49dq`8MO0ytemAq z3AhF`$IqNwiL?g@Ph%*4O`g0CiGR7GNHmREG**?{hSYas zb9RiKu|Hk!AfyqlW^UY<29Y*J=eFKEAhW~G-Z%)Zk+ z4nVHB>ef|jqdh3PBqm!Lkc12tQ1i6!KuG#dxac{qlIQ>cEpEB3-`0QQOzG7WlfqYD0f@Vv}$6C#$lh9fpQCNsQg(1Mo+5hM- z1)(sOrMT3dgoaHfs4u11;%OkPrgk=t?Z34Ts&V@hW5vinq!iGHyb7S8bGes#MT(?8 zc_Ek+_!XAp^9veefHKq5U_o1|vm3Ou9d(|;6RXF~3y?v?fxB1(T1Qtd<`F|3!R7{H z5IbWeY>Z+GA`GCgn*eL3XM-Q~w%nn%sRchs;GErFi_;Xxfbkq$URnLRhh?U5YW(VR z0)4+*P?E`a9THqZ3TrCY3~_KVfGu7`w)=Z$_lgl}vjsG=5yHOtl*_{FufGo6PFy4x zLT=jP5Yr4xO1;)bv%+-PSR)2kuU@S#tXpm5kagF;zw^#J6fu=q{b{%=Te=`H=*KaN zV%`D-sO-Mmd~Lun&&EM6F#t!UWKjkpRSb=F!QBZHDMpv}R^tBp=a4c1m#T#>$Ld;JQ_n{1603G@sofqggdanQUXG` zjbZBA^Upuuy1;CU-GS!Unxh@A&eHXiIs$;3cvDt2uHKYX;PwG6)PGrrcv~n>>Ipdv z3Ek)y0lYmSrj~$3U}`^*>rgyezY87U!Vh(^&vmLT$^pWr(`g*HlOpA4UGyJ zqj5w}xrDK#v35t(>Z4-AS%>=_?Ziaa*Yz{27^atSnqrc*SQ?f;Pv2*+lmqp5ZqKT@ z`8qeaa3`SDc1`>x5FOTH`3!redkN%}-_h@cMOIV&-*;}Txg_^4mZ;{c9I4{Tc#rjY z>C&a%Z9P%yvq-jfc=-@uI*m6b8!%Dh#&f`Y7zGpQ94ecl%l?G_svXv9WdmE&r`%e( z+A|XHk_v>1zzd-1rYkXp^T4zAeDpqqc(lGgtKR)Dj#)e-;etSn=K-+QypJ9T{i>b% zk8!2(QFqqio{4T63s%VHN^38g)^AeH5rBJVr@YJJ0ePHoi>1V*3}EoVdjVdnpKCt_ zgScIDh{6*eL0QM}L%?LY=OM##EIkiHkNY|+!(2F+J?WOrbCD&;fYKDG(+eAG7wK&CzXe6lAm(5x!JNmmf6Psd!SVWCki!9(1%*JZ4E*;Fzb?rj= zDp~H@AZPasM2`zgt}?6n*|ml}CVKwAGH#voAARp;zN=%$2x8_due@TO*pSRk`B-Dd z#zf=uOAU3_=^O z^)kkuEIprP)-EGpZa(AUcD94(iDGd%wI<2%2z5e-N4 zdV1$BEpy6($~E5RS9S1?VJ+G4F~#Hi%^UUie4pOUt+m$6~Ehlud$?In8SMX_l3lX4_jw*DrI5tG0vdoxPXKrMYHZ5QYf8)<)O9Juzt= z2g90nE)Fzkj(2PPUwY{!N<4z5ezktg@6JOOC~?c?H9D*xS*h?q`}5lR{q$b+MH-gM zu?Kk{1+ICHPL1>*kfJp;rl%vMe)!>s))RU`fN%|1kov37NMjDIPjRo-p6h6cLp^zH zM7v#20KanO%Fc7oJ%{OE^;4e{->}=9OStSF??DgHBlN&rbsrk4KBK^d)@YOTHLl|| z0R!nz;SR>PGrCVP)^%}{`c)t6U&#C^&m8z$yof#A7@CW)BFquLZ{i_3#Cz)-0bsSCll};Z!z=r!W<85E_dJ?_2n?X z8z*CLob27!{*nC$-7t=w87Q85>Z$Je|Msr$)vluopV|BVP7@jv6{r*}v{V|Zq$vfI z`VXjpulm+^U-~NeBGe*iDX1^CR!~qxUj$oF#MmF0=H3M34ZR7uNl0pGZ=2gTHn}Zys4oEu~sXMip&j7CQfIpH4jUZD+Vv^Q=W^$A#;oT<3Hys&U&*(vN7 zoP$8gfoyGh$wi~bwDtb`FHQRX_u+@zpLYgtg@x`j>lQ`9Rh~)gZq2?z?Z@ zbLi0S*eX5f4E0ROW#4B>tH+N|%7EX!v;Wp`czR`d`6!X$^vOkJ`$lJ-6F#P@X)at*?Hdj_&y*ZUL2@a!4*vh%rQbjQ{KS8`=9*$>IK1lC=-zu^EkNF9OAeTD%5-CE zOZ@GfopZ^LcW3A9zLk}49CRRY%s@)Mq+pjnyzs)rSGdw^z{zfx`p4_9Kl$}XAAM$N zaq*aP1aeHbQ_aR$>-z?djr2{vH&?f|ezCE+`FD2PW&cT@`_)sYe)i=D9=Lkw;KA=2 zN6lb7Tek3jWTaIiUqT?Q^=sNR&5iSyEWWW~4gzmbfw zkV>;&&?Mwd#@O6GlC(QvH^$v&+}8ETwIl1;^^HFdt>gEvU%zna%{SL4YqELe%9#Tz zD}Vaj;ltk^Af<1xPrS0W_JdDiJ35qUyS2T&^`DK6?|kY0`=4Hzpa0?@Ve(*e>)ht% zGk4C*%WG>t`RXH&Jh{BMctj7#WI{QvtLp0d=H?GmKbybnFz4T1d+nRY9(w2rQxu;q zjJeAgv*LKEEQ+O~C>D%k*S}CYHf6c!K9`ZRuCdiBRw-g@gYu@h0}jrG60y85H9 z9X-0wWgH$)C$NyIs;X=2=gx)Wjy&NKAP`~HrcCc_Z$EctW8=@XQb~z$ z9H-xSyYJ@yefz#r7_+}9iWR5iE2b=$3YWAs#w?c3PMV3$EQ)#KDCS_Veel8W zR@c{mMQ-cw|1Gu0PoDh#7~^~1=XlX`;kZ;NJF>u)=Ua}4zTIha)~xTq^WW#s|8q>A1h~pKHI4yTA=T(}^=@e(l=dcv+rsIc~}Gm04@FId$r3*Zkb?k#~uo1NL~QBjQ zi%R+2jeJu*(jt9-dkFrv)qf3Pcs({QUOefVvwq)Q_By_Vc2l@>KVjr}*U#Zi&kCdm zI4$7@Cd&9$18@#-JY<}q4bJw_IJ8;EPv}tD8TR96T*HQZH}Lm`{3hS=QV;pusVwqw z<7eT5tqYd(X=DTNnUsL0#g;M1f!K&B#K*|(5Vx!H+br#BCN}@THpmeP<$%c;%D;Rj zRR{`pBb6I!TiO!?+!1AcB>o-9lMvX-CISdd<_-{5f1B@b$olr3+a~NYB17JWc9^Ij zxP{H3?J3~o4@RBhsKkK^Rf10^g+ZsV;esu{b-m~N6B!C>;;_HK>#>QKu8^Ma>o%_N2XD>1#BwXrG|qT4me2w zC{t{J#KDnGW6T_Mf-NZ&GMr)X?kF+P$!#}QZe&sj;6mme){q>d$<(R8&2?PbWP=wq z3sj>_b?jd?Z36mxy`)w^1_vhiEYGYTh#X=b3Hz}Mcp(|4zJg3yKUl+& zT!P^LPXE#%bewi!%*~iV?rM1s|GRvL=jrUSC>sKt@EL(w;du`9uEg<2&@aO-4FcV- zJX0_oE2~57QXzBb=Q!@X4P>qTxWFcnthSlVA;@n$%7AmkT36*O`CE_PjhGc6+Z zQ|!w$V?2Vn3`XvyRRil{Q{ecB^Gxt}Kna9`UcdLGeM^1Bhh zXP6T|3j@GB!#Ops;g<_mWF9*R@GECHnNx?0Bn+jC5r9fyycKmA62X6;U(* zoH`|l!T==vxC!7aq(1;Sqm*l4L^ce_;5p_3fU|4;;((KHDs==WT*gUc8v!TGUlD8G zP!7mOLIEd~h#BEXlmX{%2p|!;)XJdaxJ%DoFG%2m%GC7xGLB1_+Cu%zW;n23>y&Ed zGn`Wa&P-kDO(ps*K_%fdjw1wpVFZ>EtTRmCyYdr&t6;!$kI`Jf05c;z1V`U1dNL)o zBVgh@^x&p3o}sox!A4-12flwE6f6bDuL8y!=wy?T3}JCyR)3UEF3b3w;)4UYM0cK%8QE3kwty%xN;=-dz%9L#}M}p zQYvN>2r5>fo3}}>_eZ;KIxek6`#1Cq_9AL_)3yo7dLBWhxSXv%=Khw|S~V%tEP!*M zF790$Bf$mg{x-^+Fec7WpJkkL_#4>HuKk1|Vi)kSn60$w1I}B6^1Wc~Gn~RCGQ|L=fX*^e zz`08TIo%y>=b*DDW#TqLz**zGh2L)`&QqtQQ@P(F;N%;=KG-CBAb?YTpA*0tbezmA z9a03G5NN5Ah|;62=6+7?xtvZPbN^IlII-n`)5Oa}XTZshjF75A9pc9iF!0!rKpnA{ zodQnGbT<9TaB`*^sWltGocjkP z*i{9p3e^%k?9K;r=3FY|I;#xfeuB&+ud><8chJmHup$7?09YyRc*v5}Kx-MM8V}zB zle+SL*4RS^x5Me9IUDX9k#Y-PAL6ymA1u&^Cf> z*XSU^*|lU|^Fuaa8LzYv^)VC5IUF6K5$05EJeG)|UDpAe5=bHQ34k+^eNy}x1DWDV z<;Y0}oWi_9$dJtD%m8QZ=l(V+MNh-u<|VZS0#ea)@F5A{?7Bo*+Wy=@Gsh4&Ofp6T zYR?b}P$Hfgt2~D<59$#?Ca}gV5k#iu0pO?rPWE0^0@w@(ox%}n@9C|2Adh6TZ1D_= z#7owBxjORf<-?IUhqwA4JY>8hR$l{|0uw zV1P45#+a9iaeEOD(8wN1KtZh=kj;RTvk=&M;7oe{HrMkwV?;goWA$=DsvG74=YUPb zyGz2i)e70Y1vt4=SCLB!Dg-JiW%aNm6Bn%KXEzOkP7+C>8ETF7WPpuEHl-~{8yRr& zs4UC;!8i;03~IzH2w+pGB5W$eHc4iaXLj^AX7(OV$jtNTDxpkWmV)x?7-9W0NnrC! z0iaZlOiTbz=CkpvJBQ)9EtT{!15RlzerJF)zbjSU-$vlnBxEbcWazO$X$vApMghPx z{4&^c8BTEEWuqWj8;GbD%27WXI+sB%Z|Up1I4!Otue;}^1KNO-meFv)iCoO0bgb>I zdMzTe7RQ4CQ$GL@eiezx5k04BJCJFSYw93!z@~XF85jYlA!m;xy$&b$<67Z{ul^2B z9=WgNJ6vuPwj(AIfNzvvQO2{JLiGNM2>O`&3E(6xl8G2t$pHbL7^t=V?NAa8vzrJs zi7cU{pF)xL{oGIVTiV3@Z5#*q!X_M`zX)r>BW0E zi6h-$iKbc!=JeSm4rKa6Hn4_9zN3Qa8))n!ie;JXMF1MM{rGub_!;>4wJ&vwrB^7| z{03V&vz)wL;&NONdB_xdt->34A+1UMY}FJp+<|e2AtDTp6Bdun--rL83q4}_V)#Fws(Zm2PXQ0 zpMG#bpQhi4Odh{NsgnZr#V#c`{!DhJGM@Fo;`cm{nWouK^ZNAA-_HK9?K^HMJ6JF+ z%D^(OV;+Bg9@B$NeQzksd6xe?pP4dcdztk; Date: Thu, 24 Mar 2016 12:20:00 +0900 Subject: [PATCH 393/531] Falling: Set acceleration on step again Commit 65c09a96f41705bb8e75fc5ff4276342be91ed11 "Set acceleration only once in falling node" has made the acceleration being set only once. But this has introduced a regression. Fix #3884. --- builtin/game/falling.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index 6282f655..29d94ae5 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -30,8 +30,6 @@ core.register_entity(":__builtin:falling_node", { end, on_activate = function(self, staticdata) - -- Set gravity - self.object:setacceleration({x = 0, y = -10, z = 0}) self.object:set_armor_groups({immortal = 1}) local node = core.deserialize(staticdata) @@ -43,6 +41,11 @@ core.register_entity(":__builtin:falling_node", { end, on_step = function(self, dtime) + -- Set gravity + local acceleration = self.object:getacceleration() + if not vector.equals(acceleration, {x = 0, y = -10, z = 0}) then + self.object:setacceleration({x = 0, y = -10, z = 0}) + end -- Turn to actual sand when collides to ground or just move local pos = self.object:getpos() local bcp = {x = pos.x, y = pos.y - 0.7, z = pos.z} -- Position of bottom center point From 205e38f5b8bd480bbe880db5d30300faea13a465 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 25 Mar 2016 15:57:18 +0100 Subject: [PATCH 394/531] Replace CRLF with LF in shader files --- .../shaders/default_shader/opengl_vertex.glsl | 18 +- .../shaders/nodes_shader/opengl_vertex.glsl | 170 +++++------ .../selection_shader/opengl_vertex.glsl | 18 +- .../water_surface_shader/opengl_vertex.glsl | 268 +++++++++--------- .../shaders/wielded_shader/opengl_vertex.glsl | 66 ++--- 5 files changed, 270 insertions(+), 270 deletions(-) diff --git a/client/shaders/default_shader/opengl_vertex.glsl b/client/shaders/default_shader/opengl_vertex.glsl index 0f460917..d0b16c8b 100644 --- a/client/shaders/default_shader/opengl_vertex.glsl +++ b/client/shaders/default_shader/opengl_vertex.glsl @@ -1,9 +1,9 @@ -uniform mat4 mWorldViewProj; - -void main(void) -{ - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_Position = mWorldViewProj * gl_Vertex; - - gl_FrontColor = gl_BackColor = gl_Color; -} +uniform mat4 mWorldViewProj; + +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_Position = mWorldViewProj * gl_Vertex; + + gl_FrontColor = gl_BackColor = gl_Color; +} diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl index 91536ba1..ff271d0e 100644 --- a/client/shaders/nodes_shader/opengl_vertex.glsl +++ b/client/shaders/nodes_shader/opengl_vertex.glsl @@ -1,52 +1,52 @@ -uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; -uniform mat4 mWorld; - -uniform float dayNightRatio; -uniform vec3 eyePosition; -uniform float animationTimer; - -varying vec3 vPosition; -varying vec3 worldPosition; - -varying vec3 eyeVec; -varying vec3 lightVec; -varying vec3 tsEyeVec; -varying vec3 tsLightVec; +uniform mat4 mWorldViewProj; +uniform mat4 mInvWorld; +uniform mat4 mTransWorld; +uniform mat4 mWorld; + +uniform float dayNightRatio; +uniform vec3 eyePosition; +uniform float animationTimer; + +varying vec3 vPosition; +varying vec3 worldPosition; + +varying vec3 eyeVec; +varying vec3 lightVec; +varying vec3 tsEyeVec; +varying vec3 tsLightVec; varying float area_enable_parallax; varying float disp; - -const float e = 2.718281828459; -const float BS = 10.0; - + +const float e = 2.718281828459; +const float BS = 10.0; + float smoothCurve(float x) { return x * x * (3.0 - 2.0 * x); -} +} float triangleWave(float x) { return abs(fract(x + 0.5) * 2.0 - 1.0); -} +} float smoothTriangleWave(float x) { return smoothCurve(triangleWave(x)) * 2.0 - 1.0; -} - +} -void main(void) -{ - gl_TexCoord[0] = gl_MultiTexCoord0; - //TODO: make offset depending on view angle and parallax uv displacement - //thats for textures that doesnt align vertically, like dirt with grass + +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + //TODO: make offset depending on view angle and parallax uv displacement + //thats for textures that doesnt align vertically, like dirt with grass //gl_TexCoord[0].y += 0.008; - - //Allow parallax/relief mapping only for certain kind of nodes + + //Allow parallax/relief mapping only for certain kind of nodes //Variable is also used to control area of the effect #if (DRAW_TYPE == NDT_NORMAL || DRAW_TYPE == NDT_LIQUID || DRAW_TYPE == NDT_FLOWINGLIQUID) area_enable_parallax = 1.0; @@ -65,30 +65,30 @@ void main(void) #if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER - vec4 pos = gl_Vertex; - pos.y -= 2.0; - float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH); - pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT; - gl_Position = mWorldViewProj * pos; -#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES - vec4 pos = gl_Vertex; + vec4 pos = gl_Vertex; + pos.y -= 2.0; + float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH); + pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT; + gl_Position = mWorldViewProj * pos; +#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES + vec4 pos = gl_Vertex; pos.x += disp * 0.1; pos.y += disp * 0.1; pos.z += disp; - gl_Position = mWorldViewProj * pos; -#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS - vec4 pos = gl_Vertex; - if (gl_TexCoord[0].y < 0.05) { + gl_Position = mWorldViewProj * pos; +#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS + vec4 pos = gl_Vertex; + if (gl_TexCoord[0].y < 0.05) { pos.z += disp; - } - gl_Position = mWorldViewProj * pos; -#else - gl_Position = mWorldViewProj * gl_Vertex; -#endif - + } + gl_Position = mWorldViewProj * pos; +#else + gl_Position = mWorldViewProj * gl_Vertex; +#endif - vPosition = gl_Position.xyz; - worldPosition = (mWorld * gl_Vertex).xyz; + + vPosition = gl_Position.xyz; + worldPosition = (mWorld * gl_Vertex).xyz; // Don't generate heightmaps when too far from the eye float dist = distance (vec3(0.0, 0.0 ,0.0), vPosition); @@ -96,16 +96,16 @@ void main(void) area_enable_parallax = 0.0; } - vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0); - - vec3 normal, tangent, binormal; - normal = normalize(gl_NormalMatrix * gl_Normal); + vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0); + + vec3 normal, tangent, binormal; + normal = normalize(gl_NormalMatrix * gl_Normal); tangent = normalize(gl_NormalMatrix * gl_MultiTexCoord1.xyz); binormal = normalize(gl_NormalMatrix * gl_MultiTexCoord2.xyz); vec3 v; - - lightVec = sunPosition - worldPosition; + + lightVec = sunPosition - worldPosition; v.x = dot(lightVec, tangent); v.y = dot(lightVec, binormal); v.z = dot(lightVec, normal); @@ -116,32 +116,32 @@ void main(void) v.y = dot(eyeVec, binormal); v.z = dot(eyeVec, normal); tsEyeVec = normalize (v); - - vec4 color; - float day = gl_Color.r; - float night = gl_Color.g; - float light_source = gl_Color.b; - - float rg = mix(night, day, dayNightRatio); - rg += light_source * 2.5; // Make light sources brighter - float b = rg; - - // Moonlight is blue - b += (day - night) / 13.0; - rg -= (day - night) / 23.0; - - // Emphase blue a bit in darker places - // See C++ implementation in mapblock_mesh.cpp finalColorBlend() - b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025); - - // Artificial light is yellow-ish - // See C++ implementation in mapblock_mesh.cpp finalColorBlend() - rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065); - - color.r = rg; - color.g = rg; - color.b = b; - - color.a = gl_Color.a; - gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0); -} + + vec4 color; + float day = gl_Color.r; + float night = gl_Color.g; + float light_source = gl_Color.b; + + float rg = mix(night, day, dayNightRatio); + rg += light_source * 2.5; // Make light sources brighter + float b = rg; + + // Moonlight is blue + b += (day - night) / 13.0; + rg -= (day - night) / 23.0; + + // Emphase blue a bit in darker places + // See C++ implementation in mapblock_mesh.cpp finalColorBlend() + b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025); + + // Artificial light is yellow-ish + // See C++ implementation in mapblock_mesh.cpp finalColorBlend() + rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065); + + color.r = rg; + color.g = rg; + color.b = b; + + color.a = gl_Color.a; + gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0); +} diff --git a/client/shaders/selection_shader/opengl_vertex.glsl b/client/shaders/selection_shader/opengl_vertex.glsl index 0f460917..d0b16c8b 100644 --- a/client/shaders/selection_shader/opengl_vertex.glsl +++ b/client/shaders/selection_shader/opengl_vertex.glsl @@ -1,9 +1,9 @@ -uniform mat4 mWorldViewProj; - -void main(void) -{ - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_Position = mWorldViewProj * gl_Vertex; - - gl_FrontColor = gl_BackColor = gl_Color; -} +uniform mat4 mWorldViewProj; + +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_Position = mWorldViewProj * gl_Vertex; + + gl_FrontColor = gl_BackColor = gl_Color; +} diff --git a/client/shaders/water_surface_shader/opengl_vertex.glsl b/client/shaders/water_surface_shader/opengl_vertex.glsl index 7ae517d8..9b461f4c 100644 --- a/client/shaders/water_surface_shader/opengl_vertex.glsl +++ b/client/shaders/water_surface_shader/opengl_vertex.glsl @@ -1,144 +1,144 @@ -uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; -uniform mat4 mWorld; - -uniform float dayNightRatio; -uniform vec3 eyePosition; -uniform float animationTimer; - -varying vec3 vPosition; -varying vec3 worldPosition; - -varying vec3 eyeVec; -varying vec3 lightVec; -varying vec3 tsEyeVec; -varying vec3 tsLightVec; - -const float e = 2.718281828459; -const float BS = 10.0; - +uniform mat4 mWorldViewProj; +uniform mat4 mInvWorld; +uniform mat4 mTransWorld; +uniform mat4 mWorld; + +uniform float dayNightRatio; +uniform vec3 eyePosition; +uniform float animationTimer; + +varying vec3 vPosition; +varying vec3 worldPosition; + +varying vec3 eyeVec; +varying vec3 lightVec; +varying vec3 tsEyeVec; +varying vec3 tsLightVec; + +const float e = 2.718281828459; +const float BS = 10.0; + float smoothCurve(float x) { return x * x * (3.0 - 2.0 * x); -} +} float triangleWave(float x) { return abs(fract( x + 0.5 ) * 2.0 - 1.0); -} +} float smoothTriangleWave(float x) { return smoothCurve(triangleWave( x )) * 2.0 - 1.0; -} - -void main(void) -{ - gl_TexCoord[0] = gl_MultiTexCoord0; +} -#if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER - vec4 pos = gl_Vertex; - pos.y -= 2.0; - - float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH); - - pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT; - gl_Position = mWorldViewProj * pos; -#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES - vec4 pos = gl_Vertex; - vec4 pos2 = mWorld * gl_Vertex; - /* - * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition) - * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication) - * And bufferize calcul to a float - */ - float pos2XpZ = pos2.x + pos2.z; - pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * 0.01) * 2.0 - 1.0) * 0.4; - pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.2; - pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.4; - gl_Position = mWorldViewProj * pos; -#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS - vec4 pos = gl_Vertex; - vec4 pos2 = mWorld * gl_Vertex; - if (gl_TexCoord[0].y < 0.05) { - /* - * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition) - * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication) - * And bufferize calcul to a float - */ - float pos2XpZ = pos2.x + pos2.z; - pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2XpZ * 0.1) * 2.0 - 1.0) * 0.8; - pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2XpZ * -0.5) * 2.0 - 1.0) * 0.4; - } - gl_Position = mWorldViewProj * pos; -#else - gl_Position = mWorldViewProj * gl_Vertex; -#endif - - vPosition = gl_Position.xyz; - worldPosition = (mWorld * gl_Vertex).xyz; - vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0); - - vec3 normal, tangent, binormal; - normal = normalize(gl_NormalMatrix * gl_Normal); - if (gl_Normal.x > 0.5) { - // 1.0, 0.0, 0.0 - tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, -1.0)); - binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); - } else if (gl_Normal.x < -0.5) { - // -1.0, 0.0, 0.0 - tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0)); - binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); - } else if (gl_Normal.y > 0.5) { - // 0.0, 1.0, 0.0 - tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0)); - binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0)); - } else if (gl_Normal.y < -0.5) { - // 0.0, -1.0, 0.0 - tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0)); - binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0)); - } else if (gl_Normal.z > 0.5) { - // 0.0, 0.0, 1.0 - tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0)); - binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); - } else if (gl_Normal.z < -0.5) { - // 0.0, 0.0, -1.0 - tangent = normalize(gl_NormalMatrix * vec3(-1.0, 0.0, 0.0)); - binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); - } - mat3 tbnMatrix = mat3(tangent.x, binormal.x, normal.x, - tangent.y, binormal.y, normal.y, - tangent.z, binormal.z, normal.z); - - lightVec = sunPosition - worldPosition; - tsLightVec = lightVec * tbnMatrix; - eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz; - tsEyeVec = eyeVec * tbnMatrix; - - vec4 color; - float day = gl_Color.r; - float night = gl_Color.g; - float light_source = gl_Color.b; - - float rg = mix(night, day, dayNightRatio); - rg += light_source * 2.5; // Make light sources brighter - float b = rg; - - // Moonlight is blue - b += (day - night) / 13.0; - rg -= (day - night) / 23.0; - - // Emphase blue a bit in darker places - // See C++ implementation in mapblock_mesh.cpp finalColorBlend() - b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025); - - // Artificial light is yellow-ish - // See C++ implementation in mapblock_mesh.cpp finalColorBlend() - rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065); - - color.r = rg; - color.g = rg; - color.b = b; - - color.a = gl_Color.a; - gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0); -} +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + +#if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER + vec4 pos = gl_Vertex; + pos.y -= 2.0; + + float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH); + + pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT; + gl_Position = mWorldViewProj * pos; +#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES + vec4 pos = gl_Vertex; + vec4 pos2 = mWorld * gl_Vertex; + /* + * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition) + * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication) + * And bufferize calcul to a float + */ + float pos2XpZ = pos2.x + pos2.z; + pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * 0.01) * 2.0 - 1.0) * 0.4; + pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.2; + pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.4; + gl_Position = mWorldViewProj * pos; +#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS + vec4 pos = gl_Vertex; + vec4 pos2 = mWorld * gl_Vertex; + if (gl_TexCoord[0].y < 0.05) { + /* + * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition) + * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication) + * And bufferize calcul to a float + */ + float pos2XpZ = pos2.x + pos2.z; + pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2XpZ * 0.1) * 2.0 - 1.0) * 0.8; + pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2XpZ * -0.5) * 2.0 - 1.0) * 0.4; + } + gl_Position = mWorldViewProj * pos; +#else + gl_Position = mWorldViewProj * gl_Vertex; +#endif + + vPosition = gl_Position.xyz; + worldPosition = (mWorld * gl_Vertex).xyz; + vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0); + + vec3 normal, tangent, binormal; + normal = normalize(gl_NormalMatrix * gl_Normal); + if (gl_Normal.x > 0.5) { + // 1.0, 0.0, 0.0 + tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, -1.0)); + binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); + } else if (gl_Normal.x < -0.5) { + // -1.0, 0.0, 0.0 + tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0)); + binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); + } else if (gl_Normal.y > 0.5) { + // 0.0, 1.0, 0.0 + tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0)); + binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0)); + } else if (gl_Normal.y < -0.5) { + // 0.0, -1.0, 0.0 + tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0)); + binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0)); + } else if (gl_Normal.z > 0.5) { + // 0.0, 0.0, 1.0 + tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0)); + binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); + } else if (gl_Normal.z < -0.5) { + // 0.0, 0.0, -1.0 + tangent = normalize(gl_NormalMatrix * vec3(-1.0, 0.0, 0.0)); + binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0)); + } + mat3 tbnMatrix = mat3(tangent.x, binormal.x, normal.x, + tangent.y, binormal.y, normal.y, + tangent.z, binormal.z, normal.z); + + lightVec = sunPosition - worldPosition; + tsLightVec = lightVec * tbnMatrix; + eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz; + tsEyeVec = eyeVec * tbnMatrix; + + vec4 color; + float day = gl_Color.r; + float night = gl_Color.g; + float light_source = gl_Color.b; + + float rg = mix(night, day, dayNightRatio); + rg += light_source * 2.5; // Make light sources brighter + float b = rg; + + // Moonlight is blue + b += (day - night) / 13.0; + rg -= (day - night) / 23.0; + + // Emphase blue a bit in darker places + // See C++ implementation in mapblock_mesh.cpp finalColorBlend() + b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025); + + // Artificial light is yellow-ish + // See C++ implementation in mapblock_mesh.cpp finalColorBlend() + rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065); + + color.r = rg; + color.g = rg; + color.b = b; + + color.a = gl_Color.a; + gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0); +} diff --git a/client/shaders/wielded_shader/opengl_vertex.glsl b/client/shaders/wielded_shader/opengl_vertex.glsl index a2ab9fa5..c33b0a7d 100644 --- a/client/shaders/wielded_shader/opengl_vertex.glsl +++ b/client/shaders/wielded_shader/opengl_vertex.glsl @@ -1,35 +1,35 @@ -uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; -uniform mat4 mWorld; - -uniform float dayNightRatio; -uniform vec3 eyePosition; -uniform float animationTimer; - -varying vec3 vPosition; -varying vec3 worldPosition; - -varying vec3 eyeVec; -varying vec3 lightVec; -varying vec3 tsEyeVec; -varying vec3 tsLightVec; - -const float e = 2.718281828459; -const float BS = 10.0; - -void main(void) -{ - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_Position = mWorldViewProj * gl_Vertex; - - vPosition = gl_Position.xyz; - worldPosition = (mWorld * gl_Vertex).xyz; +uniform mat4 mWorldViewProj; +uniform mat4 mInvWorld; +uniform mat4 mTransWorld; +uniform mat4 mWorld; - vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0); - - lightVec = sunPosition - worldPosition; +uniform float dayNightRatio; +uniform vec3 eyePosition; +uniform float animationTimer; + +varying vec3 vPosition; +varying vec3 worldPosition; + +varying vec3 eyeVec; +varying vec3 lightVec; +varying vec3 tsEyeVec; +varying vec3 tsLightVec; + +const float e = 2.718281828459; +const float BS = 10.0; + +void main(void) +{ + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_Position = mWorldViewProj * gl_Vertex; + + vPosition = gl_Position.xyz; + worldPosition = (mWorld * gl_Vertex).xyz; + + vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0); + + lightVec = sunPosition - worldPosition; eyeVec = -(gl_ModelViewMatrix * gl_Vertex).xyz; - - gl_FrontColor = gl_BackColor = gl_Color; -} + + gl_FrontColor = gl_BackColor = gl_Color; +} From cedb2ffe141ba8bbb335d68fbdbfacde3e12962f Mon Sep 17 00:00:00 2001 From: Craig Davison Date: Thu, 3 Sep 2015 19:19:29 +0100 Subject: [PATCH 395/531] Add CONTRIBUTING.md --- CONTRIBUTING.md | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..468ba051 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,106 @@ +# Contributing + +Contributions are welcome! Here's how you can help: + +- [Contributing code](#code) +- [Reporting issues](#issues) +- [Requesting features](#feature-requests) +- [Translating](#translations) +- [Donating](#donations) + +## Code + +If you are planning to start some significant coding, you would benefit from asking first on [our IRC channel](http://www.minetest.net/irc/) before starting. + +1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository and [clone](https://help.github.com/articles/cloning-a-repository/) your fork. + +2. Start coding! + - Refer to the [Lua API](https://github.com/minetest/minetest/blob/master/doc/lua_api.txt), [Developer Wiki](http://dev.minetest.net/Main_Page) and other [documentation](https://github.com/minetest/minetest/tree/master/doc). + - Follow the [C/C++](http://dev.minetest.net/Code_style_guidelines) and [Lua](http://dev.minetest.net/Lua_code_style_guidelines) code style guidelines. + - Check your code works as expected and document any changes to the Lua API. + +3. Commit & [push](https://help.github.com/articles/pushing-to-a-remote/) your changes to a new branch (not `master`, one change per branch) + - Commit messages should: + - Use the present tense + - Have a title which begins with a capital letter + - Be descriptive. (e.g. no `Update init.lua` or `Fix a problem`) + - Have a first line with less than *80 characters* and have a second line that is *empty* + +4. Once you are happy with your changes, submit a pull request. + - Open the [pull-request form](https://github.com/minetest/minetest/pull/new/master) + - Add a short description explaining briefly what you've done (or if it's a work-in-progress - what you need to do) + +##### A pull-request is considered merge-able when: + +1. It follows the [roadmap](https://forum.minetest.net/viewtopic.php?t=9177) in some way and fits the whole picture of the project. +2. It works. +3. It follows the code style for [C/C++](http://dev.minetest.net/Code_style_guidelines) or [Lua](http://dev.minetest.net/Lua_code_style_guidelines). +4. The code's interfaces are well designed, regardless of other aspects that might need more work in the future. +5. It uses protocols and formats which include the required compatibility. + +## Issues + +If you experience an issue, we would like to know the details - especially when a stable release is on the way. + +1. Do a quick search on GitHub to check if the issue has already been reported. +2. Is it an issue with the Minetest *engine*? If not, report it [elsewhere](http://www.minetest.net/development/#reporting-issues). +3. [Open an issue](https://github.com/minetest/minetest/issues/new) and describe the issue you are having - you could include: + - Error logs (check the bottom of the `debug.txt` file) + - Screenshots + - Ways you have tried to solve the issue, and whether they worked or not + - Your Minetest version and the content (subgames, mods or texture packs) you have installed + - Your platform (e.g. Windows 10 or Ubuntu 15.04 x64) + +After reporting you should aim to answer questions or clarifications as this helps pinpoint the cause of the issue (if you don't do this your issue may be closed after 1 month). + +## Feature requests + +Feature requests are welcome but take a moment to see if your idea follows the [roadmap](https://forum.minetest.net/viewtopic.php?t=9177) in some way and fits the whole picture of the project. You should provide a clear explanation with as much detail as possible. + +## Translations + +Translations of Minetest are performed using Weblate. You can access the project page with a list of current languages [here](https://hosted.weblate.org/projects/minetest/minetest/). + +### Donations + +If you'd like to monetarily support Minetest development, you can find donation methods on [our website](http://www.minetest.net/development/#donate). + +# Maintaining + +*This is a concise version of the [Rules & Guidelines](http://dev.minetest.net/Category:Rules_and_Guidelines) on the developer wiki.* + +These notes are for those who have push access Minetest (core developers / maintainers). + +- See the [project organisation](http://dev.minetest.net/Organisation) for the people involved. + +## Reviewing pull requests + +Pull requests should be reviewed and, if appropriate, checked if they achieve their intended purpose. You can show that you are in the process of, or will review the pull request by commenting *"Looks good"* or something similar. + +**If the pull-request is not [merge-able](#a-pull-request-is-considered-merge-able-when):** + +Submit a comment explaining to the author what they need to change to make the pull-request merge-able. + +- If the author comments or makes changes to the pull-request, it can be reviewed again. +- If no response is made from the author within 1 month (when improvements are suggested or a question is asked), it can be closed. + +**If the pull-request is [merge-able](#a-pull-request-is-considered-merge-able-when):** + +Submit a :+1: (+1) or "Looks good" comment to show you believe the pull-request should be merged. "Looks good" comments often signify that the patch might require (more) testing. + +- Two core developers must agree to the merge before it is carried out and both should +1 the pull request. +- Who intends to merge the pull-request should follow the commit rules: + - The title should follow the commit guidelines (title starts with a capital letter, present tense, descriptive). + - Don't modify history older than 10 minutes. + - Use rebase, not merge to get linear history: + - `curl https://github.com/minetest/minetest/pull/1.patch | git am` + +## Reviewing issues and feature requests + +- If an issue does not get a response from its author within 1 month (when requiring more details), it can be closed. +- When an issue is a duplicate, refer to the first ones and close the later ones. +- Tag issues with the appropriate [labels](https://github.com/minetest/minetest/labels) for devices, platforms etc. + +## Releasing a new version + +*Refer to [dev.minetest.net/Releasing_Minetest](http://dev.minetest.net/Releasing_Minetest)* From b9068af27d74c5bfcc61896fdd0d7737fc820f9c Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 27 Mar 2016 00:22:22 +0100 Subject: [PATCH 396/531] Revert "Translated using Weblate (German)" This reverts commit 25da0594eb09bb0e72816aaf8280573a668af00c. --- po/de/minetest.po | 384 ++++++++++++++++++++++------------------------ 1 file changed, 186 insertions(+), 198 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index bbc70e92..d4952c27 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-02-28 13:24+0000\n" +"PO-Revision-Date: 2015-11-12 18:10+0000\n" "Last-Translator: Wuzzy \n" -"Language-Team: German " -"\n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -153,7 +153,7 @@ msgstr "Spiel" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Kartenerzeuger" +msgstr "Kartengenerator" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" @@ -222,7 +222,7 @@ msgstr "(Keine Beschreibung vorhanden)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "< Zurück zur Einstellungsseite" +msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -517,6 +517,7 @@ msgid "2x" msgstr "2x" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "3D Clouds" msgstr "3D-Wolken" @@ -529,8 +530,9 @@ msgid "8x" msgstr "8x" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Advanced Settings" -msgstr "Erweiterte Einstellungen" +msgstr "Einstellungen" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -541,6 +543,7 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Bilinear Filter" msgstr "Bilinearer Filter" @@ -553,18 +556,21 @@ msgid "Change keys" msgstr "Tasten ändern" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Connected Glass" msgstr "Verbundenes Glas" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Enable Particles" -msgstr "Partikel aktivieren" +msgstr "Alle an" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Schöne Blätter" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Generate Normalmaps" msgstr "Normalmaps generieren" @@ -577,8 +583,9 @@ msgid "Mipmap + Aniso. Filter" msgstr "Mipmap u. Aniso. Filter" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "No Filter" -msgstr "Kein Filter" +msgstr "Filter" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -589,6 +596,7 @@ msgid "No!!!" msgstr "Nein!!!" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Node Highlighting" msgstr "Blöcke hervorheben" @@ -621,6 +629,7 @@ msgid "Simple Leaves" msgstr "Einfache Blätter" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Smooth Lighting" msgstr "Geglättetes Licht" @@ -637,18 +646,22 @@ msgid "Touchthreshold (px)" msgstr "Berührungsempfindlichkeit (px)" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Trilinear Filter" msgstr "Trilinearer Filter" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Waving Leaves" msgstr "Wehende Blätter" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Waving Plants" msgstr "Wehende Pflanzen" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Waving Water" msgstr "Wasserwellen" @@ -706,7 +719,7 @@ msgstr "Lade Texturen..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "Shader wiederherstellen …" +msgstr "Shader wiederherstellen..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -766,7 +779,7 @@ msgstr "Weiter" #: src/game.cpp msgid "Creating client..." -msgstr "Erstelle Client ..." +msgstr "Erstelle Klienten..." #: src/game.cpp msgid "Creating server..." @@ -1304,12 +1317,6 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" -"(X;Y;Z)-Versatz des Fraktals vom Weltmittelpunkt in Einheiten von „scale“.\n" -"Benutzt, um einen geeigneten Startbereich mit niedrigem Land in\n" -"die Nähe von (0; 0) zu verschieben. Der Standardwert ist für Mandel-\n" -"brotmengen geeignet, er muss für Juliamengen bearbeitet werden.\n" -"Reichweite ist grob zwischen -2 und 2. Mit „scale“ multiplizieren für einen\n" -"Versatz in Nodes." #: src/settings_translation_file.cpp msgid "" @@ -1328,6 +1335,7 @@ msgid "3D mode" msgstr "3D-Modus" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1344,8 +1352,7 @@ msgstr "" "- anaglyph: Türkises / magenta 3D.\n" "- interlaced: Gerade / ungerade zeilenbasierte Polarisation.\n" "- topbottom: Bildschirm horizontal teilen.\n" -"- sidebyside: Bildschirm vertikal teilen.\n" -"- pageflip: quadbufferbasiertes 3D." +"- sidebyside: Bildschirm vertikal teilen." #: src/settings_translation_file.cpp msgid "" @@ -1359,13 +1366,13 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" -"Eine Nachricht, die an alle verbundenen Clients versendet wird, wenn der " +"Eine Nachricht, die an alle verbundenen Klienten versendet wird, wenn der " "Server abstürzt." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" -"Eine Nachricht, die an alle verbundene Clients gesendet wird, wenn der " +"Eine Nachricht, die an alle verbundene Klienten gesendet wird, wenn der " "Server herunterfährt." #: src/settings_translation_file.cpp @@ -1406,7 +1413,7 @@ msgid "" "This setting is for the client only and is ignored by the server." msgstr "" "Ändert die Gammakodierung der Lichttabellen. Kleinere Werte sind heller.\n" -"Diese Einstellung ist clientseitig und wird vom Server ignoriert." +"Diese Einstellung ist klientenseitig und wird vom Server ignoriert." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1414,7 +1421,7 @@ msgstr "Erweitert" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "Höhenabkühlung" +msgstr "" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1426,7 +1433,7 @@ msgstr "Umgebungsverdeckungs-Gamma" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "Betont die Täler" +msgstr "" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1447,8 +1454,9 @@ msgstr "" "v6.servers.minetest.net gesetzt werden." #: src/settings_translation_file.cpp +#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "Ungefähre (X,Y,Z)-Skalierungen des Fraktals in Nodes." +msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Nodes." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1463,8 +1471,9 @@ msgid "Backward key" msgstr "Rückwärtstaste" #: src/settings_translation_file.cpp +#, fuzzy msgid "Base terrain height" -msgstr "Basisgeländehöhe" +msgstr "Wasserwellenhöhe" #: src/settings_translation_file.cpp msgid "Basic" @@ -1500,15 +1509,15 @@ msgstr "Taste zum Umschalten der Kameraaktualisierung" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "Höhlenrauschen Nr. 1" +msgstr "" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "Höhlenrauschen Nr. 2" +msgstr "" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "Höhlen und Tunnel bilden sich am Schnittpunkt der zwei Rauschen" +msgstr "" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1540,25 +1549,6 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" -"Auswahl von 18 Fraktalen aus 9 Formeln.\n" -"1 = 4D-Mangelbrotmenge, Typ „rund“.\n" -"2 = 4D-Juliamenge, Typ „rund“.\n" -"3 = 4D-Mangelbrotmenge, Typ „eckig“.\n" -"4 = 4D-Juliamenge, Typ „eckig“.\n" -"5 = 4D-Mangelbrotmenge, Typ „Mandel-Cousin“.\n" -"6 = 4D-Juliamenge, Typ „Mandel-Cousin“.\n" -"7 = 4D-Mangelbrotmenge, Typ „Variante“.\n" -"8 = 4D-Juliamenge, Typ „Variante“.\n" -"9 = 3D-Mangelbrotmenge, Typ „Madelbrot/Mandelbar“.\n" -"10 = 3D-Juliamenge, Typ „Madelbrot/Mandelbar“.\n" -"11 = 3D-Mangelbrotmenge, Typ „Weihnachtsbaum“.\n" -"12 = 3D-Juliamenge, Typ „Weihnachtsbaum“.\n" -"13 = 3D-Mangelbrotmenge, Typ „Mandelbulb“.\n" -"14 = 3D-Juliamenge, Typ „Mandelbulb“.\n" -"15 = 3D-Mangelbrotmenge, Typ „Kosinus-Mandelbulb“.\n" -"16 = 3D-Juliamenge, Typ „Kosinus-Mandelbulb“.\n" -"17 = 4D-Mangelbrotmenge, Typ „Mandelbulb“.\n" -"18 = 4D-Juliamenge, Typ „Mandelbulb“." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1598,7 +1588,7 @@ msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Wolken sind ein clientenseitiger Effekt." +msgstr "Wolken sind ein klientenseitiger Effekt." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1624,9 +1614,6 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" -"Kommagetrennte Liste von Mods, welche auf HTTP-APIs, welche es\n" -"ihnen ermöglicht, Daten aus dem Internet hoch- und herunterzuladen,\n" -"zugreifen dürfen." #: src/settings_translation_file.cpp msgid "Command key" @@ -1689,11 +1676,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "Legt die Steilheit/Tiefe von Seesenken fest." +msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "Steuert die Steilheit/Höhe von Hügeln." +msgstr "" #: src/settings_translation_file.cpp msgid "Crash message" @@ -1704,18 +1691,12 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" -"Erzeugt unvorhersehbare Lavakammern in Höhlen.\n" -"Sie können das Graben erschweren. Null deaktiviert sie.\n" -"Gültige Werte: 0 bis 10." #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" -"Erzeugt unvorhersehbare Wasserkammern in Höhlen.\n" -"Sie können das Graben erschweren. Null deaktiviert sie.\n" -"Gültige Werte: 0 bis 10." #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1814,11 +1795,11 @@ msgstr "Veraltete Lua-API-Handhabung" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "Tiefe, unter der man große Höhlen finden wird." +msgstr "" #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "Tiefe, unter der man gigantische Höhlen finden wird." +msgstr "" #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1850,9 +1831,6 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" -"Legt die Geländeform fest.\n" -"Die 3 Zahlen in Klammern steuern die Skalierung\n" -"des Geländes, die 3 Zahlen sollten identisch sein." #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1883,8 +1861,9 @@ msgid "Dump the mapgen debug infos." msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben." #: src/settings_translation_file.cpp +#, fuzzy msgid "Enable VBO" -msgstr "VBO aktivieren" +msgstr "MP aktivieren" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1914,8 +1893,8 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" -"Aktivieren, um alten Clients die Verbindung zu verwehren.\n" -"Ältere Clients sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " +"Aktivieren, um alten Klienten die Verbindung zu verwehren.\n" +"Ältere Klienten sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " "neuen\n" "Servern nicht abstürzen, aber sie könnten nicht alle neuen Funktionen, die " "Sie\n" @@ -1941,12 +1920,12 @@ msgid "" "Ignored if bind_address is set." msgstr "" "Server als IPv6 laufen lassen. Ein IPv6-Server könnte,\n" -"abhängig von der Systemkonfiguration, auf IPv6-Clients eingeschränkt sein.\n" +"abhängig von der Systemkonfiguration, auf IPv6-Klienten eingeschränkt sein.\n" "Wird ignoriert, wenn bind_address gesetzt ist." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "Aktiviert Animation von Inventaritems." +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -1968,8 +1947,9 @@ msgstr "" "werden." #: src/settings_translation_file.cpp +#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Aktiviert filmisches Tone-Mapping" +msgstr "Aktiviert die Übersichtskarte." #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -2069,11 +2049,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "Füllertiefe" +msgstr "" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "Filmisches Tone-Mapping" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2152,21 +2132,21 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" -"Von wie weit weg Kartenblöcke für Clients erzeugt werden.\n" +"Von wie weit weg Kartenblöcke für Klienten erzeugt werden.\n" "1 Kartenblock = 16×16×16 Blöcke." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Kartenblöcke zu Clients gesendet werden.\n" +"Von wie weit weg Kartenblöcke zu Klienten gesendet werden.\n" "1 Kartenblock = 16×16×16 Blöcke." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Clients über Objekte bescheid wissen,\n" +"Von wie weit weg Klienten über Objekte bescheid wissen,\n" "in Kartenblöcken (16 Blöcke)." #: src/settings_translation_file.cpp @@ -2199,13 +2179,14 @@ msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "Allgemein" +msgstr "" #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2214,11 +2195,11 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Globale Kartengenerierungsattribute.\n" -"Im Kartengenerator v6 wird der Bitschalter „decorations“ alle Dekorationen\n" -"außer Bäume und Dschungelgras beeinflussen, in allen anderen " -"Kartengeneratoren\n" -"wird er alle Dekorationen beeinflussen.\n" +"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" +"Falls Schneebiome aktiviert sind, werden Dschungel aktiviert und der\n" +"„jungles“-Bitschalter wird ignoriert.\n" +"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"werden von der Standardeinstellung unverändert gelassen.\n" "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." @@ -2231,8 +2212,9 @@ msgid "Gravity" msgstr "Gravitation" #: src/settings_translation_file.cpp +#, fuzzy msgid "HTTP Mods" -msgstr "HTTP-Mods" +msgstr "Mods" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2246,17 +2228,17 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" "Handhabung für veraltete Lua-API-Aufrufe:\n" -"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release)." -"\n" +"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für " +"Release).\n" "- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs " -"protokollieren\n" -" (Standard für Debug).\n" -"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen\n" -" (empfohlen für Mod-Entwickler)." +"protokollieren (Standard für Debug).\n" +"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen " +"(empfohlen für Mod-Entwickler)." #: src/settings_translation_file.cpp +#, fuzzy msgid "Height component of the initial window size." -msgstr "Höhenkomponente der anfänglichen Fenstergröße." +msgstr "Anfängliche Fensterbreite." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -2272,7 +2254,7 @@ msgstr "Homepage des Servers. Wird in der Serverliste angezeigt." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "Wie tief Flüsse gemacht werden" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2308,7 +2290,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "Wie breit Flüsse gemacht werden" +msgstr "" #: src/settings_translation_file.cpp msgid "IPv6" @@ -2430,11 +2412,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "Zeitintervall, in dem die Tageszeit an Clients gesendet wird." +msgstr "Zeitintervall, in dem die Tageszeit an Klienten gesendet wird." #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "Inventaritemanimationen" +msgstr "" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2453,12 +2435,13 @@ msgid "Item entity TTL" msgstr "Item-Entity-TTL" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Iterations of the recursive function.\n" "Controls the amount of fine detail." msgstr "" -"Iterationen der rekursiven Funktion.\n" -"Steuert den Detailgrad." +"Julia-Menge: Iterationen der rekursiven Funktion.\n" +"Steuert die Skalierung mit einem sehr hohem Detailgrad." #: src/settings_translation_file.cpp msgid "" @@ -2467,40 +2450,36 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" -"Nur für Juliamengen: W-Komponente der hyperkomplexen Konstante, die die " -"Julaform festlegt.\n" -"Hat keine Wirkung auf 3D-Fraktale.\n" -"Reichweite liegt etwa zwischen -2 und 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Julia set only: X component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Nur Juliamengen: X-Komponente der hyperkomplexen Konstante, die die " -"Juliaform festlegt.\n" -"Reichweite liegt grob zwischen -2 und 2." +"Julia-Menge: X-Wert, der die 4D-Form festlegt.\n" +"Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Julia set only: Y component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Nur Juliamengen: Y-Komponente der hyperkomplexen Konstante, die die " -"Juliaform festlegt.\n" -"Reichweite liegt grob zwischen -2 und 2." +"Julia-Menge: Y-Wert, der die 4D-Form festlegt.\n" +"Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Julia set only: Z component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Nur Juliamengen: Z-Komponente der hyperkomplexen Konstante, die die " -"Juliaform festlegt.\n" -"Reichweite liegt grob zwischen -2 und 2." +"Julia-Menge: Z-Wert, der die 4D-Form festlegt.\n" +"Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "Jump key" @@ -2511,14 +2490,15 @@ msgid "Jumping speed" msgstr "Sprunggeschwindigkeit" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste, um die Sichtweite zu verringern.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2531,14 +2511,15 @@ msgstr "" "html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste, um die Sichtweite zu erhöhen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72e" +"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72e" #: src/settings_translation_file.cpp msgid "" @@ -2813,11 +2794,11 @@ msgstr "Sprache" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "Tiefe für große Höhlen" +msgstr "" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "Lavakammern" +msgstr "" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -2895,7 +2876,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "Flüssigkeitswiderstand" +msgstr "Flüssigkeitswiederstand" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" @@ -2951,6 +2932,7 @@ msgid "Map directory" msgstr "Weltordner" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "Flags that are not specified in the flag string are not modified from the " @@ -2961,19 +2943,16 @@ msgid "" "\"humid_rivers\" modifies the humidity around rivers and in areas where " "water would tend to pool. It may interfere with delicately adjusted biomes." msgstr "" -"Kartengenerierungsattribute für den Täler-Kartengenerator.\n" -"Bitschalter, welche nicht im Text angegeben sind, werden von der " -"Standardeinstellung\n" -"nicht verändert. Bitschalter, die mit „no“ beginnen, werden benutzt, um sie " -"explizit zu\n" +"Globale Kartengenerierungsattribute.\n" +"Bitschalter, welche nicht in der Bitschalterzeichenkette festgelegt sind, " +"werden\n" +"nicht von der Standardeinstellung abweichen.\n" +"Bitschalter, die mit „no“ beginnen, werden benutzt, um sie explizit zu " "deaktivieren.\n" -"„altitude_chill“ macht höhere Höhen kühler, was ein paar Probleme mit Biomen " -"verursachen kann.\n" -"„humid_rivers“ verändert die Luftfeuchtigkeit um Flüssen und in Gebieten, wo " -"sich Wasser ansammeln würde. Es könnte Auswirkungen auf genau abgestimmte " -"Biome haben." +"Die Bitschalter „trees“ und „flat“ haben nur mit mgv6 eine Wirkung." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills added to the flat world.\n" @@ -2981,13 +2960,12 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für den Ebenen-Kartengenerator.\n" -"Ab und zu werden Seen und Hügel zur flachen Welt hinzugefügt.\n" -"Bitschalter, welche nicht im Text angegeben sind, werden von der " -"Standardeinstellung\n" -"nicht verändert. Bitschalter, die mit „no“ beginnen, werden benutzt, um sie " -"explizit zu\n" -"deaktivieren." +"Kartengenerierungsattribute speziell für Kartengenerator v7.\n" +"„ridges“ sind die Flüsse.\n" +"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"werden von der Standardeinstellung unverändert gelassen.\n" +"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"zu deaktivieren." #: src/settings_translation_file.cpp msgid "" @@ -3038,8 +3016,9 @@ msgid "Mapblock unload timeout" msgstr "Timeout zum Entladen von Kartenblöcken" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen Valleys" -msgstr "Täler-Kartengenerator" +msgstr "Kartengeneratorname" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -3062,52 +3041,62 @@ msgid "Mapgen flags" msgstr "Kartenerzeuger-Bitschalter" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat" -msgstr "Ebenen-Kartengenerator" +msgstr "Kartenerzeuger-Bitschalter" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat cave1 noise parameters" -msgstr "cave1-Rauschparameter für Ebenen-Kartenerzeuger" +msgstr "cave1-Rauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat cave2 noise parameters" -msgstr "cave2-Rauschparameter für Ebenen-Kartenerzeuger" +msgstr "cave2-Rauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat filler depth noise parameters" -msgstr "Fülltiefenrauschparameter für Ebenen-Kartenerzeuger" +msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat flags" -msgstr "Bitschalter für Ebenen-Kartenerzeuger" +msgstr "Bitschalter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat ground level" -msgstr "Basishöhe für Ebenen-Kartenerzeuger" +msgstr "Kartenerzeuger-Bitschalter" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "Hügelsteilheit für Ebenen-Kartenerzeuger" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "Hügellimit für Ebenen-Kartenerzeuger" +msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "See-Steilheit für Ebenen-Kartenerzeuger" +msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Seen-Höhenlimit für Ebenen-Kartenerzeuger" +msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat large cave depth" -msgstr "Tiefe für große Höhlen im Ebenen-Kartenerzeuger" +msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen flat terrain noise parameters" -msgstr "Basisgelände-Rauschparameter für Ebenen-Kartenerzeuger" +msgstr "Basisgelände-Rauschparameter" #: src/settings_translation_file.cpp msgid "Mapgen fractal" @@ -3126,12 +3115,14 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Fraktal für Fraktale-Kartenerzeuger" +msgstr "Bitschalter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Iterationen für Fraktale-Kartenerzeuger" +msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -3150,20 +3141,23 @@ msgid "Mapgen fractal julia z" msgstr "z-Parameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen fractal offset" -msgstr "Versatz für Fraktale-Kartenerzeuger" +msgstr "Julia-Versatz für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen fractal scale" -msgstr "Skalierung für Fraktale-Kartenerzeuger" +msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "Meeresgrundrauschparameter für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp +#, fuzzy msgid "Mapgen fractal slice w" -msgstr "w-Scheibe für Fraktale-Kartenerzeuger" +msgstr "w-Ausschnitt für Fraktale-Kartenerzeuger" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -3311,15 +3305,15 @@ msgstr "Geländepersistenz-Rauschparameter" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "Tiefe für gigantische Höhlen" +msgstr "" #: src/settings_translation_file.cpp msgid "Massive cave noise" -msgstr "Rauschen für gigantische Höhlen" +msgstr "" #: src/settings_translation_file.cpp msgid "Massive caves form here." -msgstr "Hier bilden sich gigantische Höhlen." +msgstr "" #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -3401,7 +3395,7 @@ msgstr "" "Maximale Anzahl der Pakete, die pro Sende-Schritt gesendet werden. Falls Sie " "eine\n" "langsame Verbindung haben, probieren Sie, diesen Wert zu reduzieren,\n" -"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Clients, die " +"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Klienten, die " "Sie\n" "anstreben." @@ -3466,7 +3460,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." -msgstr "Art der Hervorhebung von ausgewählten Objekten." +msgstr "" #: src/settings_translation_file.cpp msgid "Minimap" @@ -3554,7 +3548,7 @@ msgid "" "When starting from the main menu, this is overridden." msgstr "" "Name des Spielers.\n" -"Wenn ein Server gestartet wird, werden Clients mit diesem Namen zu " +"Wenn ein Server gestartet wird, werden Klienten mit diesem Namen zu " "Administratoren.\n" "Wird vom Hauptmenü aus gestartet, wird diese Einstellung überschrieben." @@ -3603,7 +3597,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Noises" -msgstr "Rauschen" +msgstr "" #: src/settings_translation_file.cpp msgid "Normalmaps sampling" @@ -3756,7 +3750,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "Erhöht das Gelände, um Täler um die Flüsse zu erzeugen" +msgstr "" #: src/settings_translation_file.cpp msgid "Random input" @@ -3788,19 +3782,19 @@ msgstr "Rechtsklick-Wiederholungsrate" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "Flusstiefe" +msgstr "" #: src/settings_translation_file.cpp msgid "River Noise" -msgstr "Flussrauschen" +msgstr "" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "Flussgröße" +msgstr "" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" -msgstr "Flussrauschen – Flüsse treten nahe 0 auf" +msgstr "" #: src/settings_translation_file.cpp msgid "Rollback recording" @@ -3966,7 +3960,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" -msgstr "Schrägen und Füllungen arbeiten zusammen, um die Höhen zu verändern" +msgstr "" #: src/settings_translation_file.cpp msgid "Smooth lighting" @@ -4003,7 +3997,7 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" -"Spezifiziert die URL, von der die Clients die Medien (Texturen, Sounds, …) " +"Spezifiziert die URL, von der die Klienten die Medien (Texturen, Sounds, …) " "herunterladen.\n" "$Dateiname sollte von $remote_media$Dateiname mittels cURL erreichbar sein\n" "(diese Einstellung sollte also mit einem Schrägstrich enden).\n" @@ -4033,7 +4027,7 @@ msgstr "Synchrones SQLite" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "Geländehöhe" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -4041,9 +4035,6 @@ msgid "" "Controls proportion of world area covered by hills.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" -"Geländerauschschwellwert für Hügel.\n" -"Steuert das Verhältnis des Weltgebiets, das von Hügeln bedeckt ist.\n" -"Werte nahe bei 0 vergrößern das Verhältnis." #: src/settings_translation_file.cpp msgid "" @@ -4051,9 +4042,6 @@ msgid "" "Controls proportion of world area covered by lakes.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" -"Geländerauschschwellwert für Seen.\n" -"Steuert das Verhältnis des Weltgebiets, das von Seen bedeckt ist.\n" -"Werte nahe bei 0 vergrößern das Verhältnis." #: src/settings_translation_file.cpp msgid "Texture path" @@ -4061,11 +4049,11 @@ msgstr "Texturpfad" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" -msgstr "Die Höhe, bei der die Temperatur um 20 °C fällt" +msgstr "" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" -msgstr "Die Tiefe der Erde oder einem anderem Füller" +msgstr "" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." @@ -4164,8 +4152,9 @@ msgid "Toggle camera mode key" msgstr "Kameraauswahltaste" #: src/settings_translation_file.cpp +#, fuzzy msgid "Tone Mapping" -msgstr "Tone-Mapping" +msgstr "Mip-Mapping" #: src/settings_translation_file.cpp msgid "Tooltip delay" @@ -4245,27 +4234,27 @@ msgstr "Vertikale Synchronisation" #: src/settings_translation_file.cpp msgid "VBO" -msgstr "VBO" +msgstr "" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "Taltiefe" +msgstr "" #: src/settings_translation_file.cpp msgid "Valley Fill" -msgstr "Talfüllung" +msgstr "" #: src/settings_translation_file.cpp msgid "Valley Profile" -msgstr "Talprofil" +msgstr "" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "Talhang" +msgstr "" #: src/settings_translation_file.cpp msgid "Valleys C Flags" -msgstr "Täler-C-Bitschalter" +msgstr "" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." @@ -4284,8 +4273,6 @@ msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" -"Sichtweite in Nodes.\n" -"Minimum = 20" #: src/settings_translation_file.cpp msgid "View range decrease key" @@ -4296,32 +4283,33 @@ msgid "View range increase key" msgstr "Taste „Sichtweite erhöhen“" #: src/settings_translation_file.cpp +#, fuzzy msgid "Viewing range" -msgstr "Sichtweite" +msgstr "Maximale Sichtweite" #: src/settings_translation_file.cpp msgid "Volume" msgstr "Tonlautstärke" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "W co-ordinate of the generated 3D slice of a 4D fractal.\n" "Determines which 3D slice of the 4D shape is generated.\n" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" -"W-Koordinate des erzeugten 3D-Teils eines 4D-Fraktals.\n" -"Legt fest, welcher 3D-Teil der 4D-Form erzeugt wird.\n" -"Hat keine Auswirkung auf 3D-Fraktale.\n" -"Reichweite liegt grob zwischen -2 und 2." +"Julia-Menge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" +"Die Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp msgid "Walking speed" msgstr "Gehgeschwindigkeit" #: src/settings_translation_file.cpp +#, fuzzy msgid "Water Features" -msgstr "Wasserkammern" +msgstr "Meeresspiegel" #: src/settings_translation_file.cpp msgid "Water level" @@ -4420,8 +4408,7 @@ msgstr "" "Kartenblöcke).\n" "- Diese Gruppen haben einen Abstand von [-32, -32] Blöcken vom Ursprung.\n" "- Nur Gruppen, welche innerhalb der von map_generation_limit definierten " -"Grenze liegen, werden\n" -" erzeugt." +"Grenze liegen, werden erzeugt." #: src/settings_translation_file.cpp msgid "" @@ -4440,7 +4427,7 @@ msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" -"Ob Spieler an Clients ohne Distanzbegrenzung angezeit werden.\n" +"Ob Spieler an Klienten ohne Distanzbegrenzung angezeit werden.\n" "Veraltet, benutzen Sie die Einstellung „player_transfer_distance“ " "stattdessen." @@ -4453,7 +4440,7 @@ msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" -"Ob Clients gefragt werden sollen, sich nach einem (Lua-)Absturz\n" +"Ob Klienten gefragt werden sollen, sich nach einem (Lua-)Absturz\n" "neu zu verbinden. Auf „wahr“ setzen, falls Ihr Server für auto-\n" "matische Neustarts eingerichtet ist." @@ -4465,12 +4452,13 @@ msgstr "Ob das Ende des sichtbaren Gebietes im Nebel verschwinden soll." msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" -"Ob der Client Debug-Informationen zeigen soll (hat die selbe Wirkung\n" +"Ob der Klienten Debug-Informationen zeigen soll (hat die selbe Wirkung\n" "wie das Drücken von F5)." #: src/settings_translation_file.cpp +#, fuzzy msgid "Width component of the initial window size." -msgstr "Breitenkomponente der anfänglichen Fenstergröße." +msgstr "Anfängliche Fensterbreite." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." @@ -4486,11 +4474,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Y of flat ground." -msgstr "Y-Wert des flachen Bodens." +msgstr "" #: src/settings_translation_file.cpp msgid "Y of upper limit of large pseudorandom caves." -msgstr "Y-Wert der Obergrenze für große pseudozufällige Höhlen." +msgstr "" #: src/settings_translation_file.cpp msgid "cURL file download timeout" From 8f43aaf6ae5bf0d0e0809999308d84d9ece6eb6a Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 29 Mar 2016 19:55:39 +0200 Subject: [PATCH 397/531] Fix small formatting issue in SRP debug output Writing an u8 to verbosestream writes a char, not it's numeric value. --- src/network/serverpackethandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index ac00b1d8..1bcb78a8 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1808,7 +1808,7 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt) *pkt >> salt >> verification_key >> is_empty; verbosestream << "Server: Got TOSERVER_FIRST_SRP from " << addr_s - << ", with is_empty= " << is_empty << std::endl; + << ", with is_empty=" << (is_empty == 1) << std::endl; // Either this packet is sent because the user is new or to change the password if (cstate == CS_HelloSent) { From 0338c2eb91ca2ba19551aaa23bbfb46552cee9ac Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 29 Mar 2016 11:31:52 -0400 Subject: [PATCH 398/531] Mapgen: Spread both night and day light banks in spreadLight --- src/mapgen.cpp | 55 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 36d19bfa..29af8351 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -242,18 +242,38 @@ void Mapgen::setLighting(u8 light, v3s16 nmin, v3s16 nmax) void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light) { - if (light <= 1 || !a.contains(p)) + if (light <= 1) return; u32 vi = vm->m_area.index(p); - MapNode &nn = vm->m_data[vi]; - - light--; - // should probably compare masked, but doesn't seem to make a difference - if (light <= nn.param1 || !ndef->get(nn).light_propagates) + if (!a.contains(vi)) return; - nn.param1 = light; + MapNode &n = vm->m_data[vi]; + + // Decay light in each of the banks separately + u8 light_day = light & 0x0F; + if (light_day > 0) + light_day -= 0x01; + + u8 light_night = light & 0xF0; + if (light_night > 0) + light_night -= 0x10; + + // Bail out only if we have no more light from either bank to propogate, or + // we hit a solid block that light cannot pass through. + if ((light_day <= (n.param1 & 0x0F) && + light_night <= (n.param1 & 0xF0)) || + !ndef->get(n).light_propagates) + return; + + // Since this recursive function only terminates when there is no light from + // either bank left, we need to take the max of both banks into account for + // the case where spreading has stopped for one light bank but not the other. + light = MYMAX(light_day, n.param1 & 0x0F) | + MYMAX(light_night, n.param1 & 0xF0); + + n.param1 = light; lightSpread(a, p + v3s16(0, 0, 1), light); lightSpread(a, p + v3s16(0, 1, 0), light); @@ -284,6 +304,9 @@ void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow) bool block_is_underground = (water_level >= nmax.Y); v3s16 em = vm->m_area.getExtent(); + // NOTE: Direct access to the low 4 bits of param1 is okay here because, + // by definition, sunlight will never be in the night lightbank. + for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) { for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++) { // see if we can get a light value from the overtop @@ -320,15 +343,21 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax) u32 i = vm->m_area.index(a.MinEdge.X, y, z); for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++, i++) { MapNode &n = vm->m_data[i]; - if (n.getContent() == CONTENT_IGNORE || - !ndef->get(n).light_propagates) + if (n.getContent() == CONTENT_IGNORE) continue; - u8 light_produced = ndef->get(n).light_source & 0x0F; - if (light_produced) - n.param1 = light_produced; + const ContentFeatures &cf = ndef->get(n); + if (!cf.light_propagates) + continue; - u8 light = n.param1 & 0x0F; + // TODO(hmmmmm): Abstract away direct param1 accesses with a + // wrapper, but something lighter than MapNode::get/setLight + + u8 light_produced = cf.light_source; + if (light_produced) + n.param1 = light_produced | (light_produced << 4); + + u8 light = n.param1; if (light) { lightSpread(a, v3s16(x, y, z + 1), light); lightSpread(a, v3s16(x, y + 1, z ), light); From e72b8f25ee192e25c641b9de8e134ec86f351342 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 27 Mar 2016 21:09:35 +0100 Subject: [PATCH 399/531] stop falling.lua error 2016-03-27 15:47:01: ERROR[Main]: ServerError: Lua: Runtime error from mod '*builtin*' in callback luaentity_Step(): Node name is not set or is not a string! 2016-03-27 15:47:01: ERROR[Main]: stack traceback: 2016-03-27 15:47:01: ERROR[Main]: [C]: in function 'add_node' 2016-03-27 15:47:01: ERROR[Main]: /usr/share/minetest/builtin/game/falling.lua:96: in function --- builtin/game/falling.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index 29d94ae5..3ab64f67 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -93,7 +93,9 @@ core.register_entity(":__builtin:falling_node", { end end -- Create node and remove entity - core.add_node(np, self.node) + if core.registered_nodes[self.node.name] then + core.add_node(np, self.node) + end self.object:remove() nodeupdate(np) return From 630f453da402c7b6f0af9ea32aa8b127ce2e4629 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 25 Mar 2016 15:39:24 +0000 Subject: [PATCH 400/531] Mgv7: Decrease cliff steepness --- builtin/settingtypes.txt | 2 +- minetest.conf.example | 2 +- src/mapgen_v7.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 0cacb528..8411839f 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -937,7 +937,7 @@ mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountai mgv7_np_terrain_base (Mapgen v7 terrain base noise parameters) noise_params 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0 mgv7_np_terrain_alt (Mapgen v7 terrain altitude noise parameters) noise_params 4, 25, (600, 600, 600), 5934, 5, 0.6, 2.0 mgv7_np_terrain_persist (Mapgen v7 terrain persistation noise parameters) noise_params 0.6, 0.1, (2000, 2000, 2000), 539, 3, 0.6, 2.0 -mgv7_np_height_select (Mapgen v7 height select noise parameters) noise_params -12, 24, (500, 500, 500), 4213, 6, 0.7, 2.0 +mgv7_np_height_select (Mapgen v7 height select noise parameters) noise_params -8, 16, (500, 500, 500), 4213, 6, 0.7, 2.0 mgv7_np_filler_depth (Mapgen v7 filler depth noise parameters) noise_params 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0 mgv7_np_mount_height (Mapgen v7 mount height noise parameters) noise_params 256, 112, (1000, 1000, 1000), 72449, 3, 0.6, 2.0 mgv7_np_ridge_uwater (Mapgen v7 ridge water noise parameters) noise_params 0, 1, (1000, 1000, 1000), 85039, 5, 0.6, 2.0 diff --git a/minetest.conf.example b/minetest.conf.example index 65b1f19e..80dad6d9 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1178,7 +1178,7 @@ # mgv7_np_terrain_persist = 0.6, 0.1, (2000, 2000, 2000), 539, 3, 0.6, 2.0 # type: noise_params -# mgv7_np_height_select = -12, 24, (500, 500, 500), 4213, 6, 0.7, 2.0 +# mgv7_np_height_select = -8, 16, (500, 500, 500), 4213, 6, 0.7, 2.0 # type: noise_params # mgv7_np_filler_depth = 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0 diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index db13e3ce..42fbe442 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -152,7 +152,7 @@ MapgenV7Params::MapgenV7Params() np_terrain_base = NoiseParams(4, 70, v3f(600, 600, 600), 82341, 5, 0.6, 2.0); np_terrain_alt = NoiseParams(4, 25, v3f(600, 600, 600), 5934, 5, 0.6, 2.0); np_terrain_persist = NoiseParams(0.6, 0.1, v3f(2000, 2000, 2000), 539, 3, 0.6, 2.0); - np_height_select = NoiseParams(-12, 24, v3f(500, 500, 500), 4213, 6, 0.7, 2.0); + np_height_select = NoiseParams(-8, 16, v3f(500, 500, 500), 4213, 6, 0.7, 2.0); np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0); np_mount_height = NoiseParams(256, 112, v3f(1000, 1000, 1000), 72449, 3, 0.6, 2.0); np_ridge_uwater = NoiseParams(0, 1, v3f(1000, 1000, 1000), 85039, 5, 0.6, 2.0); From 597c1d73da38ab299eb440a3429fce04da10cf05 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 25 Mar 2016 17:50:26 +0000 Subject: [PATCH 401/531] Nodes shader: Decrease amplitude of waving leaves and plants Fix initialisation of variable 'disp' Fix a few minor code style issues Add independent X motion combining 2 prime frequencies --- .../shaders/nodes_shader/opengl_vertex.glsl | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl index ff271d0e..28c5f197 100644 --- a/client/shaders/nodes_shader/opengl_vertex.glsl +++ b/client/shaders/nodes_shader/opengl_vertex.glsl @@ -15,7 +15,6 @@ varying vec3 lightVec; varying vec3 tsEyeVec; varying vec3 tsLightVec; varying float area_enable_parallax; -varying float disp; const float e = 2.718281828459; const float BS = 10.0; @@ -55,12 +54,16 @@ void main(void) #endif +float disp_x; +float disp_z; #if (MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES) || (MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS) vec4 pos2 = mWorld * gl_Vertex; float tOffset = (pos2.x + pos2.y) * 0.001 + pos2.z * 0.002; - disp = (smoothTriangleWave(animationTimer * 31.0 + tOffset) + + disp_x = (smoothTriangleWave(animationTimer * 23.0 + tOffset) + + smoothTriangleWave(animationTimer * 11.0 + tOffset)) * 0.4; + disp_z = (smoothTriangleWave(animationTimer * 31.0 + tOffset) + smoothTriangleWave(animationTimer * 29.0 + tOffset) + - smoothTriangleWave(animationTimer * 13.0 + tOffset)) - 0.9; + smoothTriangleWave(animationTimer * 13.0 + tOffset)) * 0.5; #endif @@ -72,14 +75,15 @@ void main(void) gl_Position = mWorldViewProj * pos; #elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES vec4 pos = gl_Vertex; - pos.x += disp * 0.1; - pos.y += disp * 0.1; - pos.z += disp; + pos.x += disp_x; + pos.y += disp_z * 0.1; + pos.z += disp_z; gl_Position = mWorldViewProj * pos; #elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS vec4 pos = gl_Vertex; if (gl_TexCoord[0].y < 0.05) { - pos.z += disp; + pos.x += disp_x; + pos.z += disp_z; } gl_Position = mWorldViewProj * pos; #else @@ -91,7 +95,7 @@ void main(void) worldPosition = (mWorld * gl_Vertex).xyz; // Don't generate heightmaps when too far from the eye - float dist = distance (vec3(0.0, 0.0 ,0.0), vPosition); + float dist = distance (vec3(0.0, 0.0, 0.0), vPosition); if (dist > 150.0) { area_enable_parallax = 0.0; } @@ -132,16 +136,16 @@ void main(void) // Emphase blue a bit in darker places // See C++ implementation in mapblock_mesh.cpp finalColorBlend() - b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025); + b += max(0.0, (1.0 - abs(b - 0.13) / 0.17) * 0.025); // Artificial light is yellow-ish // See C++ implementation in mapblock_mesh.cpp finalColorBlend() - rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065); + rg += max(0.0, (1.0 - abs(rg - 0.85) / 0.15) * 0.065); color.r = rg; color.g = rg; color.b = b; color.a = gl_Color.a; - gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0); + gl_FrontColor = gl_BackColor = clamp(color, 0.0, 1.0); } From 0115da1d6348a08388238d8728daaa048a603522 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 29 Mar 2016 23:59:39 -0400 Subject: [PATCH 402/531] Mapgen: Don't spread light of nodes outside the desired area This fixes #3935, a regression from 0338c2e. An 'optimization' was performed where an index for the VoxelManip being operated on was mistakenly used for bounds checking within the incorrect VoxelArea, namely, the area wherein light should be spread. --- src/mapgen.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 29af8351..b3c9380a 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -242,13 +242,10 @@ void Mapgen::setLighting(u8 light, v3s16 nmin, v3s16 nmax) void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light) { - if (light <= 1) + if (light <= 1 || !a.contains(p)) return; u32 vi = vm->m_area.index(p); - if (!a.contains(vi)) - return; - MapNode &n = vm->m_data[vi]; // Decay light in each of the banks separately From 0aac1b74037ba0f6b0526e81ad0ea7367e31c224 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 28 Mar 2016 14:39:43 +0200 Subject: [PATCH 403/531] mg_schematic: fix leak in lua API, and small cleanup * Fix leak like behaviour if you load multiple schematics in a loop. * Cleanup check in for, fixing theoretical out of bounds read if Schematic::deserializeFromMts reduced the number of elements in m_nodenames. A != check may need an overflow of the counter before it hits, if origsize is larger than m_nodenames.size(). * Fix function name passed to errorstream: it was wrong. Also use __FUNCTION__ instead of manually using the method name at other places in the function. * Don't shadow the name member in the loop. --- src/mg_schematic.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp index 019ed4de..0b95fa26 100644 --- a/src/mg_schematic.cpp +++ b/src/mg_schematic.cpp @@ -267,7 +267,7 @@ bool Schematic::deserializeFromMts(std::istream *is, //// Read signature u32 signature = readU32(ss); if (signature != MTSCHEM_FILE_SIGNATURE) { - errorstream << "Schematic::deserializeFromMts: invalid schematic " + errorstream << __FUNCTION__ << ": invalid schematic " "file" << std::endl; return false; } @@ -275,7 +275,7 @@ bool Schematic::deserializeFromMts(std::istream *is, //// Read version u16 version = readU16(ss); if (version > MTSCHEM_FILE_VER_HIGHEST_READ) { - errorstream << "Schematic::deserializeFromMts: unsupported schematic " + errorstream << __FUNCTION__ << ": unsupported schematic " "file version" << std::endl; return false; } @@ -439,7 +439,7 @@ bool Schematic::loadSchematicFromFile(const std::string &filename, { std::ifstream is(filename.c_str(), std::ios_base::binary); if (!is.good()) { - errorstream << "Schematic::loadSchematicFile: unable to open file '" + errorstream << __FUNCTION__ << ": unable to open file '" << filename << "'" << std::endl; return false; } @@ -448,17 +448,19 @@ bool Schematic::loadSchematicFromFile(const std::string &filename, if (!deserializeFromMts(&is, &m_nodenames)) return false; + m_nnlistsizes.push_back(m_nodenames.size() - origsize); + + name = filename; + if (replace_names) { - for (size_t i = origsize; i != m_nodenames.size(); i++) { - std::string &name = m_nodenames[i]; - StringMap::iterator it = replace_names->find(name); + for (size_t i = origsize; i < m_nodenames.size(); i++) { + std::string &node_name = m_nodenames[i]; + StringMap::iterator it = replace_names->find(node_name); if (it != replace_names->end()) - name = it->second; + node_name = it->second; } } - m_nnlistsizes.push_back(m_nodenames.size() - origsize); - if (ndef) ndef->pendNodeResolve(this); From e082c7766afd2be8bf55b47e261544f7191bd0ed Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Wed, 30 Mar 2016 00:06:47 +0200 Subject: [PATCH 404/531] ParticleManager::handleParticleEvent: use switch Use a proper switch with breaks. --- src/particles.cpp | 154 +++++++++++++++++++++++----------------------- 1 file changed, 76 insertions(+), 78 deletions(-) diff --git a/src/particles.cpp b/src/particles.cpp index ab77e9f5..525258a2 100644 --- a/src/particles.cpp +++ b/src/particles.cpp @@ -346,7 +346,7 @@ void ParticleManager::step(float dtime) void ParticleManager::stepSpawners (float dtime) { MutexAutoLock lock(m_spawner_list_lock); - for(std::map::iterator i = + for (std::map::iterator i = m_particle_spawners.begin(); i != m_particle_spawners.end();) { @@ -408,94 +408,92 @@ void ParticleManager::clearAll () void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef, scene::ISceneManager* smgr, LocalPlayer *player) { - if (event->type == CE_DELETE_PARTICLESPAWNER) { - MutexAutoLock lock(m_spawner_list_lock); - if (m_particle_spawners.find(event->delete_particlespawner.id) != - m_particle_spawners.end()) - { - delete m_particle_spawners.find(event->delete_particlespawner.id)->second; - m_particle_spawners.erase(event->delete_particlespawner.id); - } - // no allocated memory in delete event - return; - } - - if (event->type == CE_ADD_PARTICLESPAWNER) { - - { + switch (event->type) { + case CE_DELETE_PARTICLESPAWNER: { MutexAutoLock lock(m_spawner_list_lock); - if (m_particle_spawners.find(event->add_particlespawner.id) != - m_particle_spawners.end()) - { - delete m_particle_spawners.find(event->add_particlespawner.id)->second; - m_particle_spawners.erase(event->add_particlespawner.id); + if (m_particle_spawners.find(event->delete_particlespawner.id) != + m_particle_spawners.end()) { + delete m_particle_spawners.find(event->delete_particlespawner.id)->second; + m_particle_spawners.erase(event->delete_particlespawner.id); } + // no allocated memory in delete event + break; } - video::ITexture *texture = - gamedef->tsrc()->getTextureForMesh(*(event->add_particlespawner.texture)); + case CE_ADD_PARTICLESPAWNER: { + { + MutexAutoLock lock(m_spawner_list_lock); + if (m_particle_spawners.find(event->add_particlespawner.id) != + m_particle_spawners.end()) { + delete m_particle_spawners.find(event->add_particlespawner.id)->second; + m_particle_spawners.erase(event->add_particlespawner.id); + } + } - ParticleSpawner* toadd = new ParticleSpawner(gamedef, smgr, player, - event->add_particlespawner.amount, - event->add_particlespawner.spawntime, - *event->add_particlespawner.minpos, - *event->add_particlespawner.maxpos, - *event->add_particlespawner.minvel, - *event->add_particlespawner.maxvel, - *event->add_particlespawner.minacc, - *event->add_particlespawner.maxacc, - event->add_particlespawner.minexptime, - event->add_particlespawner.maxexptime, - event->add_particlespawner.minsize, - event->add_particlespawner.maxsize, - event->add_particlespawner.collisiondetection, - event->add_particlespawner.vertical, - texture, - event->add_particlespawner.id, - this); + video::ITexture *texture = + gamedef->tsrc()->getTextureForMesh(*(event->add_particlespawner.texture)); - /* delete allocated content of event */ - delete event->add_particlespawner.minpos; - delete event->add_particlespawner.maxpos; - delete event->add_particlespawner.minvel; - delete event->add_particlespawner.maxvel; - delete event->add_particlespawner.minacc; - delete event->add_particlespawner.texture; - delete event->add_particlespawner.maxacc; + ParticleSpawner* toadd = new ParticleSpawner(gamedef, smgr, player, + event->add_particlespawner.amount, + event->add_particlespawner.spawntime, + *event->add_particlespawner.minpos, + *event->add_particlespawner.maxpos, + *event->add_particlespawner.minvel, + *event->add_particlespawner.maxvel, + *event->add_particlespawner.minacc, + *event->add_particlespawner.maxacc, + event->add_particlespawner.minexptime, + event->add_particlespawner.maxexptime, + event->add_particlespawner.minsize, + event->add_particlespawner.maxsize, + event->add_particlespawner.collisiondetection, + event->add_particlespawner.vertical, + texture, + event->add_particlespawner.id, + this); - { - MutexAutoLock lock(m_spawner_list_lock); - m_particle_spawners.insert( - std::pair( - event->add_particlespawner.id, - toadd)); + /* delete allocated content of event */ + delete event->add_particlespawner.minpos; + delete event->add_particlespawner.maxpos; + delete event->add_particlespawner.minvel; + delete event->add_particlespawner.maxvel; + delete event->add_particlespawner.minacc; + delete event->add_particlespawner.texture; + delete event->add_particlespawner.maxacc; + + { + MutexAutoLock lock(m_spawner_list_lock); + m_particle_spawners.insert( + std::pair( + event->add_particlespawner.id, + toadd)); + } + break; } + case CE_SPAWN_PARTICLE: { + video::ITexture *texture = + gamedef->tsrc()->getTextureForMesh(*(event->spawn_particle.texture)); - return; - } + Particle* toadd = new Particle(gamedef, smgr, player, m_env, + *event->spawn_particle.pos, + *event->spawn_particle.vel, + *event->spawn_particle.acc, + event->spawn_particle.expirationtime, + event->spawn_particle.size, + event->spawn_particle.collisiondetection, + event->spawn_particle.vertical, + texture, + v2f(0.0, 0.0), + v2f(1.0, 1.0)); - if (event->type == CE_SPAWN_PARTICLE) { - video::ITexture *texture = - gamedef->tsrc()->getTextureForMesh(*(event->spawn_particle.texture)); + addParticle(toadd); - Particle* toadd = new Particle(gamedef, smgr, player, m_env, - *event->spawn_particle.pos, - *event->spawn_particle.vel, - *event->spawn_particle.acc, - event->spawn_particle.expirationtime, - event->spawn_particle.size, - event->spawn_particle.collisiondetection, - event->spawn_particle.vertical, - texture, - v2f(0.0, 0.0), - v2f(1.0, 1.0)); + delete event->spawn_particle.pos; + delete event->spawn_particle.vel; + delete event->spawn_particle.acc; - addParticle(toadd); - - delete event->spawn_particle.pos; - delete event->spawn_particle.vel; - delete event->spawn_particle.acc; - - return; + break; + } + default: break; } } From f9a90383e14a02ab0e66e5d5c36940a4ffb54502 Mon Sep 17 00:00:00 2001 From: gregorycu Date: Thu, 31 Mar 2016 01:07:47 +1100 Subject: [PATCH 405/531] Remove expensive copy of ContentFeatures --- src/map.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index 40950423..66fabaf8 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1614,7 +1614,7 @@ s32 Map::transforming_liquid_size() { return m_transforming_liquid.size(); } -void Map::transformLiquids(std::map & modified_blocks) +void Map::transformLiquids(std::map &modified_blocks) { INodeDefManager *nodemgr = m_gamedef->ndef(); @@ -1632,7 +1632,7 @@ void Map::transformLiquids(std::map & modified_blocks) std::deque must_reflow; // List of MapBlocks that will require a lighting update (due to lava) - std::map lighting_modified_blocks; + std::map lighting_modified_blocks; u32 liquid_loop_max = g_settings->getS32("liquid_loop_max"); u32 loop_max = liquid_loop_max; @@ -1675,7 +1675,7 @@ void Map::transformLiquids(std::map & modified_blocks) s8 liquid_level = -1; content_t liquid_kind = CONTENT_IGNORE; content_t floodable_node = CONTENT_AIR; - ContentFeatures cf = nodemgr->get(n0); + const ContentFeatures &cf = nodemgr->get(n0); LiquidType liquid_type = cf.liquid_type; switch (liquid_type) { case LIQUID_SOURCE: @@ -1721,7 +1721,7 @@ void Map::transformLiquids(std::map & modified_blocks) } v3s16 npos = p0 + dirs[i]; NodeNeighbor nb(getNodeNoEx(npos), nt, npos); - ContentFeatures cfnb = nodemgr->get(nb.n); + const ContentFeatures &cfnb = nodemgr->get(nb.n); switch (nodemgr->get(nb.n.getContent()).liquid_type) { case LIQUID_NONE: if (cfnb.floodable) { From c8ff11b417ae2c3a156bcaca819eaeec334c76b5 Mon Sep 17 00:00:00 2001 From: Rui914 Date: Tue, 29 Mar 2016 19:53:15 +0900 Subject: [PATCH 406/531] Mainmenu: Move description.txt textbox down Additionally, fix misc. code style issues --- builtin/mainmenu/tab_texturepacks.lua | 38 ++++++++++++++------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/builtin/mainmenu/tab_texturepacks.lua b/builtin/mainmenu/tab_texturepacks.lua index d669d568..2b0c77af 100644 --- a/builtin/mainmenu/tab_texturepacks.lua +++ b/builtin/mainmenu/tab_texturepacks.lua @@ -18,6 +18,7 @@ -------------------------------------------------------------------------------- local function filter_texture_pack_list(list) local retval = {} + for _, item in ipairs(list) do if item ~= "base" then retval[#retval + 1] = item @@ -35,9 +36,9 @@ local function render_texture_pack_list(list) local retval = "" for i, v in ipairs(list) do - if v:sub(1,1) ~= "." then + if v:sub(1, 1) ~= "." then if retval ~= "" then - retval = retval .."," + retval = retval .. "," end retval = retval .. core.formspec_escape(v) @@ -50,14 +51,14 @@ end -------------------------------------------------------------------------------- local function get_formspec(tabview, name, tabdata) - local retval = "label[4,-0.25;".. fgettext("Select texture pack:") .. "]".. + local retval = "label[4,-0.25;" .. fgettext("Select texture pack:") .. "]" .. "textlist[4,0.25;7.5,5.0;TPs;" local current_texture_path = core.setting_get("texture_path") local list = filter_texture_pack_list(core.get_dir_list(core.get_texturepath(), true)) local index = tonumber(core.setting_get("mainmenu_last_selected_TP")) - if index == nil then index = 1 end + if not index then index = 1 end if current_texture_path == "" then retval = retval .. @@ -66,15 +67,16 @@ local function get_formspec(tabview, name, tabdata) return retval end - local infofile = current_texture_path ..DIR_DELIM.."description.txt" + local infofile = current_texture_path .. DIR_DELIM .. "description.txt" -- This adds backwards compatibility for old texture pack description files named -- "info.txt", and should be removed once all such texture packs have been updated if not file_exists(infofile) then - infofile = current_texture_path ..DIR_DELIM.."info.txt" + infofile = current_texture_path .. DIR_DELIM .. "info.txt" if file_exists(infofile) then - core.log("info.txt is depreciated. description.txt should be used instead."); + core.log("info.txt is depreciated. description.txt should be used instead.") end end + local infotext = "" local f = io.open(infofile, "r") if not f then @@ -84,8 +86,8 @@ local function get_formspec(tabview, name, tabdata) f:close() end - local screenfile = current_texture_path..DIR_DELIM.."screenshot.png" - local no_screenshot = nil + local screenfile = current_texture_path .. DIR_DELIM .. "screenshot.png" + local no_screenshot if not file_exists(screenfile) then screenfile = nil no_screenshot = defaulttexturedir .. "no_screenshot.png" @@ -94,24 +96,24 @@ local function get_formspec(tabview, name, tabdata) return retval .. render_texture_pack_list(list) .. ";" .. index .. "]" .. - "image[0.25,0.25;4.0,3.7;"..core.formspec_escape(screenfile or no_screenshot).."]".. - "textarea[0.6,3.25;3.7,1.5;;"..core.formspec_escape(infotext or "")..";]" + "image[0.25,0.25;4.0,3.7;" .. core.formspec_escape(screenfile or no_screenshot) .. "]" .. + "textarea[0.6,3.5;3.7,1.5;;" .. core.formspec_escape(infotext or "") .. ";]" end -------------------------------------------------------------------------------- local function main_button_handler(tabview, fields, name, tabdata) - if fields["TPs"] ~= nil then + if fields["TPs"] then local event = core.explode_textlist_event(fields["TPs"]) if event.type == "CHG" or event.type == "DCL" then local index = core.get_textlist_index("TPs") - core.setting_set("mainmenu_last_selected_TP", - index) + core.setting_set("mainmenu_last_selected_TP", index) local list = filter_texture_pack_list(core.get_dir_list(core.get_texturepath(), true)) local current_index = core.get_textlist_index("TPs") - if current_index ~= nil and #list >= current_index then - local new_path = core.get_texturepath()..DIR_DELIM..list[current_index] - if list[current_index] == fgettext("None") then new_path = "" end - + if current_index and #list >= current_index then + local new_path = core.get_texturepath() .. DIR_DELIM .. list[current_index] + if list[current_index] == fgettext("None") then + new_path = "" + end core.setting_set("texture_path", new_path) end end From b8ac7b80e6031f1322b76d638256f8e4a52e89d1 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 2 Apr 2016 01:43:34 +0200 Subject: [PATCH 407/531] Fix nametag hiding Commit c3b279750ece0b5144bf8e973d55108347462223 "Move object nametags to camera" has added a regression to still display a shadow if their alpha got set to 0. --- src/camera.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/camera.cpp b/src/camera.cpp index 6c0f5d54..6893b8cb 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -540,6 +540,12 @@ void Camera::drawNametags() i = m_nametags.begin(); i != m_nametags.end(); ++i) { Nametag *nametag = *i; + if (nametag->nametag_color.getAlpha() == 0) { + // Enforce hiding nametag, + // because if freetype is enabled, a grey + // shadow can remain. + continue; + } v3f pos = nametag->parent_node->getPosition() + v3f(0.0, 1.1 * BS, 0.0); f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f }; trans.multiplyWith1x4Matrix(transformed_pos); From 66af984e0ec90eb58b21f7eb48641cd638dffdca Mon Sep 17 00:00:00 2001 From: kinokoio Date: Thu, 31 Mar 2016 12:19:41 -0600 Subject: [PATCH 408/531] Dungeongen: Update disabled torch placement code --- src/dungeongen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp index ce92319e..5bfc320c 100644 --- a/src/dungeongen.cpp +++ b/src/dungeongen.cpp @@ -44,7 +44,7 @@ DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams) this->vm = mapgen->vm; #ifdef DGEN_USE_TORCHES - c_torch = ndef->getId("default:torch"); + c_torch = mg->ndef->getId("default:torch"); #endif if (dparams) { From 01ae43c48009f816f4649fae2f7f6997452aa6cf Mon Sep 17 00:00:00 2001 From: Samuel Sieb Date: Sat, 2 Apr 2016 23:35:42 -0700 Subject: [PATCH 409/531] Add an option to colorize to respect the destination alpha Also, rework the colorizing code to be more efficient. --- doc/lua_api.txt | 9 +++++-- src/client/tile.cpp | 63 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index a01e7288..4a4e345a 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -357,8 +357,13 @@ The mask is applied using binary AND. #### `[colorize::` Colorize the textures with the given color. `` is specified as a `ColorString`. -`` is an int ranging from 0 to 255, and specifies how much of the -color to apply. If ommitted, the alpha will be used. +`` is an int ranging from 0 to 255 or the word "`alpha`". If +it is an int, then it specifies how far to interpolate between the +colors where 0 is only the texture color and 255 is only ``. If +omitted, the alpha of `` will be used as the ratio. If it is +the word "`alpha`", then the alpha of the color will be multiplied with +the alpha of the texture with the RGB of the color replacing the RGB of +the texture. Sounds ------ diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 7a9bc015..f0c0b4e9 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -558,6 +558,13 @@ static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst, static void blit_with_interpolate_overlay(video::IImage *src, video::IImage *dst, v2s32 src_pos, v2s32 dst_pos, v2u32 size, int ratio); +// Apply a color to an image. Uses an int (0-255) to calculate the ratio. +// If the ratio is 255 or -1 and keep_alpha is true, then it multiples the +// color alpha with the destination alpha. +// Otherwise, any pixels that are not fully transparent get the color alpha. +static void apply_colorize(video::IImage *dst, v2s32 dst_pos, v2u32 size, + video::SColor color, int ratio, bool keep_alpha); + // Apply a mask to an image static void apply_mask(video::IImage *mask, video::IImage *dst, v2s32 mask_pos, v2s32 dst_pos, v2u32 size); @@ -1639,27 +1646,17 @@ bool TextureSource::generateImagePart(std::string part_of_name, video::SColor color; int ratio = -1; + bool keep_alpha = false; if (!parseColorString(color_str, color, false)) return false; if (is_number(ratio_str)) ratio = mystoi(ratio_str, 0, 255); + else if (ratio_str == "alpha") + keep_alpha = true; - core::dimension2d dim = baseimg->getDimension(); - video::IImage *img = driver->createImage(video::ECF_A8R8G8B8, dim); - - if (!img) { - errorstream << "generateImagePart(): Could not create image " - << "for part_of_name=\"" << part_of_name - << "\", cancelling." << std::endl; - return false; - } - - img->fill(video::SColor(color)); - // Overlay the colored image - blit_with_interpolate_overlay(img, baseimg, v2s32(0,0), v2s32(0,0), dim, ratio); - img->drop(); + apply_colorize(baseimg, v2s32(0, 0), baseimg->getDimension(), color, ratio, keep_alpha); } else if (str_starts_with(part_of_name, "[applyfiltersformesh")) { @@ -1783,6 +1780,44 @@ static void blit_with_interpolate_overlay(video::IImage *src, video::IImage *dst } } +/* + Apply color to destination +*/ +static void apply_colorize(video::IImage *dst, v2s32 dst_pos, v2u32 size, + video::SColor color, int ratio, bool keep_alpha) +{ + u32 alpha = color.getAlpha(); + video::SColor dst_c; + if ((ratio == -1 && alpha == 255) || ratio == 255) { // full replacement of color + if (keep_alpha) { // replace the color with alpha = dest alpha * color alpha + dst_c = color; + for (s32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) + for (s32 x = dst_pos.X; x < dst_pos.X + size.X; x++) { + u32 dst_alpha = dst->getPixel(x, y).getAlpha(); + if (dst_alpha > 0) { + dst_c.setAlpha(dst_alpha * alpha / 255); + dst->setPixel(x, y, dst_c); + } + } + } else { // replace the color including the alpha + for (s32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) + for (s32 x = dst_pos.X; x < dst_pos.X + size.X; x++) + if (dst->getPixel(x, y).getAlpha() > 0) + dst->setPixel(x, y, color); + } + } else { // interpolate between the color and destination + float interp = (ratio == -1 ? color.getAlpha() / 255.0f : ratio / 255.0f); + for (s32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) + for (s32 x = dst_pos.X; x < dst_pos.X + size.X; x++) { + dst_c = dst->getPixel(x, y); + if (dst_c.getAlpha() > 0) { + dst_c = color.getInterpolated(dst_c, interp); + dst->setPixel(x, y, dst_c); + } + } + } +} + /* Apply mask to destination */ From 24b32ab09d1967866ddc092cadc6f6d678dac0c6 Mon Sep 17 00:00:00 2001 From: Samuel Sieb Date: Tue, 5 Apr 2016 15:36:24 -0700 Subject: [PATCH 410/531] Fix compiler warnings from "Add an option to colorize to respect the destination alpha" Fix warnings added by commit 01ae43c48009f816f4649fae2f7f6997452aa6cf Fixes #3952 --- src/client/tile.cpp | 50 ++++++++------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/src/client/tile.cpp b/src/client/tile.cpp index f0c0b4e9..f9f38ec6 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -553,16 +553,11 @@ static void blit_with_alpha(video::IImage *src, video::IImage *dst, static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst, v2s32 src_pos, v2s32 dst_pos, v2u32 size); -// Like blit_with_alpha overlay, but uses an int to calculate the ratio -// and modifies any destination pixels that are not fully transparent -static void blit_with_interpolate_overlay(video::IImage *src, video::IImage *dst, - v2s32 src_pos, v2s32 dst_pos, v2u32 size, int ratio); - // Apply a color to an image. Uses an int (0-255) to calculate the ratio. // If the ratio is 255 or -1 and keep_alpha is true, then it multiples the // color alpha with the destination alpha. // Otherwise, any pixels that are not fully transparent get the color alpha. -static void apply_colorize(video::IImage *dst, v2s32 dst_pos, v2u32 size, +static void apply_colorize(video::IImage *dst, v2u32 dst_pos, v2u32 size, video::SColor color, int ratio, bool keep_alpha); // Apply a mask to an image @@ -1656,7 +1651,7 @@ bool TextureSource::generateImagePart(std::string part_of_name, else if (ratio_str == "alpha") keep_alpha = true; - apply_colorize(baseimg, v2s32(0, 0), baseimg->getDimension(), color, ratio, keep_alpha); + apply_colorize(baseimg, v2u32(0, 0), baseimg->getDimension(), color, ratio, keep_alpha); } else if (str_starts_with(part_of_name, "[applyfiltersformesh")) { @@ -1753,37 +1748,10 @@ static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst, } } -/* - Draw an image on top of an another one, using the specified ratio - modify all partially-opaque pixels in the destination. -*/ -static void blit_with_interpolate_overlay(video::IImage *src, video::IImage *dst, - v2s32 src_pos, v2s32 dst_pos, v2u32 size, int ratio) -{ - for (u32 y0 = 0; y0 < size.Y; y0++) - for (u32 x0 = 0; x0 < size.X; x0++) - { - s32 src_x = src_pos.X + x0; - s32 src_y = src_pos.Y + y0; - s32 dst_x = dst_pos.X + x0; - s32 dst_y = dst_pos.Y + y0; - video::SColor src_c = src->getPixel(src_x, src_y); - video::SColor dst_c = dst->getPixel(dst_x, dst_y); - if (dst_c.getAlpha() > 0 && src_c.getAlpha() != 0) - { - if (ratio == -1) - dst_c = src_c.getInterpolated(dst_c, (float)src_c.getAlpha()/255.0f); - else - dst_c = src_c.getInterpolated(dst_c, (float)ratio/255.0f); - dst->setPixel(dst_x, dst_y, dst_c); - } - } -} - /* Apply color to destination */ -static void apply_colorize(video::IImage *dst, v2s32 dst_pos, v2u32 size, +static void apply_colorize(video::IImage *dst, v2u32 dst_pos, v2u32 size, video::SColor color, int ratio, bool keep_alpha) { u32 alpha = color.getAlpha(); @@ -1791,8 +1759,8 @@ static void apply_colorize(video::IImage *dst, v2s32 dst_pos, v2u32 size, if ((ratio == -1 && alpha == 255) || ratio == 255) { // full replacement of color if (keep_alpha) { // replace the color with alpha = dest alpha * color alpha dst_c = color; - for (s32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) - for (s32 x = dst_pos.X; x < dst_pos.X + size.X; x++) { + for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) + for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) { u32 dst_alpha = dst->getPixel(x, y).getAlpha(); if (dst_alpha > 0) { dst_c.setAlpha(dst_alpha * alpha / 255); @@ -1800,15 +1768,15 @@ static void apply_colorize(video::IImage *dst, v2s32 dst_pos, v2u32 size, } } } else { // replace the color including the alpha - for (s32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) - for (s32 x = dst_pos.X; x < dst_pos.X + size.X; x++) + for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) + for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) if (dst->getPixel(x, y).getAlpha() > 0) dst->setPixel(x, y, color); } } else { // interpolate between the color and destination float interp = (ratio == -1 ? color.getAlpha() / 255.0f : ratio / 255.0f); - for (s32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) - for (s32 x = dst_pos.X; x < dst_pos.X + size.X; x++) { + for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++) + for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) { dst_c = dst->getPixel(x, y); if (dst_c.getAlpha() > 0) { dst_c = color.getInterpolated(dst_c, interp); From 15e1dcc020ca5c64e4b5b306529e513cb2b97bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathana=C3=ABl=20Courant?= Date: Wed, 6 Apr 2016 01:11:36 +0200 Subject: [PATCH 411/531] Fix #3955 (player dying on login). It was caused by player not moving because fall was prevented, but their velocity still increasing, causing fatal fall damage when world was finally loaded. This commit fixes it by setting player velocity to zero when the world around them is not loaded. --- src/collision.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/collision.cpp b/src/collision.cpp index 16db3310..74c0c25c 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -332,8 +332,10 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, // Do not move if world has not loaded yet, since custom node boxes // are not available for collision detection. - if (!any_position_valid) + if (!any_position_valid) { + *speed_f = v3f(0, 0, 0); return result; + } } // tt2 From ecdd5921a14a8e61ab1bd1338d61373ad96d5d3d Mon Sep 17 00:00:00 2001 From: Samuel Sieb Date: Wed, 6 Apr 2016 00:38:11 -0700 Subject: [PATCH 412/531] Clearer explanation of [colorize with alpha --- doc/lua_api.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 4a4e345a..a03a95d9 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -361,9 +361,9 @@ Colorize the textures with the given color. it is an int, then it specifies how far to interpolate between the colors where 0 is only the texture color and 255 is only ``. If omitted, the alpha of `` will be used as the ratio. If it is -the word "`alpha`", then the alpha of the color will be multiplied with -the alpha of the texture with the RGB of the color replacing the RGB of -the texture. +the word "`alpha`", then each texture pixel will contain the RGB of +`` and the alpha of `` multiplied by the alpha of the +texture pixel. Sounds ------ From c3993f6604a646b42c1586219c471acb6d9895c6 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 7 Apr 2016 04:01:43 -0400 Subject: [PATCH 413/531] Re-add and disable blit_with_interpolate_overlay --- src/client/tile.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/client/tile.cpp b/src/client/tile.cpp index f9f38ec6..e6668063 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -1748,6 +1748,37 @@ static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst, } } +// This function has been disabled because it is currently unused. +// Feel free to re-enable if you find it handy. +#if 0 +/* + Draw an image on top of an another one, using the specified ratio + modify all partially-opaque pixels in the destination. +*/ +static void blit_with_interpolate_overlay(video::IImage *src, video::IImage *dst, + v2s32 src_pos, v2s32 dst_pos, v2u32 size, int ratio) +{ + for (u32 y0 = 0; y0 < size.Y; y0++) + for (u32 x0 = 0; x0 < size.X; x0++) + { + s32 src_x = src_pos.X + x0; + s32 src_y = src_pos.Y + y0; + s32 dst_x = dst_pos.X + x0; + s32 dst_y = dst_pos.Y + y0; + video::SColor src_c = src->getPixel(src_x, src_y); + video::SColor dst_c = dst->getPixel(dst_x, dst_y); + if (dst_c.getAlpha() > 0 && src_c.getAlpha() != 0) + { + if (ratio == -1) + dst_c = src_c.getInterpolated(dst_c, (float)src_c.getAlpha()/255.0f); + else + dst_c = src_c.getInterpolated(dst_c, (float)ratio/255.0f); + dst->setPixel(dst_x, dst_y, dst_c); + } + } +} +#endif + /* Apply color to destination */ From 465bb6f5d13803819f329e4920bceb25a3887c6f Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 2 Apr 2016 02:05:08 +0100 Subject: [PATCH 414/531] Mapgen: Optimise cave noises and tunnel excavation Instead of doing nothing at node_max.Y + 1 use 1-down overgeneration for tunnel generation and noisemaps Move some old unused code in mgv7 to end of file --- src/mapgen_flat.cpp | 26 ++--- src/mapgen_flat.h | 2 +- src/mapgen_fractal.cpp | 26 ++--- src/mapgen_fractal.h | 2 +- src/mapgen_v7.cpp | 219 +++++++++++++++++++++-------------------- src/mapgen_v7.h | 2 +- src/mapgen_valleys.cpp | 32 +++--- src/mapgen_valleys.h | 1 + 8 files changed, 162 insertions(+), 148 deletions(-) diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index 7a5302df..ecfbe49b 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -58,7 +58,8 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge //// amount of elements to skip for the next index //// for noise/height/biome maps (not vmanip) this->ystride = csize.X; - this->zstride = csize.X * (csize.Y + 2); + // 1-down overgeneration + this->zstride_1d = csize.X * (csize.Y + 1); this->biomemap = new u8[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z]; @@ -80,8 +81,9 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); //// 3D noise - noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z); - noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z); + // 1-down overgeneraion + noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z); + noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z); //// Biome noise noise_heat = new Noise(¶ms->np_biome_heat, seed, csize.X, csize.Z); @@ -566,19 +568,19 @@ void MapgenFlat::generateCaves(s16 max_stone_y) for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { bool column_is_open = false; // Is column open to overground bool is_tunnel = false; // Is tunnel or tunnel floor - u32 vi = vm->m_area.index(x, node_max.Y + 1, z); - u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + u32 vi = vm->m_area.index(x, node_max.Y, z); + u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + (x - node_min.X); // Biome of column Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); - for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; - y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { - // Don't excavate the overgenerated stone at node_max.Y + 1, - // this creates a 'roof' over the tunnel, preventing light in - // tunnels at mapchunk borders when generating mapchunks upwards. - if (y > node_max.Y) - continue; + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + // This 'roof' is removed when the mapchunk above is generated. + for (s16 y = node_max.Y; y >= node_min.Y - 1; y--, + index3d -= ystride, + vm->m_area.add_y(em, vi, -1)) { content_t c = vm->m_data[vi].getContent(); if (c == CONTENT_AIR || c == biome->c_water_top || diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h index 282e4297..8ddfe708 100644 --- a/src/mapgen_flat.h +++ b/src/mapgen_flat.h @@ -60,7 +60,7 @@ public: BiomeManager *bmgr; int ystride; - int zstride; + int zstride_1d; u32 spflags; v3s16 node_min; diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 0430f92f..810645ab 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -56,7 +56,8 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * //// amount of elements to skip for the next index //// for noise/height/biome maps (not vmanip) this->ystride = csize.X; - this->zstride = csize.X * (csize.Y + 2); + // 1-down overgeneration + this->zstride_1d = csize.X * (csize.Y + 1); this->biomemap = new u8[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z]; @@ -85,8 +86,9 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); //// 3D terrain noise - noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z); - noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z); + // 1-down overgeneraion + noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z); + noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z); //// Biome noise noise_heat = new Noise(¶ms->np_biome_heat, seed, csize.X, csize.Z); @@ -694,19 +696,19 @@ void MapgenFractal::generateCaves(s16 max_stone_y) for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { bool column_is_open = false; // Is column open to overground bool is_tunnel = false; // Is tunnel or tunnel floor - u32 vi = vm->m_area.index(x, node_max.Y + 1, z); - u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + + u32 vi = vm->m_area.index(x, node_max.Y, z); + u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + (x - node_min.X); // Biome of column Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); - for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; - y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { - // Don't excavate the overgenerated stone at node_max.Y + 1, - // this creates a 'roof' over the tunnel, preventing light in - // tunnels at mapchunk borders when generating mapchunks upwards. - if (y > node_max.Y) - continue; + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + // This 'roof' is removed when the mapchunk above is generated. + for (s16 y = node_max.Y; y >= node_min.Y - 1; y--, + index3d -= ystride, + vm->m_area.add_y(em, vi, -1)) { content_t c = vm->m_data[vi].getContent(); if (c == CONTENT_AIR || c == biome->c_water_top || diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index ffb2acfb..8c21a8a4 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -65,7 +65,7 @@ public: BiomeManager *bmgr; int ystride; - int zstride; + int zstride_1d; u16 formula; bool julia; diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 42fbe442..54abba14 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -59,7 +59,8 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) //// amount of elements to skip for the next index //// for noise/height/biome maps (not vmanip) this->ystride = csize.X; - this->zstride = csize.X * (csize.Y + 2); + // 1-down overgeneration + this->zstride_1d = csize.X * (csize.Y + 1); this->biomemap = new u8[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z]; @@ -80,10 +81,12 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) noise_ridge_uwater = new Noise(&sp->np_ridge_uwater, seed, csize.X, csize.Z); //// 3d terrain noise + // 1-up 1-down overgeneration noise_mountain = new Noise(&sp->np_mountain, seed, csize.X, csize.Y + 2, csize.Z); noise_ridge = new Noise(&sp->np_ridge, seed, csize.X, csize.Y + 2, csize.Z); - noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z); - noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z); + // 1-down overgeneraion + noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z); + noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z); //// Biome noise noise_heat = new Noise(¶ms->np_biome_heat, seed, csize.X, csize.Z); @@ -199,7 +202,7 @@ void MapgenV7Params::writeParams(Settings *settings) const } -/////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// int MapgenV7::getSpawnLevelAtPoint(v2s16 p) @@ -451,41 +454,6 @@ bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y) } -#if 0 -void MapgenV7::carveRivers() { - MapNode n_air(CONTENT_AIR), n_water_source(c_water_source); - MapNode n_stone(c_stone); - u32 index = 0; - - int river_depth = 4; - - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 x = node_min.X; x <= node_max.X; x++, index++) { - float terrain_mod = noise_terrain_mod->result[index]; - NoiseParams *np = noise_terrain_river->np; - np.persist = noise_terrain_persist->result[index]; - float terrain_river = NoisePerlin2DNoTxfm(np, x, z, seed); - float height = terrain_river * (1 - abs(terrain_mod)) * - noise_terrain_river->np.scale; - height = log(height * height); //log(h^3) is pretty interesting for terrain - - s16 y = heightmap[index]; - if (height < 1.0 && y > river_depth && - y - river_depth >= node_min.Y && y <= node_max.Y) { - - for (s16 ry = y; ry != y - river_depth; ry--) { - u32 vi = vm->m_area.index(x, ry, z); - vm->m_data[vi] = n_air; - } - - u32 vi = vm->m_area.index(x, y - river_depth, z); - vm->m_data[vi] = n_water_source; - } - } -} -#endif - - int MapgenV7::generateTerrain() { s16 stone_surface_min_y; @@ -765,6 +733,112 @@ void MapgenV7::dustTopNodes() } +void MapgenV7::generateCaves(s16 max_stone_y) +{ + if (max_stone_y < node_min.Y) + return; + + noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool column_is_open = false; // Is column open to overground + bool is_tunnel = false; // Is tunnel or tunnel floor + // Indexes at column top (node_max.Y) + u32 vi = vm->m_area.index(x, node_max.Y, z); + u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + // This 'roof' is removed when the mapchunk above is generated. + for (s16 y = node_max.Y; y >= node_min.Y - 1; y--, + index3d -= ystride, + vm->m_area.add_y(em, vi, -1)) { + + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + column_is_open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate + vm->m_data[vi] = MapNode(CONTENT_AIR); + is_tunnel = true; + } else if (is_tunnel && column_is_open && + (c == biome->c_filler || c == biome->c_stone)) { + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + column_is_open = false; + is_tunnel = false; + } else { + column_is_open = false; + is_tunnel = false; + } + } + } + + if (node_min.Y >= water_level) + return; + + PseudoRandom ps(blockseed + 21343); + u32 bruises_count = ps.range(0, 2); + for (u32 i = 0; i < bruises_count; i++) { + CaveV7 cave(this, &ps); + cave.makeCave(node_min, node_max, max_stone_y); + } +} + + +/////////////////////////////////////////////////////////////// + + +#if 0 +void MapgenV7::carveRivers() { + MapNode n_air(CONTENT_AIR), n_water_source(c_water_source); + MapNode n_stone(c_stone); + u32 index = 0; + + int river_depth = 4; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index++) { + float terrain_mod = noise_terrain_mod->result[index]; + NoiseParams *np = noise_terrain_river->np; + np.persist = noise_terrain_persist->result[index]; + float terrain_river = NoisePerlin2DNoTxfm(np, x, z, seed); + float height = terrain_river * (1 - abs(terrain_mod)) * + noise_terrain_river->np.scale; + height = log(height * height); //log(h^3) is pretty interesting for terrain + + s16 y = heightmap[index]; + if (height < 1.0 && y > river_depth && + y - river_depth >= node_min.Y && y <= node_max.Y) { + + for (s16 ry = y; ry != y - river_depth; ry--) { + u32 vi = vm->m_area.index(x, ry, z); + vm->m_data[vi] = n_air; + } + + u32 vi = vm->m_area.index(x, y - river_depth, z); + vm->m_data[vi] = n_water_source; + } + } +} +#endif + + #if 0 void MapgenV7::addTopNodes() { @@ -859,70 +933,3 @@ void MapgenV7::addTopNodes() } } #endif - - -void MapgenV7::generateCaves(s16 max_stone_y) -{ - if (max_stone_y < node_min.Y) - return; - - noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - - v3s16 em = vm->m_area.getExtent(); - u32 index2d = 0; - - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { - bool column_is_open = false; // Is column open to overground - bool is_tunnel = false; // Is tunnel or tunnel floor - u32 vi = vm->m_area.index(x, node_max.Y + 1, z); - u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + - (x - node_min.X); - // Biome of column - Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); - - for (s16 y = node_max.Y + 1; y >= node_min.Y - 1; - y--, index3d -= ystride, vm->m_area.add_y(em, vi, -1)) { - // Don't excavate the overgenerated stone at node_max.Y + 1, - // this creates a 'roof' over the tunnel, preventing light in - // tunnels at mapchunk borders when generating mapchunks upwards. - if (y > node_max.Y) - continue; - - content_t c = vm->m_data[vi].getContent(); - if (c == CONTENT_AIR || c == biome->c_water_top || - c == biome->c_water) { - column_is_open = true; - continue; - } - // Ground - float d1 = contour(noise_cave1->result[index3d]); - float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { - // In tunnel and ground content, excavate - vm->m_data[vi] = MapNode(CONTENT_AIR); - is_tunnel = true; - } else if (is_tunnel && column_is_open && - (c == biome->c_filler || c == biome->c_stone)) { - // Tunnel entrance floor - vm->m_data[vi] = MapNode(biome->c_top); - column_is_open = false; - is_tunnel = false; - } else { - column_is_open = false; - is_tunnel = false; - } - } - } - - if (node_min.Y >= water_level) - return; - - PseudoRandom ps(blockseed + 21343); - u32 bruises_count = ps.range(0, 2); - for (u32 i = 0; i < bruises_count; i++) { - CaveV7 cave(this, &ps); - cave.makeCave(node_min, node_max, max_stone_y); - } -} diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h index 82f89387..9fdecf59 100644 --- a/src/mapgen_v7.h +++ b/src/mapgen_v7.h @@ -59,7 +59,7 @@ public: BiomeManager *bmgr; int ystride; - int zstride; + int zstride_1d; u32 spflags; v3s16 node_min; diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index 34a316ab..be122aac 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -74,6 +74,8 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * //// for noise/height/biome maps (not vmanip) this->ystride = csize.X; this->zstride = csize.X * (csize.Y + 2); + // 1-down overgeneration + this->zstride_1d = csize.X * (csize.Y + 1); this->biomemap = new u8[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z]; @@ -113,10 +115,12 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * noise_valley_profile = new Noise(&sp->np_valley_profile, seed, csize.X, csize.Z); //// 3D Terrain noise - noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z); - noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z); + // 1-up 1-down overgeneration noise_inter_valley_fill = new Noise(&sp->np_inter_valley_fill, seed, csize.X, csize.Y + 2, csize.Z); - noise_massive_caves = new Noise(&sp->np_massive_caves, seed, csize.X, csize.Y + 2, csize.Z); + // 1-down overgeneraion + noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z); + noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z); + noise_massive_caves = new Noise(&sp->np_massive_caves, seed, csize.X, csize.Y + 1, csize.Z); //// Biome noise noise_heat_blend = new Noise(¶ms->np_biome_heat_blend, seed, csize.X, csize.Z); @@ -885,7 +889,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y) if (node_max.Y <= massive_cave_depth) { noise_massive_caves->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { + for (s16 y = node_min.Y - 1; y <= node_max.Y; y++) { float tcave = massive_cave_threshold; if (y < yblmin) { @@ -923,19 +927,17 @@ void MapgenValleys::generateCaves(s16 max_stone_y) Biome *biome = (Biome *)bmgr->getRaw(biomemap[index_2d]); bool air_above = false; bool underground = false; - u32 index_data = vm->m_area.index(x, node_max.Y + 1, z); - - index_3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride + (x - node_min.X); + u32 index_data = vm->m_area.index(x, node_max.Y, z); + index_3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + (x - node_min.X); // Dig caves on down loop to check for air above. - for (s16 y = node_max.Y + 1; - y >= node_min.Y - 1; - y--, index_3d -= ystride, vm->m_area.add_y(em, index_data, -1)) { - // Don't excavate the overgenerated stone at node_max.Y + 1, - // this creates a 'roof' over the tunnel, preventing light in - // tunnels at mapchunk borders when generating mapchunks upwards. - if (y > node_max.Y) - continue; + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + // This 'roof' is removed when the mapchunk above is generated. + for (s16 y = node_max.Y; y >= node_min.Y - 1; y--, + index_3d -= ystride, + vm->m_area.add_y(em, index_data, -1)) { float terrain = noise_terrain_height->result[index_2d]; diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h index 6b3eb9cf..4ad2d207 100644 --- a/src/mapgen_valleys.h +++ b/src/mapgen_valleys.h @@ -106,6 +106,7 @@ private: int ystride; int zstride; + int zstride_1d; float map_gen_limit; From 27ee8d8943080a5dd735c9faa47c726604bafdff Mon Sep 17 00:00:00 2001 From: David Knapp Date: Tue, 5 Apr 2016 23:53:00 -0700 Subject: [PATCH 415/531] Fix ncurses lookup on Arch Linux Arch Linux doesn't put it's ncursesw includes inside an ncursesw directory. This script ends up setting USE_CURSES as true, but doesn't pick up any of the headers. https://bugs.archlinux.org/task/13994 --- cmake/Modules/FindNcursesw.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cmake/Modules/FindNcursesw.cmake b/cmake/Modules/FindNcursesw.cmake index dcb7cdda..b8c7f78f 100644 --- a/cmake/Modules/FindNcursesw.cmake +++ b/cmake/Modules/FindNcursesw.cmake @@ -147,6 +147,21 @@ if(CURSES_USE_NCURSESW) set(CURSES_HAVE_NCURSESW_CURSES_H "CURSES_HAVE_NCURSESW_CURSES_H-NOTFOUND") endif() endif() + if(NOT DEFINED CURSES_HAVE_NCURSES_H) + if(EXISTS "${CURSES_INCLUDE_PATH}/ncurses.h") + set(CURSES_HAVE_NCURSES_H "${CURSES_INCLUDE_PATH}/ncurses.h") + else() + set(CURSES_HAVE_NCURSES_H "CURSES_HAVE_NCURSES_H-NOTFOUND") + endif() + endif() + if(NOT DEFINED CURSES_HAVE_CURSES_H) + if(EXISTS "${CURSES_INCLUDE_PATH}/curses.h") + set(CURSES_HAVE_CURSES_H "${CURSES_INCLUDE_PATH}/curses.h") + else() + set(CURSES_HAVE_CURSES_H "CURSES_HAVE_CURSES_H-NOTFOUND") + endif() + endif() + find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}" DOC "Path to libform.so or .lib or .a") From 92d4a738435c4b8d5944375c596befcc15b3f47c Mon Sep 17 00:00:00 2001 From: Rui914 Date: Thu, 31 Mar 2016 17:26:39 +0900 Subject: [PATCH 416/531] Mainmenu: Refactor tab UI code - Use local variables for tabs in place of globals - Merge together if statements where possible - Replace manual table searching code with indexof where possible --- builtin/init.lua | 22 +++--- builtin/mainmenu/init.lua | 100 ++++++++++++-------------- builtin/mainmenu/init_simple.lua | 2 +- builtin/mainmenu/tab_credits.lua | 2 +- builtin/mainmenu/tab_mods.lua | 2 +- builtin/mainmenu/tab_multiplayer.lua | 4 +- builtin/mainmenu/tab_server.lua | 4 +- builtin/mainmenu/tab_settings.lua | 2 +- builtin/mainmenu/tab_simple_main.lua | 4 +- builtin/mainmenu/tab_singleplayer.lua | 4 +- builtin/mainmenu/tab_texturepacks.lua | 4 +- 11 files changed, 70 insertions(+), 80 deletions(-) diff --git a/builtin/init.lua b/builtin/init.lua index 6b27cf76..4400a19d 100644 --- a/builtin/init.lua +++ b/builtin/init.lua @@ -12,7 +12,7 @@ if core.print then -- Override native print and use -- terminal if that's turned on function print(...) - local n, t = select("#", ...), { ... } + local n, t = select("#", ...), {...} for i = 1, n do t[i] = tostring(t[i]) end @@ -25,26 +25,26 @@ os.setlocale("C", "numeric") minetest = core -- Load other files -local scriptdir = core.get_builtin_path()..DIR_DELIM -local gamepath = scriptdir.."game"..DIR_DELIM -local commonpath = scriptdir.."common"..DIR_DELIM -local asyncpath = scriptdir.."async"..DIR_DELIM +local scriptdir = core.get_builtin_path() .. DIR_DELIM +local gamepath = scriptdir .. "game" .. DIR_DELIM +local commonpath = scriptdir .. "common" .. DIR_DELIM +local asyncpath = scriptdir .. "async" .. DIR_DELIM -dofile(commonpath.."strict.lua") -dofile(commonpath.."serialize.lua") -dofile(commonpath.."misc_helpers.lua") +dofile(commonpath .. "strict.lua") +dofile(commonpath .. "serialize.lua") +dofile(commonpath .. "misc_helpers.lua") if INIT == "game" then - dofile(gamepath.."init.lua") + dofile(gamepath .. "init.lua") elseif INIT == "mainmenu" then local mainmenuscript = core.setting_get("main_menu_script") if mainmenuscript ~= nil and mainmenuscript ~= "" then dofile(mainmenuscript) else - dofile(core.get_mainmenu_path()..DIR_DELIM.."init.lua") + dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua") end elseif INIT == "async" then - dofile(asyncpath.."init.lua") + dofile(asyncpath .. "init.lua") else error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT))) end diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 69536630..6dd345ff 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -37,23 +37,29 @@ dofile(menupath .. DIR_DELIM .. "common.lua") dofile(menupath .. DIR_DELIM .. "gamemgr.lua") dofile(menupath .. DIR_DELIM .. "modmgr.lua") dofile(menupath .. DIR_DELIM .. "store.lua") +dofile(menupath .. DIR_DELIM .. "textures.lua") + dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua") -dofile(menupath .. DIR_DELIM .. "tab_credits.lua") -dofile(menupath .. DIR_DELIM .. "tab_mods.lua") -dofile(menupath .. DIR_DELIM .. "tab_settings.lua") dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua") if PLATFORM ~= "Android" then dofile(menupath .. DIR_DELIM .. "dlg_create_world.lua") dofile(menupath .. DIR_DELIM .. "dlg_delete_mod.lua") dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua") dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua") - dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua") - dofile(menupath .. DIR_DELIM .. "tab_server.lua") - dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua") - dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua") - dofile(menupath .. DIR_DELIM .. "textures.lua") +end + +local tabs = {} + +tabs.settings = dofile(menupath .. DIR_DELIM .. "tab_settings.lua") +tabs.mods = dofile(menupath .. DIR_DELIM .. "tab_mods.lua") +tabs.credits = dofile(menupath .. DIR_DELIM .. "tab_credits.lua") +if PLATFORM == "Android" then + tabs.simple_main = dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua") else - dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua") + tabs.singleplayer = dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua") + tabs.multiplayer = dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua") + tabs.server = dofile(menupath .. DIR_DELIM .. "tab_server.lua") + tabs.texturepacks = dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua") end -------------------------------------------------------------------------------- @@ -69,8 +75,19 @@ local function init_globals() -- Init gamedata gamedata.worldindex = 0 + if PLATFORM == "Android" then + local world_list = core.get_worlds() + local world_index = table.indexof(world_list, "singleplayerworld") - if PLATFORM ~= "Android" then + if world_index == -1 then + core.create_world("singleplayerworld", 1) + + world_list = core.get_worlds() + world_index = table.indexof(world_list, "singleplayerworld") + end + + gamedata.worldindex = world_index + else menudata.worldlist = filterlist.create( core.get_worlds, compare_worlds, @@ -89,61 +106,34 @@ local function init_globals() if not core.setting_get("menu_last_game") then local default_game = core.setting_get("default_game") or "minetest" - core.setting_set("menu_last_game", default_game ) + core.setting_set("menu_last_game", default_game) end mm_texture.init() - else - local world_list = core.get_worlds() - - local found_singleplayerworld = false - - for i,world in pairs(world_list) do - if world.name == "singleplayerworld" then - found_singleplayerworld = true - gamedata.worldindex = i - break - end - end - - if not found_singleplayerworld then - core.create_world("singleplayerworld", 1) - - local world_list = core.get_worlds() - - for i,world in pairs(world_list) do - if world.name == "singleplayerworld" then - gamedata.worldindex = i - break - end - end - end end -- Create main tabview - local tv_main = tabview_create("maintab",{x=12,y=5.2},{x=0,y=0}) - if PLATFORM ~= "Android" then - tv_main:set_autosave_tab(true) - end - if PLATFORM ~= "Android" then - tv_main:add(tab_singleplayer) - tv_main:add(tab_multiplayer) - tv_main:add(tab_server) + local tv_main = tabview_create("maintab", {x = 12, y = 5.2}, {x = 0, y = 0}) + + if PLATFORM == "Android" then + tv_main:add(tabs.simple_main) + tv_main:add(tabs.settings) else - tv_main:add(tab_simple_main) + tv_main:set_autosave_tab(true) + tv_main:add(tabs.singleplayer) + tv_main:add(tabs.multiplayer) + tv_main:add(tabs.server) + tv_main:add(tabs.settings) + tv_main:add(tabs.texturepacks) end - tv_main:add(tab_settings) - if PLATFORM ~= "Android" then - tv_main:add(tab_texturepacks) - end - tv_main:add(tab_mods) - tv_main:add(tab_credits) + + tv_main:add(tabs.mods) + tv_main:add(tabs.credits) tv_main:set_global_event_handler(main_event_handler) - tv_main:set_fixed_size(false) - if not (PLATFORM == "Android") then + if PLATFORM ~= "Android" then tv_main:set_tab(core.setting_get("maintab_LAST")) end ui.set_default("maintab") @@ -151,9 +141,9 @@ local function init_globals() -- Create modstore ui if PLATFORM == "Android" then - modstore.init({x=12, y=6}, 3, 2) + modstore.init({x = 12, y = 6}, 3, 2) else - modstore.init({x=12, y=8}, 4, 3) + modstore.init({x = 12, y = 8}, 4, 3) end ui.update() diff --git a/builtin/mainmenu/init_simple.lua b/builtin/mainmenu/init_simple.lua index c3891d21..298bd834 100644 --- a/builtin/mainmenu/init_simple.lua +++ b/builtin/mainmenu/init_simple.lua @@ -1,4 +1,4 @@ -- helper file to be able to debug the simple menu on PC -- without messing around with actual menu code! -PLATFORM="Android" +PLATFORM = "Android" dofile("builtin/mainmenu/init.lua") diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 5cb730b3..822f6484 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -69,7 +69,7 @@ local previous_contributors = { "Zefram ", } -tab_credits = { +return { name = "credits", caption = fgettext("Credits"), cbf_formspec = function(tabview, name, tabdata) diff --git a/builtin/mainmenu/tab_mods.lua b/builtin/mainmenu/tab_mods.lua index af758f8d..69027c01 100644 --- a/builtin/mainmenu/tab_mods.lua +++ b/builtin/mainmenu/tab_mods.lua @@ -163,7 +163,7 @@ local function handle_buttons(tabview, fields, tabname, tabdata) end -------------------------------------------------------------------------------- -tab_mods = { +return { name = "mods", caption = fgettext("Mods"), cbf_formspec = get_formspec, diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index 2072f8c3..06d8791f 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -256,10 +256,10 @@ local function on_change(type,old_tab,new_tab) end -------------------------------------------------------------------------------- -tab_multiplayer = { +return { name = "multiplayer", caption = fgettext("Client"), cbf_formspec = get_formspec, cbf_button_handler = main_button_handler, on_change = on_change - } +} diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua index d08eecc2..6b96825a 100644 --- a/builtin/mainmenu/tab_server.lua +++ b/builtin/mainmenu/tab_server.lua @@ -186,10 +186,10 @@ local function main_button_handler(this, fields, name, tabdata) end -------------------------------------------------------------------------------- -tab_server = { +return { name = "server", caption = fgettext("Server"), cbf_formspec = get_formspec, cbf_button_handler = main_button_handler, on_change = nil - } +} diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 6285968e..2649a8a5 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -384,7 +384,7 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) return ddhandled end -tab_settings = { +return { name = "settings", caption = fgettext("Settings"), cbf_formspec = formspec, diff --git a/builtin/mainmenu/tab_simple_main.lua b/builtin/mainmenu/tab_simple_main.lua index 434113b5..b3241893 100644 --- a/builtin/mainmenu/tab_simple_main.lua +++ b/builtin/mainmenu/tab_simple_main.lua @@ -196,10 +196,10 @@ local function on_activate(type,old_tab,new_tab) end -------------------------------------------------------------------------------- -tab_simple_main = { +return { name = "main", caption = fgettext("Main"), cbf_formspec = get_formspec, cbf_button_handler = main_button_handler, on_change = on_activate - } +} diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua index a40918af..05060cbc 100644 --- a/builtin/mainmenu/tab_singleplayer.lua +++ b/builtin/mainmenu/tab_singleplayer.lua @@ -241,10 +241,10 @@ local function on_change(type, old_tab, new_tab) end -------------------------------------------------------------------------------- -tab_singleplayer = { +return { name = "singleplayer", caption = fgettext("Singleplayer"), cbf_formspec = get_formspec, cbf_button_handler = main_button_handler, on_change = on_change - } +} diff --git a/builtin/mainmenu/tab_texturepacks.lua b/builtin/mainmenu/tab_texturepacks.lua index 2b0c77af..a102fd61 100644 --- a/builtin/mainmenu/tab_texturepacks.lua +++ b/builtin/mainmenu/tab_texturepacks.lua @@ -123,10 +123,10 @@ local function main_button_handler(tabview, fields, name, tabdata) end -------------------------------------------------------------------------------- -tab_texturepacks = { +return { name = "texturepacks", caption = fgettext("Texturepacks"), cbf_formspec = get_formspec, cbf_button_handler = main_button_handler, on_change = nil - } +} From af799d4bd2d277a108154f815ff6b6b7a8394a9a Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 7 Apr 2016 21:50:33 -0700 Subject: [PATCH 417/531] Minimap: "North" indicator arrow for circle minimap Related: #3730 This adds a simple, and small "North" indicator to the circular minimap. The indicator is in a classical triangle-like arrow with a little bit of shading to accentuate the shape and give it a little bit depth. The indicator is stuck exactly at the edge as far outwards as possible, and is not too intrusive but still easy enough to spot. --- textures/base/pack/minimap_overlay_round.png | Bin 13105 -> 4398 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/base/pack/minimap_overlay_round.png b/textures/base/pack/minimap_overlay_round.png index fd0f9a6d23b1ff3399e9704b9b452c24ab123221..959535bd9fa3ac3eb59b5bcb52f1f6817683e6d6 100644 GIT binary patch literal 4398 zcmbVQ`9IW)_kPc2#=bN5ogoH8m#j0EX6%y`A|}FcKUpJtV}_6$lbysUin1j%_K_?_ znpRXau4J#M?912v7ry7b&Uv2myq@#x`Qc;|o$>rU(mVhF@Y@k=Tmb-lM8NaejJ%VmtCDt z1K4j9f&UGD4tN_N113i}8o0v=o>2h6EBar7fYLJLkqEzR=VS}#KoL;1foJ^TG5`qC z>}+suu^(5@cjwLy3J-D>+vRj<6;)?>Z$jr?8Ser##{R+?RMQsibZ0oAJ*cF8iB*A0 zTC?xiTL>L$2S5pXqn9DoTJ_GKyH~?HdJj78>*ob5TZAcKCUate7}J}9$IQ$-r?wq5 zhBwwP{_c(Gw7lJehB3l1ZzmFfy4q7s@HU6A^OriKxgH?4HiE~016C;(bI1nsNq9r^ zlwvVe9;}#n3W*94lV$gMY^U5gQ(dk52+?MJN~15w*J9sCU13 z*Ciw2K@gYrApxL@vR~~>Cv5Hdec(Th?tFD$XzLQupB-eQo8|b?Hjm(I3Jrj;Y~e0Hr}=FMdUSYKi~6|O;qO0U1u z%qTdZ{gxqLZR6dz8v7~fa3su9a9WPSHo1Y3%CD>q;<`Ew`57?pesF2C9|2&_sFiF9 zp)wEfYFKqVntAcfRxpwcsY>B%m8 z<4@B?AsKM?ih|?S*4GLq2Szv3Zb==+1mq_*ogXzI`n)$48(ppGPm7n);RE z=`WSP*^Qxo_a?xYT%g~pd%CxHy5uQy5Xwmp<=VjvL{YY_?SO~29QQ}8k%K7K&7d2v zkP|oqc&M!Gh|M&cTjBjpJ#Ac^A;ak~2!r)roXyYAREw%y(ok>t=Md(*c+9)anvGX}eQQH>D`lo?z$1IgF?~HRtx=Ui!2NiiH=2_h8<8F}@-5(8@qf?ivJPw!1#gq$+OImUV+yEGi!=6fGR?E8@5cZqMvMFm<`Zx!}XimxYQy z!XooNERTeS9EWChch#xKq`Z@5#CO^^L5{qOCs@zW^m2&fGFa1uRfXn6*;CVtQMywa zktwK6D>&@CVX{M`jT+hVd0%8HiE1c_xl_8J$4ys%-Cwt2c-nxj3cEIurir;wdLsO( zWAPnCsViUg3XsR7^k0@EiRkCoAW9wist?K)&`O{X~vEqp0xWu+Z_#+vtA~HLI!IC5sA2V2`TvJiy{+<&G z&hyEG5gU%miY>>7Zrzbp7TxU!)(nJM-Q!60|II- zuOpH4OoZ`x>+I-^GEK(NcuYR)e>SYBNF;M=#|R_1g&@Vuei=rh+HF}ANK)*Nxte&a zlCr^WKd*wyIS`+&h1}^WmHa)xSRe-mTZHzA?zoE zqj@Cpxdu1@fn5PESBSmIHixB7hYOlyTLNu(9;L=frhv-%Ct{IfO;37Vc-D$=f>m@t z>YZ*HbeNH>sfy+L)VT9x(s4A3!x}}@2GOH3NK}S5Ykc>I{bWYMxFPLA<$sw;vvx$29lvmfX9Pfyd}C`(*AAc zT#^?nf`$EJFtuZE!5xA<^}hDeINHc{5^eLwO-Zo33=Uo5)v7T{~i!#RgQgIDG5?^O)2hT4L2y znI=2{Q8a`uxmTwZg2i@F?P5$Zh!5fglvNHA(uAO|@#?_P@9DXoJcgj7^X(j|kMuiK zWFourX;xW%4ku7&;J0;(&heESrB+GMBn5>Oz*La2p)yVnh%{HcZ1Zfx+F4FmtpuV4 zV6}iYE^Lj6MG3l1A@ZYycIWS*7=_wKN~Gj&VP^!tI&uwF}-L?d@Y}v zP8p3P8aWq;bF=0+&||+zbH7T~t+G-^O4eWS@Ta`(<31OtPy8!;Tv8K?9ztkoxbhmI zB}JA%4H2*C1mH+A$#iXsqe@JFw$*h+@JvaOebB1w+ST9GvXs-Xzl`UWO=GK7Q%-^u zn|0!&pWk_w7v1=^kySYS2Un`-g7E&*s!crV`l$bU>q;7>#VmI9cY9a7P~#582SNA+ zK-}xYBjSi(wA%{`;qRT;S)F9tzSb@ABKV(|p~XzI*kk+8=5Sq;{Gvthux7#UcXG^;T7NIsWKscG=o_2ZQ;zNC9_YD{A7(R)aKSvg_XY2=)Unp^>lgYOxN49RW-$bLeeH?pPhCif6%O`@CcSJZI3>J1M#KkA+Y+(vHOGW-;IZiH z1VL=ym*li5jX)%~E9%Kqu8qWzS#^Li3#_EtQ}&<+X;OTXh(X!U#$$ z{81p+8ZWNrbgLvxjVpN64*My&cD9vc8pX36#2x&pErZ}%o?C^?x_$h z+_d-%-TtSmFh-2#pDQzRoqdC8XJa5nvkp-7(kJ6@S6aFmsQqT4@*-p6uu?`#7^N86 z+n9?)$P*;x<~aGQiW_7IL6U?B43_%y>vg0!-jzDGD)#VO_<>EDU|EaM_aT|PNV&(g z4-{ax?(jicxw{+^R5i*GquVjizaFS>EXq|e-<)9Rxyp)>)lnMb&ae)Wab`^(@w zW1t=Tz;D>e@Mm!ylA4Kr?Qn*#8%-6Fv~J8|v<$GJ%BV~FP|>l(`^DTEFH#n-R|eY< zJJ5Qykg5gnTN7+NTJI6W4NcFLy{z{qL)6b6zxuMt=Kx=Nk&2zo69w&~Nx3sPJp*W+ zmSTZ})Z)O9)HPZCk|!uq`DwixCV>iz^bfbp3sRc_>wS`OL1$hGX)SSTCdS-2OtLDA zDA{{;ZGy&f8ixl*r%WVRpLkjp5pq3Kx<1MT81-mj?}fipOTic%QhoRby+w$^q;K`- zl$LUVZutT!X9Cdw8*Ty=jPI@2L@?*$Wl zw#x6ua`qT|O>bF#%Z<+E`x4$VuKc0iw9B@Zq=Tz+FdSIYcC01I>As5@fQA?FoXv$W zH`Pc`2(Mv&`!(4nIPHE=P>aR&=>DvtlP51QJCuY z$(Qw=!rqcU`t?7PmOE+Gj7Nx#&~q)MGr}(lv(R_Bql4Ll#?4YYDx~=*6$j-Qi`|FY z`IB&NxkUw;#f)p~4<=TEoVXG`7XEXE`0}A&dSK5*&Y}W)!0fU7Ih(XwnTU1l;a^Ll zjZu8hNriU&L74~VSAK-1sZa9#>X3HeIm8@9L@O$z?v+no*;wfRq8_1CcgO5_z397< zupCbj!B&ELG_`5ZqW|8nC3XJQxA&f_QpM|atRhcbTr|@%22G3`+}TVl{vU*X2O8E7GwS;`m_KoPKE^D^-hnWlg;GLwRB^R!zX0LfYe#{P1n} zs(@#Qpg6o?18fwyrjsPPEm*9*s(~fCKCF^89>G(K;(N458;B|YUaweWvH`w^pu(RqoWT6U}x)W(_lrS{vRneqniK# literal 13105 zcma)j2UJr_*XSf9gboT)1Wdd(kP^z3CX!&eq97tDf(XgI2&nW93P}Jv2-rXc2^PSD zQ~{|;EP#Rp1px&C>Ajag%6TVx|8KqZ{{OA_bgi7(v&-zgXU~~Adp1|?Z1+n`td{@) zNFT7;YYzYtZX$u0DEwH6Xk7)sfOBB4<R%cvS%$3o!@G2 z<@qttZ{2gzBi4lmxE)B7kJoE8$pVo7^fVqbsLuH*kxDclU43@iAnEg z4SQDG%8a_tjlYCCjOHTW2lH$qGn9G)>(rHo=INX5wJs{u`HT=NpI1cF_GJyN~aXRzP7A^lOLSd^Ll^+FTF%Nrn0-wu?NwC2XC3IY)#~^^q%HTrS?adZ=jkd=8IC# zuE|ds4y`h0KOT(4`YCJtDItSG!-Hgx&8V7iwNif$q?s&j!MJR=l|)b^EOUFU0*i__ zLrLx{Rp&DLU&xC}T#t>5;*X1>kx1BG?&=hi+rhDteWmfWCR}bTR{QOT_OOXS7eS3z zT-@v;yPxxzOp4-97eC_hv3G`VvB$s7nQs$U*eWhFg;i1*;NG3iq0#hfO?YN9(6xZg z?X4k84MB6E>gUZWO}f>6;`99zd%~jwLJ!^5aXXZ{bGmBY_h)AJ+FWne0HbVR{=@LGjGjnok&Az^ zSSU-@jS7Ti26lGw{5*-~3|2_25DD+J%M znRxd|-3`m{G`#4Eo1md5wl%(q(K|#gZe>}DiuT9GMllYW_MW~)!?BaT_!hjh4I}Eo z@uCy3`Z#Q5RH5&#E$^bZnm{)8{Fn(hZ|BNaF&QKOZgV4z`sEi@{z*pS@X%NCsV+^a z55FN;z&)X)ezd)7kl_~bGVg6te`p}D%fyTQA>S=PZ#&HMtcujWLrUyuMPkimKjuLfD}D<;^eyON8XeM^o9U_-U%6@lL%1ddY*h7+4eOZ=1XBz;3i9qjgmF z#~?;iqROm>ar>>3+(2aV@SY5%9mOKoV`I#d`qKq=f=`@IuX+i++KDA@7`NPI`_5Ml z?w@%F3q0&|2xn92lddkMKIOP{!8f%U*k^I(%g@6;>wk->Wf9lNQFd@nr4NsLpq1Uj zxFTWPZ|Bz4b@p+{YO)G}Ztgh*ztkRvWIwJ_U2b4SPxqIqmflhH;n_X2i@t-rly&5U zZbZQDZ5Ml?C9QPW!LPNGEi5$_KB zPVq=*Z?3z-2#gGq6LJK*$Bl9C^s_JOB=$V7>}0zhT_f0~mh?@9rr_6{p@S^q?fg$?u9}?**=8ush2DcSUr7S zFPU{Fy;Ai{OkJSE86BUS>r6~=a+&hvgc9RVJ)|D|;wSk;hRI5HB|m=djh_D4;-p8Z zMNU#1Mx@-G{ouSOGf2bkRxXi>BW`0Vd%x_*9`C{Sa!7tfo$Q-$YOkvv?qATyvxph_ zk=;h0Bo;8p!7wvKtGl4$Hm#}JSnl*wc{wq?+H6n%?UgfSwT}$G%(g$9 zUN#d1IlERyhgfJO%Wt>Funxo!13V4a5>9<9+(<|@nI=@u4N%8)2 zUEiE+RxP1vRyKFq>ql|>>~Y^iVcd~(j$}Jr^WJTG8gf@Ub>n+hV(JU3i$fagMfGaO za=3;Ml%qB)-toTndb+M(4SKz5Q70>fm$i8=KO&7XARaCx^D?~qIpHhi@$3bakFY(3 ziG-HRqXiANn{(18r73Gj*lX_xlOC%vRxJuD%wiA^L{u^fDfCVsYy#+YSU?Cl7-dbQ zFISx_p+f<=SCVVZD2vhL&=BMvWK93y{OZvUwLkvSs8=2@DMT{tkDJ?nPu{*|PAjm- zst*52Hn++)Qv!AFpa?sa$y?-Ar5JT>8noDLS?d%WLoy$t#+eH?)=VKnFv0hC|_;=n1VdirVj*?)CiwuMJB~i26C`%QGZSAE<$fF#3mFv zeBmELQ#_vdH*IEz)r|jB$T|H)hCR%Q2}2=AnJqVlhl^kRurRr5XXi{SoO;6bmgF70 zKRef<9~Cg(_R=f+by7d(`{OnBY>(`PhEP+ZLw_h7RV3$%j0&=mjGLY(?PYrc-b&{L z^N5wm7~V-o`f}GN<24f7CH2}^A%qw#QRAsL(+ShUM^V7T%p%|(Tr}d(mehCj}B9h zcKVSh8N>~k?tn86uYNL}tND#qG{xKKN3Cd-#>t)XInl&OY|dYf>tKxM*G3*(7PlA2CX#rRES;~2e3A7UQ9yy^DhP@xlDMqbRI6sZYS>}E`iAND0)@i%&h zS;*~LyqsB=hh?@FA zSY1ga+8GS8yyl5~(hnZDp^J6`$?CpI%nObMwQcDqr;}tGF7?K%eFSk4&3135e(T49lPIJGx+dXF(KAL0ApD( zeG{Zj3nB$#NLEoswUrXn1X{l+c(edvcN0Lcwp>)jX#`AN_VVv)f=EmpUy};=&*S7K zbi{9~AVLr})eO&Sh}cE-3fPm~CdLPiw}=Hfn*+R#eSacJ9^>yA=Ua-3Q#TFDk~df* zor@9{C+H1&h7};Yn^e|KKU4TEz0cj|E1? zMo;P()ZzSYS(+~SwQleGnv%IEIA$(rt8j&$Zh#O?P~aj3gdnz!BZFMEWuV(Q+?1gf zt;BGUkXy&tKlpu`$53Fs>3O~^k|}9&K&imXN{;LZyuGR!e{rKO7t`77u1zxK0NM2OWm+*zI{ zx?m+xaE^x{n+fTCGQxfV2Q8UTijgRUk7E-li2!Uiik&voBFZtp_wp7wB20x?+NEFU z(k6O`EbufC;!LPuq&XK@f_@%?D2Edx%bP(883R6$9ofI?fkL~zBZxr(zB1l3yyx7xA=;+FmJ9|a4w8rxzc81-|nr|An z8Qv0IJpJlq$1ovI2_Ek*9f!M&z7u0v_s;{tzH(agwu9C`(>xFznxRn0P-OLJ)f4}j z0Jn~u#tcfeP3Fgqgz!KCXs*HG62nuhG0;OVpP8Rd`N6vwk)5T!*z0uDLcieXi6^%- zhL`HD1|6O`>K47-Hl2{F(rS8X?!4*1W!Sflq6m_%ya;{!_|lhEb?+qy%WlD7`Zl6M zy{%c~_V?5Sn-=#cNB&Kx4@C6zPB$cDVS`SrMGa(YhjYqX@a;1751^}3ekz-C4QbM0 zf;)YT3enJGd$u2c{9Q4r(%iOSKG{RuRAwZmS!{Q2AQM8Ie z>&D?8{Hoyy21rS)H`2JG5y09<{VisXD0&S#%xb}_Sr%xUZ2AQ`|AIpN?c|Q&K4U*) zfgE}*dM$q?8Gs`=VHcojBx@v($O71J<7@c{a0U5IdtC4}&1wMyoHUP+EfP0mW`#l# zw~D5yG?-4$;|OjSQ>~SsB&5#Pka&VQ?J@?XxcEhSp#b)(@nEfGC=?V)dPD%kO-FiZ zK65uW;9hGkdJc)a+O$YLRA9{clvzRT3fpt6>{++=HgiC}pb?O{Av20$%xf$;h|sa( zFF)~4e8v?4j&`!ilLJYb=thl2(&NGD_Yv+CmAc6>0iYdN1gz4&8B(s%-JhgaqD{}I z2zi5e7o)kQ*OL_y6PT~Cc83$H*~1SPNm#KhEf61VHfcl&!8oD zM}bEuRfh^_cXZJg9NO1+Txw;c5CE->Ih8Fa;UT~)(J-CG{6Sfexx;RZ)PRMbFJlfO zUff-6pTmIDd%Ve1O&mYfo;gqnh0ey(-FT--qM*v^n*W$C8mQvR3)IGHtN0ds3&`mYnDb> zBqlu>Bf--3`t6yUsx7uhSnyg8e~d=Ow8#lOLe}BOtXcB2i;2B0_7I>shoVoVm_>c@ zEgzr$U@wo#yD)=y(J87~8>O=$IPe%L&>jgKixuS3Z-feFtkYsK)_giHV9Q0S={Nzc zY^wHjeQECn6vz$IB)gg|%{W`{852W_Lja&+P%#&%0K^hwiEju1SmG>kKjEOm6|}rz zMEq@G!@&TY*hKRbf%Gcq83`s~?v_BdFtTuZ*67NxNwcyRXPV##^^TFIk|T~M0<>@9 zW~|n{roJ3^rUh0)3HLKL3wy8NX7;*}bBY0f4|O#h`et@Sx5NsTeb?HO{EWL?h7L29 zv~wR}HyrCE?J$p-f#djaEK?ybhpL)_9_b6nEZjq#5FmhL2707BAam=#&|UP%KmcwJ zY``UvP+ybehp-86V=9c*>YHIBeiB_(Wlq6sf*FuGC5}Hz4-zcpqn+?A7HDYddmM5y$HuG*!xMWJQ)Ih*38Bah+wPC9vgx zZ+K73;l*wFLE^{lkJ}$SMzXQ`UJyAyRCc+81*_J4RhwwG)P>7=jF*8f_F>Os`ahAZ zdkfkamYRuTYjySDKyJ>`CVEyE@7=Ke^$Yk{FjF4%cU8HcxLW&a+2){nSf|-9SNu}; z%GgQ(;^iV>{l|&|_l_2N>Ds_>u%6um7U5Xho<<&{ejNmWtG39gw5UNXrN8y;`eDq` z{tEz{7Ef>^5EtAwa?Qf0zqp#_xyDMJKLtTQne2@Bfj}+`na)B@Y9b zAFm>09S0YkZzC>cK}qsLdV_zM_t+@qTLNnN$)~_{dhl|8srw)|EhkSz z`Lp2oz72!~ZeDy{mH%{iwJu*0_TFuTZo;2XNqIkBuv~J-2cy<5SoR4xJX3B3;lFOE zat6RAbs^umpM8QF5I)P$YL_v|MVri1zAT{0l!_!ig}j9n7bj^BpAiYqenYOmAgPy7-4QMp zfXTC%^h6mVAAW(zjDc3z{E^Jx;MC}E@c#daB?~je{i!ut92;J2^7oFmQ<}9UkoQl9^2Fu}hV*f~9~R6E)JLO6nqI?-&kbvUa(-)Q3c zMVdQ`b~z5ySNg(_!C#WsMEj!vDE^E%^}!-)>CVrzX<2Nv{fC+xaslZ;@1m%t$NcDKLkaeG55JdhM?MAqHT32^+~_NZ$FB>0AVbqXX}762&TpwsNRujrbDatMY#n4pqRPN zPEx4754sg828b9JM2XO-YDc0D4S_tVcxycC1t%bCSy6O!`1F(AKod4E6WbU^TJ(6(Q+H=#Gb ziV45`ZY{L*aB7Xa6%z%0GyTTv2pIw%hY85=rOt4z`mc~h=f970OYCQnz0EoOv#$;N zmGT#n@UpU9n(Pe!-uBXk-BsvbSNA5|UwnfsL14eSSj1vq7u>N%Fa>;W`=w&)@tJ$C z1N~=gJi)lP7#OK zC3ximOt!zk*7>rw2#-?SC+95NxR<|5zCyz5C{>4c4`HGx;0?1F*?Io+L!bN!2lVe= zgZ{o|DV(}_QxRO$%5-rt-j7i;HsLa+QjfL55T1M4!ANG5DA?o4&DEENqZ2I)R{1L( zfcYm8US_&LIqfr63EUNh!$++kdq{z4hM=9H!QmqwngcS{{>Jd^!zIW&+PyS^o>0b0 zc9R0rjZ~xXFIE!N9YRce8p5MNHUi$Tl67b~Hi+DXDDSofP0aZmL<+W5LKvT=K;}O3 zu6pz_pm%nCrlU}U0(3y@UxFuqsD*=9@mJ&Fe`~x{B))_-3@Jq0 z{bKS#2&Kcz7?cP(S^uI7&;_1acz>u1*k6itWLy!_uE>ElKg7f|>dFb$o!LFdwtz5Y?-V%tUQx7(dOFM79@-$Wk0Gi5I=Z=0) zbe=;P!VBKQ6C~5&0`0~S;i0xR+Qy)RB;2Qs}@^KAu1O`4Q%I6{vR(y5DR?bL%#z>)fCPQ@&dfvEOR~Gt zDJAPhA%OvLi@li4yIZU7YS77#2xrBP`^)mMx9kq{lxi0GSt&F09M0E+rwF$esQxOr zO?SF}Vo1^(K0bgltu89V9>4mInxE3RI)BV_*B40X*uBLahD8o%*JUk12KqPv9OR+u zwRI%S&VIpR^zgCo70zg2eb_|(yv5Iuh4(*&L+S0CCC!{h0jMH)xJf$A*q?Hq)6&w` z*l`7(948oQF3>Uj!55M?Z=A&nrT$QW)(F9UvpqrYXg6wbqA1Y8XFucQKU1Dr;Rt@3 zP;~JA8j|qTaiNAO#`cGo>FKhwBnN%68x!~X5WE4Bmmz8;G;@b8))V0!P;f=?T}SX@ zlc>~X>XTF86dc~l#a#SOs4X74bPdrjPRjUfQ||NAI<5$aiXgy*05c^Z>7Jme|J3T# z6sX=t*Eh%y$q+Jl*$8J47XyGOB&E!2spQI1ZmP_`p6=W3UXwj&WF$$}lLO3N`olP? z?KeJqqKMH_k5raI0Vc`lW4|cW*gpl`)~2zD@cGw*e%gH5P4PvPJCFx@Rc`B#W`wIijxH{d^!#9okVJ*qvV&TvHd$f?M1Y(qaMD9t=nIb7gF(d-a zZ|B9gQvJ^18?*#yh8Pr<%c)G~g}*+j?f)#Kgk|>~k zy0b@%)xz2}ig~+24d~7h?D&ApJ#>R~jel)q`i8}kcWZoO0BxVzs(hV-VAsv#ym%kZ ze&MH`=azG%1<4w>y*$jSSvEVEZm3{I;2BzavH$f4k>8VLRmyYT`w0rm=! zQ}-J{#e||`j)e@O&_GTQx>xRQ>d6W97bBa|Aou7PVSHuKp5Y=6d2SYKR5EkGvko0Z z0NU4s{LAceeKp?O3)EtH)OPs&<9UBo7IJVMTh@HTxU&wG&B2EYgrts71o2`42hwdh z#vYdBQkPQ)w{#fgD%e%e%s!&u8x*mG7hm}^C}d!?Ie63k=g{BJAQL}XYN+YYp6#hf zgT=K`#x;VVF2>*Nj9t?m3@UU&$YB}^b*wNp@z|>~I;4*Z)K%;=DC`bWAZNZIYNsC; zxeKPb779@%dWv=?V*0oQD?YnGq1hqMbbSvayk6dkZ)W&eG$Rqui@J!$FTXFelb~%5=HVnPs`5j5HEY^g&gYWwZ`1C)6yu=_-GLC#m7*wNrV?;=KYV3ACOH> zboIsoVgm`Y2u{EgenMdO6w|yOj+43e&-OG}AT5QFn1UR8CHe*4Z?-<=darl~Ym!fT zlk+#=K8mU~!drF|flpkGYrQJ{LWqr&vwOUw;ETw_RpQTh6>T{*l32En`sh(8pvRmE;4nkzTTw*Dx5(uv*x!;Iv;s zLkvEw1_@Z`=pYw%T;s_?f_obb@!NT=E``8r5w-51HOF!`s|& zMIVH>WWpf*_+rCia9yH$>R?2V!B2lX7o%bJ33=2&<7iI9X4cEW?Xlyd@UHOrbWi;J zbIRZw3t2SdS=;vvmJcj-pPb#kEYlr&UWc(Vlp~kKqi>kVf%WnHu+-26JLlu1vU#tU zlE|Qc$Zc7%?H|z>5>xfxn8633@_F_-h&pI?qOFB6yn12`!kAFot_d&3R8Ucsjp-IA z^DK_-dtUcS9LX&D&U3?$pLOdPF03Nt^XgWL?_m&;Up!wDZ0mjDLqW)AWR;&Iytz&B z8q8J+<$1O3Ndp(7gG#A+kJAZhk#fn~q0`4Bsm}%T_HVwS?R3?BVCr1wuq24pdp`0& zj|s(~txL8$s6l6XfcLF2jy7@p(+iuytP62TLu$03H4?>0K>l>}9M8XgaYy^Npks`z z9k(R^F_c9L)AlFayv%HyivM`vA(VR0Es2_YgPJz(omVWZ^}9ar<=ZHlYp4a+B65lo z$B_4%B(8wo_z(mzJ38Io&#sV1wccGvR05fXik;5T{qA_n{6PfCgg*FiAG zPx#6fO=v|+X^5LEPHd4w>1jPAB0OC-bTkxG&XQENTU&qoyF*~- zTU0FY)Lz(Wgd2oj!^(UzK*WV0dPec$PadTZ<%p^mDEod=55mghVddAO5Y-hl#Fm(x zqT0W3VwoPh84mV>XWsVHUOq)W%nJC{Ja8(!4l|Lu<>OX4RI>y;{vn2T9Mvyn&dcZH zmKYnx#b8F>GoqalU_Pl7z<2j1e(Xifc1=xcZMM@|tKkP@-$I61gQ4iyV@8>)cD0zf zgoJwdg>_DynkPB>YX8Klw>baWM@XmKFHn$hNK@|h&r7PdbRsU|4^=tB{IlLiSH{>! z6oH+GN?cj(_n;=Y@K5*Pez&vyZIi2Y;`}}@_OJ00;l=$?^iKt`4O(S6M!lsGylfM< zY;Dl7xSY*(_vKvf)nb*!UcNlBD$Z9<3&q(T$93G2uJ4qob>GnVDx(PCe)ObG;iLHk z-TBodsqc&OtNLvjIPz`c%(F+WyWENp_tr%ma0ba!*qc+(zNl!8wu^+67t4HqD39Kp zRG4xHwff7(=RND{^0k50a{IyMRQM?I3#*7mR>L(2KExUF%-*i0D&cUXO+TQ6T~Ji= zcSi78)p(y!tVi#`fyVs)B=*eZhKuiO)_0vS{y|!WzZYZPu8z(7 zx3fFcJVc6ylw^1b*&Z=LJ$pP@9k(lxyDiBS6s0392Aw0E1GD^;S^9q*1hf1oUH%qGtl_e>CoFg zZ)#hI|G~an#B45N?%5-hk-0CCk;lvr;<0XdSal@!dVk?3Xi92l$+le0F~m#0^&LDI zTXHcLi6AekQ`KWg`S9wcra%W(>?-K`9x;sD=&;G}B~N7Ga;p0h=<^~m+q0ZnKg1$3 zb@h)E@VU3>pN=Flt}^lJ)V7s|uX|yo+~11CWbbAnVwkJ1r>i5g3cgrqXaTrv4^DY= z7kE_z!&?c2(N~79gpafBYdC?tgu?GJM2ClDf1I48-C301wN49cT~eLQ(4LQQ-NB#K zC`XIi^t8E^@@G*Qm&_fNkSv(mosOi`8i@=Av3Gr;RZo*i_&1hjh>l6)-08YWsy3aT#kOBLS^a0@?2CEBTF>=j zsPYKDQN+Uu`}O0fQ|N;FO1}6QHy^csKKM?OCSRaNaL?TpLsWCvRG?E+gOB*LMiA=o zfR+msqsw|;)nJ#0hetm1POj6R+L}n$Z@W*#g-r`N5^Hl!nopo|j znZCA+4}Od@(S$r^`9|b5$+`JE^kUw5p;kL$h-c26NNb9;f53d5OY~GOiX-aLj7<3f z&C{C0gIlD-xg}%VUtgi6^NSh7DQdM&-o?l`WXut>7&GS>wScvCs%VkZX)WyeqI7ym zICqSjP*%m<&5|D}8aD49k(_LsdBBlu$|625LZg(2 zXXed6%zLQVGTQtIUVlHGHmo(17h4!d-9LriDlJ;XOP2I`UKIT2^9gWia&BH&!plxI z_um@0y6d3eL}m11bnV?-W^yj^8H7#$Q`ySWF)I2{7j<9hsSh#%oVQ^sKRJYy;R6|X z539rOIoM@>cv#gtcdBO@TiLy#Ug90{zDyMN35)1_g@K*Wd3n*jSOgjSK9mDj_71{> z4R8mmOiixB7VcoXR7Te-r|D@W?_B(1888Yn9e6*q;|pE0-|@0128D{BobjHTqig=y zwm)@rq20@|!H=$AyR}h5+fX^;<>kU}FXbNFL7~CD z>GBNnjTWzjLL&@ZuNrZ9Chp4#&fW(T#0NCoYonSP1GP_H*NRnC6~tuj?_9aIzDZ!X zLK)zGY5tkiHHabLhuOP4tYmXwSNO_`+IOszTpaF;a6O}wdrMteRqnRM6jpS(ZaMtA zq{N%R2PDx-F`4xyE9o2VaD<#8tkhgMjjf7j{s9~*BLtKo{ zt|<28L~5bc_22X+bz_~=C6(s&&j&3f2(H+zlRg1xbw)1g|^r9BOybNd>@UsvUAdJxTf6D9?mS`Cgy)<>S_IDw&Zr-Y$Zy4eo;Gr+-uzAybK(n9nUdn z%|uB|D8(#C=!^BD5{4eP-KV+q^*dLhcF8wo=+`>Eh>P_Q#Z Date: Sun, 10 Apr 2016 04:52:18 -0700 Subject: [PATCH 418/531] Document hpchange callback ordering thing (#3981) Document hpchange callback ordering thing Callbacks registered by register_on_player_hpchange are ordered so that non-modifiers are called after modifiers are called. Credit to @TeTpaAka who mentioned this previously-undocumented feature in #3799. See also commit aa13baa30a45b0f834c23bd5c0407895eb8ec0ee "Add minetest.register_on_player_hpchange" --- doc/lua_api.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index a03a95d9..17b311ff 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1870,6 +1870,7 @@ Call these functions only at load time! * `modifier`: when true, the function should return the actual hp_change. Note: modifiers only get a temporary hp_change that can be modified by later modifiers. modifiers can return true as a second argument to stop the execution of further functions. + Non-modifiers receive the final hp change calculated by the modifiers. * `minetest.register_on_respawnplayer(func(ObjectRef))` * Called when player is to be respawned * Called _before_ repositioning of player occurs From 9a04dfd0f5a69f60318a243535993ffa234f6bf6 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 10 Apr 2016 04:08:22 +0200 Subject: [PATCH 419/531] Update CSRP-GMP to commit deaa11a7c29a73008 Backports 10 commits, with 8 commits actually affecting source code: https://github.com/est31/csrp-gmp/compare/695822e45d9ca48b75b4ec1af1b4eea19139f8b1...deaa11a7c29a730087380da231e785909ad21630 --- src/util/srp.cpp | 605 ++++++++++++++++++++++------------------------- src/util/srp.h | 70 +++--- 2 files changed, 314 insertions(+), 361 deletions(-) diff --git a/src/util/srp.cpp b/src/util/srp.cpp index e3812ee5..0d3c938a 100644 --- a/src/util/srp.cpp +++ b/src/util/srp.cpp @@ -26,12 +26,14 @@ * */ +// clang-format off #ifdef WIN32 #include #include #else #include #endif +// clang-format on #include #include @@ -69,116 +71,116 @@ static int g_initialized = 0; static unsigned int g_rand_idx; static unsigned char g_rand_buff[RAND_BUFF_MAX]; -void *(*srp_alloc) (size_t) = &malloc; -void *(*srp_realloc) (void *, size_t) = &realloc; -void (*srp_free) (void *) = &free; +void *(*srp_alloc)(size_t) = &malloc; +void *(*srp_realloc)(void *, size_t) = &realloc; +void (*srp_free)(void *) = &free; +// clang-format off void srp_set_memory_functions( - void *(*new_srp_alloc) (size_t), - void *(*new_srp_realloc) (void *, size_t), - void (*new_srp_free) (void *)) { + void *(*new_srp_alloc)(size_t), + void *(*new_srp_realloc)(void *, size_t), + void (*new_srp_free)(void *)) +{ srp_alloc = new_srp_alloc; srp_realloc = new_srp_realloc; srp_free = new_srp_free; } +// clang-format on -typedef struct -{ +typedef struct { mpz_t N; mpz_t g; } NGConstant; -struct NGHex -{ - const char* n_hex; - const char* g_hex; +struct NGHex { + const char *n_hex; + const char *g_hex; }; /* All constants here were pulled from Appendix A of RFC 5054 */ static struct NGHex global_Ng_constants[] = { - { /* 1024 */ - "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496" - "EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8E" - "F4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA" - "9AFD5138FE8376435B9FC61D2FC0EB06E3", - "2" - }, - { /* 2048 */ - "AC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC3192943DB56050A37329CBB4" - "A099ED8193E0757767A13DD52312AB4B03310DCD7F48A9DA04FD50E8083969EDB767B0CF60" - "95179A163AB3661A05FBD5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF" - "747359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A436C6481F1D2B907" - "8717461A5B9D32E688F87748544523B524B0D57D5EA77A2775D2ECFA032CFBDBF52FB37861" - "60279004E57AE6AF874E7303CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DB" - "FBB694B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F9E4AFF73", - "2" - }, - { /* 4096 */ - "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" - "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" - "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" - "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" - "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" - "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" - "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" - "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" - "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" - "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" - "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" - "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" - "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" - "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" - "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" - "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" - "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" - "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" - "FFFFFFFFFFFFFFFF", - "5" - }, - { /* 8192 */ - "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" - "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" - "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" - "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" - "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" - "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" - "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" - "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" - "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" - "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" - "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" - "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" - "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" - "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" - "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" - "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" - "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" - "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492" - "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406" - "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918" - "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151" - "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03" - "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F" - "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA" - "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B" - "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632" - "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E" - "6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA" - "3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C" - "5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9" - "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC886" - "2F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6" - "6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC5" - "0846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268" - "359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6" - "FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E71" - "60C980DD98EDD3DFFFFFFFFFFFFFFFFF", - "13" - }, - {0,0} /* null sentinel */ + {/* 1024 */ + "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C" + "9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE4" + "8E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B29" + "7BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9A" + "FD5138FE8376435B9FC61D2FC0EB06E3", + "2"}, + {/* 2048 */ + "AC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC319294" + "3DB56050A37329CBB4A099ED8193E0757767A13DD52312AB4B03310D" + "CD7F48A9DA04FD50E8083969EDB767B0CF6095179A163AB3661A05FB" + "D5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF74" + "7359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A" + "436C6481F1D2B9078717461A5B9D32E688F87748544523B524B0D57D" + "5EA77A2775D2ECFA032CFBDBF52FB3786160279004E57AE6AF874E73" + "03CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DBFBB6" + "94B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F" + "9E4AFF73", + "2"}, + {/* 4096 */ + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" + "FFFFFFFFFFFFFFFF", + "5"}, + {/* 8192 */ + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492" + "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406" + "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918" + "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151" + "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03" + "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F" + "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA" + "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B" + "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632" + "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E" + "6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA" + "3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C" + "5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9" + "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC886" + "2F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6" + "6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC5" + "0846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268" + "359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6" + "FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E71" + "60C980DD98EDD3DFFFFFFFFFFFFFFFFF", + "13"}, + {0, 0} /* null sentinel */ }; - static void delete_ng(NGConstant *ng) { if (ng) { @@ -188,18 +190,18 @@ static void delete_ng(NGConstant *ng) } } -static NGConstant *new_ng( SRP_NGType ng_type, const char *n_hex, const char *g_hex ) +static NGConstant *new_ng(SRP_NGType ng_type, const char *n_hex, const char *g_hex) { - NGConstant *ng = (NGConstant *) srp_alloc(sizeof(NGConstant)); + NGConstant *ng = (NGConstant *)srp_alloc(sizeof(NGConstant)); + + if (!ng) return 0; + mpz_init(ng->N); mpz_init(ng->g); - if (!ng) - return 0; - if (ng_type != SRP_NG_CUSTOM) { - n_hex = global_Ng_constants[ ng_type ].n_hex; - g_hex = global_Ng_constants[ ng_type ].g_hex; + n_hex = global_Ng_constants[ng_type].n_hex; + g_hex = global_Ng_constants[ng_type].g_hex; } int rv = 0; @@ -214,17 +216,13 @@ static NGConstant *new_ng( SRP_NGType ng_type, const char *n_hex, const char *g_ return ng; } - -typedef union -{ - SHA_CTX sha; +typedef union { + SHA_CTX sha; SHA256_CTX sha256; - //SHA512_CTX sha512; + // SHA512_CTX sha512; } HashCTX; - -struct SRPVerifier -{ +struct SRPVerifier { SRP_HashAlgorithm hash_alg; NGConstant *ng; @@ -237,9 +235,7 @@ struct SRPVerifier unsigned char session_key[SHA512_DIGEST_LENGTH]; }; - -struct SRPUser -{ +struct SRPUser { SRP_HashAlgorithm hash_alg; NGConstant *ng; @@ -260,19 +256,23 @@ struct SRPUser unsigned char session_key[SHA512_DIGEST_LENGTH]; }; - +// clang-format off static int hash_init(SRP_HashAlgorithm alg, HashCTX *c) { switch (alg) { #ifdef CSRP_USE_SHA1 case SRP_SHA1: return SHA1_Init(&c->sha); #endif - /*case SRP_SHA224: return SHA224_Init(&c->sha256);*/ + /* + case SRP_SHA224: return SHA224_Init(&c->sha256); + */ #ifdef CSRP_USE_SHA256 case SRP_SHA256: return SHA256_Init(&c->sha256); #endif - /*case SRP_SHA384: return SHA384_Init(&c->sha512); - case SRP_SHA512: return SHA512_Init(&c->sha512);*/ + /* + case SRP_SHA384: return SHA384_Init(&c->sha512); + case SRP_SHA512: return SHA512_Init(&c->sha512); + */ default: return -1; }; } @@ -282,12 +282,16 @@ static int hash_update( SRP_HashAlgorithm alg, HashCTX *c, const void *data, siz #ifdef CSRP_USE_SHA1 case SRP_SHA1: return SHA1_Update(&c->sha, data, len); #endif - /*case SRP_SHA224: return SHA224_Update(&c->sha256, data, len);*/ + /* + case SRP_SHA224: return SHA224_Update(&c->sha256, data, len); + */ #ifdef CSRP_USE_SHA256 case SRP_SHA256: return SHA256_Update(&c->sha256, data, len); #endif - /*case SRP_SHA384: return SHA384_Update( &c->sha512, data, len ); - case SRP_SHA512: return SHA512_Update( &c->sha512, data, len );*/ + /* + case SRP_SHA384: return SHA384_Update(&c->sha512, data, len); + case SRP_SHA512: return SHA512_Update(&c->sha512, data, len); + */ default: return -1; }; } @@ -297,12 +301,16 @@ static int hash_final( SRP_HashAlgorithm alg, HashCTX *c, unsigned char *md ) #ifdef CSRP_USE_SHA1 case SRP_SHA1: return SHA1_Final(md, &c->sha); #endif - /*case SRP_SHA224: return SHA224_Final(md, &c->sha256);*/ + /* + case SRP_SHA224: return SHA224_Final(md, &c->sha256); + */ #ifdef CSRP_USE_SHA256 case SRP_SHA256: return SHA256_Final(md, &c->sha256); #endif - /*case SRP_SHA384: return SHA384_Final(md, &c->sha512); - case SRP_SHA512: return SHA512_Final(md, &c->sha512);*/ + /* + case SRP_SHA384: return SHA384_Final(md, &c->sha512); + case SRP_SHA512: return SHA512_Final(md, &c->sha512); + */ default: return -1; }; } @@ -312,12 +320,16 @@ static unsigned char *hash(SRP_HashAlgorithm alg, const unsigned char *d, size_t #ifdef CSRP_USE_SHA1 case SRP_SHA1: return SHA1(d, n, md); #endif - /*case SRP_SHA224: return SHA224( d, n, md );*/ + /* + case SRP_SHA224: return SHA224( d, n, md ); + */ #ifdef CSRP_USE_SHA256 case SRP_SHA256: return SHA256(d, n, md); #endif - /*case SRP_SHA384: return SHA384( d, n, md ); - case SRP_SHA512: return SHA512( d, n, md );*/ + /* + case SRP_SHA384: return SHA384( d, n, md ); + case SRP_SHA512: return SHA512( d, n, md ); + */ default: return 0; }; } @@ -327,19 +339,24 @@ static size_t hash_length(SRP_HashAlgorithm alg) #ifdef CSRP_USE_SHA1 case SRP_SHA1: return SHA_DIGEST_LENGTH; #endif - /*case SRP_SHA224: return SHA224_DIGEST_LENGTH;*/ + /* + case SRP_SHA224: return SHA224_DIGEST_LENGTH; + */ #ifdef CSRP_USE_SHA256 case SRP_SHA256: return SHA256_DIGEST_LENGTH; #endif - /*case SRP_SHA384: return SHA384_DIGEST_LENGTH; - case SRP_SHA512: return SHA512_DIGEST_LENGTH;*/ + /* + case SRP_SHA384: return SHA384_DIGEST_LENGTH; + case SRP_SHA512: return SHA512_DIGEST_LENGTH; + */ default: return -1; }; } +// clang-format on inline static int mpz_num_bytes(const mpz_t op) { - return (mpz_sizeinbase (op, 2) + 7) / 8; + return (mpz_sizeinbase(op, 2) + 7) / 8; } inline static void mpz_to_bin(const mpz_t op, unsigned char *to) @@ -353,72 +370,77 @@ inline static void mpz_from_bin(const unsigned char *s, size_t len, mpz_t ret) } // set op to (op1 * op2) mod d, using tmp for the calculation -inline static void mpz_mulm(mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp) +inline static void mpz_mulm( + mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp) { mpz_mul(tmp, op1, op2); mpz_mod(op, tmp, d); } // set op to (op1 + op2) mod d, using tmp for the calculation -inline static void mpz_addm( mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp ) +inline static void mpz_addm( + mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp) { mpz_add(tmp, op1, op2); mpz_mod(op, tmp, d); } // set op to (op1 - op2) mod d, using tmp for the calculation -inline static void mpz_subm(mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp) +inline static void mpz_subm( + mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp) { mpz_sub(tmp, op1, op2); mpz_mod(op, tmp, d); } -static int H_nn(mpz_t result, SRP_HashAlgorithm alg, const mpz_t N, const mpz_t n1, const mpz_t n2) +static SRP_Result H_nn( + mpz_t result, SRP_HashAlgorithm alg, const mpz_t N, const mpz_t n1, const mpz_t n2) { unsigned char buff[SHA512_DIGEST_LENGTH]; size_t len_N = mpz_num_bytes(N); size_t len_n1 = mpz_num_bytes(n1); size_t len_n2 = mpz_num_bytes(n2); size_t nbytes = len_N + len_N; - unsigned char *bin = (unsigned char *) srp_alloc(nbytes); - if (!bin) - return 0; + unsigned char *bin = (unsigned char *)srp_alloc(nbytes); + if (!bin) return SRP_ERR; if (len_n1 > len_N || len_n2 > len_N) { srp_free(bin); - return 0; + return SRP_ERR; } memset(bin, 0, nbytes); mpz_to_bin(n1, bin + (len_N - len_n1)); mpz_to_bin(n2, bin + (len_N + len_N - len_n2)); - hash( alg, bin, nbytes, buff ); + hash(alg, bin, nbytes, buff); srp_free(bin); mpz_from_bin(buff, hash_length(alg), result); - return 1; + return SRP_OK; } -static int H_ns(mpz_t result, SRP_HashAlgorithm alg, const unsigned char *n, size_t len_n, const unsigned char *bytes, size_t len_bytes) +static SRP_Result H_ns(mpz_t result, SRP_HashAlgorithm alg, const unsigned char *n, + size_t len_n, const unsigned char *bytes, size_t len_bytes) { unsigned char buff[SHA512_DIGEST_LENGTH]; size_t nbytes = len_n + len_bytes; - unsigned char *bin = (unsigned char *) srp_alloc(nbytes); - if (!bin) - return 0; + unsigned char *bin = (unsigned char *)srp_alloc(nbytes); + if (!bin) return SRP_ERR; memcpy(bin, n, len_n); memcpy(bin + len_n, bytes, len_bytes); hash(alg, bin, nbytes, buff); srp_free(bin); mpz_from_bin(buff, hash_length(alg), result); - return 1; + return SRP_OK; } -static int calculate_x(mpz_t result, SRP_HashAlgorithm alg, const unsigned char *salt, size_t salt_len, const char *username, const unsigned char *password, size_t password_len) +static int calculate_x(mpz_t result, SRP_HashAlgorithm alg, const unsigned char *salt, + size_t salt_len, const char *username, const unsigned char *password, + size_t password_len) { unsigned char ucp_hash[SHA512_DIGEST_LENGTH]; HashCTX ctx; hash_init(alg, &ctx); - srp_dbg_data((char*) username, strlen(username), "Username for x: "); - srp_dbg_data((char*) password, password_len, "Password for x: "); + srp_dbg_data((char *)username, strlen(username), "Username for x: "); + srp_dbg_data((char *)password, password_len, "Password for x: "); hash_update(alg, &ctx, username, strlen(username)); hash_update(alg, &ctx, ":", 1); hash_update(alg, &ctx, password, password_len); @@ -428,31 +450,31 @@ static int calculate_x(mpz_t result, SRP_HashAlgorithm alg, const unsigned char return H_ns(result, alg, salt, salt_len, ucp_hash, hash_length(alg)); } -static void update_hash_n(SRP_HashAlgorithm alg, HashCTX *ctx, const mpz_t n) +static SRP_Result update_hash_n(SRP_HashAlgorithm alg, HashCTX *ctx, const mpz_t n) { size_t len = mpz_num_bytes(n); - unsigned char* n_bytes = (unsigned char *) srp_alloc(len); - if (!n_bytes) - return; + unsigned char *n_bytes = (unsigned char *)srp_alloc(len); + if (!n_bytes) return SRP_ERR; mpz_to_bin(n, n_bytes); hash_update(alg, ctx, n_bytes, len); srp_free(n_bytes); + return SRP_OK; } -static void hash_num( SRP_HashAlgorithm alg, const mpz_t n, unsigned char *dest ) +static SRP_Result hash_num(SRP_HashAlgorithm alg, const mpz_t n, unsigned char *dest) { int nbytes = mpz_num_bytes(n); - unsigned char *bin = (unsigned char *) srp_alloc(nbytes); - if(!bin) - return; + unsigned char *bin = (unsigned char *)srp_alloc(nbytes); + if (!bin) return SRP_ERR; mpz_to_bin(n, bin); hash(alg, bin, nbytes, dest); srp_free(bin); + return SRP_OK; } -static void calculate_M(SRP_HashAlgorithm alg, NGConstant *ng, unsigned char *dest, - const char *I, const unsigned char *s_bytes, size_t s_len, - const mpz_t A, const mpz_t B, const unsigned char *K) +static SRP_Result calculate_M(SRP_HashAlgorithm alg, NGConstant *ng, unsigned char *dest, + const char *I, const unsigned char *s_bytes, size_t s_len, const mpz_t A, + const mpz_t B, const unsigned char *K) { unsigned char H_N[SHA512_DIGEST_LENGTH]; unsigned char H_g[SHA512_DIGEST_LENGTH]; @@ -462,13 +484,12 @@ static void calculate_M(SRP_HashAlgorithm alg, NGConstant *ng, unsigned char *de size_t i = 0; size_t hash_len = hash_length(alg); - hash_num(alg, ng->N, H_N); - hash_num(alg, ng->g, H_g); + if (!hash_num(alg, ng->N, H_N)) return SRP_ERR; + if (!hash_num(alg, ng->g, H_g)) return SRP_ERR; hash(alg, (const unsigned char *)I, strlen(I), H_I); - - for (i = 0; i < hash_len; i++ ) + for (i = 0; i < hash_len; i++) H_xor[i] = H_N[i] ^ H_g[i]; hash_init(alg, &ctx); @@ -476,54 +497,29 @@ static void calculate_M(SRP_HashAlgorithm alg, NGConstant *ng, unsigned char *de hash_update(alg, &ctx, H_xor, hash_len); hash_update(alg, &ctx, H_I, hash_len); hash_update(alg, &ctx, s_bytes, s_len); - update_hash_n(alg, &ctx, A); - update_hash_n(alg, &ctx, B); + if (!update_hash_n(alg, &ctx, A)) return SRP_ERR; + if (!update_hash_n(alg, &ctx, B)) return SRP_ERR; hash_update(alg, &ctx, K, hash_len); hash_final(alg, &ctx, dest); + return SRP_OK; } -static void calculate_H_AMK(SRP_HashAlgorithm alg, unsigned char *dest, const mpz_t A, const unsigned char *M, const unsigned char *K) +static SRP_Result calculate_H_AMK(SRP_HashAlgorithm alg, unsigned char *dest, + const mpz_t A, const unsigned char *M, const unsigned char *K) { HashCTX ctx; hash_init(alg, &ctx); - update_hash_n(alg, &ctx, A); + if (!update_hash_n(alg, &ctx, A)) return SRP_ERR; hash_update(alg, &ctx, M, hash_length(alg)); hash_update(alg, &ctx, K, hash_length(alg)); hash_final(alg, &ctx, dest); + return SRP_OK; } -#ifndef WIN32 - -struct srp_pcgrandom { - unsigned long long int m_state; - unsigned long long int m_inc; -}; typedef struct srp_pcgrandom srp_pcgrandom; - -static unsigned long int srp_pcgrandom_next(srp_pcgrandom *r) -{ - unsigned long long int oldstate = r->m_state; - r->m_state = oldstate * 6364136223846793005ULL + r->m_inc; - - unsigned long int xorshifted = ((oldstate >> 18u) ^ oldstate) >> 27u; - unsigned long int rot = oldstate >> 59u; - return (xorshifted >> rot) | (xorshifted << ((-rot) & 31)); -} - -static void srp_pcgrandom_seed(srp_pcgrandom *r, unsigned long long int state, - unsigned long long int seq) -{ - r->m_state = 0U; - r->m_inc = (seq << 1u) | 1u; - srp_pcgrandom_next(r); - r->m_state += state; - srp_pcgrandom_next(r); -} -#endif - static SRP_Result fill_buff() { g_rand_idx = 0; @@ -536,29 +532,18 @@ static SRP_Result fill_buff() #ifdef WIN32 - CryptAcquireContext(&wctx, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - CryptGenRandom(wctx, sizeof(g_rand_buff), (BYTE*) g_rand_buff); - CryptReleaseContext(wctx, 0); - - return SRP_OK; + if (!CryptAcquireContext(&wctx, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + return SRP_ERR; + if (!CryptGenRandom(wctx, sizeof(g_rand_buff), (BYTE *)g_rand_buff)) return SRP_ERR; + if (!CryptReleaseContext(wctx, 0)) return SRP_ERR; #else fp = fopen("/dev/urandom", "r"); - if (fp) { - fread(g_rand_buff, sizeof(g_rand_buff), 1, fp); - fclose(fp); - } else { - srp_pcgrandom *r = (srp_pcgrandom *) srp_alloc(sizeof(srp_pcgrandom)); - if (!r) - return SRP_ERR; - srp_pcgrandom_seed(r, time(NULL) ^ clock(), 0xda3e39cb94b95bdbULL); - size_t i = 0; - for (i = 0; i < RAND_BUFF_MAX; i++) { - g_rand_buff[i] = srp_pcgrandom_next(r); - } - srp_free(r); - } + if (!fp) return SRP_ERR; + + if (fread(g_rand_buff, sizeof(g_rand_buff), 1, fp) != 1) return SRP_ERR; + if (fclose(fp)) return SRP_ERR; #endif return SRP_OK; } @@ -567,17 +552,15 @@ static SRP_Result mpz_fill_random(mpz_t num) { // was call: BN_rand(num, 256, -1, 0); if (RAND_BUFF_MAX - g_rand_idx < 32) - if (fill_buff() != SRP_OK) - return SRP_ERR; - mpz_from_bin((const unsigned char *) (&g_rand_buff[g_rand_idx]), 32, num); + if (fill_buff() != SRP_OK) return SRP_ERR; + mpz_from_bin((const unsigned char *)(&g_rand_buff[g_rand_idx]), 32, num); g_rand_idx += 32; return SRP_OK; } static SRP_Result init_random() { - if (g_initialized) - return SRP_OK; + if (g_initialized) return SRP_OK; SRP_Result ret = fill_buff(); g_initialized = (ret == SRP_OK); return ret; @@ -600,6 +583,7 @@ static SRP_Result init_random() * ***********************************************************************************************************/ +// clang-format off SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg, SRP_NGType ng_type, const char *username_for_verifier, const unsigned char *password, size_t len_password, @@ -611,10 +595,11 @@ SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg, mpz_t v; mpz_init(v); mpz_t x; mpz_init(x); + // clang-format on + NGConstant *ng = new_ng(ng_type, n_hex, g_hex); - if (!ng) - goto error_and_exit; + if (!ng) goto error_and_exit; if (init_random() != SRP_OK) /* Only happens once */ goto error_and_exit; @@ -623,18 +608,15 @@ SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg, size_t size_to_fill = 16; *len_s = size_to_fill; if (RAND_BUFF_MAX - g_rand_idx < size_to_fill) - if (fill_buff() != SRP_OK) - goto error_and_exit; - *bytes_s = (unsigned char*)srp_alloc(size_to_fill); - if (!*bytes_s) - goto error_and_exit; + if (fill_buff() != SRP_OK) goto error_and_exit; + *bytes_s = (unsigned char *)srp_alloc(size_to_fill); + if (!*bytes_s) goto error_and_exit; memcpy(*bytes_s, &g_rand_buff + g_rand_idx, size_to_fill); g_rand_idx += size_to_fill; } - - if (!calculate_x(x, alg, *bytes_s, *len_s, username_for_verifier, - password, len_password)) + if (!calculate_x( + x, alg, *bytes_s, *len_s, username_for_verifier, password, len_password)) goto error_and_exit; srp_dbg_num(x, "Server calculated x: "); @@ -643,15 +625,14 @@ SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg, *len_v = mpz_num_bytes(v); - *bytes_v = (unsigned char*)srp_alloc(*len_v); + *bytes_v = (unsigned char *)srp_alloc(*len_v); - if (!bytes_v) - goto error_and_exit; + if (!*bytes_v) goto error_and_exit; mpz_to_bin(v, *bytes_v); cleanup_and_exit: - delete_ng( ng ); + delete_ng(ng); mpz_clear(v); mpz_clear(x); return ret; @@ -660,7 +641,7 @@ error_and_exit: goto cleanup_and_exit; } - +// clang-format off /* Out: bytes_B, len_B. * @@ -685,6 +666,7 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, mpz_t tmp1; mpz_init(tmp1); mpz_t tmp2; mpz_init(tmp2); mpz_t tmp3; mpz_init(tmp3); + // clang-format on size_t ulen = strlen(username) + 1; NGConstant *ng = new_ng(ng_type, n_hex, g_hex); struct SRPVerifier *ver = 0; @@ -692,13 +674,11 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, *len_B = 0; *bytes_B = 0; - if (!ng) - goto cleanup_and_exit; + if (!ng) goto cleanup_and_exit; - ver = (struct SRPVerifier *) srp_alloc( sizeof(struct SRPVerifier) ); + ver = (struct SRPVerifier *)srp_alloc(sizeof(struct SRPVerifier)); - if (!ver) - goto cleanup_and_exit; + if (!ver) goto cleanup_and_exit; if (init_random() != SRP_OK) { /* Only happens once */ srp_free(ver); @@ -706,7 +686,7 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, goto cleanup_and_exit; } - ver->username = (char *) srp_alloc(ulen); + ver->username = (char *)srp_alloc(ulen); ver->hash_alg = alg; ver->ng = ng; @@ -716,7 +696,7 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, goto cleanup_and_exit; } - memcpy((char*)ver->username, username, ulen); + memcpy((char *)ver->username, username, ulen); ver->authenticated = 0; @@ -726,29 +706,17 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, if (bytes_b) { mpz_from_bin(bytes_b, len_b, b); } else { - if (mpz_fill_random(b) != SRP_OK) { - srp_free(ver); - ver = 0; - goto cleanup_and_exit; - } + if (!mpz_fill_random(b)) goto ver_cleanup_and_exit; } - if (!H_nn(k, alg, ng->N, ng->N, ng->g)) { - srp_free(ver); - ver = 0; - goto cleanup_and_exit; - } + if (!H_nn(k, alg, ng->N, ng->N, ng->g)) goto ver_cleanup_and_exit; /* B = kv + g^b */ mpz_mulm(tmp1, k, v, ng->N, tmp3); mpz_powm(tmp2, ng->g, b, ng->N); mpz_addm(B, tmp1, tmp2, ng->N, tmp3); - if (!H_nn(u, alg, ng->N, A, B)) { - srp_free(ver); - ver = 0; - goto cleanup_and_exit; - } + if (!H_nn(u, alg, ng->N, A, B)) goto ver_cleanup_and_exit; srp_dbg_num(u, "Server calculated u: "); @@ -757,20 +725,22 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, mpz_mulm(tmp2, A, tmp1, ng->N, tmp3); mpz_powm(S, tmp2, b, ng->N); - hash_num(alg, S, ver->session_key); + if (!hash_num(alg, S, ver->session_key)) goto ver_cleanup_and_exit; - calculate_M(alg, ng, ver->M, username, bytes_s, len_s, A, B, ver->session_key); - calculate_H_AMK(alg, ver->H_AMK, A, ver->M, ver->session_key); + if (!calculate_M( + alg, ng, ver->M, username, bytes_s, len_s, A, B, ver->session_key)) { + goto ver_cleanup_and_exit; + } + if (!calculate_H_AMK(alg, ver->H_AMK, A, ver->M, ver->session_key)) { + goto ver_cleanup_and_exit; + } *len_B = mpz_num_bytes(B); - *bytes_B = (unsigned char*)srp_alloc(*len_B); + *bytes_B = (unsigned char *)srp_alloc(*len_B); if (!*bytes_B) { - srp_free(ver->username); - srp_free(ver); - ver = 0; *len_B = 0; - goto cleanup_and_exit; + goto ver_cleanup_and_exit; } mpz_to_bin(B, *bytes_B); @@ -793,11 +763,13 @@ cleanup_and_exit: mpz_clear(tmp2); mpz_clear(tmp3); return ver; +ver_cleanup_and_exit: + srp_free(ver->username); + srp_free(ver); + ver = 0; + goto cleanup_and_exit; } - - - void srp_verifier_delete(struct SRPVerifier *ver) { if (ver) { @@ -809,36 +781,31 @@ void srp_verifier_delete(struct SRPVerifier *ver) } } - - int srp_verifier_is_authenticated(struct SRPVerifier *ver) { return ver->authenticated; } - const char *srp_verifier_get_username(struct SRPVerifier *ver) { return ver->username; } - -const unsigned char *srp_verifier_get_session_key(struct SRPVerifier *ver, size_t *key_length) +const unsigned char *srp_verifier_get_session_key( + struct SRPVerifier *ver, size_t *key_length) { - if (key_length) - *key_length = hash_length(ver->hash_alg); + if (key_length) *key_length = hash_length(ver->hash_alg); return ver->session_key; } - size_t srp_verifier_get_session_key_length(struct SRPVerifier *ver) { return hash_length(ver->hash_alg); } - /* user_M must be exactly SHA512_DIGEST_LENGTH bytes in size */ -void srp_verifier_verify_session(struct SRPVerifier *ver, const unsigned char *user_M, unsigned char **bytes_HAMK) +void srp_verifier_verify_session( + struct SRPVerifier *ver, const unsigned char *user_M, unsigned char **bytes_HAMK) { if (memcmp(ver->M, user_M, hash_length(ver->hash_alg)) == 0) { ver->authenticated = 1; @@ -851,15 +818,14 @@ void srp_verifier_verify_session(struct SRPVerifier *ver, const unsigned char *u struct SRPUser *srp_user_new(SRP_HashAlgorithm alg, SRP_NGType ng_type, const char *username, const char *username_for_verifier, - const unsigned char *bytes_password, size_t len_password, - const char *n_hex, const char *g_hex) + const unsigned char *bytes_password, size_t len_password, const char *n_hex, + const char *g_hex) { - struct SRPUser *usr = (struct SRPUser *) srp_alloc(sizeof(struct SRPUser)); - size_t ulen = strlen(username) + 1; + struct SRPUser *usr = (struct SRPUser *)srp_alloc(sizeof(struct SRPUser)); + size_t ulen = strlen(username) + 1; size_t uvlen = strlen(username_for_verifier) + 1; - if (!usr) - goto err_exit; + if (!usr) goto err_exit; if (init_random() != SRP_OK) /* Only happens once */ goto err_exit; @@ -871,16 +837,14 @@ struct SRPUser *srp_user_new(SRP_HashAlgorithm alg, SRP_NGType ng_type, mpz_init(usr->A); mpz_init(usr->S); - if (!usr->ng) - goto err_exit; + if (!usr->ng) goto err_exit; - usr->username = (char*)srp_alloc(ulen); - usr->username_verifier = (char*)srp_alloc(uvlen); - usr->password = (unsigned char*)srp_alloc(len_password); + usr->username = (char *)srp_alloc(ulen); + usr->username_verifier = (char *)srp_alloc(uvlen); + usr->password = (unsigned char *)srp_alloc(len_password); usr->password_len = len_password; - if (!usr->username || !usr->password || !usr->username_verifier) - goto err_exit; + if (!usr->username || !usr->password || !usr->username_verifier) goto err_exit; memcpy(usr->username, username, ulen); memcpy(usr->username_verifier, username_for_verifier, uvlen); @@ -897,8 +861,7 @@ err_exit: mpz_clear(usr->a); mpz_clear(usr->A); mpz_clear(usr->S); - if (usr->ng) - delete_ng(usr->ng); + if (usr->ng) delete_ng(usr->ng); srp_free(usr->username); srp_free(usr->username_verifier); if (usr->password) { @@ -911,11 +874,9 @@ err_exit: return 0; } - - void srp_user_delete(struct SRPUser *usr) { - if(usr) { + if (usr) { mpz_clear(usr->a); mpz_clear(usr->A); mpz_clear(usr->S); @@ -928,67 +889,58 @@ void srp_user_delete(struct SRPUser *usr) srp_free(usr->username_verifier); srp_free(usr->password); - if (usr->bytes_A) - srp_free(usr->bytes_A); + if (usr->bytes_A) srp_free(usr->bytes_A); memset(usr, 0, sizeof(*usr)); srp_free(usr); } } - - int srp_user_is_authenticated(struct SRPUser *usr) { return usr->authenticated; } - const char *srp_user_get_username(struct SRPUser *usr) { return usr->username; } - -const unsigned char* srp_user_get_session_key(struct SRPUser* usr, size_t* key_length) +const unsigned char *srp_user_get_session_key(struct SRPUser *usr, size_t *key_length) { - if (key_length) - *key_length = hash_length(usr->hash_alg); + if (key_length) *key_length = hash_length(usr->hash_alg); return usr->session_key; } - size_t srp_user_get_session_key_length(struct SRPUser *usr) { return hash_length(usr->hash_alg); } - +// clang-format off /* Output: username, bytes_A, len_A */ SRP_Result srp_user_start_authentication(struct SRPUser *usr, char **username, const unsigned char *bytes_a, size_t len_a, unsigned char **bytes_A, size_t *len_A) { + // clang-format on if (bytes_a) { mpz_from_bin(bytes_a, len_a, usr->a); } else { - if (mpz_fill_random(usr->a) != SRP_OK) - goto error_and_exit; + if (!mpz_fill_random(usr->a)) goto error_and_exit; } mpz_powm(usr->A, usr->ng->g, usr->a, usr->ng->N); *len_A = mpz_num_bytes(usr->A); - *bytes_A = (unsigned char*)srp_alloc(*len_A); + *bytes_A = (unsigned char *)srp_alloc(*len_A); - if (!*bytes_A) - goto error_and_exit; + if (!*bytes_A) goto error_and_exit; mpz_to_bin(usr->A, *bytes_A); usr->bytes_A = *bytes_A; - if (username) - *username = usr->username; + if (username) *username = usr->username; return SRP_OK; @@ -999,7 +951,7 @@ error_and_exit: return SRP_ERR; } - +// clang-format off /* Output: bytes_M. Buffer length is SHA512_DIGEST_LENGTH */ void srp_user_process_challenge(struct SRPUser *usr, const unsigned char *bytes_s, size_t len_s, @@ -1015,17 +967,17 @@ void srp_user_process_challenge(struct SRPUser *usr, mpz_t tmp2; mpz_init(tmp2); mpz_t tmp3; mpz_init(tmp3); mpz_t tmp4; mpz_init(tmp4); + // clang-format on *len_M = 0; *bytes_M = 0; - if (!H_nn(u, usr->hash_alg, usr->ng->N, usr->A, B)) - goto cleanup_and_exit; + if (!H_nn(u, usr->hash_alg, usr->ng->N, usr->A, B)) goto cleanup_and_exit; srp_dbg_num(u, "Client calculated u: "); - if (!calculate_x(x, usr->hash_alg, bytes_s, len_s, - usr->username_verifier, usr->password, usr->password_len)) + if (!calculate_x(x, usr->hash_alg, bytes_s, len_s, usr->username_verifier, + usr->password, usr->password_len)) goto cleanup_and_exit; srp_dbg_num(x, "Client calculated x: "); @@ -1034,11 +986,12 @@ void srp_user_process_challenge(struct SRPUser *usr, goto cleanup_and_exit; /* SRP-6a safety check */ - if ( mpz_sgn(B) != 0 && mpz_sgn(u) != 0 ) { + if (mpz_sgn(B) != 0 && mpz_sgn(u) != 0) { mpz_powm(v, usr->ng->g, x, usr->ng->N); srp_dbg_num(v, "Client calculated v: "); + // clang-format off /* S = (B - k*(g^x)) ^ (a + ux) */ mpz_mul(tmp1, u, x); mpz_add(tmp2, usr->a, tmp1); /* tmp2 = (a + ux) */ @@ -1046,23 +999,24 @@ void srp_user_process_challenge(struct SRPUser *usr, mpz_mulm(tmp3, k, tmp1, usr->ng->N, tmp4); /* tmp3 = k*(g^x) */ mpz_subm(tmp1, B, tmp3, usr->ng->N, tmp4); /* tmp1 = (B - K*(g^x)) */ mpz_powm(usr->S, tmp1, tmp2, usr->ng->N); + // clang-format on - hash_num(usr->hash_alg, usr->S, usr->session_key); + if (!hash_num(usr->hash_alg, usr->S, usr->session_key)) goto cleanup_and_exit; - calculate_M( usr->hash_alg, usr->ng, usr->M, usr->username, bytes_s, len_s, usr->A,B, usr->session_key ); - calculate_H_AMK( usr->hash_alg, usr->H_AMK, usr->A, usr->M, usr->session_key ); + if (!calculate_M(usr->hash_alg, usr->ng, usr->M, usr->username, bytes_s, len_s, + usr->A, B, usr->session_key)) + goto cleanup_and_exit; + if (!calculate_H_AMK(usr->hash_alg, usr->H_AMK, usr->A, usr->M, usr->session_key)) + goto cleanup_and_exit; *bytes_M = usr->M; - if (len_M) - *len_M = hash_length( usr->hash_alg ); + if (len_M) *len_M = hash_length(usr->hash_alg); } else { *bytes_M = NULL; - if (len_M) - *len_M = 0; + if (len_M) *len_M = 0; } cleanup_and_exit: - mpz_clear(B); mpz_clear(u); mpz_clear(x); @@ -1074,7 +1028,6 @@ cleanup_and_exit: mpz_clear(tmp4); } - void srp_user_verify_session(struct SRPUser *usr, const unsigned char *bytes_HAMK) { if (memcmp(usr->H_AMK, bytes_HAMK, hash_length(usr->hash_alg)) == 0) diff --git a/src/util/srp.h b/src/util/srp.h index c876e70e..2d49b076 100644 --- a/src/util/srp.h +++ b/src/util/srp.h @@ -56,12 +56,10 @@ #ifndef SRP_H #define SRP_H - struct SRPVerifier; struct SRPUser; -typedef enum -{ +typedef enum { SRP_NG_1024, SRP_NG_2048, SRP_NG_4096, @@ -69,8 +67,7 @@ typedef enum SRP_NG_CUSTOM } SRP_NGType; -typedef enum -{ +typedef enum { /*SRP_SHA1,*/ /*SRP_SHA224,*/ SRP_SHA256, @@ -78,12 +75,13 @@ typedef enum SRP_SHA512*/ } SRP_HashAlgorithm; -typedef enum -{ - SRP_OK, +typedef enum { SRP_ERR, + SRP_OK, } SRP_Result; +// clang-format off + /* Sets the memory functions used by srp. * Note: this doesn't set the memory functions used by gmp, * but it is supported to have different functions for srp and gmp. @@ -101,17 +99,18 @@ void srp_set_memory_functions( * The n_hex and g_hex parameters should be 0 unless SRP_NG_CUSTOM is used for ng_type. * If provided, they must contain ASCII text of the hexidecimal notation. * - * If bytes_s == NULL, it is filled with random data. The caller is responsible for freeing. + * If bytes_s == NULL, it is filled with random data. + * The caller is responsible for freeing. * * Returns SRP_OK on success, and SRP_ERR on error. * bytes_s might be in this case invalid, don't free it. */ -SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg, +SRP_Result srp_create_salted_verification_key(SRP_HashAlgorithm alg, SRP_NGType ng_type, const char *username_for_verifier, const unsigned char *password, size_t len_password, unsigned char **bytes_s, size_t *len_s, unsigned char **bytes_v, size_t *len_v, - const char * n_hex, const char *g_hex ); + const char *n_hex, const char *g_hex); /* Out: bytes_B, len_B. * @@ -132,54 +131,54 @@ struct SRPVerifier* srp_verifier_new(SRP_HashAlgorithm alg, SRP_NGType ng_type, unsigned char** bytes_B, size_t *len_B, const char* n_hex, const char* g_hex); +// clang-format on -void srp_verifier_delete( struct SRPVerifier* ver ); +void srp_verifier_delete(struct SRPVerifier *ver); // srp_verifier_verify_session must have been called before -int srp_verifier_is_authenticated( struct SRPVerifier* ver ); +int srp_verifier_is_authenticated(struct SRPVerifier *ver); - -const char * srp_verifier_get_username( struct SRPVerifier* ver ); +const char *srp_verifier_get_username(struct SRPVerifier *ver); /* key_length may be null */ -const unsigned char* srp_verifier_get_session_key( struct SRPVerifier* ver, - size_t *key_length ); - - -size_t srp_verifier_get_session_key_length(struct SRPVerifier* ver); +const unsigned char *srp_verifier_get_session_key( + struct SRPVerifier *ver, size_t *key_length); +size_t srp_verifier_get_session_key_length(struct SRPVerifier *ver); /* Verifies session, on success, it writes bytes_HAMK. * user_M must be exactly srp_verifier_get_session_key_length() bytes in size */ -void srp_verifier_verify_session( struct SRPVerifier* ver, - const unsigned char* user_M, unsigned char** bytes_HAMK ); +void srp_verifier_verify_session( + struct SRPVerifier *ver, const unsigned char *user_M, unsigned char **bytes_HAMK); /*******************************************************************************/ /* The n_hex and g_hex parameters should be 0 unless SRP_NG_CUSTOM is used for ng_type */ struct SRPUser *srp_user_new(SRP_HashAlgorithm alg, SRP_NGType ng_type, const char *username, const char *username_for_verifier, - const unsigned char *bytes_password, size_t len_password, - const char *n_hex, const char *g_hex); + const unsigned char *bytes_password, size_t len_password, const char *n_hex, + const char *g_hex); -void srp_user_delete(struct SRPUser * usr); +void srp_user_delete(struct SRPUser *usr); -int srp_user_is_authenticated(struct SRPUser * usr); +int srp_user_is_authenticated(struct SRPUser *usr); - -const char* srp_user_get_username(struct SRPUser * usr); +const char *srp_user_get_username(struct SRPUser *usr); /* key_length may be null */ -const unsigned char* srp_user_get_session_key(struct SRPUser* usr, size_t* key_length); +const unsigned char *srp_user_get_session_key(struct SRPUser *usr, size_t *key_length); -size_t srp_user_get_session_key_length(struct SRPUser* usr); +size_t srp_user_get_session_key_length(struct SRPUser *usr); -/* Output: username, bytes_A, len_A. If you don't want it get written, set username to NULL. +// clang-format off + +/* Output: username, bytes_A, len_A. + * If you don't want it get written, set username to NULL. * If bytes_a == NULL, random data is used for a. */ -SRP_Result srp_user_start_authentication(struct SRPUser* usr, char** username, - const unsigned char* bytes_a, size_t len_a, - unsigned char** bytes_A, size_t* len_A); +SRP_Result srp_user_start_authentication(struct SRPUser* usr, char **username, + const unsigned char *bytes_a, size_t len_a, + unsigned char **bytes_A, size_t* len_A); /* Output: bytes_M, len_M (len_M may be null and will always be * srp_user_get_session_key_length() bytes in size) */ @@ -187,8 +186,9 @@ void srp_user_process_challenge(struct SRPUser *usr, const unsigned char *bytes_s, size_t len_s, const unsigned char *bytes_B, size_t len_B, unsigned char **bytes_M, size_t *len_M); +// clang-format on /* bytes_HAMK must be exactly srp_user_get_session_key_length() bytes in size */ -void srp_user_verify_session(struct SRPUser* usr, const unsigned char* bytes_HAMK); +void srp_user_verify_session(struct SRPUser *usr, const unsigned char *bytes_HAMK); #endif /* Include Guard */ From eae33951ad8b13cb335fca8eaec73185959eb44e Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Fri, 9 Jan 2015 17:04:25 +0000 Subject: [PATCH 420/531] Hud: Fix offset being ignored by inventory bar --- doc/lua_api.txt | 1 + src/hud.cpp | 56 +++++++++++++++++++++++++------------------------ src/hud.h | 7 ++++--- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 17b311ff..fdc73690 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -945,6 +945,7 @@ Displays a horizontal bar made up of half-images. * `number`: Number of items in the inventory to be displayed. * `item`: Position of item that is selected. * `direction` +* `offset`: offset in pixels from position. ### `waypoint` Displays distance to selected world position. diff --git a/src/hud.cpp b/src/hud.cpp index 6b28021a..86236565 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -102,7 +102,7 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr, if (mode == "box") { m_use_selection_mesh = false; m_selection_material.Thickness = - rangelim(g_settings->getS16("selectionbox_width"), 1, 5); + rangelim(g_settings->getS16("selectionbox_width"), 1, 5); } else if (mode == "halo") { m_use_selection_mesh = true; m_selection_material.setTexture(0, tsrc->getTextureForMesh("halo.png")); @@ -196,24 +196,25 @@ void Hud::drawItem(const ItemStack &item, const core::rect& rect, } //NOTE: selectitem = 0 -> no selected; selectitem 1-based -void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset, - InventoryList *mainlist, u16 selectitem, u16 direction) +void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset, + InventoryList *mainlist, u16 selectitem, u16 direction, const v2s32 &offset) { #ifdef HAVE_TOUCHSCREENGUI - if ( (g_touchscreengui) && (offset == 0)) + if (g_touchscreengui && inv_offset == 0) g_touchscreengui->resetHud(); #endif s32 height = m_hotbar_imagesize + m_padding * 2; - s32 width = (itemcount - offset) * (m_hotbar_imagesize + m_padding * 2); + s32 width = (itemcount - inv_offset) * (m_hotbar_imagesize + m_padding * 2); if (direction == HUD_DIR_TOP_BOTTOM || direction == HUD_DIR_BOTTOM_TOP) { width = m_hotbar_imagesize + m_padding * 2; - height = (itemcount - offset) * (m_hotbar_imagesize + m_padding * 2); + height = (itemcount - inv_offset) * (m_hotbar_imagesize + m_padding * 2); } // Position of upper left corner of bar - v2s32 pos = upperleftpos; + v2s32 pos = upperleftpos + offset; + pos *= g_settings->getFloat("hud_scaling") * porting::getDisplayDensity(); if (hotbar_image != player->hotbar_image) { hotbar_image = player->hotbar_image; @@ -243,26 +244,25 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset, NULL, hbar_colors, true); } - for (s32 i = offset; i < itemcount && (size_t)i < mainlist->getSize(); i++) - { + for (s32 i = inv_offset; i < itemcount && (size_t)i < mainlist->getSize(); i++) { v2s32 steppos; s32 fullimglen = m_hotbar_imagesize + m_padding * 2; core::rect imgrect(0, 0, m_hotbar_imagesize, m_hotbar_imagesize); switch (direction) { - case HUD_DIR_RIGHT_LEFT: - steppos = v2s32(-(m_padding + (i - offset) * fullimglen), m_padding); - break; - case HUD_DIR_TOP_BOTTOM: - steppos = v2s32(m_padding, m_padding + (i - offset) * fullimglen); - break; - case HUD_DIR_BOTTOM_TOP: - steppos = v2s32(m_padding, -(m_padding + (i - offset) * fullimglen)); - break; - default: - steppos = v2s32(m_padding + (i - offset) * fullimglen, m_padding); - break; + case HUD_DIR_RIGHT_LEFT: + steppos = v2s32(-(m_padding + (i - inv_offset) * fullimglen), m_padding); + break; + case HUD_DIR_TOP_BOTTOM: + steppos = v2s32(m_padding, m_padding + (i - inv_offset) * fullimglen); + break; + case HUD_DIR_BOTTOM_TOP: + steppos = v2s32(m_padding, -(m_padding + (i - inv_offset) * fullimglen)); + break; + default: + steppos = v2s32(m_padding + (i - inv_offset) * fullimglen, m_padding); + break; } drawItem(mainlist->getItem(i), (imgrect + pos + steppos), (i +1) == selectitem ); @@ -275,7 +275,8 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset, } -void Hud::drawLuaElements(const v3s16 &camera_offset) { +void Hud::drawLuaElements(const v3s16 &camera_offset) +{ u32 text_height = g_fontengine->getTextHeight(); irr::gui::IGUIFont* font = g_fontengine->getFont(); for (size_t i = 0; i != player->maxHudId(); i++) { @@ -326,7 +327,8 @@ void Hud::drawLuaElements(const v3s16 &camera_offset) { break; } case HUD_ELEM_INVENTORY: { InventoryList *inv = inventory->getList(e->text); - drawItems(pos, e->number, 0, inv, e->item, e->dir); + v2s32 offs(e->offset.X, e->offset.Y); + drawItems(pos, e->number, 0, inv, e->item, e->dir, offs); break; } case HUD_ELEM_WAYPOINT: { v3f p_pos = player->getPosition() / BS; @@ -508,9 +510,9 @@ void Hud::setSelectionPos(const v3f &pos, const v3s16 &camera_offset) m_selection_pos = pos; m_selection_pos_with_offset = pos - intToFloat(camera_offset, BS); } - + void Hud::drawSelectionMesh() -{ +{ if (!m_use_selection_mesh) { // Draw 3D selection boxes video::SMaterial oldmaterial = driver->getMaterial2D(); @@ -521,9 +523,9 @@ void Hud::drawSelectionMesh() aabb3f box = aabb3f( i->MinEdge + m_selection_pos_with_offset, i->MaxEdge + m_selection_pos_with_offset); - + u32 r = (selectionbox_argb.getRed() * - m_selection_mesh_color.getRed() / 255); + m_selection_mesh_color.getRed() / 255); u32 g = (selectionbox_argb.getGreen() * m_selection_mesh_color.getGreen() / 255); u32 b = (selectionbox_argb.getBlue() * diff --git a/src/hud.h b/src/hud.h index 9583d660..a28416a3 100644 --- a/src/hud.h +++ b/src/hud.h @@ -130,7 +130,7 @@ public: void drawCrosshair(); void drawSelectionMesh(); void updateSelectionMesh(const v3s16 &camera_offset); - + std::vector *getSelectionBoxes() { return &m_selection_boxes; } @@ -148,8 +148,9 @@ private: void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s32 count, v2s32 offset, v2s32 size=v2s32()); - void drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset, - InventoryList *mainlist, u16 selectitem, u16 direction); + void drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset, + InventoryList *mainlist, u16 selectitem, u16 direction, + const v2s32 &offset = v2s32(0, 0)); void drawItem(const ItemStack &item, const core::rect& rect, bool selected); From 2eeb62057a9e08def6a0f013e3ca5d84768d1566 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 10 Apr 2016 23:51:36 -0400 Subject: [PATCH 421/531] Hud: Cache hud_scaling, fix minor style issues --- src/client.cpp | 2 +- src/hud.cpp | 48 ++++++++++++++++++++++++------------------------ src/hud.h | 6 +++--- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 2a8e02d6..4ffcec6b 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -265,7 +265,7 @@ Client::Client( m_cache_smooth_lighting = g_settings->getBool("smooth_lighting"); m_cache_enable_shaders = g_settings->getBool("enable_shaders"); m_cache_use_tangent_vertices = m_cache_enable_shaders && ( - g_settings->getBool("enable_bumpmapping") || + g_settings->getBool("enable_bumpmapping") || g_settings->getBool("enable_parallax_occlusion")); } diff --git a/src/hud.cpp b/src/hud.cpp index 86236565..d7214189 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -41,7 +41,8 @@ with this program; if not, write to the Free Software Foundation, Inc., Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr, gui::IGUIEnvironment* guienv, IGameDef *gamedef, LocalPlayer *player, - Inventory *inventory) { + Inventory *inventory) +{ this->driver = driver; this->smgr = smgr; this->guienv = guienv; @@ -49,16 +50,15 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr, this->player = player; this->inventory = inventory; + m_hud_scaling = g_settings->getFloat("hud_scaling"); m_screensize = v2u32(0, 0); m_displaycenter = v2s32(0, 0); m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5); - m_hotbar_imagesize *= g_settings->getFloat("hud_scaling"); + m_hotbar_imagesize *= m_hud_scaling; m_padding = m_hotbar_imagesize / 12; - const video::SColor hbar_color(255, 255, 255, 255); - for (unsigned int i=0; i < 4; i++ ){ - hbar_colors[i] = hbar_color; - } + for (unsigned int i = 0; i < 4; i++) + hbar_colors[i] = video::SColor(255, 255, 255, 255); tsrc = gamedef->getTextureSource(); @@ -196,8 +196,8 @@ void Hud::drawItem(const ItemStack &item, const core::rect& rect, } //NOTE: selectitem = 0 -> no selected; selectitem 1-based -void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset, - InventoryList *mainlist, u16 selectitem, u16 direction, const v2s32 &offset) +void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount, + s32 inv_offset, InventoryList *mainlist, u16 selectitem, u16 direction) { #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui && inv_offset == 0) @@ -213,8 +213,8 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset, } // Position of upper left corner of bar - v2s32 pos = upperleftpos + offset; - pos *= g_settings->getFloat("hud_scaling") * porting::getDisplayDensity(); + v2s32 pos = upperleftpos + screen_offset; + pos *= m_hud_scaling * porting::getDisplayDensity(); if (hotbar_image != player->hotbar_image) { hotbar_image = player->hotbar_image; @@ -235,7 +235,7 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset, /* draw customized item background */ if (use_hotbar_image) { core::rect imgrect2(-m_padding/2, -m_padding/2, - width+m_padding/2, height+m_padding/2); + width+m_padding/2, height+m_padding/2); core::rect rect2 = imgrect2 + pos; video::ITexture *texture = tsrc->getTexture(hotbar_image); core::dimension2di imgsize(texture->getOriginalSize()); @@ -265,7 +265,7 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset, break; } - drawItem(mainlist->getItem(i), (imgrect + pos + steppos), (i +1) == selectitem ); + drawItem(mainlist->getItem(i), (imgrect + pos + steppos), (i + 1) == selectitem); #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) @@ -327,8 +327,8 @@ void Hud::drawLuaElements(const v3s16 &camera_offset) break; } case HUD_ELEM_INVENTORY: { InventoryList *inv = inventory->getList(e->text); - v2s32 offs(e->offset.X, e->offset.Y); - drawItems(pos, e->number, 0, inv, e->item, e->dir, offs); + drawItems(pos, v2s32(e->offset.X, e->offset.Y), e->number, 0, + inv, e->item, e->dir); break; } case HUD_ELEM_WAYPOINT: { v3f p_pos = player->getPosition() / BS; @@ -381,8 +381,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, if (size == v2s32()) { dstd = srcd; } else { - double size_factor = g_settings->getFloat("hud_scaling") * - porting::getDisplayDensity(); + float size_factor = m_hud_scaling * porting::getDisplayDensity(); dstd.Height = size.Y * size_factor; dstd.Width = size.X * size_factor; offset.X *= size_factor; @@ -450,18 +449,19 @@ void Hud::drawHotbar(u16 playeritem) { if ( (float) width / (float) porting::getWindowSize().X <= g_settings->getFloat("hud_hotbar_max_width")) { if (player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE) { - drawItems(pos, hotbar_itemcount, 0, mainlist, playeritem + 1, 0); + drawItems(pos, v2s32(0, 0), hotbar_itemcount, 0, mainlist, playeritem + 1, 0); } - } - else { + } else { pos.X += width/4; v2s32 secondpos = pos; pos = pos - v2s32(0, m_hotbar_imagesize + m_padding); if (player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE) { - drawItems(pos, hotbar_itemcount/2, 0, mainlist, playeritem + 1, 0); - drawItems(secondpos, hotbar_itemcount, hotbar_itemcount/2, mainlist, playeritem + 1, 0); + drawItems(pos, v2s32(0, 0), hotbar_itemcount / 2, 0, + mainlist, playeritem + 1, 0); + drawItems(secondpos, v2s32(0, 0), hotbar_itemcount, + hotbar_itemcount / 2, mainlist, playeritem + 1, 0); } } @@ -486,8 +486,8 @@ void Hud::drawHotbar(u16 playeritem) { } -void Hud::drawCrosshair() { - +void Hud::drawCrosshair() +{ if (use_crosshair_image) { video::ITexture *crosshair = tsrc->getTexture("crosshair.png"); v2u32 size = crosshair->getOriginalSize(); @@ -600,7 +600,7 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset) void Hud::resizeHotbar() { if (m_screensize != porting::getWindowSize()) { m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5); - m_hotbar_imagesize *= g_settings->getFloat("hud_scaling"); + m_hotbar_imagesize *= m_hud_scaling; m_padding = m_hotbar_imagesize / 12; m_screensize = porting::getWindowSize(); m_displaycenter = v2s32(m_screensize.X/2,m_screensize.Y/2); diff --git a/src/hud.h b/src/hud.h index a28416a3..0b69c58d 100644 --- a/src/hud.h +++ b/src/hud.h @@ -148,13 +148,13 @@ private: void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s32 count, v2s32 offset, v2s32 size=v2s32()); - void drawItems(v2s32 upperleftpos, s32 itemcount, s32 inv_offset, - InventoryList *mainlist, u16 selectitem, u16 direction, - const v2s32 &offset = v2s32(0, 0)); + void drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount, + s32 inv_offset, InventoryList *mainlist, u16 selectitem, u16 direction); void drawItem(const ItemStack &item, const core::rect& rect, bool selected); + float m_hud_scaling; v3s16 m_camera_offset; v2u32 m_screensize; v2s32 m_displaycenter; From d7908ee49480caaab63d05c8a53d93103579d7a9 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Wed, 30 Mar 2016 07:50:10 -0700 Subject: [PATCH 422/531] Convert nodeupdate to non-recursive This took me a while to figure out. We no longer visit all 9 block around and with the touched node, but instead visit adjacent plus self. We then walk -non- recursively through all neigbors and if they cause a nodeupdate, we just keep walking until it ends. On the way back we prune the tail. I've tested this with 8000+ sand nodes. Video result is here: https://youtu.be/liKKgLefhFQ Took ~ 10 seconds to process and return to normal. --- builtin/game/falling.lua | 86 +++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 19 deletions(-) diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index 3ab64f67..cce8d4bf 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -147,7 +147,7 @@ end -- Some common functions -- -function nodeupdate_single(p, delay) +function nodeupdate_single(p) local n = core.get_node(p) if core.get_item_group(n.name, "falling_node") ~= 0 then local p_bottom = {x = p.x, y = p.y - 1, z = p.z} @@ -160,36 +160,84 @@ function nodeupdate_single(p, delay) core.get_node_level(p_bottom) < core.get_node_max_level(p_bottom))) and (not core.registered_nodes[n_bottom.name].walkable or core.registered_nodes[n_bottom.name].buildable_to) then - if delay then - core.after(0.1, nodeupdate_single, p, false) - else - n.level = core.get_node_level(p) - core.remove_node(p) - spawn_falling_node(p, n) - nodeupdate(p) - end + n.level = core.get_node_level(p) + core.remove_node(p) + spawn_falling_node(p, n) + return true end end if core.get_item_group(n.name, "attached_node") ~= 0 then if not check_attached_node(p, n) then drop_attached_node(p) - nodeupdate(p) + return true end end + + return false end -function nodeupdate(p, delay) - -- Round p to prevent falling entities to get stuck +-- This table is specifically ordered. +-- We don't walk diagonals, only our direct neighbors, and self. +-- Down first as likely case, but always before self. The same with sides. +-- Up must come last, so that things above self will also fall all at once. +local nodeupdate_neighbors = { + {x = 0, y = -1, z = 0}, + {x = -1, y = 0, z = 0}, + {x = 1, y = 0, z = 0}, + {x = 0, y = 0, z = 1}, + {x = 0, y = 0, z = -1}, + {x = 0, y = 0, z = 0}, + {x = 0, y = 1, z = 0}, +} + +function nodeupdate(p) + -- Round p to prevent falling entities to get stuck. p = vector.round(p) - for x = -1, 1 do - for y = -1, 1 do - for z = -1, 1 do - local d = vector.new(x, y, z) - nodeupdate_single(vector.add(p, d), delay or not (x == 0 and y == 0 and z == 0)) - end - end + -- We make a stack, and manually maintain size for performance. + -- Stored in the stack, we will maintain tables with pos, and + -- last neighbor visited. This way, when we get back to each + -- node, we know which directions we have already walked, and + -- which direction is the next to walk. + local s = {} + local n = 0 + -- The neighbor order we will visit from our table. + local v = 1 + + while true do + -- Push current pos onto the stack. + n = n + 1 + s[n] = {p = p, v = v} + -- Select next node from neighbor list. + p = vector.add(p, nodeupdate_neighbors[v]) + -- Now we check out the node. If it is in need of an update, + -- it will let us know in the return value (true = updated). + if not nodeupdate_single(p) then + -- If we don't need to "recurse" (walk) to it then pop + -- our previous pos off the stack and continue from there, + -- with the v value we were at when we last were at that + -- node + repeat + local pop = s[n] + p = pop.p + v = pop.v + s[n] = nil + n = n - 1 + -- If there's nothing left on the stack, and no + -- more sides to walk to, we're done and can exit + if n == 0 and v == 7 then + return + end + until v < 7 + -- The next round walk the next neighbor in list. + v = v + 1 + else + -- If we did need to walk the neighbor, then + -- start walking it from the walk order start (1), + -- and not the order we just pushed up the stack. + v = 1 + end end end From 3b43e7e87cb83f44820838c9d4b1ab4b82467f09 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Sun, 10 Apr 2016 11:03:16 -0700 Subject: [PATCH 423/531] Minimap: revert change from RGBA to Indexed @kilbith spotted correctly that I had accidentally removed the "soft" edging on the minimap overlay by converting it from RGBA to Indexed, which killed the transparent pixels on the edging. --- textures/base/pack/minimap_overlay_round.png | Bin 4398 -> 22044 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/base/pack/minimap_overlay_round.png b/textures/base/pack/minimap_overlay_round.png index 959535bd9fa3ac3eb59b5bcb52f1f6817683e6d6..16e3c41c730d785aaaa83e7fb5bd5d68922cf828 100644 GIT binary patch literal 22044 zcmbTec|6oz96$PszsNTK8zOA#}vFoZ(3iiwOpC5$CzD%DenM#%2TAXy{C zV5UvUh%6xng%HMWFxx%T^V?qcb?+bdD(O4lvwY6ye9mWm9}mu2nMzA3NI?)JjWs)E z13_@`UpOSO0sL4B?OF#vHn>@so`M9zKRFEriQp5-Yi3S2AZX(@;WrFQ%a8{jiU(mW zPm2$WN^OPdljOa8AxH_ro;qO{`hA+&ACSQg7I50ujcyDl{H1d4S@EK>)%FjM+*MD{ z;00&38>TMZf`18^C1POCInwQDOfEVHlNJN5_-n2VF6Z4@*^dzwH3%lxRqxAw_CEPa zrsdo_~N06Q+v+Jc*d$*CY##t-hE(F|t`BIA- zGLz=tRJN9j;5|Q#4XB?t@kR-X*(~M_>`Uj8I^=k+_|pCn6)4=GyvL_10g1gH6&0m~ zCI6(;F<#mVZQLqOykIrH202-P=1ms1u5+$f#+m0;BzQRGUOa5NRg5GGDSfIDTeE^k zkdgLfJuzexsk?8z((?D=?X@dC*T3@$i0cJ{8Xirs>?&9$2D}~WOhkH{rCD_bRa`u5 zO^w*s^7pLnIi+Ke8AQ6YYm_Q6eZt16Lz#d+?5!=Bozox=A_S`+1)dzDU{n>oM%4Y` z@ekhq1{;f_s(TyTSlUeQ{~x^@B~}zSEo5#8NwoXB@&|YPk(ruNOAjla$Q_Zh;G@@? zt*;tRS-9h+v7IcVgWk?Ik$06Ee4dqm9VJm9B^Xq#)2oUlUvaYkj!Br^U#?1i$TCV0 zd=F$xi`NNhxKo6Lth2@%-ZL1?F_tvyLPFOkYr){@XYJ<$6Y{+?{|usgXc!&7bRbB6 zx&^OW{zhrY5?AwWnMBn?b}tZ3P*X==^Hx8ijSgaI+%e7N9wM)&gjVUSC-aBAfMJh~ zWOMRoygh^1sw3FziyPNG9I#AyoiUslkeSC!Y7Eb_aax_UCYl>VXJL>k z_lnlAg&LLfPwF1?&LvXn465>-zbfYz_lZHp^eI=zaU|{6B$H_%HI3iFY}oJpmcdHv zqu6^@Txdn}I?=o#a?t$G)7XymfW}%!*e7Bnwu8o>qVZjs8T?8O_4~3Wi#?MGsYy)3 z;-mwwT&UHjE;p#XeV8PIvRFi3#@gWUizVi_sOTVepX^(^*z3>E9yo)2(d|>EF9!$o ztzgzG2=zg)He0=68lwE zQDhjPFyzfabW4S~#N{JRp}3@Nd}ZuAd^K9Yek?yiN=>qtT5;XuLz7y;Cl`jfGOs5% z3=ZJ&%km>Kb`K;8wVM`j=jZ2bBAn2cojmep3k6hV zF4-z*>s&w0NPp9c4#Bn8OnBY`j>w1UNn%oFrR_`XEp3j5Og{}yKj5cyO#T{sAslyN%rEzO)@~W7RG2|5 zcCeH}&IDM9ZqT=s7~uU&xsIY{tBUyAi<@l_&V^}jtMK!yvTdXybSrsUP0HA$!y_fOJY>274u)m_P>NfAC`^Snsn-+XG2z;vQR`>W`f|+$B zsXOc-7Ml+4%QD~m&0NY@;{F09;Ap_`w6?NW3@a|5aWsL$ynGqzdOuVYIh1|Pwr5FxjzOWgy4Y+heB)>$Am%w1b7 zi7p%(R82;TW$qXCaoM>inEh?Mv#$GA98zRtWF#1S@BtJq76G-}7VxHe%2KA5*RSP% zJ^BRM{MaP-`g_Ksd$K$3G*aH-LzJ41jk(==r8UM&)G6zKtXxz^-48pd)te za(W#+W$!NF^ZG_dDb`k2fq_%G)_Gj_?(f+N_C?)wl(p*U;g;Ik+Wr~I6J+H5RzC(a zzK-+2KA6sAQzO)s<^3#!qg=fEjSKZl2*>~6YhhywKm{6-}8$P6+X`nxOU)DL` zHQPP5#=&4r2Apq3Yil>+cqsi~tkj819o&hDiLUnc_V)t=1DV|~M95avsz5ey4WBU* zm%lI(*g9W)50iI~5@9EX5rZ;T9E@fV*V!l64i*ngVuzS1qCEMLkxNmZT^E-GcMx1m zhXY}qxdOdXgGIK>zCP3qLn)#vU&@c11H$X=fw5sSJsEy)nKbQ6%|a=X6tr?`IK}R{ zof z1v%h;bOOC&@)x8AO-#|zM~@x_R_+J4E2uQFGpf;mcG$Z*IFP(F7Ou(zyS%0F<~xoW}AauUiHQ-TaEJMYJt zxQ9nYWt{@s+dlHxvyT_0KKD`H+I&5YQf9I4e7}Hq3>AT#yc#=i!fy&qNi+(1t)Bo+ zhKYF6Eq8o~eTS1y&soIuD>Yen?f`?o-T1Xjq1{!vm=E`tBmon`S6NO=z2@W^|4YXbGdqdCEaF;b6z74=u=>9Ek9E(bVlCn<3t}LOK-Smto zD2T+4c&9}#jr^i%clVI3w-f2b>$~U(d zufAu-2RX|nXlJmuWdyOyzN!kD-%KBB7BXdAm2W?sJ-PG>ef;>vh^dmAikiW2^@aU4 z{7GU}B9Ws%?BOb~aOrgAFQlm3Z+Z?7;y13ZPnF&8aU~k2rluYw*vdJs1l!p1mHt{6 z#lT5fo49KS#|k+-?kQX6y{jsQPlEcHWkoYrfvMAs`SA07qN?@LnE*Fb8p|ib&QIuek$?2_FiaMHvQ)^-TVP5HS+Leb!yyw+5C?m zKkfu>NK?;tGpN10P;hsr%Yif2*0brUsbPnsubFf#k{e%I4ZF@qxpqhsXkVqc@DQtF@ei zSogKMj=;tv`B(9stVW;VogPs*+akF7vgE6+urb49c-?R2q6;&Rs=oESNM&w~yR8Jn z)JR9MvPKIYf-|i&nNKDDViA#ZBK;{6uhvEF3ngw|>e!`I6nt|1g|lg{k{KkyRrH;^ z!LCcSOz+!65Ogui()y}2TCQ$cy_IP#3M571$4!3K%@eI#-j2o93CY80MrHK3@a`J_ zTeJauateulYPrDn60{Kp{2<}^e#n3#pm5VobJ=L zu3M#}=zGmXUxnx5OnczKa3*S7&VuuMFijK-wcjb=8~=Mvx20kuxiQy+$@6Vp9FO0g z_eQ2S?*UyQ?sgGNroF-&hRsgvlYRk1LKAOniF;RR2PZS?4zSbvQnXiLRE}Y8!?|`w zUEPjPh`D8Pg21pFcudp7A7|q91`k|usxGrH+H)!7w;-9ajn(M-gaa!+E8RO>Mekbh z!NktjQPJ`W3Td^W^KL%)dO`w(E3zx^*m_p6tNhQ<|fnY|48ok$pcfA+e7KPzYiWZoYiACKP|^C6%~o~Al^o^~la*wNwX5*^c z^`M|2#||t(5E46|#5Er-&f2>(<1w)D=uOJ?nx&$^G>6OuXe;cCGZ}f38X3{&M>LI# z0!}d-gawQ|ixh>M*I~WW>_VR^=iR$@^*J0)$+qZR%Ajogopa)B>mW&nG5t>V?amKw z*VB+BQCyp^>-6Gib7H4YGS?MVIs3eCf{@c`LR(u~3)8;}^Siz^!7i=NTekktq>sdp zOpTU7V7$1uKb$a#-%HBm89N6KA&f&mF!;tD>;+BA9j5j=4_D8s+FBuqLat{P~PL>;GQfaihYRHsob?wxkUSpO@I z<1`+vYn;`qWHY9Fl%t1I`>LEvRy<1V(@X4&CdXP*)_y|msM3qITY)~F)fsm7=eyS$2ZZ*|LK$u@N|8 zH{K9)**q5iap7sT7GXCr|=3SFK1@k4&Z`_JNiMdn06o zxdm3WCY?F-cq!_oV?A~&Sfk=?0lRft4(s_UC@)~DQ4ooxX;ltc)U~=HASz{R`Rk)* zu5nWQyQvL7Sp_Q6HD$6Pz_hMpQ3Qc(wivn8p2Czm$G@@(}xWz*gvzIJn%HT$$r z@U$bVm;5 zc50qeGVt<31w6K50F77e+ITZ{XOa|VNKAmj>oOwIB*Tl+6R$LJ_8pd3JFti0Lux3# z#cd+rwsuy$yg&x)yCjxjzxc+}`Jg1uf&S~K6z)dF_ijAbL5j~{i}Y4T@fWi><{UVq zIOkUs=>#^9+n+-*=eti!<-pq``lfwQ{4iaP-CW9&t5b4=>w)c8{~nUTX*Lo{D>R2W z`JcC;X@Ut;wE0lzNSrrTPciNuBh9n( zSMIs4?{Y_SZrZgoE!J2Nn1&p*2)v4n5CR$6O7fTC&$LG6<4?Byv?3A&mJ+vyWuQI# zVXRVF<0oB?E1Pa@K^Zix=KJj@lcYCjyW9p2IAc|W{;Q#_LP(pd6@M#=50xLBtx;sk zVT1x<`-av%{n3gDh2CQ`ld_a?c;XLMNt8O7Am1j__W1w&%y#7WHctTS87!{kMft0I`P3&9SU z(j?L87D2-r{>wi~k{G==H0P52PRSrcX&Y84`33>4YfGAu-@C_VA)8y(9ZJtoBbp+D z_}}NY-pq3@x%cwrOY;U7^cMGB20y$eR{u1hcJPJh z_LvWoZZAVSnLCH#yXytn!Gs&^E!YB}MF_+`W}7{*IJvpGrwIjuI8of=hP7Ymcf%Wu zb{ikvr%;z2YoyCwT~irEWnI1Z0U>oWinG|_;hGX{YbXq}GYH|{~s zqy&9oxLA=#^FS77eeTD*cL9xS_{(Lgun0q#W5>Maq#TN~5vy6tIfqgow_Z+94q`IV z|7f}BpjOsJFfuAIr{u`T9>UlF(;P35 zKjL7+Pq#)0{^g!~f+Al{?<>HPZ*Fz3H#~N%*#%Jd7QT<=1=w1YchYM4A*Vcg+Q z$i7af7Z> zs5y~eX0V)(gZ)L_K7WHRn*-awya#SiwU`aekuTXX^9+HCpt+O{)kShvG=PwWlO2k> z{k*)qfT#1peB{N&*j~uU<;_AZDbcg$GS`sNliz*%`{2so^mRL#196^3g9R#G#eg;2mPEqgw8c5yc0u)$E6u+Pp}h zh@)joH*elNNL=oA7}va1cM1siC5m&&I&hzEO8kf-BN687acP!A5!DB;>FtLu>G6c4 zg)|g^)hy@JnaNQ5k~rk3Bbjq>PM!KfG9e!g(Zju@20Y}TG(H4n<{Z36P=U00Fi79T zc9>-b6@znpVEr}3mv)}WBbIpmW1=d-|YXkI_M3y3DFjIr*rqGKWEy~fe z7U3#w-#4h#QcTH4!EC|+k9Ja`ryxJyYh8q7Sh~DKzkBy?8nr+Z!q&7-cOtPy53~leGBPrhS4AM?+J~5(ogn+%x!Zh7o7h^U^?!~kAO(KF=|kzy+#sK{pI(R{Vi6zY ziQ_DUkoV|o!*sZi6CPR~VYb7w1H9ZZ9>j_|JgY;Mb-&4)ANeSfqUpLH)_b_cLJ&4b zQ<|(zO6Hl>r6HS3`fCE(ToxW^^2!+6^BaR@wl2cvLnNz25|}H@n!bmS-9r3ggfe)kXd=Qn1e@?0ZDZ^m zMZ6v=@D9HdL4+`-C-O@WpawZbF8zh2i;OwISdHqSts2aW$w}|Kq1CkWqy+KsWPb~r zOXWyoY4KW73hp=Q4QMDQ#q%%C<@#0N5$4i(GXd(nE}3>vVW`rPJm3$LRMO%@t ztnk=F0rk9<{;0JD4>gGSo3hmQ2?#-q^|L*38xGT?%sO8Uv^c;TGN7lFx6{+p|4=IN zD;?%}L=$iz`mZTnB50rWcL1t2^MTf*`nk6o4f|!~!&g64o9Eda-Y(^iU#X{NyZZMd z_5qZ*l9{k%iFGBgUkVdI+`0Sc>1N0NMB;P%k!%VNWO-~BzX)DYcs?tK zx>O>ulL)B%(sxr42dY$pHt@`lk^3w=JIN+4H|IZO`AJNF5XD{pMRU~HO8~j1m3oSn zj)lfoM!pL38oNlyihhrzB2v1KRqko52TF0H@^OUmQH1;P>%f2f*JVIDVQDxRSwm1s=#siC=62>ccLKZ0xN~a%@h36qct-$ zZm^%F?g?URp%jztKD+yZifu}lB{uC(ReR}klDgrxg76Y}Iex@7>yjmva|lZeVrzoT zU6&~$66h$%&pPLG861@13QkJYAbDERbEjRzCerWGv&58&~;5f3>ojZ3xF~#Q3r`D#@x5!rJ>n5@Db|4EF zCCu_=7Q?5#;O+W6Pp6PxCJm1tNAA(BBztj1prvzixQ2Teth;h_8Ft+nlxgZa&yzCG zKw0{{@sX|jSXpK-sGO77?9@J;`Emq=k#T@I%WRZV9(cSYj^fzv{pft21cCq%0ETPY z!9p}(UYUFl+4Y(i5V62)$20*Gg>WoXZf9Jr<-{gG5?eVXhck`pOiJc!pn2(iuZ8*A zoU@KKGAcKb8UaDJ3!6|&RwCikxl4)$mQd!ipy14)% zxr~!L9z1x^hr|N+AltqWKD`>4<8KYU=zb9w7bgt@^?l0G8}Tb-YIZR2r`|ApG63VK zuceMmvpiKmynFb)JP0;l-CSE3yOaq9RW02YZjqiHEd2Vh_UiqR2Cy{KRce^B!{Xn+ zh?4Tq5Xtbo*u>Zvrau`f2ezub=LOVIzuSwt6-ox@apj_1PD+Z1zXiN}aMJZpZ)4$W z1F!&VK`a<8r08n0h`*s z&Aax3lVMKYjMX1!38}Y(*_Xn1Coky`&^wKf2JzOH4>32t?v^6~xQ0qo=&24TtSZCr zDOd+djozt#yLI|?YUXt|V8mzprpb~ske{2|U(FSM2bw}bAt1f)1YsO#`y8nR2Uu4| zbWB(4Gsly5D8RX9wx;MQ(FG+V>bj@nc(5VEF5iJxpO|Mc@MOgm| zTNrI-e9bjI#uEXRBsn_MQ-vAKP7gbt(MGKQ$ujM_i5r|R*)2Ih7R`xV(rgN~>Tm+J zyuvH^bFKH4ZvueA6f0g>_9&zA^#SkbE`{)}3XO>E?)Bp=*R;Njw4Mi?x6~ze&de2Q%T8T^_;)oOC`A92fRwSx4Wx$eSJn+d4wA0@CZ z#;F3%tdM=GeuJ9mG7<}l{=qYJx1923;=iRk1@+6{F6Fp7$6wEp>jAXcx(UPTU|%7i6E_ZyspSqb9nn8cbw(v z9;*Rn%~@2VJICDGT+69#y}DtbSc?9zmFPAv13^>vuy0PAUa7Q_(jP;`J=~ANNx!Xh zx#e)3aV=@E>|?MA%9?dY91`mYv;+O~%b@F8XC;2DhiHo!`NG?S7qgK&1Q1l-Rjnst zWDCbEg8u0aV(q%R;Jp~>7aD?e3#H04TS;v|t8v94`Y-32UG0oV{wAp5d)tJfwDa)A z1N*TRLySich0U|Ds;wk)lUuCmNeOYFg!OJp&uRQ8&Mg(dk_bRm_rGzA6Y=zyvTq+C zv7135RN7BFIY1lcs3EXWNDN{yW&ZgyTCG&h`7~H-@qtMa6@jYMGJL0l=^aK~ty&;n zW8b4%W9zJiG&6x3Yb9wlfwI5mWaO@REf5jiC+}E5^gr<>#UY`oWC1gBfWb;K&-(~sG;IM4YQGCM9XubNd`TTj z(QfSPfi8;>pO=0XfJEA#2APLw8+y&eNDE;77XmEGV0D(z0f7iqE?vE@pcJ%r|6i^Q zL|^Ic@FiVUhn|2jdyOuHNVi+UF>45jA7;HH-(yB%$mfJ3T9gD!~O+m1DTqISiGS%(nYfvsZDCA*nJwUAyKn6UP+BQ1hqo=>waYAXT95~Ky z$sQc{*q9Mw*uvRF?MwpFN=G4XeRLEFf-{n3$lUOo1BKP)1| z83a^*g!NcJ@_?uuJ-^>aagM6}IIyv#!I$16B;WlI$f@2|!3y29T=Js_^JoYPIios4 zB0mc55HH8W%bR%U5h9p_whUIw5^?n1)DE(wpDO(5j2*LrR)$+_Fv?vxpnrAKQJj;1 zB&5}3kHFM*zzmDe;T@OxLkyp_hIfWdfY4r}889--|CJ1`Ta?5B!-luvmtnAk&A0pVvlgWfY` z#@GT7C8@m^Ha76>HX@P>apF@dVb@Y9bz^5zdE1r0KErYh3X!slr!GD+xt z{|m|`fs4Od3lw0WTe2RM*5~D7bp+M2Fzsf9C9k)p>$&q4VGwC%Y%K8Deyok=cBw_Y zed3c^>R2M=s|z(?ujP8(ZfDo;2TU#7AY^l(&>`bF-K0hWY zdtu|PS0?+0Z6z^9up@|l&tFGif!#52ad|4CdQJ#Ocfxte0AWZPobbL=xP4sDCqV38B7);?OB}vh=@q`Q1lVK z2oxGB^dTWqYvcwUVi65!wC^3AUW?^#sXutbd4oS_L4NL zq1$OakOxY=Iv#$ndXw9l1g;3y?(9L5yvEa?{bA^CqyJ+epDCkRr_;*ab;w zpOANDrKYfxS;vkDdt^`Hw;wT!1=N)*2BDhlhaIS+`1g0;WMrXqisAJI(~tb6L6fb36_*?atec(st0h@cATYXBEDMi=%C zxo=eiGYVUv?Cu3L(^>74y7a)>ftx#^3&MpGGp~v~u^$ro({}xgUO(h8v*fu^34|2| zBmN}cN9!-egyeKK>taAQ2~t%C0vmCgx)=ypPc61Dx~tJ* zPW}wAwOauM7j^`tZmytPc@o54qrY0y^IB3gZNZXqOwSjcPtVTQ#40=vIw0`;%6#`w z5|ftCY8{E3y6}(I=25}oOMnLp2behW1eh_$vjJGvWF)rs?15NweLOxlOofiDP5p3u zP(1@pY+T+Wjn%h(PuhowCJCHt(3e ztU*x2){2df2j@3V_H8Uh5|#cX5o!?>zzCWpc1ECY!w7&a{$eSk-^+|%KR$Y&>y6z; z&KDOK_x&L(*J`x*Xf;V<*#nV(mx;cneAB!VXL1L){2+chd*G=KmG3_1vx^E*jQ(Cl|dL@)K z%wAZ07A8P&gd>$_Z1y$19%jX*>jgA@h~T-soFG3-%Oe7zZTSo-i&}Sf#qTkwj&euz z3&qXgazp4I{Z+Bv4dDFDPK9n94wr=fyxGR|g8^+-E-jR{?#UhW`th<|j6PvI;?$Lm zIjP+j-1#TSe>xJUf;Qp`?OqH~31z$5|FjWY2-t{A%TEMKvB<)Q1#|RQ#AQK8q(FCp z7Xo(EXXCKYX-GMI$ysBv?6vd}kiroI`md(sDEw*mkL>SoFT91px@h5cKE`ZSjW_OjrrDU<>dMDRbye3x(;e}gq5D2b3_tuI-Q(k8Az(fJbRh~~*h4m)TA|Q>l zgTd%gfZbFBoY;P3R$k+Q2?m(;CMjtWr@OewU@J71OTv=7fDc%o+Ku#JU1hoK z5KgufTcrRkZlR}9){xlWGy6#DDv&;rU+?LZoagO)gZ<42QV_05Yf2mX#*9>Ma*Wr) z3!CkSw1rGS=zBw(l+PRrfG%pma)fj>mjBp5m)rJVx5%~*=(QVM>CYHp!Utz~xz9eF z#J>l;-!nFUlxMfKwkCOtib6P!A;8iD;D$}?bs81%MG><2oddhpEsCo$!4UMY9t6Z@ z3OF#vBP~|SDFg)a zW6ycO2ilz87ll&C+NesCiuOY@alq{d&SY2phOjmEI<29iTtBgy$*FGMTvmZQs}%W5W!c63Igyu+>6uuUQy9cw7b2ue}lL{z3JC^ z3pRqteTk0ZJ{9VKaI*roK&$BiC~T(LzZSTnU^yUyBMnyWVhfyAy*kB#GLG+yb9+(dQFJ)a2Bh?_IMV-! z*HjO?HV(8`h;Ih8dD@oP`}_G719&(eKt}(h3J|}1$@-0gSqi+I0z9(WU$j+Y{yRAW z2+l@gMSv{}b_x9<1~f9_Naaa<$nja2{3paB6^93Pr>m-L!5$R|IJWUjUL(M0rzdXT zB@SdJqF9T+Q>C?*^E#CY6kEKhsj06oQ$TnEnJoZ*0dKQbegwQrS#oUklwJ(QfmIKt z#S4Pj2eE8sWc}F#3`;93{8Zc+!MQYkadB}YmK;0Y1N|Y$5`+~kBLKKH)C%C|cf@6O zys}!Ojfj%2V}Pyg%8wHSUx49u1Ch^sSvW#GbQe@Zo4{G=jY>D<_xOwD1Dw$EQ|Zdn7U9BczK$S*ZP{CJ6B2mQ9IbeB(tn7)DB;#VY_7#ueEY zh5UGX*Nu$iwEDf|&ay7&jt~{G5T*J$U4CTGpHXdmlLaRwM#!un6u;(QQ4+Y41XZ^t zCkgayV8g;u{L7QZ1Ry%y+5_JB-9Mx*2srTHn?p5u;Eg@>8r*}zZS)UbBj!qy-s^y7 z7rZT61d3Mwy=n0aTN5~`L75jtVrx0TAYMCbvnGUpoChtxp|A9V6s851y!%PenG0w6 z#AH#7vp`{3n4AtdZrS+*pg}W*HgGC~uOhcWT>QSu9vS8T(m#ES1p!J0^1UQtriRrY zWdSJWMTsBn%Tqnx8^F$Hb_#lX9o6q;#c5>)vrm2>T@X~-Lp#b~jA;vC@IYp!d%=~^ z%XpODw~K(@YW(~kJO)q{+v1db9^?>^ndd8E*Bt+6j%U`XMbMT8nc18nUoo=(p}LoJ1X%Ozu_c<5B25F0gbOxk=hpN|VnEvEe(Q7wr3?hY@7S|Lh#YWP zu6L?H04fIn$Z;)pK7(>7fZx9a^n;!VD@H2|poIZw`kWX9U0V;x;h>_lO`_275^ZTITTjs4>NmhBrE>BC)#t_NDtRC(ti+NBbSu%ReTN9y-bH`1pF2cA za&2LfR<&x{ag5*^wVn-e3Ag<`@D2S4nOS+jh$bVdjV-|fJ4*4 z>WBH>Xr9IT@upBiEcrg!M~Ge9tG6suE=DYrD}u=Q_ilhm-!5<$yCww=wDt3KsRe=( z5HQ*S8N4B!xLkf;&n51NF#UNUWPPYY6eAoO_o0(kcaeKzY2vFTnit>!rwhliKgyf! z`kC!-0sR@){y1;;{m<-~GZ0cZ(p=XhQFVvF52V&++>~B`liL6WEd7A)zXY4Oq9qGX z8{GvAwg$R@6r>#sPg}x zvh4=J>qFl}ad~POi60xWo#cw+is4or0L_%A(E>{4rb5LpTyvuV&q57M`RIA=3SR|9 zRhm48^3CKIFnQmsGWazHFh?6Pv(6S%YlS%JeWJL`!tw*n0k?|@_ol0L8Kb0CEFg{7_-$t^R8~)#=mkCz3d3a7)Dcl5^ z`D97D2@ZpJ;p+hiPGXRAM-=t}rH-P>~*S z0HRuzC)IQHrfY85kHu%>VolWMC~YNP<2w zZUzQcfW*_WJ;siHB-}AsP^rk^_c*Wbo2;gw>o`J)+;1U-*pDzb^ioub_}Ec6s7`p; zq_wpQ$^j0%agWUQtXFEz@Pavr`h2W%*TB0-CtrNp#ia zFZ%%(6zqv%X||#u{1_}p8Hj7kdfj~4rH+^~mWcu!T${)SC>@$tJLuK>_N0%i9)CGV z4D-8Dx&413Z!UskR(+~y$+f6^<-Y6}?79_AhrfIip5W;;r7N1&_kjC>ChLBDi*fHq zaAI-lU-C;jXaE$4Fi!h$_=v1-<1#K zM;Id?It8N2!^?Y!T(?_spG)>04CdZ&pkkv9q(& zFl>ExQVLTfRc?H8SO}?U5>7v5ojdh}&uloqPE(#_Hw>)y=t+{0wEtcIUSRyT#RBj{ zVG%?S*n^s%6F}~2x;CBx0e-0cicl5&26wh3eq4#2e+x>@DC)jRng3Z%&ujpI=I=!X zf+#a+haz0X5|o85b##wWVa^UP{7N7hsc8txI>H(!8vrU*lqG=&qAdz8(_FcF_3CRo zwah?v3S-&>WiZYXXJ|aO^Ht{wj4V49!3C9MyVG${ZSyCQJGO^qciO!&@hzR$|Pk=xz5nN%XU02NAeH5Wvt z0!P-TDh-r5TDzu}FE}M%(y5er@1+FcP`A(A-$x{uj;jiafL#ROqL3j#fDSAHNdr6M ztd=B8`jjRUh)6Qm{LBBwT$2w|0##I}DUVq*+gy@53OYGkPPcqM?Ec+j=#-A)f3!_nW z@>S~04Fali7gn!zxmpG_JuX^b1b6_ z;x%t6QIergUOpNXf$cb`Gs{c*7^fN1-ykSG11-c}4MWqh>ZLazNba%l_W}eU8#E_3 zeg(^Oq)rB$B4g8pxICk4Y=W_b1IXdb($;?$E%KsfX};T_s%4RA*~V*ZHe(vxJxR#N zKuW8G?@OM4PfY|I|?c_IJZF;l5YFb zPWO5r{2zoad*sE?GLpKy&(apy#=H5nhI25l{BUhCICQFW2q^r8*m%&Xx8G~MKSq+| zC0yJduJ?LBRg(1TRz4lT!NIlfF93(Wg$#0!v%>(ZacDBBVQ{Ht=Qaqt5VKP=KhMTH z-%(@GWu*C5fl8!92fH;E34)^&bKveKmD~uhfF%pj|A*}LZG1!2RDq^+#H_{<(~;ya z38ElTDaFUHFuA4UKN-pXITyh$*q{0G>+l zS%lZhO*C#%hhfR(2PB~NVN#Ft(g>@pcqdnd*W==|e&KLmOtuPIu-3*45Ud0!l6O>S zr0Z4M*_^Nu0)}n)C4YG*oIU}y_uF4ss5L05u@ku zLi9DYmh+F}c2TH-cdxPO8R9lt67vyDqE-s$HPwrW8dP0Pgo@Kd{}7_ON}x{MAGU^< zy8$$x5;Q>@ZhMB_I;R0+;{Zptt&!3&DM3+ujPwTYe_&^GD zIARvu{0aa8hi{s!tnoi?vjEezf8?ln+CES33qY1V zYdABZP98csUg~@1tc0=@&2!u=OJ(h0Y6CQkB;`W;TVpQ?CssbU4R<}nXVdiS4lHzz zzx*V%yPkb6*&{kl3o|5hu_L@5uf{;tnsu4|57Hu?5`n~>EE9SoU+IDRyL}fX6ShMHXQ!imoP}O*&QDOVRm8S zM(5*HFS_40mN;j}rKa;FaH}(;I0Pn%PFZ1Uih+v z>7b&O<7nK?o80i-AAKz>ESkC8dRV)NMs)8^Mq3-Tu(0s?#lsG>Lp0**^3R z7nd4&dZ7ZCz{rIWqba+oKm!Gzo^wa z#%dxrV0=K3P`~x#eCE+dJ-`+3WDiDI&suswduM{{ul=|kF`1Y049xiA#?`}?wlh*- zI}go%zU;{b8uRZ>?_86UlfQu)Vj>p^^TOG0b{lZ-GyJs;4KH<oK-IDWzswY9dzhg(gPg<@n&OhTlAVNWE_pdPBL^hzthB{~L<< zD7w8@E~gPve($o06!L=Y+vK_d7eJIR@(We)uF*n)JDXtZoDhVU8vXyn)|&*B9ez4y83oW#Vm)ITGy z!R2TBR=-{Jy3{c8829K8f3_G@j>Ot+l{Jnv2F3od_>czL>`gSO47v#)CN{8#bkbYz zn&kc)P6HFM-fgq{z8ji*!schB@>H80TBnbG_rw`MyGS~(Z1IXJFmg}E4O-Z2Pm(k^ z75FaVFGlLM;NajufB%^WtS7Y8OqD+GtD6}N_r;rn0wit2waTwv#lW;R0Zei}AqC8F zXdCYS<~`;B#eK2R?)M4Vu2v1PVKV@xhkd^wntNRF$mU^)bP{jBICy_;!y8a%3iALa zn<}@gsi|rG;rh+D$Jh^3Gga4QAWt)+q?rG!hHH;!di~?yna!PH$)(t`5Gk5V&RjM{ zIdY3GO1ZBKM~;?VkBjo#Ddw=4(G ziL@YxjIOFot)o&zM5d`~HmYg1VtDw=_4pwz=rD42-LNH1?XjL@a0Fv4KJTJm#29rH;ol7wxK^vUpTwSMI}T}$|s4(B(Nim$^^f8$~A<`7SOB@xnF zQPe!6G9$GDr9iOh?_ZxdxVfD<@$0V-ZV#8DCP-s`csxG#*EJT&-5x#?AWA@vN0`r9 zs0LeUB$|A;l$B6s48p_~esAFpF^M8A%%ebVG}+HwMyRK%xY+A@Qw7x%EW7Mz?n2lGz2IacW^4tIfbDTKsKz~S*)J9A` z5kw5g^qv;qYJD@gL(*Y$p`s^9tg!A_hGq?hpBGtdeEp??%jKSv|MnwD5N)AL*r2;Zt3 z^^f5A!73V4i=1l0AAnj05?i(Dzn!$IjAV>!D0?x+(CmWcsTwXFrT9^vG5U20;MHPE z9hn?UHmWQSuPqF#Vr$clA1WFSF)B+u^u|A(^B?eafkXyReG4)41oC_#WkyZBm`_3} zImckwdGgz_kr6SAYRcaL^}v4X7yJZ!7H1vhz%%OjrHbY(?|^dkALozgWR48cm2ets zQhS)vWUHnAAV153QKL9mewtA-f;sayHT^bWYTtj8e@`UNOa+}0vn^#C={1hTa7@6P zCO>8^NY(wm#N6kh3qY}d=kDHw%9CF7NWru}+GwM?mtjPyzU{Xxpb0nKAth^iyowGLd?_X9J$VOz%IR`gqyA0|AW{D!uRu zC-uzDZ4OVoCD$lPqQW50^Ii+%aA)}jIL5q2K}Zbe3;K6%;-tME@4=;qRaK&@Oy;D= zW`X^oWEX~)FQaH?HK>taJ@rD22IExU+Ss&z(eRQxEflc687*}S4}7Iz;rD}hFu>|l zPa13SKvwq09*8oP)e{@^>86NmW48~RUyl#Wxh36bZcPt8osLqy&cN&kBqjt=2{+DjGduEZoW%SvAo)_3Q^MVEzBSr+_5lj}VougPQSHx=M_v?tP$_zVZ_ znr0~ls&M2TDHzbDiu4?KO)|eIFX5?eCNOMj_`<)Q6-Ok7q=s^#D^KTxbac5moqVEr zi1T`J3lzgX0{g%tuU@6#kpqQsV-FseA% z{fGc=0CR7}bDP_i%UN&WjilKfG{~?31RFm5T6{-%~B%mkP%z9-ogM9^t(o@L34A>0z zs27K85uds3bLGWDt=?%W-sn0pRh(bo9!EBWY;pdJS&=$4ZzNH(1a-z>FeQLK@-#brZ%?~Rv_lP`u}8#&MUa{B-C_V@R{1Qnm#(&DL~^8w2YikbDy z@D9(|*lAD#bNrdp+Ss_?)>Nc-U~F^I&syZa*5pJthuJ!Vz6s~Rq3o`<&A`{4?*0H} zsE$`xSF1puqUEZoFEv$3_tm2uJGraCD7G9i%S<|IA>bw=`2whyc0<0jsE`hnc9FF) zeUwdLh!;l?qdUQ>IuhPWpfYb24w8$4wuE#H` zsZ)k8(nZCqFlQ|I9?(U|C?46aeqqUp&KOmA_qIrvOvA>&3mfBQoFS5{B0DsT!?)C$ z*j(>i>c4x?Y8ytbu_TdjFMb?EkWe}st{bjr}5dTLdhwbHW4|T2UZJAPlb+NH~ zWoZ{hHrxC@S^&`z_@)H%x9&%)n5T=@248JGbTvqlTw1N>7x=m7{R5KEm|zCpC}bUU z;`#WjJe`Z>sf;SBWVolj;PH+o@?V+fWWh=5aS`h4BE^rGb7+Beblok41X#L~$O zl8*)d7ktxKR@2?1AU^7j+xJ!uC0>Sa-IJqhrWf2+!}5zw#mwB?Fus2#V7* zZyxLs2xbA|-DtZY+g(x4QC?t!K%9vd4vytItb5){X5;;o00Y>aPN+b%xA<~*rD*d%z*JjLTxE}m zsZjsF+}_OX|Ak_L4DnA^jNWCs=cQ5x0*5lz>SUDIfBFYwHRQm%Nvq}ym>WB_p_Rdu zfX(U8%p#%g_Z{~kY7A3fPB}uQ;ji0*}~vE@xtjXNuOoK*XZ9UAeNWcXYac06p0@(Iv>l?96dit4czj)u6hcF!xEfdLQD*2!+&9LN0LEHlxq!1BbuK-f9BAJ zV0bDw7yBZ+PQeRpN7ttm%;G*q3rMaETFg5{2+)2)&@p@hI=lk)vokS zIj$D^%6^StkLI>wMv|sU_MvL_{S#>e+P0GP$2qcxBJ24(GPd*g=ja`gPxoD2NwzE4 z!G2U$^j1VAvXXW0Qu)*oP3YtfzTR`LZ12h=X+dW-9$>cKHk_dRl zl(v+ZRqfGeL4kB}zk^nIIq<+gg210o(zd31k=UX-rO;ya{+W>Z&S+fofXmRJxZ z5mWIO73b5?K6l91whDLS{c#K4z>V*Gklq)HRq%GFO5bre+UXtBeQeTh4-$1IqB@rOaurk)j**<>^GYY%65!&S4PProS$(H_TyIb!8M6{`e1o&mN$XNvJ#|` z%qc(z0$-7>9;{wTm;z_S+8igfGS2ck-)PW@)gwF2tSWf_By3@5DE!;wY6B`3L}QTp zxl$p{ihkiPii9U`?c^SgO|>k5C3mlXvCl?WLf45F`>xxZrArU(mVhF@Y@k=Tmb-lM8NaejJ%VmtCDt z1K4j9f&UGD4tN_N113i}8o0v=o>2h6EBar7fYLJLkqEzR=VS}#KoL;1foJ^TG5`qC z>}+suu^(5@cjwLy3J-D>+vRj<6;)?>Z$jr?8Ser##{R+?RMQsibZ0oAJ*cF8iB*A0 zTC?xiTL>L$2S5pXqn9DoTJ_GKyH~?HdJj78>*ob5TZAcKCUate7}J}9$IQ$-r?wq5 zhBwwP{_c(Gw7lJehB3l1ZzmFfy4q7s@HU6A^OriKxgH?4HiE~016C;(bI1nsNq9r^ zlwvVe9;}#n3W*94lV$gMY^U5gQ(dk52+?MJN~15w*J9sCU13 z*Ciw2K@gYrApxL@vR~~>Cv5Hdec(Th?tFD$XzLQupB-eQo8|b?Hjm(I3Jrj;Y~e0Hr}=FMdUSYKi~6|O;qO0U1u z%qTdZ{gxqLZR6dz8v7~fa3su9a9WPSHo1Y3%CD>q;<`Ew`57?pesF2C9|2&_sFiF9 zp)wEfYFKqVntAcfRxpwcsY>B%m8 z<4@B?AsKM?ih|?S*4GLq2Szv3Zb==+1mq_*ogXzI`n)$48(ppGPm7n);RE z=`WSP*^Qxo_a?xYT%g~pd%CxHy5uQy5Xwmp<=VjvL{YY_?SO~29QQ}8k%K7K&7d2v zkP|oqc&M!Gh|M&cTjBjpJ#Ac^A;ak~2!r)roXyYAREw%y(ok>t=Md(*c+9)anvGX}eQQH>D`lo?z$1IgF?~HRtx=Ui!2NiiH=2_h8<8F}@-5(8@qf?ivJPw!1#gq$+OImUV+yEGi!=6fGR?E8@5cZqMvMFm<`Zx!}XimxYQy z!XooNERTeS9EWChch#xKq`Z@5#CO^^L5{qOCs@zW^m2&fGFa1uRfXn6*;CVtQMywa zktwK6D>&@CVX{M`jT+hVd0%8HiE1c_xl_8J$4ys%-Cwt2c-nxj3cEIurir;wdLsO( zWAPnCsViUg3XsR7^k0@EiRkCoAW9wist?K)&`O{X~vEqp0xWu+Z_#+vtA~HLI!IC5sA2V2`TvJiy{+<&G z&hyEG5gU%miY>>7Zrzbp7TxU!)(nJM-Q!60|II- zuOpH4OoZ`x>+I-^GEK(NcuYR)e>SYBNF;M=#|R_1g&@Vuei=rh+HF}ANK)*Nxte&a zlCr^WKd*wyIS`+&h1}^WmHa)xSRe-mTZHzA?zoE zqj@Cpxdu1@fn5PESBSmIHixB7hYOlyTLNu(9;L=frhv-%Ct{IfO;37Vc-D$=f>m@t z>YZ*HbeNH>sfy+L)VT9x(s4A3!x}}@2GOH3NK}S5Ykc>I{bWYMxFPLA<$sw;vvx$29lvmfX9Pfyd}C`(*AAc zT#^?nf`$EJFtuZE!5xA<^}hDeINHc{5^eLwO-Zo33=Uo5)v7T{~i!#RgQgIDG5?^O)2hT4L2y znI=2{Q8a`uxmTwZg2i@F?P5$Zh!5fglvNHA(uAO|@#?_P@9DXoJcgj7^X(j|kMuiK zWFourX;xW%4ku7&;J0;(&heESrB+GMBn5>Oz*La2p)yVnh%{HcZ1Zfx+F4FmtpuV4 zV6}iYE^Lj6MG3l1A@ZYycIWS*7=_wKN~Gj&VP^!tI&uwF}-L?d@Y}v zP8p3P8aWq;bF=0+&||+zbH7T~t+G-^O4eWS@Ta`(<31OtPy8!;Tv8K?9ztkoxbhmI zB}JA%4H2*C1mH+A$#iXsqe@JFw$*h+@JvaOebB1w+ST9GvXs-Xzl`UWO=GK7Q%-^u zn|0!&pWk_w7v1=^kySYS2Un`-g7E&*s!crV`l$bU>q;7>#VmI9cY9a7P~#582SNA+ zK-}xYBjSi(wA%{`;qRT;S)F9tzSb@ABKV(|p~XzI*kk+8=5Sq;{Gvthux7#UcXG^;T7NIsWKscG=o_2ZQ;zNC9_YD{A7(R)aKSvg_XY2=)Unp^>lgYOxN49RW-$bLeeH?pPhCif6%O`@CcSJZI3>J1M#KkA+Y+(vHOGW-;IZiH z1VL=ym*li5jX)%~E9%Kqu8qWzS#^Li3#_EtQ}&<+X;OTXh(X!U#$$ z{81p+8ZWNrbgLvxjVpN64*My&cD9vc8pX36#2x&pErZ}%o?C^?x_$h z+_d-%-TtSmFh-2#pDQzRoqdC8XJa5nvkp-7(kJ6@S6aFmsQqT4@*-p6uu?`#7^N86 z+n9?)$P*;x<~aGQiW_7IL6U?B43_%y>vg0!-jzDGD)#VO_<>EDU|EaM_aT|PNV&(g z4-{ax?(jicxw{+^R5i*GquVjizaFS>EXq|e-<)9Rxyp)>)lnMb&ae)Wab`^(@w zW1t=Tz;D>e@Mm!ylA4Kr?Qn*#8%-6Fv~J8|v<$GJ%BV~FP|>l(`^DTEFH#n-R|eY< zJJ5Qykg5gnTN7+NTJI6W4NcFLy{z{qL)6b6zxuMt=Kx=Nk&2zo69w&~Nx3sPJp*W+ zmSTZ})Z)O9)HPZCk|!uq`DwixCV>iz^bfbp3sRc_>wS`OL1$hGX)SSTCdS-2OtLDA zDA{{;ZGy&f8ixl*r%WVRpLkjp5pq3Kx<1MT81-mj?}fipOTic%QhoRby+w$^q;K`- zl$LUVZutT!X9Cdw8*Ty=jPI@2L@?*$Wl zw#x6ua`qT|O>bF#%Z<+E`x4$VuKc0iw9B@Zq=Tz+FdSIYcC01I>As5@fQA?FoXv$W zH`Pc`2(Mv&`!(4nIPHE=P>aR&=>DvtlP51QJCuY z$(Qw=!rqcU`t?7PmOE+Gj7Nx#&~q)MGr}(lv(R_Bql4Ll#?4YYDx~=*6$j-Qi`|FY z`IB&NxkUw;#f)p~4<=TEoVXG`7XEXE`0}A&dSK5*&Y}W)!0fU7Ih(XwnTU1l;a^Ll zjZu8hNriU&L74~VSAK-1sZa9#>X3HeIm8@9L@O$z?v+no*;wfRq8_1CcgO5_z397< zupCbj!B&ELG_`5ZqW|8nC3XJQxA&f_QpM|atRhcbTr|@%22G3`+}TVl{vU*X2O8E7GwS;`m_KoPKE^D^-hnWlg;GLwRB^R!zX0LfYe#{P1n} zs(@#Qpg6o?18fwyrjsPPEm*9*s(~fCKCF^89>G(K;(N458;B|YUaweWvH`w^pu(RqoWT6U}x)W(_lrS{vRneqniK# From 73d4538d9463b349eedc767c47d1750a164e2b7b Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Mon, 11 Apr 2016 23:04:42 +0200 Subject: [PATCH 424/531] Fix hotbar placement on displays with low screen density --- src/hud.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hud.cpp b/src/hud.cpp index d7214189..a7d94cb8 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -214,7 +214,8 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount, // Position of upper left corner of bar v2s32 pos = upperleftpos + screen_offset; - pos *= m_hud_scaling * porting::getDisplayDensity(); + pos.X *= m_hud_scaling * porting::getDisplayDensity(); + pos.Y *= m_hud_scaling * porting::getDisplayDensity(); if (hotbar_image != player->hotbar_image) { hotbar_image = player->hotbar_image; From fe349d401d2d414f1ddc02c471c01d948bd89ee6 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 9 Apr 2016 00:24:36 +0100 Subject: [PATCH 425/531] Mgvalleys: Don't let cavegen place biome nodes everywhere Fix use of 'air_above' bool so that biome nodes are only placed in tunnel floors Minor code improvements 'Continue' when massive cave air is placed --- src/mapgen_valleys.cpp | 77 ++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index be122aac..3926deb4 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -921,14 +921,13 @@ void MapgenValleys::generateCaves(s16 max_stone_y) } u32 index_2d = 0; - u32 index_3d = 0; for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 x = node_min.X; x <= node_max.X; x++, index_2d++) { Biome *biome = (Biome *)bmgr->getRaw(biomemap[index_2d]); - bool air_above = false; + bool tunnel_air_above = false; bool underground = false; u32 index_data = vm->m_area.index(x, node_max.Y, z); - index_3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + (x - node_min.X); + u32 index_3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + (x - node_min.X); // Dig caves on down loop to check for air above. // Don't excavate the overgenerated stone at node_max.Y + 1, @@ -942,12 +941,10 @@ void MapgenValleys::generateCaves(s16 max_stone_y) float terrain = noise_terrain_height->result[index_2d]; // Saves some time. - if (y > terrain + 10) { - air_above = true; + if (y > terrain + 10) continue; - } else if (y < terrain - 40) { + else if (y < terrain - 40) underground = true; - } // Dig massive caves. if (node_max.Y <= massive_cave_depth @@ -955,6 +952,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y) > tcave_cache[y - node_min.Y + 1]) { vm->m_data[index_data] = n_air; made_a_big_one = true; + continue; } content_t c = vm->m_data[index_data].getContent(); @@ -963,54 +961,51 @@ void MapgenValleys::generateCaves(s16 max_stone_y) // River water is not set as ground content // in the default game. This can produce strange results - // when a cave undercuts a river. However, that's not for + // when a tunnel undercuts a river. However, that's not for // the mapgen to correct. Fix it in lua. - if (c == CONTENT_AIR) { - air_above = true; - } else if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { - // in a cave + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + // in a tunnel vm->m_data[index_data] = n_air; - air_above = true; - } else if (air_above && (c == biome->c_filler || c == biome->c_stone)) { - // at the cave floor - s16 sr = ps.range(0,39); - u32 j = index_data; - vm->m_area.add_y(em, j, 1); + tunnel_air_above = true; + } else if (c == biome->c_filler || c == biome->c_stone) { + if (tunnel_air_above) { + // at the tunnel floor + s16 sr = ps.range(0, 39); + u32 j = index_data; + vm->m_area.add_y(em, j, 1); - if (sr > terrain - y) { - // Put dirt in caves near the surface. - if (underground) - vm->m_data[index_data] = MapNode(biome->c_filler); - else - vm->m_data[index_data] = MapNode(biome->c_top); - } else if (sr < 3 && underground) { - sr = abs(ps.next()); - if (lava_features_lim > 0 && y <= lava_max_height - && c == biome->c_stone && sr < lava_chance) - vm->m_data[j] = n_lava; + if (sr > terrain - y) { + // Put dirt in tunnels near the surface. + if (underground) + vm->m_data[index_data] = MapNode(biome->c_filler); + else + vm->m_data[index_data] = MapNode(biome->c_top); + } else if (sr < 3 && underground) { + sr = abs(ps.next()); + if (lava_features_lim > 0 && y <= lava_max_height + && c == biome->c_stone && sr < lava_chance) + vm->m_data[j] = n_lava; - sr -= lava_chance; + sr -= lava_chance; - // If sr < 0 then we should have already placed lava -- - // don't immediately dump water on it. - if (water_features_lim > 0 && y <= cave_water_max_height - && sr >= 0 && sr < water_chance) - vm->m_data[j] = n_water; + // If sr < 0 then we should have already placed lava -- + // don't immediately dump water on it. + if (water_features_lim > 0 && y <= cave_water_max_height + && sr >= 0 && sr < water_chance) + vm->m_data[j] = n_water; + } } - air_above = false; - underground = true; - } else if (c == biome->c_filler || c == biome->c_stone) { - air_above = false; + tunnel_air_above = false; underground = true; } else { - air_above = false; + tunnel_air_above = false; } } } - if (node_max.Y <= large_cave_depth && (!made_a_big_one)) { + if (node_max.Y <= large_cave_depth && !made_a_big_one) { u32 bruises_count = ps.range(0, 2); for (u32 i = 0; i < bruises_count; i++) { CaveV5 cave(this, &ps); From e661d8b32c99681c98b8bc469ceb19f7699cf381 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 9 Apr 2016 03:03:46 +0100 Subject: [PATCH 426/531] Mgv5: Optimise tunnels, add biome material in entrances Place biome top node on tunnel entrance floor Instead of doing nothing at node_max.Y + 1 use 1-down overgeneration for tunnel generation and noisemaps --- src/mapgen_v5.cpp | 122 ++++++++++++++++++++++++++++------------------ src/mapgen_v5.h | 2 +- 2 files changed, 76 insertions(+), 48 deletions(-) diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index e9b1b58b..5ae2568a 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -54,7 +54,8 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge) // amount of elements to skip for the next index // for noise/height/biome maps (not vmanip) this->ystride = csize.X; - this->zstride = csize.X * (csize.Y + 2); + // 1-down overgeneration + this->zstride_1d = csize.X * (csize.Y + 1); this->biomemap = new u8[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z]; @@ -70,9 +71,11 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge) noise_height = new Noise(&sp->np_height, seed, csize.X, csize.Z); // 3D terrain noise - noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z); - noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z); + // 1-up 1-down overgeneration noise_ground = new Noise(&sp->np_ground, seed, csize.X, csize.Y + 2, csize.Z); + // 1-down overgeneraion + noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 1, csize.Z); + noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 1, csize.Z); // Biome noise noise_heat = new Noise(¶ms->np_biome_heat, seed, csize.X, csize.Z); @@ -505,50 +508,6 @@ MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map) } -void MapgenV5::generateCaves(int max_stone_y) -{ - if (max_stone_y < node_min.Y) - return; - - noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - - u32 index = 0; - - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - u32 vi = vm->m_area.index(node_min.X, y, z); - for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) { - // Don't excavate the overgenerated stone at node_max.Y + 1, - // this creates a 'roof' over the tunnel, preventing light in - // tunnels at mapchunk borders when generating mapchunks upwards. - if (y > node_max.Y) - continue; - - float d1 = contour(noise_cave1->result[index]); - float d2 = contour(noise_cave2->result[index]); - if (d1 * d2 > 0.125f) { - content_t c = vm->m_data[vi].getContent(); - if (!ndef->get(c).is_ground_content || c == CONTENT_AIR) - continue; - - vm->m_data[vi] = MapNode(CONTENT_AIR); - } - } - } - - if (node_max.Y > MGV5_LARGE_CAVE_DEPTH) - return; - - PseudoRandom ps(blockseed + 21343); - u32 bruises_count = ps.range(0, 2); - for (u32 i = 0; i < bruises_count; i++) { - CaveV5 cave(this, &ps); - cave.makeCave(node_min, node_max, max_stone_y); - } -} - - void MapgenV5::dustTopNodes() { if (node_max.Y < water_level) @@ -597,3 +556,72 @@ void MapgenV5::dustTopNodes() } } } + + +void MapgenV5::generateCaves(int max_stone_y) +{ + if (max_stone_y < node_min.Y) + return; + + noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); + + v3s16 em = vm->m_area.getExtent(); + u32 index2d = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + bool column_is_open = false; // Is column open to overground + bool is_tunnel = false; // Is tunnel or tunnel floor + // Indexes at column top (node_max.Y) + u32 vi = vm->m_area.index(x, node_max.Y, z); + u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride + + (x - node_min.X); + // Biome of column + Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]); + + // Don't excavate the overgenerated stone at node_max.Y + 1, + // this creates a 'roof' over the tunnel, preventing light in + // tunnels at mapchunk borders when generating mapchunks upwards. + // This 'roof' is removed when the mapchunk above is generated. + for (s16 y = node_max.Y; y >= node_min.Y - 1; y--, + index3d -= ystride, + vm->m_area.add_y(em, vi, -1)) { + + content_t c = vm->m_data[vi].getContent(); + if (c == CONTENT_AIR || c == biome->c_water_top || + c == biome->c_water) { + column_is_open = true; + continue; + } + // Ground + float d1 = contour(noise_cave1->result[index3d]); + float d2 = contour(noise_cave2->result[index3d]); + + if (d1 * d2 > 0.125f && ndef->get(c).is_ground_content) { + // In tunnel and ground content, excavate + vm->m_data[vi] = MapNode(CONTENT_AIR); + is_tunnel = true; + } else { + // Not in tunnel or not ground content + if (is_tunnel && column_is_open && + (c == biome->c_filler || c == biome->c_stone)) + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + + column_is_open = false; + is_tunnel = false; + } + } + } + + if (node_max.Y > MGV5_LARGE_CAVE_DEPTH) + return; + + PseudoRandom ps(blockseed + 21343); + u32 bruises_count = ps.range(0, 2); + for (u32 i = 0; i < bruises_count; i++) { + CaveV5 cave(this, &ps); + cave.makeCave(node_min, node_max, max_stone_y); + } +} diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h index 44a06907..8047f225 100644 --- a/src/mapgen_v5.h +++ b/src/mapgen_v5.h @@ -53,7 +53,7 @@ public: BiomeManager *bmgr; int ystride; - int zstride; + int zstride_1d; u32 spflags; v3s16 node_min; From 4fdf66bbf4d90846844ee3f6d41acb31ce06ca8b Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 12 Apr 2016 04:43:22 +0100 Subject: [PATCH 427/531] Mgv7, mgflat, mgfractal: Tunnel generation code optimisation --- src/mapgen_flat.cpp | 13 +++++++------ src/mapgen_fractal.cpp | 13 +++++++------ src/mapgen_v7.cpp | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index ecfbe49b..0c243842 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -591,17 +591,18 @@ void MapgenFlat::generateCaves(s16 max_stone_y) // Ground float d1 = contour(noise_cave1->result[index3d]); float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); is_tunnel = true; - } else if (is_tunnel && column_is_open && - (c == biome->c_filler || c == biome->c_stone)) { - // Tunnel entrance floor - vm->m_data[vi] = MapNode(biome->c_top); - column_is_open = false; - is_tunnel = false; } else { + // Not in tunnel or not ground content + if (is_tunnel && column_is_open && + (c == biome->c_filler || c == biome->c_stone)) + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + column_is_open = false; is_tunnel = false; } diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index 810645ab..d75d1149 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -719,17 +719,18 @@ void MapgenFractal::generateCaves(s16 max_stone_y) // Ground float d1 = contour(noise_cave1->result[index3d]); float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); is_tunnel = true; - } else if (is_tunnel && column_is_open && - (c == biome->c_filler || c == biome->c_stone)) { - // Tunnel entrance floor - vm->m_data[vi] = MapNode(biome->c_top); - column_is_open = false; - is_tunnel = false; } else { + // Not in tunnel or not ground content + if (is_tunnel && column_is_open && + (c == biome->c_filler || c == biome->c_stone)) + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + column_is_open = false; is_tunnel = false; } diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 54abba14..069c3411 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -772,17 +772,18 @@ void MapgenV7::generateCaves(s16 max_stone_y) // Ground float d1 = contour(noise_cave1->result[index3d]); float d2 = contour(noise_cave2->result[index3d]); + if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); is_tunnel = true; - } else if (is_tunnel && column_is_open && - (c == biome->c_filler || c == biome->c_stone)) { - // Tunnel entrance floor - vm->m_data[vi] = MapNode(biome->c_top); - column_is_open = false; - is_tunnel = false; } else { + // Not in tunnel or not ground content + if (is_tunnel && column_is_open && + (c == biome->c_filler || c == biome->c_stone)) + // Tunnel entrance floor + vm->m_data[vi] = MapNode(biome->c_top); + column_is_open = false; is_tunnel = false; } From b5f6d41eedca983a98470fdb97b5732e08802d24 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Tue, 12 Apr 2016 12:54:08 +0100 Subject: [PATCH 428/531] Fix inventory hud scaling --- src/hud.cpp | 18 +++++++++++------- src/hud.h | 6 +++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/hud.cpp b/src/hud.cpp index a7d94cb8..502865ca 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -208,15 +208,18 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount, s32 width = (itemcount - inv_offset) * (m_hotbar_imagesize + m_padding * 2); if (direction == HUD_DIR_TOP_BOTTOM || direction == HUD_DIR_BOTTOM_TOP) { - width = m_hotbar_imagesize + m_padding * 2; - height = (itemcount - inv_offset) * (m_hotbar_imagesize + m_padding * 2); + s32 tmp = height; + height = width; + width = tmp; } // Position of upper left corner of bar - v2s32 pos = upperleftpos + screen_offset; + v2s32 pos = screen_offset; pos.X *= m_hud_scaling * porting::getDisplayDensity(); pos.Y *= m_hud_scaling * porting::getDisplayDensity(); + pos += upperleftpos; + // Store hotbar_image in member variable, used by drawItem() if (hotbar_image != player->hotbar_image) { hotbar_image = player->hotbar_image; if (hotbar_image != "") @@ -225,6 +228,7 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount, use_hotbar_image = false; } + // Store hotbar_selected_image in member variable, used by drawItem() if (hotbar_selected_image != player->hotbar_selected_image) { hotbar_selected_image = player->hotbar_selected_image; if (hotbar_selected_image != "") @@ -233,7 +237,7 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount, use_hotbar_selected_image = false; } - /* draw customized item background */ + // draw customized item background if (use_hotbar_image) { core::rect imgrect2(-m_padding/2, -m_padding/2, width+m_padding/2, height+m_padding/2); @@ -245,12 +249,12 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount, NULL, hbar_colors, true); } + // Draw items + core::rect imgrect(0, 0, m_hotbar_imagesize, m_hotbar_imagesize); for (s32 i = inv_offset; i < itemcount && (size_t)i < mainlist->getSize(); i++) { - v2s32 steppos; s32 fullimglen = m_hotbar_imagesize + m_padding * 2; - core::rect imgrect(0, 0, m_hotbar_imagesize, m_hotbar_imagesize); - + v2s32 steppos; switch (direction) { case HUD_DIR_RIGHT_LEFT: steppos = v2s32(-(m_padding + (i - inv_offset) * fullimglen), m_padding); diff --git a/src/hud.h b/src/hud.h index 0b69c58d..7f0fbe7b 100644 --- a/src/hud.h +++ b/src/hud.h @@ -154,12 +154,12 @@ private: void drawItem(const ItemStack &item, const core::rect& rect, bool selected); - float m_hud_scaling; + float m_hud_scaling; // cached minetest setting v3s16 m_camera_offset; v2u32 m_screensize; v2s32 m_displaycenter; - s32 m_hotbar_imagesize; - s32 m_padding; + s32 m_hotbar_imagesize; // Takes hud_scaling into account, updated by resizeHotbar() + s32 m_padding; // Takes hud_scaling into account, updated by resizeHotbar() video::SColor hbar_colors[4]; std::vector m_selection_boxes; From 6530ed4dd8e8304a6f7769b05bd776535c9c3abc Mon Sep 17 00:00:00 2001 From: TriBlade9 Date: Thu, 14 Apr 2016 02:15:41 -0700 Subject: [PATCH 429/531] Add option to disable entity selectionboxes. (#3992) Setting only loaded once, default value is to enable them. --- builtin/settingtypes.txt | 3 +++ minetest.conf.example | 4 ++++ src/defaultsettings.cpp | 1 + src/game.cpp | 5 ++++- src/settings_translation_file.cpp | 1 + 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 8411839f..ca331ff4 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -241,6 +241,9 @@ send_pre_v25_init (Support older servers) bool true # Save the map received by the client on disk. enable_local_map_saving (Saving map received from server) bool false +# Show entity selection boxes +show_entity_selectionbox (Show entity selection boxes) bool true + # Enable usage of remote media server (if provided by server). # Remote servers offer a significantly faster way to download media (e.g. textures) # when connecting to the server. diff --git a/minetest.conf.example b/minetest.conf.example index 80dad6d9..e913140a 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -253,6 +253,10 @@ # type: bool # enable_local_map_saving = false +# Show entity selection boxes. +# type: bool +# show_entity_selectionbox true + # Enable usage of remote media server (if provided by server). # Remote servers offer a significantly faster way to download media (e.g. textures) # when connecting to the server. diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index e00ff148..d048721e 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -150,6 +150,7 @@ void set_default_settings(Settings *settings) settings->setDefault("desynchronize_mapblock_texture_animation", "true"); settings->setDefault("hud_hotbar_max_width", "1.0"); settings->setDefault("enable_local_map_saving", "false"); + settings->setDefault("show_entity_selectionbox", "true"); settings->setDefault("mip_map", "false"); settings->setDefault("anisotropic_filter", "false"); diff --git a/src/game.cpp b/src/game.cpp index c1f80c5a..d513517b 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -329,6 +329,8 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio std::vector *selectionboxes = hud->getSelectionBoxes(); selectionboxes->clear(); + static const bool show_entity_selectionbox = g_settings->getBool("show_entity_selectionbox"); + selected_object = NULL; INodeDefManager *nodedef = client->getNodeDefManager(); @@ -342,7 +344,8 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio camera_position, shootline); if (selected_object != NULL) { - if (selected_object->doShowSelectionBox()) { + if (show_entity_selectionbox && + selected_object->doShowSelectionBox()) { aabb3f *selection_box = selected_object->getSelectionBox(); // Box should exist because object was // returned in the first place diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index 77fd6c68..beb56d9f 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -102,6 +102,7 @@ fake_function() { gettext("Whether to support older servers before protocol version 25.\nEnable if you want to connect to 0.4.12 servers and before.\nServers starting with 0.4.13 will work, 0.4.12-dev servers may work.\nDisabling this option will protect your password better."); gettext("Saving map received from server"); gettext("Save the map received by the client on disk."); + gettext("Show entity selection boxes"); gettext("Connect to external media server"); gettext("Enable usage of remote media server (if provided by server).\nRemote servers offer a significantly faster way to download media (e.g. textures)\nwhen connecting to the server."); gettext("Serverlist URL"); From d82c5da0dccb1f30250725d17c3f373aacdda0e2 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Fri, 15 Apr 2016 14:37:09 +0200 Subject: [PATCH 430/531] mainmenu: Tidy up logic in is_server_protocol_compat() (#3997) Apply de morgan to simplify the logic. --- builtin/mainmenu/common.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index b9a010e6..3dd7d8b4 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -290,7 +290,7 @@ end -------------------------------------------------------------------------------- function is_server_protocol_compat(server_proto_min, server_proto_max) - return not ((min_supp_proto > (server_proto_max or 24)) or (max_supp_proto < (server_proto_min or 13))) + return min_supp_proto <= (server_proto_max or 24) and max_supp_proto >= (server_proto_min or 13) end -------------------------------------------------------------------------------- function is_server_protocol_compat_or_error(server_proto_min, server_proto_max) From bc4dc80c0166bd5c7f645bec1472101e4a9e20bb Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 15 Apr 2016 04:13:53 +0200 Subject: [PATCH 431/531] Mainmenu: Still support favorites if send_pre_v25_init is disabled @SmallJoker has noted a bug that servers from the (local) main menu favorites list can't be opened. This commit fixes the bug by disabling any main menu based protocol checks for servers from the favorite list. Also, it fixes a second bug that happens when a server from the public serverlist doesn't send its supported protocol versions, most likely because its running a minetest older than commit [1]. Then we have shown an error msg that the server has enforced one specific protocol version. This was most likely not the case. Of course, we can't do anything better than do an assumption on the protocol versions if they are not known. That assumption should however be closest to the most often occuring case as possible. Also, some little cleanups. [1]: 5a0ed780f56a5225b3d7c5f64099586e390e5f39 "Server: announce MIN/MAX protocol version supported to serverlist. Client: check serverlist" --- builtin/mainmenu/common.lua | 10 +++++++--- builtin/mainmenu/tab_multiplayer.lua | 30 ++++++++++++++++------------ builtin/mainmenu/tab_simple_main.lua | 12 +++++++---- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index 3dd7d8b4..62ab2b57 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -246,6 +246,7 @@ function asyncOnlineFavourites() }} end menudata.favorites = menudata.public_known + menudata.favorites_is_public = true core.handle_async( function(param) return core.get_favorites("online") @@ -257,6 +258,7 @@ function asyncOnlineFavourites() if favs[1] then menudata.public_known = favs menudata.favorites = menudata.public_known + menudata.favorites_is_public = true end core.event_handler("Refresh") end @@ -297,12 +299,14 @@ function is_server_protocol_compat_or_error(server_proto_min, server_proto_max) if not is_server_protocol_compat(server_proto_min, server_proto_max) then local server_prot_ver_info local client_prot_ver_info - if server_proto_min ~= server_proto_max then + local s_p_min = server_proto_min or 13 + local s_p_max = server_proto_max or 24 + if s_p_min ~= s_p_max then server_prot_ver_info = fgettext_ne("Server supports protocol versions between $1 and $2. ", - server_proto_min or 13, server_proto_max or 24) + s_p_min, s_p_max) else server_prot_ver_info = fgettext_ne("Server enforces protocol version $1. ", - server_proto_min or 13) + s_p_min) end if min_supp_proto ~= max_supp_proto then client_prot_ver_info= fgettext_ne("We support protocol versions between version $1 and $2.", diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index 06d8791f..f3ba122f 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -102,22 +102,22 @@ local function main_button_handler(tabview, fields, name, tabdata) local event = core.explode_table_event(fields["favourites"]) if event.type == "DCL" then if event.row <= #menudata.favorites then - if not is_server_protocol_compat_or_error(menudata.favorites[event.row].proto_min, - menudata.favorites[event.row].proto_max) then + local fav = menudata.favorites[event.row] + if menudata.favorites_is_public and + not is_server_protocol_compat_or_error( + fav.proto_min, fav.proto_max) then return true end - gamedata.address = menudata.favorites[event.row].address - gamedata.port = menudata.favorites[event.row].port + gamedata.address = fav.address + gamedata.port = fav.port gamedata.playername = fields["te_name"] if fields["te_pwd"] ~= nil then gamedata.password = fields["te_pwd"] end gamedata.selected_world = 0 - if menudata.favorites ~= nil then - gamedata.servername = menudata.favorites[event.row].name - gamedata.serverdescription = menudata.favorites[event.row].description - end + gamedata.servername = fav.name + gamedata.serverdescription = fav.description if gamedata.address ~= nil and gamedata.port ~= nil then @@ -188,6 +188,7 @@ local function main_button_handler(tabview, fields, name, tabdata) asyncOnlineFavourites() else menudata.favorites = core.get_favorites("local") + menudata.favorites_is_public = false end tabdata.fav_selected = nil return true @@ -197,7 +198,7 @@ local function main_button_handler(tabview, fields, name, tabdata) local current_favourite = core.get_table_index("favourites") if current_favourite == nil then return end core.delete_favorite(current_favourite) - menudata.favorites = order_favorite_list(core.get_favorites()) + menudata.favorites = core.get_favorites("local") tabdata.fav_selected = nil core.setting_set("address","") @@ -221,11 +222,13 @@ local function main_button_handler(tabview, fields, name, tabdata) menudata.favorites[fav_idx].address == fields["te_address"] and menudata.favorites[fav_idx].port == fields["te_port"] then - gamedata.servername = menudata.favorites[fav_idx].name - gamedata.serverdescription = menudata.favorites[fav_idx].description + local fav = menudata.favorites[fav_idx] + gamedata.servername = fav.name + gamedata.serverdescription = fav.description - if not is_server_protocol_compat_or_error(menudata.favorites[fav_idx].proto_min, - menudata.favorites[fav_idx].proto_max)then + if menudata.favorites_is_public and + not is_server_protocol_compat_or_error( + fav.proto_min, fav.proto_max) then return true end else @@ -252,6 +255,7 @@ local function on_change(type,old_tab,new_tab) asyncOnlineFavourites() else menudata.favorites = core.get_favorites("local") + menudata.favorites_is_public = false end end diff --git a/builtin/mainmenu/tab_simple_main.lua b/builtin/mainmenu/tab_simple_main.lua index b3241893..cb64b73f 100644 --- a/builtin/mainmenu/tab_simple_main.lua +++ b/builtin/mainmenu/tab_simple_main.lua @@ -122,6 +122,7 @@ local function main_button_handler(tabview, fields, name, tabdata) asyncOnlineFavourites() else menudata.favorites = core.get_favorites("local") + menudata.favorites_is_public = false end return true end @@ -149,12 +150,14 @@ local function main_button_handler(tabview, fields, name, tabdata) if fav_idx ~= nil and fav_idx <= #menudata.favorites and menudata.favorites[fav_idx].address == fields["te_address"] and menudata.favorites[fav_idx].port == fields["te_port"] then + local fav = menudata.favorites[fav_idx] - gamedata.servername = menudata.favorites[fav_idx].name - gamedata.serverdescription = menudata.favorites[fav_idx].description + gamedata.servername = fav.name + gamedata.serverdescription = fav.description - if not is_server_protocol_compat_or_error(menudata.favorites[fav_idx].proto_min, - menudata.favorites[fav_idx].proto_max) then + if menudata.favorites_is_public and + not is_server_protocol_compat_or_error( + fav.proto_min, fav.proto_max) then return true end else @@ -192,6 +195,7 @@ local function on_activate(type,old_tab,new_tab) asyncOnlineFavourites() else menudata.favorites = core.get_favorites("local") + menudata.favorites_is_public = false end end From 855a305057a8a41d1e34520c4e88845872a01d6f Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Wed, 13 Apr 2016 23:10:37 -0700 Subject: [PATCH 432/531] falling: walk 4 additional diagonally down directions. This seems very little cost and matches the old behavior more closely. This will cause some more falling nodes to get added to falling clusters. With the efficiency of the algorithm, this really doesn't do much damage. --- builtin/game/falling.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index cce8d4bf..57bb98cf 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -182,6 +182,10 @@ end -- Down first as likely case, but always before self. The same with sides. -- Up must come last, so that things above self will also fall all at once. local nodeupdate_neighbors = { + {x = -1, y = -1, z = 0}, + {x = 1, y = -1, z = 0}, + {x = 0, y = -1, z = -1}, + {x = 0, y = -1, z = 1}, {x = 0, y = -1, z = 0}, {x = -1, y = 0, z = 0}, {x = 1, y = 0, z = 0}, @@ -226,10 +230,10 @@ function nodeupdate(p) n = n - 1 -- If there's nothing left on the stack, and no -- more sides to walk to, we're done and can exit - if n == 0 and v == 7 then + if n == 0 and v == 11 then return end - until v < 7 + until v < 11 -- The next round walk the next neighbor in list. v = v + 1 else From fed5dd3b5d153bc38939298f37650062d11a7082 Mon Sep 17 00:00:00 2001 From: paramat Date: Sat, 16 Apr 2016 23:20:20 +0100 Subject: [PATCH 433/531] Mgv7: Combine mountain terrain generation with base terrain generation Previous mountain terrain generation was by necessity placing stone in air, this was removing air from any overgenerated structures such as tunnels, dungeons and large caves Moving it into the base terrain generation loop ensures that only 'ignore' is replaced generateRidgeTerrain: only return if node_max.Y < water_level - 16 Previously, if water level was set a few nodes above a mapchunk border the river channel was only partially excavated --- src/mapgen_v7.cpp | 144 ++++++++++++++++++++++------------------------ src/mapgen_v7.h | 7 +-- 2 files changed, 70 insertions(+), 81 deletions(-) diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 069c3411..162bf068 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -59,6 +59,8 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) //// amount of elements to skip for the next index //// for noise/height/biome maps (not vmanip) this->ystride = csize.X; + // 1-up 1-down overgeneration + this->zstride_1u1d = csize.X * (csize.Y + 2); // 1-down overgeneration this->zstride_1d = csize.X * (csize.Y + 1); @@ -263,10 +265,13 @@ void MapgenV7::makeChunk(BlockMakeData *data) // Make some noise calculateNoise(); - // Generate base terrain, mountains, and ridges with initial heightmaps + // Generate terrain and ridges with initial heightmaps s16 stone_surface_max_y = generateTerrain(); - // Create heightmap + if (spflags & MGV7_RIDGES) + generateRidgeTerrain(); + + // Update heightmap to include mountain terrain updateHeightmap(node_min, node_max); // Create biomemap at heightmap surface @@ -361,6 +366,11 @@ void MapgenV7::calculateNoise() noise_terrain_alt->perlinMap2D(x, z, persistmap); noise_height_select->perlinMap2D(x, z); + if (spflags & MGV7_MOUNTAINS) { + noise_mountain->perlinMap3D(x, y, z); + noise_mount_height->perlinMap2D(x, z); + } + if ((spflags & MGV7_RIDGES) && node_max.Y >= water_level) { noise_ridge->perlinMap3D(x, y, z); noise_ridge_uwater->perlinMap2D(x, z); @@ -369,9 +379,6 @@ void MapgenV7::calculateNoise() // Cave noises are calculated in generateCaves() // only if solid terrain is present in mapchunk - // Mountain noises are calculated in generateMountainTerrain() - // only if solid terrain surface dips into mapchunk - noise_filler_depth->perlinMap2D(x, z); noise_heat->perlinMap2D(x, z); noise_humidity->perlinMap2D(x, z); @@ -400,7 +407,7 @@ Biome *MapgenV7::getBiomeAtPoint(v3s16 p) return bmgr->getBiome(heat, humidity, groundlevel); } -//needs to be updated + float MapgenV7::baseTerrainLevelAtPoint(s16 x, s16 z) { float hselect = NoisePerlin2D(&noise_height_select->np, x, z, seed); @@ -455,100 +462,55 @@ bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y) int MapgenV7::generateTerrain() -{ - s16 stone_surface_min_y; - s16 stone_surface_max_y; - - generateBaseTerrain(&stone_surface_min_y, &stone_surface_max_y); - - if ((spflags & MGV7_MOUNTAINS) && stone_surface_min_y < node_max.Y) - stone_surface_max_y = generateMountainTerrain(stone_surface_max_y); - - if (spflags & MGV7_RIDGES) - generateRidgeTerrain(); - - return stone_surface_max_y; -} - - -void MapgenV7::generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y) { MapNode n_air(CONTENT_AIR); MapNode n_stone(c_stone); MapNode n_water(c_water_source); v3s16 em = vm->m_area.getExtent(); - s16 surface_min_y = MAX_MAP_GENERATION_LIMIT; - s16 surface_max_y = -MAX_MAP_GENERATION_LIMIT; - u32 index = 0; + s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT; + u32 index2d = 0; + bool mountain_flag = spflags & MGV7_MOUNTAINS; for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 x = node_min.X; x <= node_max.X; x++, index++) { - float surface_height = baseTerrainLevelFromMap(index); - s16 surface_y = (s16)surface_height; + for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { + s16 surface_y = baseTerrainLevelFromMap(index2d); + heightmap[index2d] = surface_y; // Create base terrain heightmap + ridge_heightmap[index2d] = surface_y; - heightmap[index] = surface_y; - ridge_heightmap[index] = surface_y; - - if (surface_y < surface_min_y) - surface_min_y = surface_y; - - if (surface_y > surface_max_y) - surface_max_y = surface_y; + if (surface_y > stone_surface_max_y) + stone_surface_max_y = surface_y; u32 vi = vm->m_area.index(x, node_min.Y - 1, z); + u32 index3d = (z - node_min.Z) * zstride_1u1d + (x - node_min.X); + for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { if (vm->m_data[vi].getContent() == CONTENT_IGNORE) { - if (y <= surface_y) - vm->m_data[vi] = n_stone; - else if (y <= water_level) + if (y <= surface_y) { + vm->m_data[vi] = n_stone; // Base terrain + } else if (mountain_flag && + getMountainTerrainFromMap(index3d, index2d, y)) { + vm->m_data[vi] = n_stone; // Mountain terrain + if (y > stone_surface_max_y) + stone_surface_max_y = y; + } else if (y <= water_level) { vm->m_data[vi] = n_water; - else + } else { vm->m_data[vi] = n_air; + } } vm->m_area.add_y(em, vi, 1); + index3d += ystride; } } - *stone_surface_min_y = surface_min_y; - *stone_surface_max_y = surface_max_y; -} - - -int MapgenV7::generateMountainTerrain(s16 ymax) -{ - noise_mountain->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z); - noise_mount_height->perlinMap2D(node_min.X, node_min.Z); - - MapNode n_stone(c_stone); - u32 j = 0; - - for (s16 z = node_min.Z; z <= node_max.Z; z++) - for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { - u32 vi = vm->m_area.index(node_min.X, y, z); - for (s16 x = node_min.X; x <= node_max.X; x++) { - int index = (z - node_min.Z) * csize.X + (x - node_min.X); - content_t c = vm->m_data[vi].getContent(); - - if (getMountainTerrainFromMap(j, index, y) - && (c == CONTENT_AIR || c == c_water_source)) { - vm->m_data[vi] = n_stone; - if (y > ymax) - ymax = y; - } - - vi++; - j++; - } - } - - return ymax; + return stone_surface_max_y; } void MapgenV7::generateRidgeTerrain() { - if (node_max.Y < water_level) + if (node_max.Y < water_level - 16) return; MapNode n_water(c_water_source); @@ -562,7 +524,7 @@ void MapgenV7::generateRidgeTerrain() for (s16 x = node_min.X; x <= node_max.X; x++, index++, vi++) { int j = (z - node_min.Z) * csize.X + (x - node_min.X); - if (heightmap[j] < water_level - 16) + if (heightmap[j] < water_level - 16) // Use base terrain heightmap continue; float uwatern = noise_ridge_uwater->result[j] * 2; @@ -805,6 +767,36 @@ void MapgenV7::generateCaves(s16 max_stone_y) /////////////////////////////////////////////////////////////// +#if 0 +int MapgenV7::generateMountainTerrain(s16 ymax) +{ + MapNode n_stone(c_stone); + u32 j = 0; + + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) { + u32 vi = vm->m_area.index(node_min.X, y, z); + for (s16 x = node_min.X; x <= node_max.X; x++) { + int index = (z - node_min.Z) * csize.X + (x - node_min.X); + content_t c = vm->m_data[vi].getContent(); + + if (getMountainTerrainFromMap(j, index, y) + && (c == CONTENT_AIR || c == c_water_source)) { + vm->m_data[vi] = n_stone; + if (y > ymax) + ymax = y; + } + + vi++; + j++; + } + } + + return ymax; +} +#endif + + #if 0 void MapgenV7::carveRivers() { MapNode n_air(CONTENT_AIR), n_water_source(c_water_source); diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h index 9fdecf59..57cb55a8 100644 --- a/src/mapgen_v7.h +++ b/src/mapgen_v7.h @@ -59,6 +59,7 @@ public: BiomeManager *bmgr; int ystride; + int zstride_1u1d; int zstride_1d; u32 spflags; @@ -113,16 +114,12 @@ public: void calculateNoise(); - virtual int generateTerrain(); - void generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y); - int generateMountainTerrain(s16 ymax); + int generateTerrain(); void generateRidgeTerrain(); MgStoneType generateBiomes(float *heat_map, float *humidity_map); void dustTopNodes(); - //void addTopNodes(); - void generateCaves(s16 max_stone_y); }; From 65db88d24e65972b34da824743ba7dc6d307def0 Mon Sep 17 00:00:00 2001 From: kilbith Date: Mon, 18 Apr 2016 18:20:04 +0200 Subject: [PATCH 434/531] Mainmenu: Unify favorite servers with main serverlist --- builtin/mainmenu/common.lua | 26 ++-- builtin/mainmenu/tab_multiplayer.lua | 154 +++++++++---------- textures/base/pack/server_flags_favorite.png | Bin 0 -> 916 bytes 3 files changed, 85 insertions(+), 95 deletions(-) create mode 100644 textures/base/pack/server_flags_favorite.png diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index 62ab2b57..203b1382 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -85,7 +85,7 @@ function order_favorite_list(list) end -------------------------------------------------------------------------------- -function render_favorite(spec,render_details) +function render_favorite(spec, is_favorite) local text = "" if spec.name ~= nil then @@ -105,13 +105,15 @@ function render_favorite(spec,render_details) end end - if not render_details then - return text - end - local details = "" local grey_out = not is_server_protocol_compat(spec.proto_min, spec.proto_max) + if is_favorite then + details = "1," + else + details = "0," + end + if spec.clients ~= nil and spec.clients_max ~= nil then local clients_color = '' local clients_percent = 100 * spec.clients / spec.clients_max @@ -253,15 +255,13 @@ function asyncOnlineFavourites() end, nil, function(result) - if core.setting_getbool("public_serverlist") then - local favs = order_favorite_list(result) - if favs[1] then - menudata.public_known = favs - menudata.favorites = menudata.public_known - menudata.favorites_is_public = true - end - core.event_handler("Refresh") + local favs = order_favorite_list(result) + if favs[1] then + menudata.public_known = favs + menudata.favorites = menudata.public_known + menudata.favorites_is_public = true end + core.event_handler("Refresh") end ) end diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index f3ba122f..b5323fa9 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -20,65 +20,64 @@ local function get_formspec(tabview, name, tabdata) -- Update the cached supported proto info, -- it may have changed after a change by the settings menu. common_update_cached_supp_proto() + local fav_selected = menudata.favorites[tabdata.fav_selected] - local render_details = core.is_yes(core.setting_getbool("public_serverlist")) - local retval = - "label[7.75,-0.15;" .. fgettext("Address / Port :") .. "]" .. - "label[7.75,1.05;" .. fgettext("Name / Password :") .. "]" .. - "field[8,0.75;3.4,0.5;te_address;;" .. - core.formspec_escape(core.setting_get("address")) .. "]" .. - "field[11.25,0.75;1.3,0.5;te_port;;" .. - core.formspec_escape(core.setting_get("remote_port")) .. "]" .. - "checkbox[0,4.85;cb_public_serverlist;" .. fgettext("Public Serverlist") .. ";" .. - dump(core.setting_getbool("public_serverlist")) .. "]" - - if not core.setting_getbool("public_serverlist") then - retval = retval .. - "button[8,4.9;2,0.5;btn_delete_favorite;" .. fgettext("Delete") .. "]" - end - - retval = retval .. - "button[10,4.9;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]" .. + "label[7.75,-0.15;" .. fgettext("Address / Port") .. "]" .. + "label[7.75,1.05;" .. fgettext("Name / Password") .. "]" .. + "field[8,0.75;3.3,0.5;te_address;;" .. + core.formspec_escape(core.setting_get("address")) .. "]" .. + "field[11.15,0.75;1.4,0.5;te_port;;" .. + core.formspec_escape(core.setting_get("remote_port")) .. "]" .. + "button[10.1,4.9;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]" .. "field[8,1.95;2.95,0.5;te_name;;" .. - core.formspec_escape(core.setting_get("name")) .. "]" .. + core.formspec_escape(core.setting_get("name")) .. "]" .. "pwdfield[10.78,1.95;1.77,0.5;te_pwd;]" .. - "box[7.73,2.35;4.3,2.28;#999999]" .. - "textarea[8.1,2.4;4.26,2.6;;" - - if tabdata.fav_selected ~= nil and - menudata.favorites[tabdata.fav_selected] ~= nil and - menudata.favorites[tabdata.fav_selected].description ~= nil then - retval = retval .. - core.formspec_escape(menudata.favorites[tabdata.fav_selected].description,true) - end + "box[7.73,2.35;4.3,2.28;#999999]" - retval = retval .. - ";]" + if tabdata.fav_selected and fav_selected then + if gamedata.fav then + retval = retval .. "button[7.85,4.9;2.3,0.5;btn_delete_favorite;" .. + fgettext("Del. Favorite") .. "]" + end + if fav_selected.description then + retval = retval .. "textarea[8.1,2.4;4.26,2.6;;" .. + core.formspec_escape((gamedata.serverdescription or ""), true) .. ";]" + end + end --favourites - if render_details then - retval = retval .. "tablecolumns[" .. - "color,span=3;" .. - "text,align=right;" .. -- clients - "text,align=center,padding=0.25;" .. -- "/" - "text,align=right,padding=0.25;" .. -- clients_max - image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" .. - image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" .. - image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" .. - "color,span=1;" .. - "text,padding=1]" -- name - else - retval = retval .. "tablecolumns[text]" - end - retval = retval .. - "table[-0.15,-0.1;7.75,5;favourites;" + retval = retval .. "tablecolumns[" .. + image_column(fgettext("Favorite"), "favorite") .. ";" .. + "color,span=3;" .. + "text,align=right;" .. -- clients + "text,align=center,padding=0.25;" .. -- "/" + "text,align=right,padding=0.25;" .. -- clients_max + image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" .. + image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" .. + image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" .. + "color,span=1;" .. + "text,padding=1]" .. + "table[-0.15,-0.1;7.75,5.5;favourites;" if #menudata.favorites > 0 then - retval = retval .. render_favorite(menudata.favorites[1],render_details) - - for i=2,#menudata.favorites,1 do - retval = retval .. "," .. render_favorite(menudata.favorites[i],render_details) + local favs = core.get_favorites("local") + if #favs > 0 then + for i = 1, #favs do + for j = 1, #menudata.favorites do + if menudata.favorites[j].address == favs[i].address and + menudata.favorites[j].port == favs[i].port then + table.insert(menudata.favorites, i, table.remove(menudata.favorites, j)) + end + end + if favs[i].address ~= menudata.favorites[i].address then + table.insert(menudata.favorites, i, favs[i]) + end + end + end + retval = retval .. render_favorite(menudata.favorites[1], (#favs > 0)) + for i = 2, #menudata.favorites do + retval = retval .. "," .. render_favorite(menudata.favorites[i], (i <= #favs)) end end @@ -100,9 +99,10 @@ local function main_button_handler(tabview, fields, name, tabdata) if fields["favourites"] ~= nil then local event = core.explode_table_event(fields["favourites"]) + local fav = menudata.favorites[event.row] + if event.type == "DCL" then if event.row <= #menudata.favorites then - local fav = menudata.favorites[event.row] if menudata.favorites_is_public and not is_server_protocol_compat_or_error( fav.proto_min, fav.proto_max) then @@ -131,8 +131,18 @@ local function main_button_handler(tabview, fields, name, tabdata) if event.type == "CHG" then if event.row <= #menudata.favorites then - local address = menudata.favorites[event.row].address - local port = menudata.favorites[event.row].port + gamedata.fav = false + local favs = core.get_favorites("local") + local address = fav.address + local port = fav.port + gamedata.serverdescription = fav.description + + for i = 1, #favs do + if fav.address == favs[i].address and + fav.port == favs[i].port then + gamedata.fav = true + end + end if address ~= nil and port ~= nil then @@ -181,29 +191,16 @@ local function main_button_handler(tabview, fields, name, tabdata) return true end - if fields["cb_public_serverlist"] ~= nil then - core.setting_set("public_serverlist", fields["cb_public_serverlist"]) - - if core.setting_getbool("public_serverlist") then - asyncOnlineFavourites() - else - menudata.favorites = core.get_favorites("local") - menudata.favorites_is_public = false - end - tabdata.fav_selected = nil - return true - end - - if fields["btn_delete_favorite"] ~= nil then + if fields.btn_delete_favorite then local current_favourite = core.get_table_index("favourites") - if current_favourite == nil then return end + if not current_favourite then return end + core.delete_favorite(current_favourite) - menudata.favorites = core.get_favorites("local") + asyncOnlineFavourites() tabdata.fav_selected = nil - core.setting_set("address","") - core.setting_set("remote_port","30000") - + core.setting_set("address", "") + core.setting_set("remote_port", "30000") return true end @@ -247,16 +244,9 @@ local function main_button_handler(tabview, fields, name, tabdata) return false end -local function on_change(type,old_tab,new_tab) - if type == "LEAVE" then - return - end - if core.setting_getbool("public_serverlist") then - asyncOnlineFavourites() - else - menudata.favorites = core.get_favorites("local") - menudata.favorites_is_public = false - end +local function on_change(type, old_tab, new_tab) + if type == "LEAVE" then return end + asyncOnlineFavourites() end -------------------------------------------------------------------------------- diff --git a/textures/base/pack/server_flags_favorite.png b/textures/base/pack/server_flags_favorite.png new file mode 100644 index 0000000000000000000000000000000000000000..6a3fc5efe7ce3a9ffa0f2e0a800afdace65285c4 GIT binary patch literal 916 zcmV;F18e+=P)Ky5;j10^mHOxQ-`a%p0KmH*s0SF)_1|+})G695v z1~9NPXE6ANGPrrGS(%G4*n;HEL>L&{r5G5#{Xysf2p|*#z?wm>_`#seq^=ymAb5{~ z(MFjyN|!l>4JenV0W|wRiVg;V0Ac}?e}P(mG6*sJW)Nol$sqWji6NQAQk|cH;UNQq zm?DFdlZwxxuQ#Ji`5CT#`o!@5?;nQO3>*yKK=uIy5DUY9U;s%8>of4kaxgOg;$z`v z=V26;WM@+S1(XJc6vHD1wG?B11#O|FA6~xu!u*!;^WXPhKC#_-`uE?z|MdU?#Pan! z!&at$?17yA#_UY&Pk|b~0`Y60-j6`Pfb0N9jmTvNHh&%lF$OUn1_mCUe=BcGPTRw9 za?fjq`v3vN__m&b;mKnLTUiyB1p+}LN(`dFVEGC3C?j(4{DTm$iQ&(2~h3>gSMOm<6L<^ZgVCXR&d&Y15hNsV`X@@;p4ZCRX-O@ zd&E!=H1Z8d3Lt=({sCRc2}%Pj3|H?z_+Rzw^4C8MpMEefeEbf`2B2QX3n zK#EF$0Ad0q-G4wM|NRB4v19>x{TWc;>OY3hyZx$w literal 0 HcmV?d00001 From 8cf26bb0bbc94de437342c84c7b0854feb8957e8 Mon Sep 17 00:00:00 2001 From: kilbith Date: Mon, 18 Apr 2016 22:43:12 +0200 Subject: [PATCH 435/531] Mainmenu: Code cleaning --- builtin/mainmenu/common.lua | 150 +++++++++------------------ builtin/mainmenu/tab_multiplayer.lua | 102 ++++++++---------- 2 files changed, 95 insertions(+), 157 deletions(-) diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index 203b1382..5bf39abd 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -22,8 +22,7 @@ menudata = {} -------------------------------------------------------------------------------- -- Local cached values -------------------------------------------------------------------------------- -local min_supp_proto -local max_supp_proto +local min_supp_proto, max_supp_proto function common_update_cached_supp_proto() min_supp_proto = core.get_min_supp_proto() @@ -36,31 +35,24 @@ common_update_cached_supp_proto() -------------------------------------------------------------------------------- local function render_client_count(n) - if n > 99 then - return '99+' - elseif n >= 0 then - return tostring(n) - else - return '?' - end + if n > 99 then return '99+' + elseif n >= 0 then return tostring(n) + else return '?' end end local function configure_selected_world_params(idx) - local worldconfig = modmgr.get_worldconfig( - menudata.worldlist:get_list()[idx].path) - - if worldconfig.creative_mode ~= nil then + local worldconfig = modmgr.get_worldconfig(menudata.worldlist:get_list()[idx].path) + if worldconfig.creative_mode then core.setting_set("creative_mode", worldconfig.creative_mode) end - if worldconfig.enable_damage ~= nil then + if worldconfig.enable_damage then core.setting_set("enable_damage", worldconfig.enable_damage) end end -------------------------------------------------------------------------------- function image_column(tooltip, flagname) - return "image," .. - "tooltip=" .. core.formspec_escape(tooltip) .. "," .. + return "image,tooltip=" .. core.formspec_escape(tooltip) .. "," .. "0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," .. "1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_" .. flagname .. ".png") end @@ -69,13 +61,13 @@ end function order_favorite_list(list) local res = {} --orders the favorite list after support - for i=1,#list,1 do + for i = 1, #list do local fav = list[i] if is_server_protocol_compat(fav.proto_min, fav.proto_max) then res[#res + 1] = fav end end - for i=1,#list,1 do + for i = 1, #list do local fav = list[i] if not is_server_protocol_compat(fav.proto_min, fav.proto_max) then res[#res + 1] = fav @@ -87,21 +79,12 @@ end -------------------------------------------------------------------------------- function render_favorite(spec, is_favorite) local text = "" - - if spec.name ~= nil then + if spec.name then text = text .. core.formspec_escape(spec.name:trim()) - --- if spec.description ~= nil and --- core.formspec_escape(spec.description):trim() ~= "" then --- text = text .. " (" .. core.formspec_escape(spec.description) .. ")" --- end - else - if spec.address ~= nil then - text = text .. spec.address:trim() - - if spec.port ~= nil then - text = text .. ":" .. spec.port - end + elseif spec.address then + text = text .. spec.address:trim() + if spec.port then + text = text .. ":" .. spec.port end end @@ -114,33 +97,24 @@ function render_favorite(spec, is_favorite) details = "0," end - if spec.clients ~= nil and spec.clients_max ~= nil then + if spec.clients and spec.clients_max then local clients_color = '' local clients_percent = 100 * spec.clients / spec.clients_max -- Choose a color depending on how many clients are connected -- (relatively to clients_max) - if spec.clients == 0 then - clients_color = '' -- 0 players: default/white - elseif spec.clients == spec.clients_max then - clients_color = '#dd5b5b' -- full server: red (darker) - elseif clients_percent <= 60 then - clients_color = '#a1e587' -- 0-60%: green - elseif clients_percent <= 90 then - clients_color = '#ffdc97' -- 60-90%: yellow - else - clients_color = '#ffba97' -- 90-100%: orange + if grey_out then clients_color = '#aaaaaa' + elseif spec.clients == 0 then clients_color = '' -- 0 players: default/white + elseif clients_percent <= 60 then clients_color = '#a1e587' -- 0-60%: green + elseif clients_percent <= 90 then clients_color = '#ffdc97' -- 60-90%: yellow + elseif clients_percent == 100 then clients_color = '#dd5b5b' -- full server: red (darker) + else clients_color = '#ffba97' -- 90-100%: orange end - if grey_out then - clients_color = '#aaaaaa' - end + details = details .. clients_color .. ',' .. + render_client_count(spec.clients) .. ',/,' .. + render_client_count(spec.clients_max) .. ',' - details = details .. - clients_color .. ',' .. - render_client_count(spec.clients) .. ',' .. - '/,' .. - render_client_count(spec.clients_max) .. ',' elseif grey_out then details = details .. '#aaaaaa,?,/,?,' else @@ -191,56 +165,36 @@ end -------------------------------------------------------------------------------- function menu_render_worldlist() local retval = "" - local current_worldlist = menudata.worldlist:get_list() - for i,v in ipairs(current_worldlist) do - if retval ~= "" then - retval = retval .."," - end - + for i, v in ipairs(current_worldlist) do + if retval ~= "" then retval = retval .. "," end retval = retval .. core.formspec_escape(v.name) .. - " \\[" .. core.formspec_escape(v.gameid) .. "\\]" + " \\[" .. core.formspec_escape(v.gameid) .. "\\]" end return retval end -------------------------------------------------------------------------------- -function menu_handle_key_up_down(fields,textlist,settingname) - if fields["key_up"] then - local oldidx = core.get_textlist_index(textlist) - - if oldidx ~= nil and oldidx > 1 then - local newidx = oldidx -1 - core.setting_set(settingname, - menudata.worldlist:get_raw_index(newidx)) - - configure_selected_world_params(newidx) +function menu_handle_key_up_down(fields, textlist, settingname) + local oldidx, newidx = core.get_textlist_index(textlist) + if fields.key_up or fields.key_down then + if fields.key_up and oldidx and oldidx > 1 then + newidx = oldidx - 1 + elseif fields.key_down and oldidx and + oldidx < menudata.worldlist:size() then + newidx = oldidx + 1 end + core.setting_set(settingname, menudata.worldlist:get_raw_index(newidx)) + configure_selected_world_params(newidx) return true end - - if fields["key_down"] then - local oldidx = core.get_textlist_index(textlist) - - if oldidx ~= nil and oldidx < menudata.worldlist:size() then - local newidx = oldidx + 1 - core.setting_set(settingname, - menudata.worldlist:get_raw_index(newidx)) - - configure_selected_world_params(newidx) - end - - return true - end - return false end -------------------------------------------------------------------------------- function asyncOnlineFavourites() - if not menudata.public_known then menudata.public_known = {{ name = fgettext("Loading..."), @@ -267,24 +221,18 @@ function asyncOnlineFavourites() end -------------------------------------------------------------------------------- -function text2textlist(xpos,ypos,width,height,tl_name,textlen,text,transparency) - local textlines = core.splittext(text,textlen) +function text2textlist(xpos, ypos, width, height, tl_name, textlen, text, transparency) + local textlines = core.splittext(text, textlen) + local retval = "textlist[" .. xpos .. "," .. ypos .. ";" .. width .. + "," .. height .. ";" .. tl_name .. ";" - local retval = "textlist[" .. xpos .. "," .. ypos .. ";" - .. width .. "," .. height .. ";" - .. tl_name .. ";" - - for i=1, #textlines, 1 do - textlines[i] = textlines[i]:gsub("\r","") + for i = 1, #textlines do + textlines[i] = textlines[i]:gsub("\r", "") retval = retval .. core.formspec_escape(textlines[i]) .. "," end retval = retval .. ";0;" - - if transparency then - retval = retval .. "true" - end - + if transparency then retval = retval .. "true" end retval = retval .. "]" return retval @@ -297,10 +245,10 @@ end -------------------------------------------------------------------------------- function is_server_protocol_compat_or_error(server_proto_min, server_proto_max) if not is_server_protocol_compat(server_proto_min, server_proto_max) then - local server_prot_ver_info - local client_prot_ver_info + local server_prot_ver_info, client_prot_ver_info local s_p_min = server_proto_min or 13 local s_p_max = server_proto_max or 24 + if s_p_min ~= s_p_max then server_prot_ver_info = fgettext_ne("Server supports protocol versions between $1 and $2. ", s_p_min, s_p_max) @@ -329,7 +277,7 @@ function menu_worldmt(selected, setting, value) local filename = world.path .. DIR_DELIM .. "world.mt" local world_conf = Settings(filename) - if value ~= nil then + if value then if not world_conf:write() then core.log("error", "Failed to write world config file") end @@ -347,7 +295,7 @@ function menu_worldmt_legacy(selected) local modes_names = {"creative_mode", "enable_damage", "server_announce"} for _, mode_name in pairs(modes_names) do local mode_val = menu_worldmt(selected, mode_name) - if mode_val ~= nil then + if mode_val then core.setting_set(mode_name, mode_val) else menu_worldmt(selected, mode_name, core.setting_get(mode_name)) diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index b5323fa9..00150f26 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -81,7 +81,7 @@ local function get_formspec(tabview, name, tabdata) end end - if tabdata.fav_selected ~= nil then + if tabdata.fav_selected then retval = retval .. ";" .. tabdata.fav_selected .. "]" else retval = retval .. ";0]" @@ -92,13 +92,13 @@ end -------------------------------------------------------------------------------- local function main_button_handler(tabview, fields, name, tabdata) - if fields["te_name"] ~= nil then - gamedata.playername = fields["te_name"] - core.setting_set("name", fields["te_name"]) + if fields.te_name then + gamedata.playername = fields.te_name + core.setting_set("name", fields.te_name) end - if fields["favourites"] ~= nil then - local event = core.explode_table_event(fields["favourites"]) + if fields.favourites then + local event = core.explode_table_event(fields.favourites) local fav = menudata.favorites[event.row] if event.type == "DCL" then @@ -108,21 +108,22 @@ local function main_button_handler(tabview, fields, name, tabdata) fav.proto_min, fav.proto_max) then return true end + gamedata.address = fav.address gamedata.port = fav.port - gamedata.playername = fields["te_name"] - if fields["te_pwd"] ~= nil then - gamedata.password = fields["te_pwd"] - end + gamedata.playername = fields.te_name gamedata.selected_world = 0 + if fields.te_pwd then + gamedata.password = fields.te_pwd + end + gamedata.servername = fav.name gamedata.serverdescription = fav.description - if gamedata.address ~= nil and - gamedata.port ~= nil then - core.setting_set("address",gamedata.address) - core.setting_set("remote_port",gamedata.port) + if gamedata.address and gamedata.port then + core.setting_set("address", gamedata.address) + core.setting_set("remote_port", gamedata.port) core.start() end end @@ -144,47 +145,41 @@ local function main_button_handler(tabview, fields, name, tabdata) end end - if address ~= nil and - port ~= nil then - core.setting_set("address",address) - core.setting_set("remote_port",port) + if address and port then + core.setting_set("address", address) + core.setting_set("remote_port", port) end - tabdata.fav_selected = event.row end - return true end end - if fields["key_up"] ~= nil or - fields["key_down"] ~= nil then - + if fields.key_up or fields.key_down then local fav_idx = core.get_table_index("favourites") + local fav = menudata.favorites[fav_idx] - if fav_idx ~= nil then - if fields["key_up"] ~= nil and fav_idx > 1 then - fav_idx = fav_idx -1 - else if fields["key_down"] and fav_idx < #menudata.favorites then - fav_idx = fav_idx +1 - end end + if fav_idx then + if fields.key_up and fav_idx > 1 then + fav_idx = fav_idx - 1 + elseif fields.key_down and fav_idx < #menudata.favorites then + fav_idx = fav_idx + 1 + end else fav_idx = 1 end - - if menudata.favorites == nil or - menudata.favorites[fav_idx] == nil then + + if not menudata.favorites or not fav then tabdata.fav_selected = 0 return true end - - local address = menudata.favorites[fav_idx].address - local port = menudata.favorites[fav_idx].port - if address ~= nil and - port ~= nil then - core.setting_set("address",address) - core.setting_set("remote_port",port) + local address = fav.address + local port = fav.port + + if address and port then + core.setting_set("address", address) + core.setting_set("remote_port", port) end tabdata.fav_selected = fav_idx @@ -204,22 +199,19 @@ local function main_button_handler(tabview, fields, name, tabdata) return true end - if (fields["btn_mp_connect"] ~= nil or - fields["key_enter"] ~= nil) and fields["te_address"] ~= nil and - fields["te_port"] ~= nil then - - gamedata.playername = fields["te_name"] - gamedata.password = fields["te_pwd"] - gamedata.address = fields["te_address"] - gamedata.port = fields["te_port"] - + if (fields.btn_mp_connect or fields.key_enter) and fields.te_address and fields.te_port then + gamedata.playername = fields.te_name + gamedata.password = fields.te_pwd + gamedata.address = fields.te_address + gamedata.port = fields.te_port + gamedata.selected_world = 0 local fav_idx = core.get_table_index("favourites") + local fav = menudata.favorites[fav_idx] - if fav_idx ~= nil and fav_idx <= #menudata.favorites and - menudata.favorites[fav_idx].address == fields["te_address"] and - menudata.favorites[fav_idx].port == fields["te_port"] then + if fav_idx and fav_idx <= #menudata.favorites and + fav.address == fields.te_address and + fav.port == fields.te_port then - local fav = menudata.favorites[fav_idx] gamedata.servername = fav.name gamedata.serverdescription = fav.description @@ -233,10 +225,8 @@ local function main_button_handler(tabview, fields, name, tabdata) gamedata.serverdescription = "" end - gamedata.selected_world = 0 - - core.setting_set("address", fields["te_address"]) - core.setting_set("remote_port",fields["te_port"]) + core.setting_set("address", fields.te_address) + core.setting_set("remote_port", fields.te_port) core.start() return true From a60aa8e226584b97d0be0d26688b302dfddf7125 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 19 Apr 2016 15:47:14 -0700 Subject: [PATCH 436/531] Fix timer initialization. This fixes the problem that the first timer tick is an overrun and causes all timers to expire immediately. replaces #4003 --- builtin/game/misc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua index 4f58710d..de41cfc9 100644 --- a/builtin/game/misc.lua +++ b/builtin/game/misc.lua @@ -6,7 +6,7 @@ local jobs = {} local time = 0.0 -local last = 0.0 +local last = core.get_us_time() / 1000000 core.register_globalstep(function(dtime) local new = core.get_us_time() / 1000000 From 9b437088dfff0303c99f70848f8f404b16ed1e55 Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 20 Apr 2016 07:24:14 +0100 Subject: [PATCH 437/531] Textures: Replace menu background fallback dirt_bg.png with empty sky texture --- builtin/mainmenu/textures.lua | 4 ++-- textures/base/pack/dirt_bg.png | Bin 82 -> 0 bytes textures/base/pack/menu_bg.png | Bin 0 -> 124 bytes 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 textures/base/pack/dirt_bg.png create mode 100644 textures/base/pack/menu_bg.png diff --git a/builtin/mainmenu/textures.lua b/builtin/mainmenu/textures.lua index 075f38ee..dadbb093 100644 --- a/builtin/mainmenu/textures.lua +++ b/builtin/mainmenu/textures.lua @@ -179,7 +179,7 @@ function mm_texture.set_dirt_bg() end end - --use base pack - local minimalpath = defaulttexturedir .. "dirt_bg.png" + -- Use universal fallback texture in textures/base/pack + local minimalpath = defaulttexturedir .. "menu_bg.png" core.set_background("background", minimalpath, true, 128) end diff --git a/textures/base/pack/dirt_bg.png b/textures/base/pack/dirt_bg.png deleted file mode 100644 index 29df43912305a909c9cb66e80d7c39a27cb2b5ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;Lx4|+tM`h|P#}}n)5S5QA}%>0 bMTL`*f!TmT(LDN%6iAV$tDnm{r-UW|6~+%S diff --git a/textures/base/pack/menu_bg.png b/textures/base/pack/menu_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7e34f61625c8bca81bfee04d6996686ddbb787 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XYtOD Date: Thu, 21 Apr 2016 08:58:29 +0100 Subject: [PATCH 438/531] Biomes: Make dust fallback 'ignore' to fix y = 63 lighting The shadow bug at y = 63 was caused by dark air being placed as dust, when the biome dust was unspecified it was falling back to 'air' In dustTopNodes only dust == 'ignore' will disable dust placement --- src/mg_biome.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mg_biome.cpp b/src/mg_biome.cpp index 055ce019..9ab8d06c 100644 --- a/src/mg_biome.cpp +++ b/src/mg_biome.cpp @@ -56,7 +56,7 @@ BiomeManager::BiomeManager(IGameDef *gamedef) : b->m_nodenames.push_back("mapgen_water_source"); b->m_nodenames.push_back("mapgen_water_source"); b->m_nodenames.push_back("mapgen_river_water_source"); - b->m_nodenames.push_back("air"); + b->m_nodenames.push_back("ignore"); m_ndef->pendNodeResolve(b); add(b); @@ -138,5 +138,5 @@ void Biome::resolveNodeNames() getIdFromNrBacklog(&c_water_top, "mapgen_water_source", CONTENT_AIR); getIdFromNrBacklog(&c_water, "mapgen_water_source", CONTENT_AIR); getIdFromNrBacklog(&c_river_water, "mapgen_river_water_source", CONTENT_AIR); - getIdFromNrBacklog(&c_dust, "air", CONTENT_IGNORE); + getIdFromNrBacklog(&c_dust, "ignore", CONTENT_IGNORE); } From c350cfb50b3bf81c075a80307adb15393ea773d0 Mon Sep 17 00:00:00 2001 From: Ekdohibs Date: Thu, 21 Apr 2016 10:45:42 +0200 Subject: [PATCH 439/531] Make logging use a fixed-length buffer to avoid race conditions. Previously, race conditions occurred inside logging, that caused segfaults because a thread was trying to use an old pointer that was freed when the string was reallocated. Using a fixed-length buffer avoids this, at the cost of cutting too long messages over seveal lines. --- src/log.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/log.cpp b/src/log.cpp index 600e715c..589cfd90 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -34,9 +34,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +const int BUFFER_LENGTH = 256; + class StringBuffer : public std::streambuf { public: - StringBuffer() {} + StringBuffer() { + buffer_index = 0; + } int overflow(int c); virtual void flush(const std::string &buf) = 0; @@ -44,7 +48,8 @@ public: void push_back(char c); private: - std::string buffer; + char buffer[BUFFER_LENGTH]; + int buffer_index; }; @@ -338,11 +343,18 @@ std::streamsize StringBuffer::xsputn(const char *s, std::streamsize n) void StringBuffer::push_back(char c) { if (c == '\n' || c == '\r') { - if (!buffer.empty()) - flush(buffer); - buffer.clear(); + if (buffer_index) + flush(std::string(buffer, buffer_index)); + buffer_index = 0; } else { - buffer.push_back(c); + int index = buffer_index; + buffer[index++] = c; + if (index >= BUFFER_LENGTH) { + flush(std::string(buffer, buffer_index)); + buffer_index = 0; + } else { + buffer_index = index; + } } } From 7a6502a7a5007e4bed8c1dd10af39d4fa2b296a4 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 17 Apr 2016 18:35:02 +0200 Subject: [PATCH 440/531] CONTRIBUTING: disallow signed git commits They break bzr-git, and bzr-git breaks the Minetest PPAs. --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 468ba051..986f6002 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,6 +25,7 @@ If you are planning to start some significant coding, you would benefit from ask - Have a title which begins with a capital letter - Be descriptive. (e.g. no `Update init.lua` or `Fix a problem`) - Have a first line with less than *80 characters* and have a second line that is *empty* + - Do **not** [sign your commits](https://git-scm.com/book/uz/v2/Git-Tools-Signing-Your-Work), as Minetest offers automatically built ppas over launchpad and it [would break](https://bugs.launchpad.net/bzr-git/+bug/1084403) if there were signed commits in master 4. Once you are happy with your changes, submit a pull request. - Open the [pull-request form](https://github.com/minetest/minetest/pull/new/master) From 2177f3090e6bb8037779a5b518f193a03094797f Mon Sep 17 00:00:00 2001 From: Ekdohibs Date: Fri, 22 Apr 2016 14:20:16 +0200 Subject: [PATCH 441/531] Fix mainmenu code downloading the public serverlist twice. Also, fix a nil error that can happen sometimes in menu_handle_key_up_down --- builtin/mainmenu/common.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index 5bf39abd..1fd89ff7 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -178,7 +178,7 @@ end -------------------------------------------------------------------------------- function menu_handle_key_up_down(fields, textlist, settingname) - local oldidx, newidx = core.get_textlist_index(textlist) + local oldidx, newidx = core.get_textlist_index(textlist), 1 if fields.key_up or fields.key_down then if fields.key_up and oldidx and oldidx > 1 then newidx = oldidx - 1 @@ -203,12 +203,20 @@ function asyncOnlineFavourites() end menudata.favorites = menudata.public_known menudata.favorites_is_public = true + + if not menudata.public_downloading then + menudata.public_downloading = true + else + return + end + core.handle_async( function(param) return core.get_favorites("online") end, nil, function(result) + menudata.public_downloading = nil local favs = order_favorite_list(result) if favs[1] then menudata.public_known = favs From 21079cc8ebae0bf694c1903c07bf3e1517feab99 Mon Sep 17 00:00:00 2001 From: Xunto Date: Thu, 21 Apr 2016 23:26:31 +0300 Subject: [PATCH 442/531] Fix bug that was leading to oversized tooltips containing multiline text when it have multiple lines --- src/guiFormSpecMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 6492eb9d..1a6ee91c 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2253,7 +2253,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, this->bringToFront(m_tooltip_element); m_tooltip_element->setText(utf8_to_wide(tooltip_text).c_str()); s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height; - s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5; + s32 tooltip_height = m_tooltip_element->getTextHeight() + 5; v2u32 screenSize = driver->getScreenSize(); int tooltip_offset_x = m_btn_height; int tooltip_offset_y = m_btn_height; From 48939df9a5ef1ff20f4f9717d1341b51a50dff14 Mon Sep 17 00:00:00 2001 From: Ekdohibs Date: Mon, 4 Apr 2016 18:31:00 +0200 Subject: [PATCH 443/531] Escape more strings: formspecs, item descriptions, infotexts... Also, change the escape character to the more standard \x1b Thus, it can be used in the future for translation or colored text, for example. --- src/chat.cpp | 4 +-- src/game.cpp | 8 +++-- src/guiFormSpecMenu.cpp | 54 ++++++++++++++------------------- src/guiFormSpecMenu.h | 25 ++++++++++----- src/hud.cpp | 7 +++-- src/unittest/test_utilities.cpp | 19 ++++++++++++ src/util/string.cpp | 27 ----------------- src/util/string.h | 44 +++++++++++++++++++++------ 8 files changed, 105 insertions(+), 83 deletions(-) diff --git a/src/chat.cpp b/src/chat.cpp index 7a5196ed..ab945444 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -679,8 +679,8 @@ ChatBackend::~ChatBackend() void ChatBackend::addMessage(std::wstring name, std::wstring text) { - name = removeChatEscapes(name); - text = removeChatEscapes(text); + name = unescape_enriched(name); + text = unescape_enriched(text); // Note: A message may consist of multiple lines, for example the MOTD. WStrfnd fnd(text); diff --git a/src/game.cpp b/src/game.cpp index d513517b..23f261cf 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -3731,7 +3731,7 @@ void Game::handlePointingAtNode(GameRunData *runData, NodeMetadata *meta = map.getNodeMetadata(nodepos); if (meta) { - infotext = utf8_to_wide(meta->getString("infotext")); + infotext = unescape_enriched(utf8_to_wide(meta->getString("infotext"))); } else { MapNode n = map.getNodeNoEx(nodepos); @@ -3807,13 +3807,15 @@ void Game::handlePointingAtObject(GameRunData *runData, const v3f &player_position, bool show_debug) { - infotext = utf8_to_wide(runData->selected_object->infoText()); + infotext = unescape_enriched( + utf8_to_wide(runData->selected_object->infoText())); if (show_debug) { if (infotext != L"") { infotext += L"\n"; } - infotext += utf8_to_wide(runData->selected_object->debugInfoText()); + infotext += unescape_enriched(utf8_to_wide( + runData->selected_object->debugInfoText())); } if (input->getLeftState()) { diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 1a6ee91c..23cff3eb 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -609,8 +609,6 @@ void GUIFormSpecMenu::parseButton(parserData* data,std::string element, if(!data->explicit_size) warningstream<<"invalid use of button without a size[] element"< rect = core::rect(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y); FieldSpec spec( @@ -746,7 +743,7 @@ void GUIFormSpecMenu::parseTable(parserData* data,std::string element) spec.ftype = f_Table; for (unsigned int i = 0; i < items.size(); ++i) { - items[i] = unescape_string(items[i]); + items[i] = unescape_string(unescape_enriched(items[i])); } //now really show table @@ -818,7 +815,7 @@ void GUIFormSpecMenu::parseTextList(parserData* data,std::string element) spec.ftype = f_Table; for (unsigned int i = 0; i < items.size(); ++i) { - items[i] = unescape_string(items[i]); + items[i] = unescape_string(unescape_enriched(items[i])); } //now really show list @@ -889,7 +886,8 @@ void GUIFormSpecMenu::parseDropDown(parserData* data,std::string element) } for (unsigned int i=0; i < items.size(); i++) { - e->addItem(utf8_to_wide(items[i]).c_str()); + e->addItem(unescape_string(unescape_enriched( + utf8_to_wide(items[i]))).c_str()); } if (str_initial_selection != "") @@ -930,8 +928,6 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element) core::rect rect = core::rect(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y); - label = unescape_string(label); - std::wstring wlabel = utf8_to_wide(label); FieldSpec spec( @@ -995,8 +991,6 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data, if(m_form_src) default_val = m_form_src->resolveText(default_val); - default_val = unescape_string(default_val); - label = unescape_string(label); std::wstring wlabel = utf8_to_wide(label); @@ -1094,9 +1088,6 @@ void GUIFormSpecMenu::parseTextArea(parserData* data, default_val = m_form_src->resolveText(default_val); - default_val = unescape_string(default_val); - label = unescape_string(label); - std::wstring wlabel = utf8_to_wide(label); FieldSpec spec( @@ -1197,7 +1188,6 @@ void GUIFormSpecMenu::parseLabel(parserData* data,std::string element) if(!data->explicit_size) warningstream<<"invalid use of label without a size[] element"< lines = split(text, '\n'); for (unsigned int i = 0; i != lines.size(); i++) { @@ -1243,7 +1233,8 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element) ((parts.size() > 2) && (m_formspec_version > FORMSPEC_API_VERSION))) { std::vector v_pos = split(parts[0],','); - std::wstring text = utf8_to_wide(unescape_string(parts[1])); + std::wstring text = unescape_string( + unescape_enriched(utf8_to_wide(parts[1]))); MY_CHECKPOS("vertlabel",1); @@ -1330,7 +1321,6 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element, image_name = unescape_string(image_name); pressed_image_name = unescape_string(pressed_image_name); - label = unescape_string(label); std::wstring wlabel = utf8_to_wide(label); @@ -1430,7 +1420,8 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data,std::string element) e->setNotClipped(true); for (unsigned int i = 0; i < buttons.size(); i++) { - e->addTab(utf8_to_wide(buttons[i]).c_str(), -1); + e->addTab(unescape_string(unescape_enriched( + utf8_to_wide(buttons[i]))).c_str(), -1); } if ((tab_index >= 0) && @@ -1489,7 +1480,6 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) m_default_tooltip_bgcolor, m_default_tooltip_color); - label = unescape_string(label); FieldSpec spec( name, utf8_to_wide(label), @@ -1604,14 +1594,14 @@ void GUIFormSpecMenu::parseTooltip(parserData* data, std::string element) std::vector parts = split(element,';'); if (parts.size() == 2) { std::string name = parts[0]; - m_tooltips[name] = TooltipSpec(unescape_string(parts[1]), + m_tooltips[name] = TooltipSpec(parts[1], m_default_tooltip_bgcolor, m_default_tooltip_color); return; } else if (parts.size() == 4) { std::string name = parts[0]; video::SColor tmp_color1, tmp_color2; if ( parseColorString(parts[2], tmp_color1, false) && parseColorString(parts[3], tmp_color2, false) ) { - m_tooltips[name] = TooltipSpec(unescape_string(parts[1]), + m_tooltips[name] = TooltipSpec(parts[1], tmp_color1, tmp_color2); return; } @@ -2242,16 +2232,18 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase, } // Draw tooltip - std::string tooltip_text = ""; - if (hovering && !m_selected_item) - tooltip_text = item.getDefinition(m_gamedef->idef()).description; - if (tooltip_text != "") { - std::vector tt_rows = str_split(tooltip_text, '\n'); + std::wstring tooltip_text = L""; + if (hovering && !m_selected_item) { + tooltip_text = utf8_to_wide(item.getDefinition(m_gamedef->idef()).description); + tooltip_text = unescape_enriched(tooltip_text); + } + if (tooltip_text != L"") { + std::vector tt_rows = str_split(tooltip_text, L'\n'); m_tooltip_element->setBackgroundColor(m_default_tooltip_bgcolor); m_tooltip_element->setOverrideColor(m_default_tooltip_color); m_tooltip_element->setVisible(true); this->bringToFront(m_tooltip_element); - m_tooltip_element->setText(utf8_to_wide(tooltip_text).c_str()); + m_tooltip_element->setText(tooltip_text.c_str()); s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height; s32 tooltip_height = m_tooltip_element->getTextHeight() + 5; v2u32 screenSize = driver->getScreenSize(); @@ -2504,7 +2496,7 @@ void GUIFormSpecMenu::drawMenu() u32 delta = 0; if (id == -1) { m_old_tooltip_id = id; - m_old_tooltip = ""; + m_old_tooltip = L""; } else { if (id == m_old_tooltip_id) { delta = porting::getDeltaMs(m_hovered_time, getTimeMs()); @@ -2517,11 +2509,11 @@ void GUIFormSpecMenu::drawMenu() if (id != -1 && delta >= m_tooltip_show_delay) { for(std::vector::iterator iter = m_fields.begin(); iter != m_fields.end(); ++iter) { - if ( (iter->fid == id) && (m_tooltips[iter->fname].tooltip != "") ){ + if (iter->fid == id && m_tooltips[iter->fname].tooltip != L"") { if (m_old_tooltip != m_tooltips[iter->fname].tooltip) { m_old_tooltip = m_tooltips[iter->fname].tooltip; - m_tooltip_element->setText(utf8_to_wide(m_tooltips[iter->fname].tooltip).c_str()); - std::vector tt_rows = str_split(m_tooltips[iter->fname].tooltip, '\n'); + m_tooltip_element->setText(m_tooltips[iter->fname].tooltip.c_str()); + std::vector tt_rows = str_split(m_tooltips[iter->fname].tooltip, L'\n'); s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height; s32 tooltip_height = m_tooltip_element->getTextHeight() * tt_rows.size() + 5; int tooltip_offset_x = m_btn_height; @@ -2875,7 +2867,7 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event) core::position2d(x, y)); if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) { m_old_tooltip_id = -1; - m_old_tooltip = ""; + m_old_tooltip = L""; } if (!isChild(hovered,this)) { if (DoubleClickDetection(event)) { diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 005b9136..8774d306 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "modalMenu.h" #include "guiTable.h" #include "network/networkprotocol.h" +#include "util/string.h" class IGameDef; class InventoryManager; @@ -191,18 +192,26 @@ class GUIFormSpecMenu : public GUIModalMenu bool scale; }; + /* The responsibility of unescaping the strings has been shifted + * from the formspec parsing methods to the draw methods. + * There still are a few exceptions: + * - Vertical label, because it modifies the string by inserting + * '\n' between each character, + * - Tab header, because it gives the string immediately to + * Irrlicht and we can't unescape it later. + */ struct FieldSpec { FieldSpec() { } FieldSpec(const std::string &name, const std::wstring &label, - const std::wstring &fdeflt, int id) : + const std::wstring &default_text, int id) : fname(name), - flabel(label), - fdefault(fdeflt), fid(id) { + flabel = unescape_string(unescape_enriched(label)); + fdefault = unescape_string(unescape_enriched(default_text)); send = false; ftype = f_Unknown; is_exit = false; @@ -235,12 +244,12 @@ class GUIFormSpecMenu : public GUIModalMenu } TooltipSpec(std::string a_tooltip, irr::video::SColor a_bgcolor, irr::video::SColor a_color): - tooltip(a_tooltip), bgcolor(a_bgcolor), color(a_color) { + tooltip = unescape_string(unescape_enriched(utf8_to_wide(a_tooltip))); } - std::string tooltip; + std::wstring tooltip; irr::video::SColor bgcolor; irr::video::SColor color; }; @@ -252,18 +261,18 @@ class GUIFormSpecMenu : public GUIModalMenu } StaticTextSpec(const std::wstring &a_text, const core::rect &a_rect): - text(a_text), rect(a_rect), parent_button(NULL) { + text = unescape_string(unescape_enriched(a_text)); } StaticTextSpec(const std::wstring &a_text, const core::rect &a_rect, gui::IGUIButton *a_parent_button): - text(a_text), rect(a_rect), parent_button(a_parent_button) { + text = unescape_string(unescape_enriched(a_text)); } std::wstring text; core::rect rect; @@ -406,7 +415,7 @@ protected: u32 m_tooltip_show_delay; s32 m_hovered_time; s32 m_old_tooltip_id; - std::string m_old_tooltip; + std::wstring m_old_tooltip; bool m_rmouse_auto_place; diff --git a/src/hud.cpp b/src/hud.cpp index 502865ca..19feaef7 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "hud.h" #include "settings.h" #include "util/numeric.h" +#include "util/string.h" #include "log.h" #include "gamedef.h" #include "itemdef.h" @@ -319,7 +320,7 @@ void Hud::drawLuaElements(const v3s16 &camera_offset) (e->number >> 8) & 0xFF, (e->number >> 0) & 0xFF); core::rect size(0, 0, e->scale.X, text_height * e->scale.Y); - std::wstring text = utf8_to_wide(e->text); + std::wstring text = unescape_enriched(utf8_to_wide(e->text)); core::dimension2d textsize = font->getDimension(text.c_str()); v2s32 offset((e->align.X - 1.0) * (textsize.Width / 2), (e->align.Y - 1.0) * (textsize.Height / 2)); @@ -355,11 +356,11 @@ void Hud::drawLuaElements(const v3s16 &camera_offset) (e->number >> 8) & 0xFF, (e->number >> 0) & 0xFF); core::rect size(0, 0, 200, 2 * text_height); - std::wstring text = utf8_to_wide(e->name); + std::wstring text = unescape_enriched(utf8_to_wide(e->name)); font->draw(text.c_str(), size + pos, color); std::ostringstream os; os << distance << e->text; - text = utf8_to_wide(os.str()); + text = unescape_enriched(utf8_to_wide(os.str())); pos.Y += text_height; font->draw(text.c_str(), size + pos, color); break; } diff --git a/src/unittest/test_utilities.cpp b/src/unittest/test_utilities.cpp index 1785997d..d73975b9 100644 --- a/src/unittest/test_utilities.cpp +++ b/src/unittest/test_utilities.cpp @@ -45,6 +45,7 @@ public: void testStringAllowed(); void testAsciiPrintableHelper(); void testUTF8(); + void testRemoveEscapes(); void testWrapRows(); void testIsNumber(); void testIsPowerOfTwo(); @@ -71,6 +72,7 @@ void TestUtilities::runTests(IGameDef *gamedef) TEST(testStringAllowed); TEST(testAsciiPrintableHelper); TEST(testUTF8); + TEST(testRemoveEscapes); TEST(testWrapRows); TEST(testIsNumber); TEST(testIsPowerOfTwo); @@ -253,6 +255,23 @@ void TestUtilities::testUTF8() == "the shovel dug a crumbly node!"); } +void TestUtilities::testRemoveEscapes() +{ + UASSERT(unescape_enriched( + L"abc\x1bXdef") == L"abcdef"); + UASSERT(unescape_enriched( + L"abc\x1b(escaped)def") == L"abcdef"); + UASSERT(unescape_enriched( + L"abc\x1b((escaped with parenthesis\\))def") == L"abcdef"); + UASSERT(unescape_enriched( + L"abc\x1b(incomplete") == L"abc"); + UASSERT(unescape_enriched( + L"escape at the end\x1b") == L"escape at the end"); + // Nested escapes not supported + UASSERT(unescape_enriched( + L"abc\x1b(outer \x1b(inner escape)escape)def") == L"abcescape)def"); +} + void TestUtilities::testWrapRows() { UASSERT(wrap_rows("12345678",4) == "1234\n5678"); diff --git a/src/util/string.cpp b/src/util/string.cpp index c8f528a7..2c4143c7 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -729,33 +729,6 @@ static bool parseNamedColorString(const std::string &value, video::SColor &color return true; } -std::wstring removeChatEscapes(const std::wstring &s) { - std::wstring output; - size_t i = 0; - while (i < s.length()) { - if (s[i] == L'\v') { - ++i; - if (i == s.length()) continue; - if (s[i] == L'(') { - ++i; - while (i < s.length() && s[i] != L')') { - if (s[i] == L'\\') { - ++i; - } - ++i; - } - ++i; - } else { - ++i; - } - continue; - } - output += s[i]; - ++i; - } - return output; -} - void str_replace(std::string &str, char from, char to) { std::replace(str.begin(), str.end(), from, to); diff --git a/src/util/string.h b/src/util/string.h index 9e59ab20..40ef3e4d 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -386,14 +386,6 @@ inline void str_replace(std::string &str, const std::string &pattern, } } -/** - * Remove all chat escape sequences in \p s. - * - * @param s The string in which to remove escape sequences. - * @return \p s, with escape sequences removed. - */ -std::wstring removeChatEscapes(const std::wstring &s); - /** * Replace all occurrences of the character \p from in \p str with \p to. * @@ -476,7 +468,7 @@ inline std::string wrap_rows(const std::string &from, * Removes backslashes from an escaped string (FormSpec strings) */ template -inline std::basic_string unescape_string(std::basic_string &s) +inline std::basic_string unescape_string(const std::basic_string &s) { std::basic_string res; @@ -492,6 +484,40 @@ inline std::basic_string unescape_string(std::basic_string &s) return res; } +/** + * Remove all escape sequences in \p s. + * + * @param s The string in which to remove escape sequences. + * @return \p s, with escape sequences removed. + */ +template +std::basic_string unescape_enriched(const std::basic_string &s) +{ + std::basic_string output; + size_t i = 0; + while (i < s.length()) { + if (s[i] == '\x1b') { + ++i; + if (i == s.length()) continue; + if (s[i] == '(') { + ++i; + while (i < s.length() && s[i] != ')') { + if (s[i] == '\\') { + ++i; + } + ++i; + } + ++i; + } else { + ++i; + } + continue; + } + output += s[i]; + ++i; + } + return output; +} /** * Checks that all characters in \p to_check are a decimal digits. From 46da0e8b3b7ac9f833b660afd34b24095531bcb0 Mon Sep 17 00:00:00 2001 From: gregorycu Date: Sun, 24 Apr 2016 14:56:56 +1000 Subject: [PATCH 444/531] Make GUIEngine use pause_fps_max not fps_max --- src/guiEngine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index 84bc8488..ba286a91 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -361,7 +361,7 @@ void GUIEngine::cloudPreProcess() /******************************************************************************/ void GUIEngine::cloudPostProcess() { - float fps_max = g_settings->getFloat("fps_max"); + float fps_max = g_settings->getFloat("pause_fps_max"); // Time of frame without fps limit u32 busytime_u32; From 31c1fca6fd5e200c4f4b24d7ba62b36a16494ed2 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Thu, 21 Apr 2016 21:54:30 +0200 Subject: [PATCH 445/531] tile.cpp: Automatically upscale lower resolution texture --- doc/lua_api.txt | 1 + src/client/tile.cpp | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index fdc73690..47624496 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -243,6 +243,7 @@ Example: default_dirt.png^default_grass_side.png `default_grass_side.png` is overlayed over `default_dirt.png`. +The texture with the lower resolution will be automatically upscaled to the higher resolution texture. ### Texture grouping Textures can be grouped together by enclosing them in `(` and `)`. diff --git a/src/client/tile.cpp b/src/client/tile.cpp index e6668063..72d626da 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -1175,7 +1175,28 @@ bool TextureSource::generateImagePart(std::string part_of_name, core::rect(pos_from, dim), video::SColor(255,255,255,255), NULL);*/ - blit_with_alpha(image, baseimg, pos_from, pos_to, dim); + + core::dimension2d dim_dst = baseimg->getDimension(); + if (dim == dim_dst) { + blit_with_alpha(image, baseimg, pos_from, pos_to, dim); + } else if (dim.Width * dim.Height < dim_dst.Width * dim_dst.Height) { + // Upscale overlying image + video::IImage* scaled_image = m_device->getVideoDriver()-> + createImage(video::ECF_A8R8G8B8, dim_dst); + image->copyToScaling(scaled_image); + + blit_with_alpha(scaled_image, baseimg, pos_from, pos_to, dim_dst); + scaled_image->drop(); + } else { + // Upscale base image + video::IImage* scaled_base = m_device->getVideoDriver()-> + createImage(video::ECF_A8R8G8B8, dim); + baseimg->copyToScaling(scaled_base); + baseimg->drop(); + baseimg = scaled_base; + + blit_with_alpha(image, baseimg, pos_from, pos_to, dim); + } } //cleanup image->drop(); From ae7fb9b5bea291f81a82912d42fc43b7e71702bf Mon Sep 17 00:00:00 2001 From: Xunto Date: Fri, 22 Apr 2016 15:49:06 +0300 Subject: [PATCH 446/531] Inventory: Make ItemStack with different metadata not stackable --- src/inventory.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/inventory.cpp b/src/inventory.cpp index fce8575e..cb8faecb 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -335,8 +335,9 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_, *this = newitem; newitem.clear(); } - // If item name differs, bail out - else if(name != newitem.name) + // If item name or metadata differs, bail out + else if (name != newitem.name + || metadata != newitem.metadata) { // cannot be added } @@ -374,8 +375,9 @@ bool ItemStack::itemFits(const ItemStack &newitem_, { newitem.clear(); } - // If item name differs, bail out - else if(name != newitem.name) + // If item name or metadata differs, bail out + else if (name != newitem.name + || metadata != newitem.metadata) { // cannot be added } From 26a9a85129db3c769a9deecf905640858dc48ed8 Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Mon, 25 Apr 2016 15:05:35 +0300 Subject: [PATCH 447/531] Android: Update dependencies, GMP was required as a dependency --- build/android/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index d27fb8cf..df5f65c4 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -107,7 +107,7 @@ OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -CURL_VERSION = 7.47.0 +CURL_VERSION = 7.48.0 CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp @@ -134,7 +134,7 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz -SQLITE3_FOLDER = sqlite-amalgamation-3100200 +SQLITE3_FOLDER = sqlite-amalgamation-3120200 SQLITE3_URL = http://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip -include $(PATHCFGFILE) @@ -307,7 +307,7 @@ openssl_download : openssl : $(OPENSSL_LIB) -$(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) +$(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) $(GMP_LIB) @REFRESH=0; \ if [ ! -e ${OPENSSL_TIMESTAMP_INT} ] ; then \ echo "${OPENSSL_TIMESTAMP_INT} doesn't exist"; \ From 6278da296be13c1229bfce45c476119a1db9477f Mon Sep 17 00:00:00 2001 From: obneq Date: Thu, 28 Apr 2016 01:58:09 +1000 Subject: [PATCH 448/531] Handle particle spawners in env and delete expired ids Rebased by Zeno (2016-04-2016) --- src/environment.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++++ src/environment.h | 7 +++++++ src/server.cpp | 25 ++++++++---------------- src/server.h | 6 +----- 4 files changed, 62 insertions(+), 22 deletions(-) diff --git a/src/environment.cpp b/src/environment.cpp index 902e2bda..413bc7ff 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -50,6 +50,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #define LBM_NAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_:" +// A number that is much smaller than the timeout for particle spawners should/could ever be +#define PARTICLE_SPAWNER_NO_EXPIRY -1024.f + Environment::Environment(): m_time_of_day_speed(0), m_time_of_day(9000), @@ -1544,6 +1547,49 @@ void ServerEnvironment::step(float dtime) */ removeRemovedObjects(); } + + /* + Manage particle spawner expiration + */ + if (m_particle_management_interval.step(dtime, 1.0)) { + for (std::map::iterator i = m_particle_spawners.begin(); + i != m_particle_spawners.end(); ) { + //non expiring spawners + if (i->second == PARTICLE_SPAWNER_NO_EXPIRY) { + ++i; + continue; + } + + i->second -= 1.0f; + if (i->second <= 0.f) + m_particle_spawners.erase(i++); + else + ++i; + } + } +} + +u32 ServerEnvironment::addParticleSpawner(float exptime) +{ + // Timers with lifetime 0 do not expire + float time = exptime > 0.f ? exptime : PARTICLE_SPAWNER_NO_EXPIRY; + + u32 id = 0; + for (;;) { // look for unused particlespawner id + id++; + std::map::iterator f; + f = m_particle_spawners.find(id); + if (f == m_particle_spawners.end()) { + m_particle_spawners[id] = time; + break; + } + } + return id; +} + +void ServerEnvironment::deleteParticleSpawner(u32 id) +{ + m_particle_spawners.erase(id); } ServerActiveObject* ServerEnvironment::getActiveObject(u16 id) diff --git a/src/environment.h b/src/environment.h index 660c6f1b..c6786fae 100644 --- a/src/environment.h +++ b/src/environment.h @@ -337,6 +337,9 @@ public: // env_meta.txt doesn't exist (e.g. new world) void loadDefaultMeta(); + u32 addParticleSpawner(float exptime); + void deleteParticleSpawner(u32 id); + /* External ActiveObject interface ------------------------------------------- @@ -516,6 +519,10 @@ private: // Estimate for general maximum lag as determined by server. // Can raise to high values like 15s with eg. map generation mods. float m_max_lag_estimate; + + // Particles + IntervalLimiter m_particle_management_interval; + std::map m_particle_spawners; }; #ifndef SERVER diff --git a/src/server.cpp b/src/server.cpp index 6c008a2a..0aba2796 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3194,19 +3194,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime, peer_id = player->peer_id; } - u32 id = 0; - for(;;) // look for unused particlespawner id - { - id++; - if (std::find(m_particlespawner_ids.begin(), - m_particlespawner_ids.end(), id) - == m_particlespawner_ids.end()) - { - m_particlespawner_ids.push_back(id); - break; - } - } - + u32 id = m_env->addParticleSpawner(spawntime); SendAddParticleSpawner(peer_id, amount, spawntime, minpos, maxpos, minvel, maxvel, minacc, maxacc, minexptime, maxexptime, minsize, maxsize, @@ -3229,13 +3217,16 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id) peer_id = player->peer_id; } - m_particlespawner_ids.erase( - std::remove(m_particlespawner_ids.begin(), - m_particlespawner_ids.end(), id), - m_particlespawner_ids.end()); + m_env->deleteParticleSpawner(id); SendDeleteParticleSpawner(peer_id, id); } +void Server::deleteParticleSpawnerAll(u32 id) +{ + m_env->deleteParticleSpawner(id); + SendDeleteParticleSpawner(PEER_ID_INEXISTENT, id); +} + Inventory* Server::createDetachedInventory(const std::string &name) { if(m_detached_inventories.count(name) > 0){ diff --git a/src/server.h b/src/server.h index fd559ba1..daf51dee 100644 --- a/src/server.h +++ b/src/server.h @@ -287,6 +287,7 @@ public: const std::string &playername); void deleteParticleSpawner(const std::string &playername, u32 id); + void deleteParticleSpawnerAll(u32 id); // Creates or resets inventory Inventory* createDetachedInventory(const std::string &name); @@ -662,11 +663,6 @@ private: // key = name std::map m_detached_inventories; - /* - Particles - */ - std::vector m_particlespawner_ids; - DISABLE_CLASS_COPY(Server); }; From 30083d1e0070d0f86337a57ea36b6bba7fd52572 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sun, 24 Apr 2016 15:44:10 +0200 Subject: [PATCH 449/531] Mainmenu: Standardize the menu button order and sizes --- builtin/mainmenu/dlg_config_world.lua | 38 ++++++++++++------------- builtin/mainmenu/dlg_create_world.lua | 6 ++-- builtin/mainmenu/dlg_delete_mod.lua | 9 +++--- builtin/mainmenu/dlg_delete_world.lua | 8 +++--- builtin/mainmenu/dlg_rename_modpack.lua | 12 ++++---- src/guiKeyChangeMenu.cpp | 4 +-- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua index 4d13faea..eb0319ba 100644 --- a/builtin/mainmenu/dlg_config_world.lua +++ b/builtin/mainmenu/dlg_config_world.lua @@ -25,20 +25,20 @@ local function get_formspec(data) local mod = data.list:get_list()[data.selected_mod] local retval = - "size[11,6.5,true]" .. - "label[0.5,-0.25;" .. fgettext("World:") .. "]" .. - "label[1.75,-0.25;" .. data.worldspec.name .. "]" + "size[11.5,7.5,true]" .. + "label[0.5,0;" .. fgettext("World:") .. "]" .. + "label[1.75,0;" .. data.worldspec.name .. "]" if data.hide_gamemods then - retval = retval .. "checkbox[0,5.75;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";true]" + retval = retval .. "checkbox[1,6;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";true]" else - retval = retval .. "checkbox[0,5.75;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";false]" + retval = retval .. "checkbox[1,6;cb_hide_gamemods;" .. fgettext("Hide Game") .. ";false]" end if data.hide_modpackcontents then - retval = retval .. "checkbox[2,5.75;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";true]" + retval = retval .. "checkbox[6,6;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";true]" else - retval = retval .. "checkbox[2,5.75;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";false]" + retval = retval .. "checkbox[6,6;cb_hide_mpcontent;" .. fgettext("Hide mp content") .. ";false]" end if mod == nil then @@ -46,13 +46,13 @@ local function get_formspec(data) end retval = retval .. - "label[0,0.45;" .. fgettext("Mod:") .. "]" .. - "label[0.75,0.45;" .. mod.name .. "]" .. - "label[0,1;" .. fgettext("Depends:") .. "]" .. - "textlist[0,1.5;5,4.25;world_config_depends;" .. + "label[0,0.7;" .. fgettext("Mod:") .. "]" .. + "label[0.75,0.7;" .. mod.name .. "]" .. + "label[0,1.25;" .. fgettext("Depends:") .. "]" .. + "textlist[0,1.75;5,4.25;world_config_depends;" .. modmgr.get_dependencies(mod.path) .. ";0]" .. - "button[9.25,6.35;2,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" .. - "button[7.4,6.35;2,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]" + "button[3.25,7;2.5,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" .. + "button[5.75,7;2.5,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]" if mod ~= nil and mod.name ~= "" and mod.typ ~= "game_mod" then if mod.is_modpack then @@ -68,22 +68,22 @@ local function get_formspec(data) end if all_enabled == false then - retval = retval .. "button[5.5,-0.125;2,0.5;btn_mp_enable;" .. fgettext("Enable MP") .. "]" + retval = retval .. "button[5.5,0.125;2.5,0.5;btn_mp_enable;" .. fgettext("Enable MP") .. "]" else - retval = retval .. "button[5.5,-0.125;2,0.5;btn_mp_disable;" .. fgettext("Disable MP") .. "]" + retval = retval .. "button[5.5,0.125;2.5,0.5;btn_mp_disable;" .. fgettext("Disable MP") .. "]" end else if mod.enabled then - retval = retval .. "checkbox[5.5,-0.375;cb_mod_enable;" .. fgettext("enabled") .. ";true]" + retval = retval .. "checkbox[5.5,-0.125;cb_mod_enable;" .. fgettext("enabled") .. ";true]" else - retval = retval .. "checkbox[5.5,-0.375;cb_mod_enable;" .. fgettext("enabled") .. ";false]" + retval = retval .. "checkbox[5.5,-0.125;cb_mod_enable;" .. fgettext("enabled") .. ";false]" end end end retval = retval .. - "button[8.5,-0.125;2.5,0.5;btn_all_mods;" .. fgettext("Enable all") .. "]" .. - "textlist[5.5,0.5;5.5,5.75;world_config_modlist;" + "button[8.75,0.125;2.5,0.5;btn_all_mods;" .. fgettext("Enable all") .. "]" .. + "textlist[5.5,0.75;5.75,5.25;world_config_modlist;" retval = retval .. modmgr.render_modlist(data.list) retval = retval .. ";" .. data.selected_mod .."]" diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index b42d119e..477b8bcb 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -46,7 +46,7 @@ local function create_world_formspec(dialogdata) current_seed = core.formspec_escape(current_seed) local retval = - "size[12,6,true]" .. + "size[11.5,6.5,true]" .. "label[2,0;" .. fgettext("World name") .. "]".. "field[4.5,0.4;6,0.5;te_world_name;;]" .. @@ -60,8 +60,8 @@ local function create_world_formspec(dialogdata) "textlist[4.2,3;5.8,2.3;games;" .. gamemgr.gamelist() .. ";" .. gameidx .. ";true]" .. - "button[5,5.5;2.6,0.5;world_create_confirm;" .. fgettext("Create") .. "]" .. - "button[7.5,5.5;2.8,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" + "button[3.25,6;2.5,0.5;world_create_confirm;" .. fgettext("Create") .. "]" .. + "button[5.75,6;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" if #gamemgr.games == 0 then retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" .. diff --git a/builtin/mainmenu/dlg_delete_mod.lua b/builtin/mainmenu/dlg_delete_mod.lua index 6e00b804..2efd7041 100644 --- a/builtin/mainmenu/dlg_delete_mod.lua +++ b/builtin/mainmenu/dlg_delete_mod.lua @@ -22,10 +22,11 @@ local function delete_mod_formspec(dialogdata) dialogdata.mod = modmgr.global_mods:get_list()[dialogdata.selected] local retval = - "size[12.4,5,true]" .. - "field[1.75,1;10,3;;" .. fgettext("Are you sure you want to delete \"$1\"?", dialogdata.mod.name) .. ";]".. - "button[4,4.2;1,0.5;dlg_delete_mod_confirm;" .. fgettext("Yes") .. "]" .. - "button[6.5,4.2;3,0.5;dlg_delete_mod_cancel;" .. fgettext("No of course not!") .. "]" + "size[11.5,4.5,true]" .. + "label[2,2;" .. + fgettext("Are you sure you want to delete \"$1\"?", dialogdata.mod.name) .. "]".. + "button[3.25,3.5;2.5,0.5;dlg_delete_mod_confirm;" .. fgettext("Delete") .. "]" .. + "button[5.75,3.5;2.5,0.5;dlg_delete_mod_cancel;" .. fgettext("Cancel") .. "]" return retval end diff --git a/builtin/mainmenu/dlg_delete_world.lua b/builtin/mainmenu/dlg_delete_world.lua index aa710ef3..1e5af1fe 100644 --- a/builtin/mainmenu/dlg_delete_world.lua +++ b/builtin/mainmenu/dlg_delete_world.lua @@ -19,11 +19,11 @@ local function delete_world_formspec(dialogdata) local retval = - "size[12,6,true]" .. + "size[11.5,4.5,true]" .. "label[2,2;" .. - fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]".. - "button[3.5,4.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes").. "]" .. - "button[6,4.2;2.8,0.5;world_delete_cancel;" .. fgettext("No") .. "]" + fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" .. + "button[3.25,3.5;2.5,0.5;world_delete_confirm;" .. fgettext("Delete") .. "]" .. + "button[5.75,3.5;2.5,0.5;world_delete_cancel;" .. fgettext("Cancel") .. "]" return retval end diff --git a/builtin/mainmenu/dlg_rename_modpack.lua b/builtin/mainmenu/dlg_rename_modpack.lua index 9e252408..959c65d9 100644 --- a/builtin/mainmenu/dlg_rename_modpack.lua +++ b/builtin/mainmenu/dlg_rename_modpack.lua @@ -22,14 +22,12 @@ local function rename_modpack_formspec(dialogdata) dialogdata.mod = modmgr.global_mods:get_list()[dialogdata.selected] local retval = - "size[12.4,5,true]" .. - "label[1.75,1;".. fgettext("Rename Modpack:") .. "]".. - "field[4.5,1.4;6,0.5;te_modpack_name;;" .. - dialogdata.mod.name .. - "]" .. - "button[5,4.2;2.6,0.5;dlg_rename_modpack_confirm;".. + "size[11.5,4.5,true]" .. + "field[2.5,2;7,0.5;te_modpack_name;".. fgettext("Rename Modpack:") .. ";" .. + dialogdata.mod.name .. "]" .. + "button[3.25,3.5;2.5,0.5;dlg_rename_modpack_confirm;".. fgettext("Accept") .. "]" .. - "button[7.5,4.2;2.8,0.5;dlg_rename_modpack_cancel;".. + "button[5.75,3.5;2.5,0.5;dlg_rename_modpack_cancel;".. fgettext("Cancel") .. "]" return retval diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp index bb878d6e..b0581825 100644 --- a/src/guiKeyChangeMenu.cpp +++ b/src/guiKeyChangeMenu.cpp @@ -187,7 +187,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize) { core::rect < s32 > rect(0, 0, 100, 30); - rect += topleft + v2s32(size.X - 100 - 20, size.Y - 40); + rect += topleft + v2s32(size.X / 2 - 105, size.Y - 40); const wchar_t *text = wgettext("Save"); Environment->addButton(rect, this, GUI_ID_BACK_BUTTON, text); @@ -195,7 +195,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize) } { core::rect < s32 > rect(0, 0, 100, 30); - rect += topleft + v2s32(size.X - 100 - 20 - 100 - 20, size.Y - 40); + rect += topleft + v2s32(size.X / 2 + 5, size.Y - 40); const wchar_t *text = wgettext("Cancel"); Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON, text); From 17bfe2fe5b24aa7cf097bfe0a18dd3a66a0cee38 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 9 Apr 2016 16:07:45 +0100 Subject: [PATCH 450/531] Builtin: Add basic_privs setting --- builtin/game/chatcommands.lua | 8 ++++++-- builtin/settingtypes.txt | 3 +++ doc/lua_api.txt | 1 + minetest.conf.example | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 4deff281..7480446f 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -181,8 +181,10 @@ core.register_chatcommand("grant", { end local privs = core.get_player_privs(grantname) local privs_unknown = "" + local basic_privs = + core.string_to_privs(core.setting_get("basic_privs") or "interact,shout") for priv, _ in pairs(grantprivs) do - if priv ~= "interact" and priv ~= "shout" and + if not basic_privs[priv] and not core.check_player_privs(name, {privs=true}) then return false, "Your privileges are insufficient." end @@ -223,8 +225,10 @@ core.register_chatcommand("revoke", { end local revoke_privs = core.string_to_privs(revoke_priv_str) local privs = core.get_player_privs(revoke_name) + local basic_privs = + core.string_to_privs(core.setting_get("basic_privs") or "interact,shout") for priv, _ in pairs(revoke_privs) do - if priv ~= "interact" and priv ~= "shout" and + if not basic_privs[priv] and not core.check_player_privs(name, {privs=true}) then return false, "Your privileges are insufficient." end diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index ca331ff4..0a951961 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -691,6 +691,9 @@ default_password (Default password) string # See /privs in game for a full list on your server and mod configuration. default_privs (Default privileges) string interact, shout +# Privileges that players with basic_privs can grant +basic_privs (Basic Privileges) string interact, shout + # Whether players are shown to clients without any range limit. # Deprecated, use the setting player_transfer_distance instead. unlimited_player_transfer_distance (Unlimited player transfer distance) bool true diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 47624496..4b5f969d 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1924,6 +1924,7 @@ Call these functions only at load time! * `minetest.register_privilege(name, definition)` * `definition`: `"description text"` * `definition`: `{ description = "description text", give_to_singleplayer = boolean, -- default: true }` + * To allow players with basic_privs to grant, see basic_privs minetest.conf setting. * `minetest.register_authentication_handler(handler)` * See `minetest.builtin_auth_handler` in `builtin.lua` for reference diff --git a/minetest.conf.example b/minetest.conf.example index e913140a..6f0eb786 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -826,6 +826,10 @@ # type: string # default_privs = interact, shout +# Privileges that players with basic_privs can grant +# type: string +# basic_privs = interact, shout + # Whether players are shown to clients without any range limit. # Deprecated, use the setting player_transfer_distance instead. # type: bool @@ -1513,4 +1517,3 @@ # type: string # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/ - From dc35091affef70e8af8caa2b0fbbd328f1844550 Mon Sep 17 00:00:00 2001 From: kilbith Date: Mon, 25 Apr 2016 11:18:17 +0200 Subject: [PATCH 451/531] Android menu: Unified serverlist --- builtin/mainmenu/tab_simple_main.lua | 210 ++++++++++++++------------- 1 file changed, 110 insertions(+), 100 deletions(-) diff --git a/builtin/mainmenu/tab_simple_main.lua b/builtin/mainmenu/tab_simple_main.lua index cb64b73f..3818f321 100644 --- a/builtin/mainmenu/tab_simple_main.lua +++ b/builtin/mainmenu/tab_simple_main.lua @@ -17,66 +17,80 @@ -------------------------------------------------------------------------------- local function get_formspec(tabview, name, tabdata) - local retval = "" + -- Update the cached supported proto info, + -- it may have changed after a change by the settings menu. + common_update_cached_supp_proto() + local fav_selected = menudata.favorites[tabdata.fav_selected] - local render_details = dump(core.setting_getbool("public_serverlist")) + local retval = + "label[9.5,0;".. fgettext("Name / Password") .. "]" .. + "field[0.25,3.35;5.5,0.5;te_address;;" .. + core.formspec_escape(core.setting_get("address")) .."]" .. + "field[5.75,3.35;2.25,0.5;te_port;;" .. + core.formspec_escape(core.setting_get("remote_port")) .."]" .. + "button[10,2.6;2,1.5;btn_mp_connect;".. fgettext("Connect") .. "]" .. + "field[9.8,1;2.6,0.5;te_name;;" .. + core.formspec_escape(core.setting_get("name")) .."]" .. + "pwdfield[9.8,2;2.6,0.5;te_pwd;]" - retval = retval .. - "label[8,0.5;".. fgettext("Name/Password") .. "]" .. - "field[0.25,3.25;5.5,0.5;te_address;;" .. - core.formspec_escape(core.setting_get("address")) .."]" .. - "field[5.75,3.25;2.25,0.5;te_port;;" .. - core.formspec_escape(core.setting_get("remote_port")) .."]" .. - "checkbox[8,-0.25;cb_public_serverlist;".. fgettext("Public Serverlist") .. ";" .. - render_details .. "]" - retval = retval .. - "button[8,2.5;4,1.5;btn_mp_connect;".. fgettext("Connect") .. "]" .. - "field[8.75,1.5;3.5,0.5;te_name;;" .. - core.formspec_escape(core.setting_get("name")) .."]" .. - "pwdfield[8.75,2.3;3.5,0.5;te_pwd;]" - - if render_details then - retval = retval .. "tablecolumns[" .. - "color,span=3;" .. - "text,align=right;" .. -- clients - "text,align=center,padding=0.25;" .. -- "/" - "text,align=right,padding=0.25;" .. -- clients_max - image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" .. - image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" .. - image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" .. - "color,span=1;" .. - "text,padding=1]" -- name - else - retval = retval .. "tablecolumns[text]" - end - retval = retval .. - "table[-0.05,0;7.55,2.75;favourites;" - - if #menudata.favorites > 0 then - retval = retval .. render_favorite(menudata.favorites[1],render_details) - - for i=2,#menudata.favorites,1 do - retval = retval .. "," .. render_favorite(menudata.favorites[i],render_details) + if tabdata.fav_selected and fav_selected then + if gamedata.fav then + retval = retval .. "button[7.7,2.6;2.3,1.5;btn_delete_favorite;" .. + fgettext("Del. Favorite") .. "]" end end - if tabdata.fav_selected ~= nil then + retval = retval .. "tablecolumns[" .. + image_column(fgettext("Favorite"), "favorite") .. ";" .. + "color,span=3;" .. + "text,align=right;" .. -- clients + "text,align=center,padding=0.25;" .. -- "/" + "text,align=right,padding=0.25;" .. -- clients_max + image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" .. + image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" .. + image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" .. + "color,span=1;" .. + "text,padding=1]" .. -- name + "table[-0.05,0;9.2,2.75;favourites;" + + if #menudata.favorites > 0 then + local favs = core.get_favorites("local") + if #favs > 0 then + for i = 1, #favs do + for j = 1, #menudata.favorites do + if menudata.favorites[j].address == favs[i].address and + menudata.favorites[j].port == favs[i].port then + table.insert(menudata.favorites, i, + table.remove(menudata.favorites, j)) + end + end + if favs[i].address ~= menudata.favorites[i].address then + table.insert(menudata.favorites, i, favs[i]) + end + end + end + retval = retval .. render_favorite(menudata.favorites[1], (#favs > 0)) + for i = 2, #menudata.favorites do + retval = retval .. "," .. render_favorite(menudata.favorites[i], (i <= #favs)) + end + end + + if tabdata.fav_selected then retval = retval .. ";" .. tabdata.fav_selected .. "]" else retval = retval .. ";0]" end -- separator - retval = retval .. - "box[-0.28,3.75;12.4,0.1;#FFFFFF]" + retval = retval .. "box[-0.28,3.75;12.4,0.1;#FFFFFF]" -- checkboxes retval = retval .. "checkbox[8.0,3.9;cb_creative;".. fgettext("Creative Mode") .. ";" .. - dump(core.setting_getbool("creative_mode")) .. "]".. + dump(core.setting_getbool("creative_mode")) .. "]".. "checkbox[8.0,4.4;cb_damage;".. fgettext("Enable Damage") .. ";" .. - dump(core.setting_getbool("enable_damage")) .. "]" + dump(core.setting_getbool("enable_damage")) .. "]" -- buttons retval = retval .. "button[0,3.7;8,1.5;btn_start_singleplayer;" .. fgettext("Start Singleplayer") .. "]" .. @@ -87,97 +101,100 @@ end -------------------------------------------------------------------------------- local function main_button_handler(tabview, fields, name, tabdata) - - if fields["btn_start_singleplayer"] then + if fields.btn_start_singleplayer then gamedata.selected_world = gamedata.worldindex gamedata.singleplayer = true core.start() return true end - if fields["favourites"] ~= nil then - local event = core.explode_table_event(fields["favourites"]) - + if fields.favourites then + local event = core.explode_table_event(fields.favourites) if event.type == "CHG" then if event.row <= #menudata.favorites then - local address = menudata.favorites[event.row].address - local port = menudata.favorites[event.row].port + gamedata.fav = false + local favs = core.get_favorites("local") + local fav = menudata.favorites[event.row] + local address = fav.address + local port = fav.port + gamedata.serverdescription = fav.description - if address ~= nil and - port ~= nil then - core.setting_set("address",address) - core.setting_set("remote_port",port) + for i = 1, #favs do + if fav.address == favs[i].address and + fav.port == favs[i].port then + gamedata.fav = true + end end + if address and port then + core.setting_set("address", address) + core.setting_set("remote_port", port) + end tabdata.fav_selected = event.row end + return true end + end + + if fields.btn_delete_favorite then + local current_favourite = core.get_table_index("favourites") + if not current_favourite then return end + + core.delete_favorite(current_favourite) + asyncOnlineFavourites() + tabdata.fav_selected = nil + + core.setting_set("address", "") + core.setting_set("remote_port", "30000") return true end - if fields["cb_public_serverlist"] ~= nil then - core.setting_set("public_serverlist", fields["cb_public_serverlist"]) - - if core.setting_getbool("public_serverlist") then - asyncOnlineFavourites() - else - menudata.favorites = core.get_favorites("local") - menudata.favorites_is_public = false - end + if fields.cb_creative then + core.setting_set("creative_mode", fields.cb_creative) return true end - if fields["cb_creative"] then - core.setting_set("creative_mode", fields["cb_creative"]) + if fields.cb_damage then + core.setting_set("enable_damage", fields.cb_damage) return true end - if fields["cb_damage"] then - core.setting_set("enable_damage", fields["cb_damage"]) - return true - end - - if fields["btn_mp_connect"] ~= nil or - fields["key_enter"] ~= nil then - - gamedata.playername = fields["te_name"] - gamedata.password = fields["te_pwd"] - gamedata.address = fields["te_address"] - gamedata.port = fields["te_port"] - + if fields.btn_mp_connect or fields.key_enter then + gamedata.playername = fields.te_name + gamedata.password = fields.te_pwd + gamedata.address = fields.te_address + gamedata.port = fields.te_port local fav_idx = core.get_textlist_index("favourites") - if fav_idx ~= nil and fav_idx <= #menudata.favorites and - menudata.favorites[fav_idx].address == fields["te_address"] and - menudata.favorites[fav_idx].port == fields["te_port"] then + if fav_idx and fav_idx <= #menudata.favorites and + menudata.favorites[fav_idx].address == fields.te_address and + menudata.favorites[fav_idx].port == fields.te_port then local fav = menudata.favorites[fav_idx] - gamedata.servername = fav.name gamedata.serverdescription = fav.description if menudata.favorites_is_public and - not is_server_protocol_compat_or_error( - fav.proto_min, fav.proto_max) then + not is_server_protocol_compat_or_error( + fav.proto_min, fav.proto_max) then return true end else - gamedata.servername = "" - gamedata.serverdescription = "" + gamedata.servername = "" + gamedata.serverdescription = "" end gamedata.selected_world = 0 - core.setting_set("address",fields["te_address"]) - core.setting_set("remote_port",fields["te_port"]) + core.setting_set("address", fields.te_address) + core.setting_set("remote_port", fields.te_port) core.start() return true end - if fields["btn_config_sp_world"] ~= nil then + if fields.btn_config_sp_world then local configdialog = create_configure_world_dlg(1) - - if (configdialog ~= nil) then + if configdialog then configdialog:set_parent(tabview) tabview:hide() configdialog:show() @@ -188,15 +205,8 @@ end -------------------------------------------------------------------------------- local function on_activate(type,old_tab,new_tab) - if type == "LEAVE" then - return - end - if core.setting_getbool("public_serverlist") then - asyncOnlineFavourites() - else - menudata.favorites = core.get_favorites("local") - menudata.favorites_is_public = false - end + if type == "LEAVE" then return end + asyncOnlineFavourites() end -------------------------------------------------------------------------------- From 7baddd173591cc9394d57cdb265f978495314f7a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 28 Apr 2016 23:59:54 +1000 Subject: [PATCH 452/531] Avoid teleporting player if /teleport coords are out-of-range --- builtin/game/chatcommands.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 7480446f..3350140e 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -352,10 +352,16 @@ core.register_chatcommand("teleport", { p.x = tonumber(p.x) p.y = tonumber(p.y) p.z = tonumber(p.z) - teleportee = core.get_player_by_name(name) - if teleportee and p.x and p.y and p.z then - teleportee:setpos(p) - return true, "Teleporting to "..core.pos_to_string(p) + if p.x and p.y and p.z then + local lm = tonumber(minetest.setting_get("map_generation_limit") or 31000) + if p.x < -lm or p.x > lm or p.y < -lm or p.y > lm or p.z < -lm or p.z > lm then + return false, "Cannot teleport out of map bounds!" + end + teleportee = core.get_player_by_name(name) + if teleportee then + teleportee:setpos(p) + return true, "Teleporting to "..core.pos_to_string(p) + end end local teleportee = nil From e41673820ffe200df78b1ec185ccb9d9ca962ae1 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Wed, 13 Apr 2016 14:14:04 -0400 Subject: [PATCH 453/531] Upgrade Android build to Gradle build system The old Ant build system has been deprecated for a while and new development is focused on Gradle. I also removed a hardcoded string that lint caught and moved the patch files to a subdirectory. I left the JNI files in the root directory. --- .gitignore | 15 +- build/android/AndroidManifest.xml.template | 35 -- build/android/Makefile | 372 ++++++++---------- build/android/build.gradle | 49 +++ build/android/build.xml | 16 - build/android/jni/Android.mk | 32 +- build/android/jni/Application.mk | 3 +- .../{ => patches}/irrlicht-back_button.patch | 0 .../{ => patches}/irrlicht-texturehack.patch | 0 .../{ => patches}/irrlicht-touchcount.patch | 0 .../{ => patches}/libiconv_android.patch | 0 .../{ => patches}/libiconv_stdio.patch | 0 .../{ => patches}/libvorbis-libogg-fpu.patch | 0 .../android/{ => patches}/openssl_arch.patch | 0 build/android/project.properties | 1 - build/android/settings.gradle | 2 + build/android/src/debug/AndroidManifest.xml | 4 + build/android/src/main/AndroidManifest.xml | 34 ++ .../MinetestAssetCopy.java | 0 .../MinetestTextEntry.java | 0 .../MtNativeActivity.java | 0 .../main}/res/drawable-hdpi/irr_icon.png | Bin .../main}/res/drawable-ldpi/irr_icon.png | Bin .../main}/res/drawable-mdpi/irr_icon.png | Bin .../main}/res/drawable-xhdpi/irr_icon.png | Bin .../{ => src/main}/res/layout/assetcopy.xml | 2 +- build/android/src/main/res/values/strings.xml | 5 + .../{ => src/main}/res/values/styles.xml | 0 util/bump_version.sh | 8 +- 29 files changed, 291 insertions(+), 287 deletions(-) delete mode 100644 build/android/AndroidManifest.xml.template create mode 100644 build/android/build.gradle delete mode 100644 build/android/build.xml rename build/android/{ => patches}/irrlicht-back_button.patch (100%) rename build/android/{ => patches}/irrlicht-texturehack.patch (100%) rename build/android/{ => patches}/irrlicht-touchcount.patch (100%) rename build/android/{ => patches}/libiconv_android.patch (100%) rename build/android/{ => patches}/libiconv_stdio.patch (100%) rename build/android/{ => patches}/libvorbis-libogg-fpu.patch (100%) rename build/android/{ => patches}/openssl_arch.patch (100%) delete mode 100644 build/android/project.properties create mode 100644 build/android/settings.gradle create mode 100644 build/android/src/debug/AndroidManifest.xml create mode 100644 build/android/src/main/AndroidManifest.xml rename build/android/src/{net/minetest/minetest => main/java/net.minetest.minetest}/MinetestAssetCopy.java (100%) rename build/android/src/{net/minetest/minetest => main/java/net.minetest.minetest}/MinetestTextEntry.java (100%) rename build/android/src/{net/minetest/minetest => main/java/net.minetest.minetest}/MtNativeActivity.java (100%) rename build/android/{ => src/main}/res/drawable-hdpi/irr_icon.png (100%) rename build/android/{ => src/main}/res/drawable-ldpi/irr_icon.png (100%) rename build/android/{ => src/main}/res/drawable-mdpi/irr_icon.png (100%) rename build/android/{ => src/main}/res/drawable-xhdpi/irr_icon.png (100%) rename build/android/{ => src/main}/res/layout/assetcopy.xml (94%) create mode 100644 build/android/src/main/res/values/strings.xml rename build/android/{ => src/main}/res/values/styles.xml (100%) diff --git a/.gitignore b/.gitignore index cd6ee3e3..f9c664da 100644 --- a/.gitignore +++ b/.gitignore @@ -73,15 +73,14 @@ locale/ *.a ## Android build files -build/android/assets -build/android/bin -build/android/Debug +build/android/src/main/assets +build/android/build build/android/deps -build/android/gen -build/android/jni/src build/android/libs +build/android/jni/src +build/android/src/main/jniLibs build/android/obj -build/android/path.cfg -build/android/and_env -build/android/AndroidManifest.xml +build/android/local.properties +build/android/.gradle timestamp + diff --git a/build/android/AndroidManifest.xml.template b/build/android/AndroidManifest.xml.template deleted file mode 100644 index 0f75ca64..00000000 --- a/build/android/AndroidManifest.xml.template +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - ###DEBUG_BUILD### - - - - - - - - - - - - - - diff --git a/build/android/Makefile b/build/android/Makefile index df5f65c4..f3a18189 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -8,29 +8,21 @@ OS := $(shell uname) # build for build platform APP_PLATFORM = android-9 -# paths used for timestaps, dependencys, tree config and libs -PATHCFGFILE = path.cfg - -ROOT = $(shell pwd) +ANDR_ROOT = $(shell pwd) +PROJ_ROOT = $(shell realpath $(ANDR_ROOT)/../..) +APP_ROOT = $(ANDR_ROOT)/src/main GAMES_TO_COPY = minetest_game MODS_TO_COPY = -VERSION_MAJOR := $(shell cat $(ROOT)/../../CMakeLists.txt | \ +VERSION_MAJOR := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \ grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | cut -f2 -d' ') -VERSION_MINOR := $(shell cat $(ROOT)/../../CMakeLists.txt | \ +VERSION_MINOR := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \ grep ^set\(VERSION_MINOR\ | sed 's/)/ /' | cut -f2 -d' ') -VERSION_PATCH := $(shell cat $(ROOT)/../../CMakeLists.txt | \ +VERSION_PATCH := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \ grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | cut -f2 -d' ') -################################################################################ -# Android Version code -# Increase for each build! -################################################################################ -# Play Store actual version (16/03/15): 11 -ANDROID_VERSION_CODE = 13 - ################################################################################ # toolchain config for arm new processors ################################################################################ @@ -42,7 +34,7 @@ TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3 -O3 TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) TARGET_ARCH = armv7 CROSS_PREFIX = arm-linux-androideabi- -COMPILER_VERSION = 4.8 +COMPILER_VERSION = 4.9 HAVE_LEVELDB = 1 ################################################################################ @@ -54,7 +46,7 @@ HAVE_LEVELDB = 1 #TARGET_TOOLCHAIN = mipsel-linux-android- #TARGET_ARCH = mips32 #CROSS_PREFIX = mipsel-linux-android- -#COMPILER_VERSION = 4.8 +#COMPILER_VERSION = 4.9 #HAVE_LEVELDB = 0 ################################################################################ @@ -66,78 +58,80 @@ HAVE_LEVELDB = 1 #TARGET_TOOLCHAIN = x86- #CROSS_PREFIX = i686-linux-android- #TARGET_ARCH = x86 -#COMPILER_VERSION = 4.8 +#COMPILER_VERSION = 4.9 #HAVE_LEVELDB = 1 ################################################################################ ASSETS_TIMESTAMP = deps/assets_timestamp -LEVELDB_DIR = $(ROOT)/deps/leveldb/ +LEVELDB_DIR = $(ANDR_ROOT)/deps/leveldb/ LEVELDB_LIB = $(LEVELDB_DIR)libleveldb.a LEVELDB_TIMESTAMP = $(LEVELDB_DIR)/timestamp -LEVELDB_TIMESTAMP_INT = $(ROOT)/deps/leveldb_timestamp +LEVELDB_TIMESTAMP_INT = $(ANDR_ROOT)/deps/leveldb_timestamp LEVELDB_URL_GIT = https://github.com/google/leveldb LEVELDB_COMMIT = 2d0320a458d0e6a20fff46d5f80b18bfdcce7018 -OPENAL_DIR = $(ROOT)/deps/openal-soft/ +OPENAL_DIR = $(ANDR_ROOT)/deps/openal-soft/ OPENAL_LIB = $(OPENAL_DIR)libs/$(TARGET_ABI)/libopenal.so OPENAL_TIMESTAMP = $(OPENAL_DIR)/timestamp -OPENAL_TIMESTAMP_INT = $(ROOT)/deps/openal_timestamp +OPENAL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openal_timestamp OPENAL_URL_GIT = https://github.com/apportable/openal-soft -OGG_DIR = $(ROOT)/deps/libvorbis-libogg-android/ +OGG_DIR = $(ANDR_ROOT)/deps/libvorbis-libogg-android/ OGG_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so VORBIS_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so OGG_TIMESTAMP = $(OGG_DIR)timestamp -OGG_TIMESTAMP_INT = $(ROOT)/deps/ogg_timestamp +OGG_TIMESTAMP_INT = $(ANDR_ROOT)/deps/ogg_timestamp OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android IRRLICHT_REVISION = 5122 -IRRLICHT_DIR = $(ROOT)/deps/irrlicht/ +IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/ IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp -IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp +IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) OPENSSL_VERSION = 1.0.2g OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) -OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/ +OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp -OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp +OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz CURL_VERSION = 7.48.0 -CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION) +CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp -CURL_TIMESTAMP_INT = $(ROOT)/deps/curl_timestamp +CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 GMP_VERSION = 6.1.0 -GMP_DIR = $(ROOT)/deps/gmp-$(GMP_VERSION) +GMP_DIR = $(ANDR_ROOT)/deps/gmp-$(GMP_VERSION) GMP_LIB = $(GMP_DIR)/usr/lib/libgmp.so GMP_TIMESTAMP = $(GMP_DIR)/timestamp -GMP_TIMESTAMP_INT = $(ROOT)/deps/gmp_timestamp +GMP_TIMESTAMP_INT = $(ANDR_ROOT)/deps/gmp_timestamp GMP_URL_HTTP = https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 -FREETYPE_DIR = $(ROOT)/deps/freetype2-android/ +FREETYPE_DIR = $(ANDR_ROOT)/deps/freetype2-android/ FREETYPE_LIB = $(FREETYPE_DIR)/Android/obj/local/$(TARGET_ABI)/libfreetype2-static.a FREETYPE_TIMESTAMP = $(FREETYPE_DIR)timestamp -FREETYPE_TIMESTAMP_INT = $(ROOT)/deps/freetype_timestamp +FREETYPE_TIMESTAMP_INT = $(ANDR_ROOT)/deps/freetype_timestamp FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android ICONV_VERSION = 1.14 -ICONV_DIR = $(ROOT)/deps/libiconv/ +ICONV_DIR = $(ANDR_ROOT)/deps/libiconv/ ICONV_LIB = $(ICONV_DIR)/lib/.libs/libiconv.so ICONV_TIMESTAMP = $(ICONV_DIR)timestamp -ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp +ICONV_TIMESTAMP_INT = $(ANDR_ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz SQLITE3_FOLDER = sqlite-amalgamation-3120200 SQLITE3_URL = http://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip --include $(PATHCFGFILE) +ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') +ANDROID_NDK = $(shell grep '^ndk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') +NDK_MODULE_PATH = $(ANDROID_NDK)/toolchains #use interim target variable to switch leveldb on or off ifeq ($(HAVE_LEVELDB),1) @@ -151,54 +145,50 @@ endif freetype_download clean_freetype freetype \ apk clean_apk \ clean_all clean prep_srcdir \ - install_debug install envpaths all \ - manifest clean_manifest\ + install_debug install_release envpaths all \ $(ASSETS_TIMESTAMP) $(LEVELDB_TIMESTAMP) \ $(OPENAL_TIMESTAMP) $(OGG_TIMESTAMP) \ $(IRRLICHT_TIMESTAMP) $(CURL_TIMESTAMP) \ $(OPENSSL_TIMESTAMP) \ - $(ROOT)/jni/src/android_version.h \ - $(ROOT)/jni/src/android_version_githash.h + $(ANDR_ROOT)/jni/src/android_version.h \ + $(ANDR_ROOT)/jni/src/android_version_githash.h -debug : $(PATHCFGFILE) +debug : local.properties export NDEBUG=; \ export BUILD_TYPE=debug; \ $(MAKE) apk all : debug release -release : $(PATHCFGFILE) +release : local.properties @export NDEBUG=1; \ export BUILD_TYPE=release; \ $(MAKE) apk reconfig: delconfig - @$(MAKE) $(PATHCFGFILE) + @$(MAKE) local.properties -delconfig : - $(RM) ${PATHCFGFILE} +delconfig: + $(RM) local.properties -$(PATHCFGFILE) : +local.properties: @echo "Please specify path of ANDROID NDK"; \ - echo "e.g. /home/user/android-ndk-r9c/"; \ + echo "e.g. $$HOME/Android/ndk-r11c/"; \ read ANDROID_NDK ; \ if [ ! -d $$ANDROID_NDK ] ; then \ echo "$$ANDROID_NDK is not a valid folder"; \ exit 1; \ fi; \ - echo "ANDROID_NDK = $$ANDROID_NDK" > ${PATHCFGFILE}; \ - echo "NDK_MODULE_PATH = $$ANDROID_NDK/toolchains" >> ${PATHCFGFILE}; \ - echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\ - echo "+ Note: NDK_MODULE_PATH is set to $$ANDROID_NDK/toolchains"; \ - echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\ + echo "ndk.dir = $$ANDROID_NDK" > local.properties; \ echo "Please specify path of ANDROID SDK"; \ - echo "e.g. /home/user/adt-bundle-linux-x86_64-20131030/sdk/"; \ + echo "e.g. $$HOME/Android/sdk/"; \ read SDKFLDR ; \ if [ ! -d $$SDKFLDR ] ; then \ echo "$$SDKFLDR is not a valid folder"; \ exit 1; \ fi; \ - echo "SDKFOLDER = $$SDKFLDR" >> ${PATHCFGFILE}; + echo "sdk.dir = $$SDKFLDR" >> local.properties; + $(OPENAL_TIMESTAMP) : openal_download @LAST_MODIF=$$(find ${OPENAL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ @@ -209,8 +199,8 @@ $(OPENAL_TIMESTAMP) : openal_download openal_download : @if [ ! -d ${OPENAL_DIR} ] ; then \ echo "openal sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ git clone ${OPENAL_URL_GIT} || exit 1; \ fi @@ -225,14 +215,14 @@ $(OPENAL_LIB): $(OPENAL_TIMESTAMP) REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for openal detected building..."; \ cd ${OPENAL_DIR}; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_ABI=${TARGET_ABI} TARGET_ARCH_ABI=${TARGET_ABI} \ - APP_PLATFORM=${APP_PLATFORM} TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + ${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG} \ + NDK_MODULE_PATH=${NDK_MODULE_PATH} APP_ABI=${TARGET_ABI} \ + TARGET_ARCH_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} \ + TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ + TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ + TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ touch ${OPENAL_TIMESTAMP}; \ touch ${OPENAL_TIMESTAMP_INT}; \ else \ @@ -251,11 +241,11 @@ $(OGG_TIMESTAMP) : ogg_download ogg_download : @if [ ! -d ${OGG_DIR} ] ; then \ echo "ogg sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ git clone ${OGG_URL_GIT}|| exit 1; \ cd libvorbis-libogg-android ; \ - patch -p1 < ../../libvorbis-libogg-fpu.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/libvorbis-libogg-fpu.patch || exit 1; \ sed -i 's-:-?-' jni/Application.mk; \ fi @@ -271,14 +261,14 @@ $(OGG_LIB): $(OGG_TIMESTAMP) REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for ogg detected building..."; \ cd ${OGG_DIR}; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + ${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG} \ + NDK_MODULE_PATH=${NDK_MODULE_PATH} \ + APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} \ + TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ + TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ + TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ touch ${OGG_TIMESTAMP}; \ touch ${OGG_TIMESTAMP_INT}; \ else \ @@ -297,12 +287,12 @@ $(OPENSSL_TIMESTAMP) : openssl_download openssl_download : @if [ ! -d ${OPENSSL_DIR} ] ; then \ echo "openssl sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ wget ${OPENSSL_URL} || exit 1; \ tar -xzf ${OPENSSL_BASEDIR}.tar.gz; \ cd ${OPENSSL_BASEDIR}; \ - patch -p1 < ../../openssl_arch.patch; \ + patch -p1 < ${ANDR_ROOT}/patches/openssl_arch.patch; \ fi openssl : $(OPENSSL_LIB) @@ -322,8 +312,8 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) $(GMP_LIB) ln -s ${OPENSSL_DIR} ../openssl; \ export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-openssl; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ - --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ - --install-dir=$${TOOLCHAIN}; \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ CC=${CROSS_PREFIX}gcc ./Configure enable-gmp -DL_ENDIAN -I${GMP_DIR} -L${GMP_DIR}/usr/lib android-${TARGET_ARCH};\ CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make depend; \ @@ -337,8 +327,8 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP) $(GMP_LIB) clean_openssl : $(RM) -rf ${OPENSSL_DIR}; \ - $(RM) -rf $(ROOT)/deps/${OPENSSL_BASEDIR}.tar.gz; \ - $(RM) -rf $(ROOT)/deps/openssl + $(RM) -rf $(ANDR_ROOT)/deps/${OPENSSL_BASEDIR}.tar.gz; \ + $(RM) -rf $(ANDR_ROOT)/deps/openssl $(LEVELDB_TIMESTAMP) : leveldb_download @LAST_MODIF=$$(find ${LEVELDB_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ @@ -349,8 +339,8 @@ $(LEVELDB_TIMESTAMP) : leveldb_download leveldb_download : @if [ ! -d ${LEVELDB_DIR} ] ; then \ echo "leveldb sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps ; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps ; \ git clone ${LEVELDB_URL_GIT} || exit 1; \ cd ${LEVELDB_DIR} || exit 1; \ git checkout ${LEVELDB_COMMIT} || exit 1; \ @@ -367,22 +357,21 @@ $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP) REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ - export PATH=$${PATH}:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for leveldb detected building..."; \ cd deps/leveldb; \ export CROSS_PREFIX=${CROSS_PREFIX}; \ export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-leveldb; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ - --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ - --install-dir=$${TOOLCHAIN}; \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ export CC=${CROSS_PREFIX}gcc; \ export CXX=${CROSS_PREFIX}g++; \ export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \ - export CPPFLAGS="$${CPPFLAGS} ${TARGET_CFLAGS_ADDON}"; \ + export CPPFLAGS="$${CPPFLAGS} ${TARGET_CXXFLAGS_ADDON}"; \ export LDFLAGS="$${LDFLAGS} ${TARGET_LDFLAGS_ADDON}"; \ export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \ - $(MAKE) -s || exit 1; \ + $(MAKE) || exit 1; \ touch ${LEVELDB_TIMESTAMP}; \ touch ${LEVELDB_TIMESTAMP_INT}; \ $(RM) -rf $${TOOLCHAIN}; \ @@ -402,7 +391,7 @@ $(FREETYPE_TIMESTAMP) : freetype_download freetype_download : @if [ ! -d ${FREETYPE_DIR} ] ; then \ echo "freetype sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ cd deps; \ git clone ${FREETYPE_URL_GIT} || exit 1; \ fi @@ -422,14 +411,14 @@ $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${FREETYPE_DIR}; \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for freetype detected building..."; \ cd ${FREETYPE_DIR}/Android/jni; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + ${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG} \ + NDK_MODULE_PATH=${NDK_MODULE_PATH} \ + APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI} \ + TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ + TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ + TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ touch ${FREETYPE_TIMESTAMP}; \ touch ${FREETYPE_TIMESTAMP_INT}; \ else \ @@ -448,15 +437,15 @@ $(ICONV_TIMESTAMP) : iconv_download iconv_download : @if [ ! -d ${ICONV_DIR} ] ; then \ echo "iconv sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ - cd ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ + cd ${ANDR_ROOT}/deps; \ wget ${ICONV_URL_HTTP} || exit 1; \ tar -xzf libiconv-${ICONV_VERSION}.tar.gz || exit 1; \ rm libiconv-${ICONV_VERSION}.tar.gz; \ ln -s libiconv-${ICONV_VERSION} libiconv; \ cd ${ICONV_DIR}; \ - patch -p1 < ${ROOT}/libiconv_android.patch; \ - patch -p1 < ${ROOT}/libiconv_stdio.patch; \ + patch -p1 < ${ANDR_ROOT}/patches/libiconv_android.patch; \ + patch -p1 < ${ANDR_ROOT}/patches/libiconv_stdio.patch; \ fi iconv : $(ICONV_LIB) @@ -474,14 +463,13 @@ $(ICONV_LIB) : $(ICONV_TIMESTAMP) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${ICONV_DIR}; \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for iconv detected building..."; \ cd ${ICONV_DIR}; \ \ export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-iconv; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ - --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ - --install-dir=$${TOOLCHAIN}; \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ export CC=${CROSS_PREFIX}gcc; \ export CXX=${CROSS_PREFIX}g++; \ @@ -508,13 +496,13 @@ clean_iconv : irrlicht_download : @if [ ! -d "deps/irrlicht" ] ; then \ echo "irrlicht sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ cd deps; \ svn co ${IRRLICHT_URL_SVN} irrlicht || exit 1; \ cd irrlicht; \ - patch -p1 < ../../irrlicht-touchcount.patch || exit 1; \ - patch -p1 < ../../irrlicht-back_button.patch || exit 1; \ - patch -p1 < ../../irrlicht-texturehack.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/irrlicht-touchcount.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/irrlicht-back_button.patch || exit 1; \ + patch -p1 < ${ANDR_ROOT}/patches/irrlicht-texturehack.patch || exit 1; \ fi $(IRRLICHT_TIMESTAMP) : irrlicht_download @@ -538,14 +526,14 @@ $(IRRLICHT_LIB): $(IRRLICHT_TIMESTAMP) $(FREETYPE_LIB) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${IRRLICHT_DIR}; \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ echo "changed timestamp for irrlicht detected building..."; \ cd deps/irrlicht/source/Irrlicht/Android; \ - ndk-build NDEBUG=${NDEBUG} NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + ${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG} \ + NDK_MODULE_PATH=${NDK_MODULE_PATH} \ + APP_ABI=${TARGET_ABI} APP_PLATFORM=${APP_PLATFORM} \ + TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ + TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ + TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ touch ${IRRLICHT_TIMESTAMP}; \ touch ${IRRLICHT_TIMESTAMP_INT}; \ else \ @@ -564,7 +552,7 @@ $(CURL_TIMESTAMP) : curl_download curl_download : @if [ ! -d "deps/curl-${CURL_VERSION}" ] ; then \ echo "curl sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ cd deps; \ wget ${CURL_URL_HTTP} || exit 1; \ tar -xjf curl-${CURL_VERSION}.tar.bz2 || exit 1; \ @@ -587,20 +575,18 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${CURL_DIR}; \ - export PATH="$${PATH}:${SDKFOLDER}/platform-tools:${ANDROID_NDK}"; \ echo "changed timestamp for curl detected building..."; \ cd deps/curl-${CURL_VERSION}; \ export CROSS_PREFIX=${CROSS_PREFIX}; \ export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-curl; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ - --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ - --install-dir=$${TOOLCHAIN}; \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ export CC=${CROSS_PREFIX}gcc; \ export CXX=${CROSS_PREFIX}g++; \ export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \ - export CPPFLAGS="$${CPPFLAGS} -I${OPENSSL_DIR}/include \ - ${TARGET_CFLAGS_ADDON}"; \ + export CPPFLAGS="$${CPPFLAGS} -I${OPENSSL_DIR}/include ${TARGET_CFLAGS_ADDON}"; \ export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \ export LDFLAGS="$${LDFLAGS} -L${OPENSSL_DIR} ${TARGET_LDFLAGS_ADDON}"; \ ./configure --host=${TARGET_HOST} --disable-shared --enable-static --with-ssl; \ @@ -625,7 +611,7 @@ $(GMP_TIMESTAMP) : gmp_download gmp_download : @if [ ! -d "${GMP_DIR}" ] ; then \ echo "gmp sources missing, downloading..."; \ - mkdir -p ${ROOT}/deps; \ + mkdir -p ${ANDR_ROOT}/deps; \ cd deps; \ wget ${GMP_URL_HTTP} || exit 1; \ tar -xjf gmp-${GMP_VERSION}.tar.bz2 || exit 1; \ @@ -648,14 +634,13 @@ $(GMP_LIB): $(GMP_TIMESTAMP) fi; \ if [ $$REFRESH -ne 0 ] ; then \ mkdir -p ${GMP_DIR}; \ - export PATH="$${PATH}:${SDKFOLDER}/platform-tools:${ANDROID_NDK}"; \ echo "changed timestamp for gmp detected building..."; \ cd deps/gmp-${GMP_VERSION}; \ export CROSS_PREFIX=${CROSS_PREFIX}; \ export TOOLCHAIN=/tmp/ndk-${TARGET_HOST}-gmp; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ - --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ - --install-dir=$${TOOLCHAIN}; \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --install-dir=$${TOOLCHAIN}; \ export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ export CC=${CROSS_PREFIX}gcc; \ export CXX=${CROSS_PREFIX}g++; \ @@ -687,11 +672,11 @@ clean_sqlite3: $(RM) -f sqlite $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB) - @mkdir -p ${ROOT}/deps; \ + @mkdir -p ${ANDR_ROOT}/deps; \ for DIRNAME in {builtin,client,doc,fonts,games,mods,po,textures}; do \ - LAST_MODIF=$$(find ${ROOT}/../../${DIRNAME} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ + LAST_MODIF=$$(find ${PROJ_ROOT}/${DIRNAME} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ]; then \ - touch ${ROOT}/../../${DIRNAME}/timestamp; \ + touch ${PROJ_ROOT}/${DIRNAME}/timestamp; \ touch ${ASSETS_TIMESTAMP}; \ echo ${DIRNAME} changed $$LAST_MODIF; \ fi; \ @@ -701,11 +686,11 @@ $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB) touch ${IRRLICHT_DIR}/media/timestamp; \ touch ${ASSETS_TIMESTAMP}; \ fi; \ - if [ ${ROOT}/../../minetest.conf.example -nt ${ASSETS_TIMESTAMP} ] ; then \ + if [ ${PROJ_ROOT}/minetest.conf.example -nt ${ASSETS_TIMESTAMP} ] ; then \ echo "conf changed"; \ touch ${ASSETS_TIMESTAMP}; \ fi; \ - if [ ${ROOT}/../../README.txt -nt ${ASSETS_TIMESTAMP} ] ; then \ + if [ ${PROJ_ROOT}/README.txt -nt ${ASSETS_TIMESTAMP} ] ; then \ touch ${ASSETS_TIMESTAMP}; \ fi; \ if [ ! -e $(ASSETS_TIMESTAMP) ] ; then \ @@ -720,34 +705,34 @@ assets : $(ASSETS_TIMESTAMP) if [ ${ASSETS_TIMESTAMP} -nt ${ASSETS_TIMESTAMP}.old ] ; then \ REFRESH=1; \ fi; \ - if [ ! -d ${ROOT}/assets ] ; then \ + if [ ! -d ${APP_ROOT}/assets ] ; then \ REFRESH=1; \ fi; \ if [ $$REFRESH -ne 0 ] ; then \ echo "assets changed, refreshing..."; \ $(MAKE) clean_assets; \ - mkdir -p ${ROOT}/assets/Minetest; \ - cp ${ROOT}/../../minetest.conf.example ${ROOT}/assets/Minetest; \ - cp ${ROOT}/../../README.txt ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../builtin ${ROOT}/assets/Minetest; \ - mkdir ${ROOT}/assets/Minetest/client; \ - cp -r ${ROOT}/../../client/shaders ${ROOT}/assets/Minetest/client; \ - cp ${ROOT}/../../doc/lgpl-2.1.txt ${ROOT}/assets/Minetest/LICENSE.txt; \ - mkdir ${ROOT}/assets/Minetest/fonts; \ - cp -r ${ROOT}/../../fonts/*.ttf ${ROOT}/assets/Minetest/fonts/; \ - mkdir ${ROOT}/assets/Minetest/games; \ + mkdir -p ${APP_ROOT}/assets/Minetest; \ + cp ${PROJ_ROOT}/minetest.conf.example ${APP_ROOT}/assets/Minetest; \ + cp ${PROJ_ROOT}/README.txt ${APP_ROOT}/assets/Minetest; \ + cp -r ${PROJ_ROOT}/builtin ${APP_ROOT}/assets/Minetest; \ + mkdir -p ${APP_ROOT}/assets/Minetest/client; \ + cp -r ${PROJ_ROOT}/client/shaders ${APP_ROOT}/assets/Minetest/client; \ + cp ${PROJ_ROOT}/doc/lgpl-2.1.txt ${APP_ROOT}/assets/Minetest/LICENSE.txt; \ + mkdir -p ${APP_ROOT}/assets/Minetest/fonts; \ + cp -r ${PROJ_ROOT}/fonts/*.ttf ${APP_ROOT}/assets/Minetest/fonts/; \ + mkdir -p ${APP_ROOT}/assets/Minetest/games; \ for game in ${GAMES_TO_COPY}; do \ - cp -r ${ROOT}/../../games/$$game ${ROOT}/assets/Minetest/games/; \ + cp -r ${PROJ_ROOT}/games/$$game ${APP_ROOT}/assets/Minetest/games/; \ done; \ - mkdir ${ROOT}/assets/Minetest/mods; \ + mkdir -p ${APP_ROOT}/assets/Minetest/mods; \ for mod in ${MODS_TO_COPY}; do \ - cp -r ${ROOT}/../../mods/$$mod ${ROOT}/assets/Minetest/mods/; \ + cp -r ${PROJ_ROOT}/mods/$$mod ${APP_ROOT}/assets/Minetest/mods/; \ done; \ - cp -r ${ROOT}/../../po ${ROOT}/assets/Minetest; \ - cp -r ${ROOT}/../../textures ${ROOT}/assets/Minetest; \ - mkdir -p ${ROOT}/assets/Minetest/media; \ - cp -r ${IRRLICHT_DIR}/media/Shaders ${ROOT}/assets/Minetest/media; \ - cd ${ROOT}/assets || exit 1; \ + cp -r ${PROJ_ROOT}/po ${APP_ROOT}/assets/Minetest; \ + cp -r ${PROJ_ROOT}/textures ${APP_ROOT}/assets/Minetest; \ + mkdir -p ${APP_ROOT}/assets/Minetest/media; \ + cp -r ${IRRLICHT_DIR}/media/Shaders ${APP_ROOT}/assets/Minetest/media; \ + cd ${APP_ROOT}/assets || exit 1; \ find . -name "timestamp" -exec rm {} \; ; \ find . -name "*.blend" -exec rm {} \; ; \ find . -name "*~" -exec rm {} \; ; \ @@ -755,8 +740,8 @@ assets : $(ASSETS_TIMESTAMP) find . -type d -path "*.svn" -exec rm -rf {} \; ; \ find . -type f -path "*.gitignore" -exec rm -rf {} \; ; \ ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \ - find Minetest >"filelist.txt"; \ - cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old; \ + find -L Minetest > filelist.txt; \ + cp ${ANDR_ROOT}/${ASSETS_TIMESTAMP} ${ANDR_ROOT}/${ASSETS_TIMESTAMP}.old; \ else \ echo "nothing to be done for assets"; \ fi @@ -764,56 +749,50 @@ assets : $(ASSETS_TIMESTAMP) clean_assets : @$(RM) -r assets -apk: $(PATHCFGFILE) assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LEVELDB_TARGET) \ - $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h \ - $(ROOT)/jni/src/android_version_githash.h sqlite3_download - @export NDEBUG=$$NDEBUG; $(MAKE) manifest; \ - export PATH=$$PATH:${SDKFOLDER}/platform-tools:${ANDROID_NDK}; \ - export ANDROID_HOME=${SDKFOLDER}; \ - mkdir -p ${ROOT}/src; \ - ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} \ - GPROF=${GPROF} APP_ABI=${TARGET_ABI} HAVE_LEVELDB=${HAVE_LEVELDB} \ - APP_PLATFORM=${APP_PLATFORM} \ - TARGET_LIBDIR=${TARGET_LIBDIR} \ - TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ - TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ - TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" && \ - ant $$BUILD_TYPE && \ - echo "++ Success!" && \ - echo "APK: bin/Minetest-$$BUILD_TYPE.apk" && \ - echo "You can install it with \`adb install -r bin/Minetest-$$BUILD_TYPE.apk\`" +apk: local.properties assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LEVELDB_TARGET) \ + $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ANDR_ROOT)/jni/src/android_version.h \ + $(ANDR_ROOT)/jni/src/android_version_githash.h sqlite3_download + @${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} \ + GPROF=${GPROF} APP_ABI=${TARGET_ABI} HAVE_LEVELDB=${HAVE_LEVELDB} \ + APP_PLATFORM=${APP_PLATFORM} \ + TARGET_LIBDIR=${TARGET_LIBDIR} \ + TARGET_CFLAGS+="${TARGET_CFLAGS_ADDON}" \ + TARGET_LDFLAGS+="${TARGET_LDFLAGS_ADDON}" \ + TARGET_CXXFLAGS+="${TARGET_CXXFLAGS_ADDON}" || exit 1; \ + if [ ! -e ${APP_ROOT}/jniLibs ]; then \ + ln -s ${ANDR_ROOT}/libs ${APP_ROOT}/jniLibs || exit 1; \ + fi; \ + export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" && \ + export BUILD_TYPE_C=$$(echo "$${BUILD_TYPE}" | sed 's/./\U&/') && \ + gradle assemble$$BUILD_TYPE_C && \ + echo "APK stored at: build/outputs/apk/Minetest-$$BUILD_TYPE.apk" && \ + echo "You can install it with \`make install_$$BUILD_TYPE\`" + +# These Intentionally doesn't depend on their respective build steps, +# because it takes a while to verify that everything's up-to-date. +install_debug: + ${ANDROID_SDK}/platform-tools/adb install -r build/outputs/apk/Minetest-debug.apk + +install_release: + ${ANDROID_SDK}/platform-tools/adb install -r build/outputs/apk/Minetest-release.apk prep_srcdir : - @if [ ! -e ${ROOT}/jni/src ]; then \ - ln -s ${ROOT}/../../src ${ROOT}/jni/src; \ + @if [ ! -e ${ANDR_ROOT}/jni/src ]; then \ + ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \ fi -clean_apk : manifest - @export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}; \ - export ANDROID_HOME=${SDKFOLDER}; \ - ant clean - -install_debug : - @export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}; \ - adb install -r ${ROOT}/bin/Minetest-debug.apk - -install : - @export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}; \ - adb install -r ${ROOT}/bin/Minetest-release.apk - -envpaths : - @echo "export PATH=$$PATH:${SDKFOLDER}platform-tools:${ANDROID_NDK}" > and_env;\ - echo "export ANDROID_HOME=${SDKFOLDER}" >> and_env; +clean_apk : + gradle clean clean_all : @$(MAKE) clean_apk; \ - $(MAKE) clean_assets clean_iconv clean_irrlicht clean_leveldb clean_curl clean_openssl \ - clean_openal clean_ogg clean_gmp clean_manifest; \ + $(MAKE) clean_assets clean_iconv clean_irrlicht clean_leveldb clean_curl \ + clean_openssl clean_openal clean_ogg clean_gmp; \ sleep 1; \ $(RM) -r gen libs obj deps bin Debug and_env -$(ROOT)/jni/src/android_version_githash.h : prep_srcdir - @export VERSION_FILE=${ROOT}/jni/src/android_version_githash.h; \ +$(ANDR_ROOT)/jni/src/android_version_githash.h : prep_srcdir + @export VERSION_FILE=${ANDR_ROOT}/jni/src/android_version_githash.h; \ export VERSION_FILE_NEW=$${VERSION_FILE}.new; \ { \ echo "#ifndef ANDROID_MT_VERSION_GITHASH_H"; \ @@ -831,8 +810,8 @@ $(ROOT)/jni/src/android_version_githash.h : prep_srcdir fi -$(ROOT)/jni/src/android_version.h : prep_srcdir - @export VERSION_FILE=${ROOT}/jni/src/android_version.h; \ +$(ANDR_ROOT)/jni/src/android_version.h : prep_srcdir + @export VERSION_FILE=${ANDR_ROOT}/jni/src/android_version.h; \ export VERSION_FILE_NEW=$${VERSION_FILE}.new; \ { \ echo "#ifndef ANDROID_MT_VERSION_H"; \ @@ -851,22 +830,5 @@ $(ROOT)/jni/src/android_version.h : prep_srcdir rm "$${VERSION_FILE_NEW}"; \ fi -manifest : - @BASE_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"; \ - if [ "${NDEBUG}x" != "x" ] ; then \ - DBG=''; \ - DBG_FLAG="android:debuggable=\"false\""; \ - else \ - DBG=""; \ - DBG_FLAG="android:debuggable=\"true\""; \ - fi; \ - cat ${ROOT}/AndroidManifest.xml.template | \ - sed "s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g" | \ - sed "s/###BASE_VERSION###/$$BASE_VERSION/g" | \ - sed -e "s@###DEBUG_BUILD###@$$DBG@g" | \ - sed -e "s@###DEBUG_FLAG###@$$DBG_FLAG@g" >${ROOT}/AndroidManifest.xml - -clean_manifest : - rm -rf ${ROOT}/AndroidManifest.xml - clean : clean_apk clean_assets + diff --git a/build/android/build.gradle b/build/android/build.gradle new file mode 100644 index 00000000..3ce11bec --- /dev/null +++ b/build/android/build.gradle @@ -0,0 +1,49 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:1.5.0" + } +} + +apply plugin: "com.android.application" + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + defaultConfig { + versionCode 13 + versionName "${System.env.VERSION_STR}.${versionCode}" + minSdkVersion 9 + targetSdkVersion 9 + applicationId "net.minetest.minetest" + manifestPlaceholders = [ package: "net.minetest.minetest", project: project.name ] + } + + lintOptions { + disable "OldTargetApi", "GoogleAppIndexingWarning" + } + + Properties props = new Properties() + props.load(new FileInputStream(file("local.properties"))) + + if (props.getProperty("keystore") != null) { + signingConfigs { + release { + storeFile file(props["keystore"]) + storePassword props["keystore.password"] + keyAlias props["key"] + keyPassword props["key.password"] + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + } + } + } +} + diff --git a/build/android/build.xml b/build/android/build.xml deleted file mode 100644 index 50a3e95a..00000000 --- a/build/android/build.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 92738e6c..e8534eaa 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -69,13 +69,13 @@ GPROF_DEF=-DGPROF endif LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \ - -DHAVE_TOUCHSCREENGUI \ - -DUSE_CURL=1 \ - -DUSE_SOUND=1 \ - -DUSE_FREETYPE=1 \ - -DUSE_LEVELDB=$(HAVE_LEVELDB) \ - $(GPROF_DEF) \ - -pipe -fstrict-aliasing + -DHAVE_TOUCHSCREENGUI \ + -DUSE_CURL=1 \ + -DUSE_SOUND=1 \ + -DUSE_FREETYPE=1 \ + -DUSE_LEVELDB=$(HAVE_LEVELDB) \ + $(GPROF_DEF) \ + -pipe -fstrict-aliasing ifndef NDEBUG LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer @@ -95,8 +95,8 @@ ifeq ($(TARGET_ARCH_ABI),x86) LOCAL_CFLAGS += -fno-stack-protector endif -LOCAL_C_INCLUDES := \ - jni/src jni/src/sqlite \ +LOCAL_C_INCLUDES := \ + jni/src \ jni/src/script \ jni/src/lua/src \ jni/src/json \ @@ -111,7 +111,7 @@ LOCAL_C_INCLUDES := \ deps/leveldb/include \ deps/sqlite/ -LOCAL_SRC_FILES := \ +LOCAL_SRC_FILES := \ jni/src/ban.cpp \ jni/src/camera.cpp \ jni/src/cavegen.cpp \ @@ -261,7 +261,7 @@ LOCAL_SRC_FILES := \ # intentionally kept out (we already build openssl itself): jni/src/util/sha256.c # Network -LOCAL_SRC_FILES += \ +LOCAL_SRC_FILES += \ jni/src/network/connection.cpp \ jni/src/network/networkpacket.cpp \ jni/src/network/clientopcodes.cpp \ @@ -270,7 +270,7 @@ LOCAL_SRC_FILES += \ jni/src/network/serverpackethandler.cpp \ # lua api -LOCAL_SRC_FILES += \ +LOCAL_SRC_FILES += \ jni/src/script/common/c_content.cpp \ jni/src/script/common/c_converter.cpp \ jni/src/script/common/c_internal.cpp \ @@ -310,11 +310,10 @@ LOCAL_SRC_FILES += \ jni/src/script/scripting_mainmenu.cpp #freetype2 support -LOCAL_SRC_FILES += \ - jni/src/cguittfont/xCGUITTFont.cpp +LOCAL_SRC_FILES += jni/src/cguittfont/xCGUITTFont.cpp -# lua -LOCAL_SRC_FILES += \ +# Lua +LOCAL_SRC_FILES += \ jni/src/lua/src/lapi.c \ jni/src/lua/src/lauxlib.c \ jni/src/lua/src/lbaselib.c \ @@ -374,3 +373,4 @@ ifdef GPROF $(call import-module,android-ndk-profiler) endif $(call import-module,android/native_app_glue) + diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk index b7ffc56a..53467059 100644 --- a/build/android/jni/Application.mk +++ b/build/android/jni/Application.mk @@ -1,4 +1,4 @@ -# NDK_TOOLCHAIN_VERSION := clang3.3 +# NDK_TOOLCHAIN_VERSION := clang3.8 APP_PLATFORM := android-9 APP_MODULES := minetest @@ -6,3 +6,4 @@ APP_STL := gnustl_static APP_CPPFLAGS += -fexceptions APP_GNUSTL_FORCE_CPP_FEATURES := rtti + diff --git a/build/android/irrlicht-back_button.patch b/build/android/patches/irrlicht-back_button.patch similarity index 100% rename from build/android/irrlicht-back_button.patch rename to build/android/patches/irrlicht-back_button.patch diff --git a/build/android/irrlicht-texturehack.patch b/build/android/patches/irrlicht-texturehack.patch similarity index 100% rename from build/android/irrlicht-texturehack.patch rename to build/android/patches/irrlicht-texturehack.patch diff --git a/build/android/irrlicht-touchcount.patch b/build/android/patches/irrlicht-touchcount.patch similarity index 100% rename from build/android/irrlicht-touchcount.patch rename to build/android/patches/irrlicht-touchcount.patch diff --git a/build/android/libiconv_android.patch b/build/android/patches/libiconv_android.patch similarity index 100% rename from build/android/libiconv_android.patch rename to build/android/patches/libiconv_android.patch diff --git a/build/android/libiconv_stdio.patch b/build/android/patches/libiconv_stdio.patch similarity index 100% rename from build/android/libiconv_stdio.patch rename to build/android/patches/libiconv_stdio.patch diff --git a/build/android/libvorbis-libogg-fpu.patch b/build/android/patches/libvorbis-libogg-fpu.patch similarity index 100% rename from build/android/libvorbis-libogg-fpu.patch rename to build/android/patches/libvorbis-libogg-fpu.patch diff --git a/build/android/openssl_arch.patch b/build/android/patches/openssl_arch.patch similarity index 100% rename from build/android/openssl_arch.patch rename to build/android/patches/openssl_arch.patch diff --git a/build/android/project.properties b/build/android/project.properties deleted file mode 100644 index cc2a7c5c..00000000 --- a/build/android/project.properties +++ /dev/null @@ -1 +0,0 @@ -target=android-10 diff --git a/build/android/settings.gradle b/build/android/settings.gradle new file mode 100644 index 00000000..a6e60c43 --- /dev/null +++ b/build/android/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = "Minetest" + diff --git a/build/android/src/debug/AndroidManifest.xml b/build/android/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..a3815b9f --- /dev/null +++ b/build/android/src/debug/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + diff --git a/build/android/src/main/AndroidManifest.xml b/build/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000..df218fb3 --- /dev/null +++ b/build/android/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/build/android/src/net/minetest/minetest/MinetestAssetCopy.java b/build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java similarity index 100% rename from build/android/src/net/minetest/minetest/MinetestAssetCopy.java rename to build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java diff --git a/build/android/src/net/minetest/minetest/MinetestTextEntry.java b/build/android/src/main/java/net.minetest.minetest/MinetestTextEntry.java similarity index 100% rename from build/android/src/net/minetest/minetest/MinetestTextEntry.java rename to build/android/src/main/java/net.minetest.minetest/MinetestTextEntry.java diff --git a/build/android/src/net/minetest/minetest/MtNativeActivity.java b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java similarity index 100% rename from build/android/src/net/minetest/minetest/MtNativeActivity.java rename to build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java diff --git a/build/android/res/drawable-hdpi/irr_icon.png b/build/android/src/main/res/drawable-hdpi/irr_icon.png similarity index 100% rename from build/android/res/drawable-hdpi/irr_icon.png rename to build/android/src/main/res/drawable-hdpi/irr_icon.png diff --git a/build/android/res/drawable-ldpi/irr_icon.png b/build/android/src/main/res/drawable-ldpi/irr_icon.png similarity index 100% rename from build/android/res/drawable-ldpi/irr_icon.png rename to build/android/src/main/res/drawable-ldpi/irr_icon.png diff --git a/build/android/res/drawable-mdpi/irr_icon.png b/build/android/src/main/res/drawable-mdpi/irr_icon.png similarity index 100% rename from build/android/res/drawable-mdpi/irr_icon.png rename to build/android/src/main/res/drawable-mdpi/irr_icon.png diff --git a/build/android/res/drawable-xhdpi/irr_icon.png b/build/android/src/main/res/drawable-xhdpi/irr_icon.png similarity index 100% rename from build/android/res/drawable-xhdpi/irr_icon.png rename to build/android/src/main/res/drawable-xhdpi/irr_icon.png diff --git a/build/android/res/layout/assetcopy.xml b/build/android/src/main/res/layout/assetcopy.xml similarity index 94% rename from build/android/res/layout/assetcopy.xml rename to build/android/src/main/res/layout/assetcopy.xml index 8ec14bdc..1fcfffd6 100644 --- a/build/android/res/layout/assetcopy.xml +++ b/build/android/src/main/res/layout/assetcopy.xml @@ -18,7 +18,7 @@ android:ellipsize="middle" android:singleLine="true" android:layout_gravity="center_horizontal" - android:text="preparing media ..." + android:text="@string/preparing_media" android:textAppearance="?android:attr/textAppearanceSmall" /> diff --git a/build/android/src/main/res/values/strings.xml b/build/android/src/main/res/values/strings.xml new file mode 100644 index 00000000..b407a77c --- /dev/null +++ b/build/android/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ + + + Preparing media... + + diff --git a/build/android/res/values/styles.xml b/build/android/src/main/res/values/styles.xml similarity index 100% rename from build/android/res/values/styles.xml rename to build/android/src/main/res/values/styles.xml diff --git a/util/bump_version.sh b/util/bump_version.sh index 5ff69c8a..948561ac 100755 --- a/util/bump_version.sh +++ b/util/bump_version.sh @@ -32,12 +32,12 @@ cd ${0%/*}/.. grep -q -E '^set\(VERSION_MAJOR [0-9]+\)$' CMakeLists.txt || die "error: Could not find CMakeLists.txt" grep -q -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt || die "error: Could not find CMakeLists.txt" grep -q -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt || die "error: Could not find CMakeLists.txt" -grep -q -E '^ANDROID_VERSION_CODE = [0-9]+$' build/android/Makefile || die "error: Could not find build/android/Makefile" +grep -q -E 'versionCode [0-9]+$' build/android/build.gradle || die "error: Could not find Android version code" VERSION_MAJOR=$(grep -E '^set\(VERSION_MAJOR [0-9]+\)$' CMakeLists.txt | tr -dC 0-9) VERSION_MINOR=$(grep -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt | tr -dC 0-9) VERSION_PATCH=$(grep -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt | tr -dC 0-9) -ANDROID_VERSION_CODE=$(grep -E '^ANDROID_VERSION_CODE = [0-9]+$' build/android/Makefile | tr -dC 0-9) +ANDROID_VERSION_CODE=$(grep -E 'versionCode [0-9]+$' build/android/build.gradle | tr -dC 0-9) echo "Current Minetest version: $VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH" echo "Current Android version code: $ANDROID_VERSION_CODE" @@ -89,13 +89,13 @@ sed -i -re "s/^set\(VERSION_PATCH [0-9]+\)$/set(VERSION_PATCH $NEW_VERSION_PATCH sed -i -re "s/^set\(DEVELOPMENT_BUILD TRUE\)$/set(DEVELOPMENT_BUILD FALSE)/" CMakeLists.txt || die "Failed to unset DEVELOPMENT_BUILD" -sed -i -re "s/^ANDROID_VERSION_CODE = [0-9]+$/ANDROID_VERSION_CODE = $NEW_ANDROID_VERSION_CODE/" build/android/Makefile || die "Failed to update ANDROID_VERSION_CODE" +sed -i -re "s/versionCode [0-9]+$/versionCode $NEW_ANDROID_VERSION_CODE/" build/android/build.gradle || die "Failed to update Android version code" sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEW_VERSION/g" doc/lua_api.txt || die "Failed to update doc/lua_api.txt" sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEW_VERSION/g" doc/menu_lua_api.txt || die "Failed to update doc/menu_lua_api.txt" -git add -f CMakeLists.txt build/android/Makefile doc/lua_api.txt doc/menu_lua_api.txt || die "git add failed" +git add -f CMakeLists.txt build/android/build.gradle doc/lua_api.txt doc/menu_lua_api.txt || die "git add failed" git commit -m "Bump version to $NEW_VERSION" || die "git commit failed" From 46fd114e9a4e05b74576dce682e24357363298e7 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Mon, 7 Mar 2016 16:55:32 -0500 Subject: [PATCH 454/531] Fix race on thread creation This often broke the threading tests on OSX. --- src/threading/thread.cpp | 12 +----------- src/threading/thread.h | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp index 8688c4cb..ecf8563f 100644 --- a/src/threading/thread.cpp +++ b/src/threading/thread.cpp @@ -116,9 +116,7 @@ bool Thread::start() #if USE_CPP11_THREADS try { - m_thread_obj = new std::thread(threadProc, this); - m_thread_id = m_thread_obj->get_id(); - m_thread_handle = m_thread_obj->native_handle(); + m_thread_obj = new std::thread(threadProc, this); } catch (const std::system_error &e) { return false; } @@ -135,8 +133,6 @@ bool Thread::start() if (status) return false; - m_thread_id = m_thread_handle; - #endif while (!m_running) @@ -234,12 +230,6 @@ bool Thread::getReturnValue(void **ret) } -bool Thread::isCurrentThread() -{ - return thr_is_current_thread(m_thread_id); -} - - #if USE_CPP11_THREADS || USE_POSIX_THREADS void *Thread::threadProc(void *param) #elif defined(_WIN32_WCE) diff --git a/src/threading/thread.h b/src/threading/thread.h index 6a24afff..10732c44 100644 --- a/src/threading/thread.h +++ b/src/threading/thread.h @@ -90,12 +90,22 @@ public: /* * Returns true if the calling thread is this Thread object. */ - bool isCurrentThread(); + bool isCurrentThread() { return thr_is_current_thread(getThreadId()); } inline bool isRunning() { return m_running; } inline bool stopRequested() { return m_request_stop; } + +#if USE_CPP11_THREADS + inline threadid_t getThreadId() { return m_thread_obj->get_id(); } + inline threadhandle_t getThreadHandle() { return m_thread_obj->native_handle(); } +#else +# if USE_WIN_THREADS inline threadid_t getThreadId() { return m_thread_id; } +# else + inline threadid_t getThreadId() { return m_thread_handle; } +# endif inline threadhandle_t getThreadHandle() { return m_thread_handle; } +#endif /* * Gets the thread return value. @@ -147,8 +157,12 @@ private: Atomic m_running; Mutex m_mutex; - threadid_t m_thread_id; +#if !USE_CPP11_THREADS threadhandle_t m_thread_handle; +#if _WIN32 + threadid_t m_thread_id; +#endif +#endif static ThreadStartFunc threadProc; From 8b1f8e99cf860625ebd20531ab7f3e8316a66b51 Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 25 Apr 2016 11:47:25 +0100 Subject: [PATCH 455/531] Mapgen: Make 3D noise tunnels' width settable Correct parameter names mg_valleys to mgvalleys Remove biome NoiseParams from MapgenValleysParams Improve format of parameter code --- builtin/settingtypes.txt | 49 +++++++++++------ minetest.conf.example | 56 +++++++++++++------ src/mapgen_flat.cpp | 37 +++++++------ src/mapgen_flat.h | 7 +-- src/mapgen_fractal.cpp | 99 ++++++++++++++++----------------- src/mapgen_fractal.h | 8 +-- src/mapgen_v5.cpp | 15 +++-- src/mapgen_v5.h | 4 +- src/mapgen_v7.cpp | 15 +++-- src/mapgen_v7.h | 4 +- src/mapgen_valleys.cpp | 116 ++++++++++++++++++++------------------- src/mapgen_valleys.h | 39 ++++++------- 12 files changed, 244 insertions(+), 205 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 0a951961..ad269d8b 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -886,6 +886,9 @@ mg_biome_np_humidity_blend (Mapgen biome humidity blend noise parameters) noise_ [***Mapgen v5] +# Controls width of tunnels, a smaller value creates wider tunnels. +mgv5_cave_width (Mapgen v5 cave width) float 0.125 + mgv5_np_filler_depth (Mapgen v5 filler depth noise parameters) noise_params 0, 1, (150, 150, 150), 261, 4, 0.7, 2.0 mgv5_np_factor (Mapgen v5 factor noise parameters) noise_params 0, 1, (250, 250, 250), 920381, 3, 0.45, 2.0 mgv5_np_height (Mapgen v5 height noise parameters) noise_params 0, 10, (250, 250, 250), 84174, 4, 0.5, 2.0 @@ -940,6 +943,9 @@ mgv6_np_apple_trees (Mapgen v6 apple trees noise parameters) noise_params 0, 1, # Flags starting with 'no' are used to explicitly disable them. mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountains,noridges +# Controls width of tunnels, a smaller value creates wider tunnels. +mgv7_cave_width (Mapgen v7 cave width) float 0.3 + mgv7_np_terrain_base (Mapgen v7 terrain base noise parameters) noise_params 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0 mgv7_np_terrain_alt (Mapgen v7 terrain altitude noise parameters) noise_params 4, 25, (600, 600, 600), 5934, 5, 0.6, 2.0 mgv7_np_terrain_persist (Mapgen v7 terrain persistation noise parameters) noise_params 0.6, 0.1, (2000, 2000, 2000), 539, 3, 0.6, 2.0 @@ -968,6 +974,9 @@ mgflat_ground_level (Mapgen flat ground level) int 8 # Y of upper limit of large pseudorandom caves. mgflat_large_cave_depth (Mapgen flat large cave depth) int -33 +# Controls width of tunnels, a smaller value creates wider tunnels. +mgflat_cave_width (Mapgen flat cave width) float 0.3 + # Terrain noise threshold for lakes. # Controls proportion of world area covered by lakes. # Adjust towards 0.0 for a larger proportion. @@ -995,6 +1004,9 @@ mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 1 [***Mapgen fractal] +# Controls width of tunnels, a smaller value creates wider tunnels. +mgfractal_cave_width (Mapgen fractal cave width) float 0.3 + # Choice of 18 fractals from 9 formulas. # 1 = 4D "Roundy" mandelbrot set. # 2 = 4D "Roundy" julia set. @@ -1074,60 +1086,63 @@ mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, ( mg_valleys_spflags (Valleys C Flags) flags altitude_chill,humid_rivers altitude_chill,noaltitude_chill,humid_rivers,nohumid_rivers # The altitude at which temperature drops by 20C -mg_valleys_altitude_chill (Altitude Chill) int 90 +mgvalleys_altitude_chill (Altitude Chill) int 90 # Depth below which you'll find large caves. -mg_valleys_large_cave_depth (Large cave depth) int -33 +mgvalleys_large_cave_depth (Large cave depth) int -33 # Creates unpredictable lava features in caves. # These can make mining difficult. Zero disables them. (0-10) -mg_valleys_lava_features (Lava Features) int 0 +mgvalleys_lava_features (Lava Features) int 0 # Depth below which you'll find massive caves. -mg_valleys_massive_cave_depth (Massive cave depth) int -256 +mgvalleys_massive_cave_depth (Massive cave depth) int -256 # How deep to make rivers -mg_valleys_river_depth (River Depth) int 4 +mgvalleys_river_depth (River Depth) int 4 # How wide to make rivers -mg_valleys_river_size (River Size) int 5 +mgvalleys_river_size (River Size) int 5 # Creates unpredictable water features in caves. # These can make mining difficult. Zero disables them. (0-10) -mg_valleys_water_features (Water Features) int 0 +mgvalleys_water_features (Water Features) int 0 + +# Controls width of tunnels, a smaller value creates wider tunnels. +mgvalleys_cave_width (Cave width) float 0.3 # Noise parameters [****Noises] # Caves and tunnels form at the intersection of the two noises -mg_valleys_np_cave1 (Cave noise #1) noise_params 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 +mgvalleys_np_cave1 (Cave noise #1) noise_params 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 # Caves and tunnels form at the intersection of the two noises -mg_valleys_np_cave2 (Cave noise #2) noise_params 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 +mgvalleys_np_cave2 (Cave noise #2) noise_params 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 # The depth of dirt or other filler -mg_valleys_np_filler_depth (Filler Depth) noise_params 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 +mgvalleys_np_filler_depth (Filler Depth) noise_params 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 # Massive caves form here. -mg_valleys_np_massive_caves (Massive cave noise) noise_params 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0 +mgvalleys_np_massive_caves (Massive cave noise) noise_params 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0 # River noise -- rivers occur close to zero -mg_valleys_np_rivers (River Noise) noise_params 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 +mgvalleys_np_rivers (River Noise) noise_params 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 # Base terrain height -mg_valleys_np_terrain_height (Terrain Height) noise_params -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 +mgvalleys_np_terrain_height (Terrain Height) noise_params -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 # Raises terrain to make valleys around the rivers -mg_valleys_np_valley_depth (Valley Depth) noise_params 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 +mgvalleys_np_valley_depth (Valley Depth) noise_params 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 # Slope and fill work together to modify the heights -mg_valleys_np_inter_valley_fill (Valley Fill) noise_params 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 +mgvalleys_np_inter_valley_fill (Valley Fill) noise_params 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 # Amplifies the valleys -mg_valleys_np_valley_profile (Valley Profile) noise_params 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 +mgvalleys_np_valley_profile (Valley Profile) noise_params 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 # Slope and fill work together to modify the heights -mg_valleys_np_inter_valley_slope (Valley Slope) noise_params 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 +mgvalleys_np_inter_valley_slope (Valley Slope) noise_params 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 [*Security] diff --git a/minetest.conf.example b/minetest.conf.example index 6f0eb786..e72c7e35 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1098,6 +1098,10 @@ #### Mapgen v5 +# Controls width of tunnels, a smaller value creates wider tunnels. +# type: float +# mgv5_cave_width = 0.125 + # type: noise_params # mgv5_np_filler_depth = 0, 1, (150, 150, 150), 261, 4, 0.7, 2.0 @@ -1176,6 +1180,10 @@ # type: flags possible values: mountains, ridges, nomountains, noridges # mgv7_spflags = mountains,ridges +# Controls width of tunnels, a smaller value creates wider tunnels. +# type: float +# mgv7_cave_width = 0.3 + # type: noise_params # mgv7_np_terrain_base = 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0 @@ -1228,6 +1236,10 @@ # type: int # mgflat_large_cave_depth = -33 +# Controls width of tunnels, a smaller value creates wider tunnels. +# type: float +# mgflat_cave_width = 0.3 + # Terrain noise threshold for lakes. # Controls proportion of world area covered by lakes. # Adjust towards 0.0 for a larger proportion. @@ -1265,6 +1277,10 @@ #### Mapgen fractal +# Controls width of tunnels, a smaller value creates wider tunnels. +# type: float +# mgfractal_cave_width = 0.3 + # Choice of 18 fractals from 9 formulas. # 1 = 4D "Roundy" mandelbrot set. # 2 = 4D "Roundy" julia set. @@ -1356,79 +1372,83 @@ # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers -# mg_valleys_spflags = altitude_chill,humid_rivers +# mgvalleys_spflags = altitude_chill,humid_rivers # The altitude at which temperature drops by 20C # type: int -# mg_valleys_altitude_chill = 90 +# mgvalleys_altitude_chill = 90 # Depth below which you'll find large caves. # type: int -# mg_valleys_large_cave_depth = -33 +# mgvalleys_large_cave_depth = -33 # Creates unpredictable lava features in caves. # These can make mining difficult. Zero disables them. (0-10) # type: int -# mg_valleys_lava_features = 0 +# mgvalleys_lava_features = 0 # Depth below which you'll find massive caves. # type: int -# mg_valleys_massive_cave_depth = -256 +# mgvalleys_massive_cave_depth = -256 # How deep to make rivers # type: int -# mg_valleys_river_depth = 4 +# mgvalleys_river_depth = 4 # How wide to make rivers # type: int -# mg_valleys_river_size = 5 +# mgvalleys_river_size = 5 # Creates unpredictable water features in caves. # These can make mining difficult. Zero disables them. (0-10) # type: int -# mg_valleys_water_features = 0 +# mgvalleys_water_features = 0 + +# Controls width of tunnels, a smaller value creates wider tunnels. +# type: float +# mgvalleys_cave_width = 0.3 ##### Noises # Caves and tunnels form at the intersection of the two noises # type: noise_params -# mg_valleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 +# mgvalleys_np_cave1 = 0, 12, (100, 100, 100), 52534, 4, 0.5, 2.0 # Caves and tunnels form at the intersection of the two noises # type: noise_params -# mg_valleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 +# mgvalleys_np_cave2 = 0, 12, (100, 100, 100), 10325, 4, 0.5, 2.0 # The depth of dirt or other filler # type: noise_params -# mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 +# mgvalleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 # Massive caves form here. # type: noise_params -# mg_valleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0 +# mgvalleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0 # River noise -- rivers occur close to zero # type: noise_params -# mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 +# mgvalleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0 # Base terrain height # type: noise_params -# mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 +# mgvalleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0 # Raises terrain to make valleys around the rivers # type: noise_params -# mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 +# mgvalleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0 # Slope and fill work together to modify the heights # type: noise_params -# mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 +# mgvalleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0 # Amplifies the valleys # type: noise_params -# mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 +# mgvalleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 # Slope and fill work together to modify the heights # type: noise_params -# mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 +# mgvalleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0 ## Security diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp index 0c243842..4669f171 100644 --- a/src/mapgen_flat.cpp +++ b/src/mapgen_flat.cpp @@ -67,14 +67,15 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge this->humidmap = NULL; MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams; - this->spflags = sp->spflags; - this->ground_level = sp->ground_level; + this->spflags = sp->spflags; + this->ground_level = sp->ground_level; this->large_cave_depth = sp->large_cave_depth; - this->lake_threshold = sp->lake_threshold; - this->lake_steepness = sp->lake_steepness; - this->hill_threshold = sp->hill_threshold; - this->hill_steepness = sp->hill_steepness; + this->cave_width = sp->cave_width; + this->lake_threshold = sp->lake_threshold; + this->lake_steepness = sp->lake_steepness; + this->hill_threshold = sp->hill_threshold; + this->hill_steepness = sp->hill_steepness; //// 2D noise noise_terrain = new Noise(&sp->np_terrain, seed, csize.X, csize.Z); @@ -139,14 +140,14 @@ MapgenFlat::~MapgenFlat() MapgenFlatParams::MapgenFlatParams() { - spflags = 0; - - ground_level = 8; + spflags = 0; + ground_level = 8; large_cave_depth = -33; - lake_threshold = -0.45; - lake_steepness = 48.0; - hill_threshold = 0.45; - hill_steepness = 64.0; + cave_width = 0.3; + lake_threshold = -0.45; + lake_steepness = 48.0; + hill_threshold = 0.45; + hill_steepness = 64.0; np_terrain = NoiseParams(0, 1, v3f(600, 600, 600), 7244, 5, 0.6, 2.0); np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0); @@ -157,10 +158,10 @@ MapgenFlatParams::MapgenFlatParams() void MapgenFlatParams::readParams(const Settings *settings) { - settings->getFlagStrNoEx("mgflat_spflags", spflags, flagdesc_mapgen_flat); - + settings->getFlagStrNoEx("mgflat_spflags", spflags, flagdesc_mapgen_flat); settings->getS16NoEx("mgflat_ground_level", ground_level); settings->getS16NoEx("mgflat_large_cave_depth", large_cave_depth); + settings->getFloatNoEx("mgflat_cave_width", cave_width); settings->getFloatNoEx("mgflat_lake_threshold", lake_threshold); settings->getFloatNoEx("mgflat_lake_steepness", lake_steepness); settings->getFloatNoEx("mgflat_hill_threshold", hill_threshold); @@ -175,10 +176,10 @@ void MapgenFlatParams::readParams(const Settings *settings) void MapgenFlatParams::writeParams(Settings *settings) const { - settings->setFlagStr("mgflat_spflags", spflags, flagdesc_mapgen_flat, U32_MAX); - + settings->setFlagStr("mgflat_spflags", spflags, flagdesc_mapgen_flat, U32_MAX); settings->setS16("mgflat_ground_level", ground_level); settings->setS16("mgflat_large_cave_depth", large_cave_depth); + settings->setFloat("mgflat_cave_width", cave_width); settings->setFloat("mgflat_lake_threshold", lake_threshold); settings->setFloat("mgflat_lake_steepness", lake_steepness); settings->setFloat("mgflat_hill_threshold", hill_threshold); @@ -592,7 +593,7 @@ void MapgenFlat::generateCaves(s16 max_stone_y) float d1 = contour(noise_cave1->result[index3d]); float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); is_tunnel = true; diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h index 8ddfe708..8aed09be 100644 --- a/src/mapgen_flat.h +++ b/src/mapgen_flat.h @@ -34,14 +34,13 @@ extern FlagDesc flagdesc_mapgen_flat[]; struct MapgenFlatParams : public MapgenSpecificParams { u32 spflags; - s16 ground_level; s16 large_cave_depth; + float cave_width; float lake_threshold; float lake_steepness; float hill_threshold; float hill_steepness; - NoiseParams np_terrain; NoiseParams np_filler_depth; NoiseParams np_cave1; @@ -61,20 +60,20 @@ public: int ystride; int zstride_1d; - u32 spflags; v3s16 node_min; v3s16 node_max; v3s16 full_node_min; v3s16 full_node_max; + u32 spflags; s16 ground_level; s16 large_cave_depth; + float cave_width; float lake_threshold; float lake_steepness; float hill_threshold; float hill_steepness; - Noise *noise_terrain; Noise *noise_filler_depth; Noise *noise_cave1; diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp index d75d1149..e2e29f87 100644 --- a/src/mapgen_fractal.cpp +++ b/src/mapgen_fractal.cpp @@ -65,21 +65,18 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * this->humidmap = NULL; MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams; - this->spflags = sp->spflags; + this->spflags = sp->spflags; + this->cave_width = sp->cave_width; this->fractal = sp->fractal; this->iterations = sp->iterations; this->scale = sp->scale; this->offset = sp->offset; this->slice_w = sp->slice_w; - - this->julia_x = sp->julia_x; - this->julia_y = sp->julia_y; - this->julia_z = sp->julia_z; - this->julia_w = sp->julia_w; - - this->formula = fractal / 2 + fractal % 2; - this->julia = fractal % 2 == 0; + this->julia_x = sp->julia_x; + this->julia_y = sp->julia_y; + this->julia_z = sp->julia_z; + this->julia_w = sp->julia_w; //// 2D terrain noise noise_seabed = new Noise(&sp->np_seabed, seed, csize.X, csize.Z); @@ -96,6 +93,9 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager * noise_heat_blend = new Noise(¶ms->np_biome_heat_blend, seed, csize.X, csize.Z); noise_humidity_blend = new Noise(¶ms->np_biome_humidity_blend, seed, csize.X, csize.Z); + this->formula = fractal / 2 + fractal % 2; + this->julia = fractal % 2 == 0; + //// Resolve nodes to be used INodeDefManager *ndef = emerge->ndef; @@ -144,18 +144,17 @@ MapgenFractal::~MapgenFractal() MapgenFractalParams::MapgenFractalParams() { - spflags = 0; - - fractal = 1; + spflags = 0; + cave_width = 0.3; + fractal = 1; iterations = 11; - scale = v3f(4096.0, 1024.0, 4096.0); - offset = v3f(1.79, 0.0, 0.0); - slice_w = 0.0; - - julia_x = 0.33; - julia_y = 0.33; - julia_z = 0.33; - julia_w = 0.33; + scale = v3f(4096.0, 1024.0, 4096.0); + offset = v3f(1.79, 0.0, 0.0); + slice_w = 0.0; + julia_x = 0.33; + julia_y = 0.33; + julia_z = 0.33; + julia_w = 0.33; np_seabed = NoiseParams(-14, 9, v3f(600, 600, 600), 41900, 5, 0.6, 2.0); np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0); @@ -166,45 +165,43 @@ MapgenFractalParams::MapgenFractalParams() void MapgenFractalParams::readParams(const Settings *settings) { - settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal); + settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal); + settings->getFloatNoEx("mgfractal_cave_width", cave_width); + settings->getU16NoEx("mgfractal_fractal", fractal); + settings->getU16NoEx("mgfractal_iterations", iterations); + settings->getV3FNoEx("mgfractal_scale", scale); + settings->getV3FNoEx("mgfractal_offset", offset); + settings->getFloatNoEx("mgfractal_slice_w", slice_w); + settings->getFloatNoEx("mgfractal_julia_x", julia_x); + settings->getFloatNoEx("mgfractal_julia_y", julia_y); + settings->getFloatNoEx("mgfractal_julia_z", julia_z); + settings->getFloatNoEx("mgfractal_julia_w", julia_w); - settings->getU16NoEx("mgfractal_fractal", fractal); - settings->getU16NoEx("mgfractal_iterations", iterations); - settings->getV3FNoEx("mgfractal_scale", scale); - settings->getV3FNoEx("mgfractal_offset", offset); - settings->getFloatNoEx("mgfractal_slice_w", slice_w); - - settings->getFloatNoEx("mgfractal_julia_x", julia_x); - settings->getFloatNoEx("mgfractal_julia_y", julia_y); - settings->getFloatNoEx("mgfractal_julia_z", julia_z); - settings->getFloatNoEx("mgfractal_julia_w", julia_w); - - settings->getNoiseParams("mgfractal_np_seabed", np_seabed); + settings->getNoiseParams("mgfractal_np_seabed", np_seabed); settings->getNoiseParams("mgfractal_np_filler_depth", np_filler_depth); - settings->getNoiseParams("mgfractal_np_cave1", np_cave1); - settings->getNoiseParams("mgfractal_np_cave2", np_cave2); + settings->getNoiseParams("mgfractal_np_cave1", np_cave1); + settings->getNoiseParams("mgfractal_np_cave2", np_cave2); } void MapgenFractalParams::writeParams(Settings *settings) const { - settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX); + settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX); + settings->setFloat("mgfractal_cave_width", cave_width); + settings->setU16("mgfractal_fractal", fractal); + settings->setU16("mgfractal_iterations", iterations); + settings->setV3F("mgfractal_scale", scale); + settings->setV3F("mgfractal_offset", offset); + settings->setFloat("mgfractal_slice_w", slice_w); + settings->setFloat("mgfractal_julia_x", julia_x); + settings->setFloat("mgfractal_julia_y", julia_y); + settings->setFloat("mgfractal_julia_z", julia_z); + settings->setFloat("mgfractal_julia_w", julia_w); - settings->setU16("mgfractal_fractal", fractal); - settings->setU16("mgfractal_iterations", iterations); - settings->setV3F("mgfractal_scale", scale); - settings->setV3F("mgfractal_offset", offset); - settings->setFloat("mgfractal_slice_w", slice_w); - - settings->setFloat("mgfractal_julia_x", julia_x); - settings->setFloat("mgfractal_julia_y", julia_y); - settings->setFloat("mgfractal_julia_z", julia_z); - settings->setFloat("mgfractal_julia_w", julia_w); - - settings->setNoiseParams("mgfractal_np_seabed", np_seabed); + settings->setNoiseParams("mgfractal_np_seabed", np_seabed); settings->setNoiseParams("mgfractal_np_filler_depth", np_filler_depth); - settings->setNoiseParams("mgfractal_np_cave1", np_cave1); - settings->setNoiseParams("mgfractal_np_cave2", np_cave2); + settings->setNoiseParams("mgfractal_np_cave1", np_cave1); + settings->setNoiseParams("mgfractal_np_cave2", np_cave2); } @@ -720,7 +717,7 @@ void MapgenFractal::generateCaves(s16 max_stone_y) float d1 = contour(noise_cave1->result[index3d]); float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); is_tunnel = true; diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index 8c21a8a4..dd96045e 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -35,18 +35,16 @@ extern FlagDesc flagdesc_mapgen_fractal[]; struct MapgenFractalParams : public MapgenSpecificParams { u32 spflags; - + float cave_width; u16 fractal; u16 iterations; v3f scale; v3f offset; float slice_w; - float julia_x; float julia_y; float julia_z; float julia_w; - NoiseParams np_seabed; NoiseParams np_filler_depth; NoiseParams np_cave1; @@ -75,18 +73,16 @@ public: v3s16 full_node_max; u32 spflags; - + float cave_width; u16 fractal; u16 iterations; v3f scale; v3f offset; float slice_w; - float julia_x; float julia_y; float julia_z; float julia_w; - Noise *noise_seabed; Noise *noise_filler_depth; Noise *noise_cave1; diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 5ae2568a..b98acb92 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -63,7 +63,9 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge) this->humidmap = NULL; MapgenV5Params *sp = (MapgenV5Params *)params->sparams; - this->spflags = sp->spflags; + + this->spflags = sp->spflags; + this->cave_width = sp->cave_width; // Terrain noise noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); @@ -133,7 +135,8 @@ MapgenV5::~MapgenV5() MapgenV5Params::MapgenV5Params() { - spflags = 0; + spflags = 0; + cave_width = 0.125; np_filler_depth = NoiseParams(0, 1, v3f(150, 150, 150), 261, 4, 0.7, 2.0); np_factor = NoiseParams(0, 1, v3f(250, 250, 250), 920381, 3, 0.45, 2.0); @@ -150,7 +153,8 @@ MapgenV5Params::MapgenV5Params() void MapgenV5Params::readParams(const Settings *settings) { - settings->getFlagStrNoEx("mgv5_spflags", spflags, flagdesc_mapgen_v5); + settings->getFlagStrNoEx("mgv5_spflags", spflags, flagdesc_mapgen_v5); + settings->getFloatNoEx("mgv5_cave_width", cave_width); settings->getNoiseParams("mgv5_np_filler_depth", np_filler_depth); settings->getNoiseParams("mgv5_np_factor", np_factor); @@ -163,7 +167,8 @@ void MapgenV5Params::readParams(const Settings *settings) void MapgenV5Params::writeParams(Settings *settings) const { - settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5, U32_MAX); + settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5, U32_MAX); + settings->setFloat("mgv5_cave_width", cave_width); settings->setNoiseParams("mgv5_np_filler_depth", np_filler_depth); settings->setNoiseParams("mgv5_np_factor", np_factor); @@ -598,7 +603,7 @@ void MapgenV5::generateCaves(int max_stone_y) float d1 = contour(noise_cave1->result[index3d]); float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.125f && ndef->get(c).is_ground_content) { + if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); is_tunnel = true; diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h index 8047f225..fd2f7f4d 100644 --- a/src/mapgen_v5.h +++ b/src/mapgen_v5.h @@ -32,6 +32,7 @@ extern FlagDesc flagdesc_mapgen_v5[]; struct MapgenV5Params : public MapgenSpecificParams { u32 spflags; + float cave_width; NoiseParams np_filler_depth; NoiseParams np_factor; NoiseParams np_height; @@ -54,13 +55,14 @@ public: int ystride; int zstride_1d; - u32 spflags; v3s16 node_min; v3s16 node_max; v3s16 full_node_min; v3s16 full_node_max; + u32 spflags; + float cave_width; Noise *noise_filler_depth; Noise *noise_factor; Noise *noise_height; diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 162bf068..9fb65f57 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -71,7 +71,9 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) this->ridge_heightmap = new s16[csize.X * csize.Z]; MapgenV7Params *sp = (MapgenV7Params *)params->sparams; - this->spflags = sp->spflags; + + this->spflags = sp->spflags; + this->cave_width = sp->cave_width; //// Terrain noise noise_terrain_base = new Noise(&sp->np_terrain_base, seed, csize.X, csize.Z); @@ -152,7 +154,8 @@ MapgenV7::~MapgenV7() MapgenV7Params::MapgenV7Params() { - spflags = MGV7_MOUNTAINS | MGV7_RIDGES; + spflags = MGV7_MOUNTAINS | MGV7_RIDGES; + cave_width = 0.3; np_terrain_base = NoiseParams(4, 70, v3f(600, 600, 600), 82341, 5, 0.6, 2.0); np_terrain_alt = NoiseParams(4, 25, v3f(600, 600, 600), 5934, 5, 0.6, 2.0); @@ -170,7 +173,8 @@ MapgenV7Params::MapgenV7Params() void MapgenV7Params::readParams(const Settings *settings) { - settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7); + settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7); + settings->getFloatNoEx("mgv7_cave_width", cave_width); settings->getNoiseParams("mgv7_np_terrain_base", np_terrain_base); settings->getNoiseParams("mgv7_np_terrain_alt", np_terrain_alt); @@ -188,7 +192,8 @@ void MapgenV7Params::readParams(const Settings *settings) void MapgenV7Params::writeParams(Settings *settings) const { - settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, U32_MAX); + settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, U32_MAX); + settings->setFloat("mgv7_cave_width", cave_width); settings->setNoiseParams("mgv7_np_terrain_base", np_terrain_base); settings->setNoiseParams("mgv7_np_terrain_alt", np_terrain_alt); @@ -735,7 +740,7 @@ void MapgenV7::generateCaves(s16 max_stone_y) float d1 = contour(noise_cave1->result[index3d]); float d2 = contour(noise_cave2->result[index3d]); - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) { // In tunnel and ground content, excavate vm->m_data[vi] = MapNode(CONTENT_AIR); is_tunnel = true; diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h index 57cb55a8..c2522064 100644 --- a/src/mapgen_v7.h +++ b/src/mapgen_v7.h @@ -34,6 +34,7 @@ extern FlagDesc flagdesc_mapgen_v7[]; struct MapgenV7Params : public MapgenSpecificParams { u32 spflags; + float cave_width; NoiseParams np_terrain_base; NoiseParams np_terrain_alt; NoiseParams np_terrain_persist; @@ -61,7 +62,6 @@ public: int ystride; int zstride_1u1d; int zstride_1d; - u32 spflags; v3s16 node_min; v3s16 node_max; @@ -70,6 +70,8 @@ public: s16 *ridge_heightmap; + u32 spflags; + float cave_width; Noise *noise_terrain_base; Noise *noise_terrain_alt; Noise *noise_terrain_persist; diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index 3926deb4..0ec5409c 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -86,25 +86,16 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * g_settings->getU16("map_generation_limit")); MapgenValleysParams *sp = (MapgenValleysParams *)params->sparams; - this->spflags = sp->spflags; - - this->humid_rivers = (spflags & MGVALLEYS_HUMID_RIVERS); - this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL); + this->spflags = sp->spflags; this->altitude_chill = sp->altitude_chill; - this->humidity_adjust = params->np_biome_humidity.offset - 50.f; this->large_cave_depth = sp->large_cave_depth; this->lava_features_lim = rangelim(sp->lava_features, 0, 10); this->massive_cave_depth = sp->massive_cave_depth; this->river_depth_bed = sp->river_depth + 1.f; this->river_size_factor = sp->river_size / 100.f; this->water_features_lim = rangelim(sp->water_features, 0, 10); - - // a small chance of overflows if the settings are very high - this->cave_water_max_height = water_level + MYMAX(0, water_features_lim - 4) * 50; - this->lava_max_height = water_level + MYMAX(0, lava_features_lim - 4) * 50; - - tcave_cache = new float[csize.Y + 2]; + this->cave_width = sp->cave_width; //// 2D Terrain noise noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z); @@ -128,6 +119,16 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * noise_humidity_blend = new Noise(¶ms->np_biome_humidity_blend, seed, csize.X, csize.Z); noise_humidity = new Noise(¶ms->np_biome_humidity, seed, csize.X, csize.Z); + this->humid_rivers = (spflags & MGVALLEYS_HUMID_RIVERS); + this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL); + this->humidity_adjust = params->np_biome_humidity.offset - 50.f; + + // a small chance of overflows if the settings are very high + this->cave_water_max_height = water_level + MYMAX(0, water_features_lim - 4) * 50; + this->lava_max_height = water_level + MYMAX(0, lava_features_lim - 4) * 50; + + tcave_cache = new float[csize.Y + 2]; + //// Resolve nodes to be used INodeDefManager *ndef = emerge->ndef; @@ -165,10 +166,6 @@ MapgenValleys::~MapgenValleys() delete noise_cave1; delete noise_cave2; delete noise_filler_depth; - delete noise_heat; - delete noise_heat_blend; - delete noise_humidity; - delete noise_humidity_blend; delete noise_inter_valley_fill; delete noise_inter_valley_slope; delete noise_rivers; @@ -177,6 +174,11 @@ MapgenValleys::~MapgenValleys() delete noise_valley_depth; delete noise_valley_profile; + delete noise_heat; + delete noise_heat_blend; + delete noise_humidity; + delete noise_humidity_blend; + delete[] biomemap; delete[] heightmap; delete[] tcave_cache; @@ -185,8 +187,7 @@ MapgenValleys::~MapgenValleys() MapgenValleysParams::MapgenValleysParams() { - spflags = MGVALLEYS_HUMID_RIVERS | MGVALLEYS_ALT_CHILL; - + spflags = MGVALLEYS_HUMID_RIVERS | MGVALLEYS_ALT_CHILL; altitude_chill = 90; // The altitude at which temperature drops by 20C. large_cave_depth = -33; lava_features = 0; // How often water will occur in caves. @@ -194,6 +195,7 @@ MapgenValleysParams::MapgenValleysParams() river_depth = 4; // How deep to carve river channels. river_size = 5; // How wide to make rivers. water_features = 0; // How often water will occur in caves. + cave_width = 0.3; np_cave1 = NoiseParams(0, 12, v3f(96, 96, 96), 52534, 4, 0.5, 2.0); np_cave2 = NoiseParams(0, 12, v3f(96, 96, 96), 10325, 4, 0.5, 2.0); @@ -205,56 +207,56 @@ MapgenValleysParams::MapgenValleysParams() np_terrain_height = NoiseParams(-10.f, 50.f, v3f(1024, 1024, 1024), 5202, 6, 0.4f, 2.f); np_valley_depth = NoiseParams(5.f, 4.f, v3f(512, 512, 512), -1914, 1, 1.f, 2.f); np_valley_profile = NoiseParams(0.6f, 0.5f, v3f(512, 512, 512), 777, 1, 1.f, 2.f); - } +} void MapgenValleysParams::readParams(const Settings *settings) { - settings->getFlagStrNoEx("mg_valleys_spflags", spflags, flagdesc_mapgen_valleys); + settings->getFlagStrNoEx("mgvalleys_spflags", spflags, flagdesc_mapgen_valleys); + settings->getU16NoEx("mgvalleys_altitude_chill", altitude_chill); + settings->getS16NoEx("mgvalleys_large_cave_depth", large_cave_depth); + settings->getU16NoEx("mgvalleys_lava_features", lava_features); + settings->getS16NoEx("mgvalleys_massive_cave_depth", massive_cave_depth); + settings->getU16NoEx("mgvalleys_river_depth", river_depth); + settings->getU16NoEx("mgvalleys_river_size", river_size); + settings->getU16NoEx("mgvalleys_water_features", water_features); + settings->getFloatNoEx("mgvalleys_cave_width", cave_width); - settings->getU16NoEx("mg_valleys_altitude_chill", altitude_chill); - settings->getS16NoEx("mg_valleys_large_cave_depth", large_cave_depth); - settings->getU16NoEx("mg_valleys_lava_features", lava_features); - settings->getS16NoEx("mg_valleys_massive_cave_depth", massive_cave_depth); - settings->getU16NoEx("mg_valleys_river_depth", river_depth); - settings->getU16NoEx("mg_valleys_river_size", river_size); - settings->getU16NoEx("mg_valleys_water_features", water_features); - - settings->getNoiseParams("mg_valleys_np_cave1", np_cave1); - settings->getNoiseParams("mg_valleys_np_cave2", np_cave2); - settings->getNoiseParams("mg_valleys_np_filler_depth", np_filler_depth); - settings->getNoiseParams("mg_valleys_np_inter_valley_fill", np_inter_valley_fill); - settings->getNoiseParams("mg_valleys_np_inter_valley_slope", np_inter_valley_slope); - settings->getNoiseParams("mg_valleys_np_rivers", np_rivers); - settings->getNoiseParams("mg_valleys_np_massive_caves", np_massive_caves); - settings->getNoiseParams("mg_valleys_np_terrain_height", np_terrain_height); - settings->getNoiseParams("mg_valleys_np_valley_depth", np_valley_depth); - settings->getNoiseParams("mg_valleys_np_valley_profile", np_valley_profile); + settings->getNoiseParams("mgvalleys_np_cave1", np_cave1); + settings->getNoiseParams("mgvalleys_np_cave2", np_cave2); + settings->getNoiseParams("mgvalleys_np_filler_depth", np_filler_depth); + settings->getNoiseParams("mgvalleys_np_inter_valley_fill", np_inter_valley_fill); + settings->getNoiseParams("mgvalleys_np_inter_valley_slope", np_inter_valley_slope); + settings->getNoiseParams("mgvalleys_np_rivers", np_rivers); + settings->getNoiseParams("mgvalleys_np_massive_caves", np_massive_caves); + settings->getNoiseParams("mgvalleys_np_terrain_height", np_terrain_height); + settings->getNoiseParams("mgvalleys_np_valley_depth", np_valley_depth); + settings->getNoiseParams("mgvalleys_np_valley_profile", np_valley_profile); } void MapgenValleysParams::writeParams(Settings *settings) const { - settings->setFlagStr("mg_valleys_spflags", spflags, flagdesc_mapgen_valleys, U32_MAX); + settings->setFlagStr("mgvalleys_spflags", spflags, flagdesc_mapgen_valleys, U32_MAX); + settings->setU16("mgvalleys_altitude_chill", altitude_chill); + settings->setS16("mgvalleys_large_cave_depth", large_cave_depth); + settings->setU16("mgvalleys_lava_features", lava_features); + settings->setS16("mgvalleys_massive_cave_depth", massive_cave_depth); + settings->setU16("mgvalleys_river_depth", river_depth); + settings->setU16("mgvalleys_river_size", river_size); + settings->setU16("mgvalleys_water_features", water_features); + settings->setFloat("mgvalleys_cave_width", cave_width); - settings->setU16("mg_valleys_altitude_chill", altitude_chill); - settings->setS16("mg_valleys_large_cave_depth", large_cave_depth); - settings->setU16("mg_valleys_lava_features", lava_features); - settings->setS16("mg_valleys_massive_cave_depth", massive_cave_depth); - settings->setU16("mg_valleys_river_depth", river_depth); - settings->setU16("mg_valleys_river_size", river_size); - settings->setU16("mg_valleys_water_features", water_features); - - settings->setNoiseParams("mg_valleys_np_cave1", np_cave1); - settings->setNoiseParams("mg_valleys_np_cave2", np_cave2); - settings->setNoiseParams("mg_valleys_np_filler_depth", np_filler_depth); - settings->setNoiseParams("mg_valleys_np_inter_valley_fill", np_inter_valley_fill); - settings->setNoiseParams("mg_valleys_np_inter_valley_slope", np_inter_valley_slope); - settings->setNoiseParams("mg_valleys_np_rivers", np_rivers); - settings->setNoiseParams("mg_valleys_np_massive_caves", np_massive_caves); - settings->setNoiseParams("mg_valleys_np_terrain_height", np_terrain_height); - settings->setNoiseParams("mg_valleys_np_valley_depth", np_valley_depth); - settings->setNoiseParams("mg_valleys_np_valley_profile", np_valley_profile); + settings->setNoiseParams("mgvalleys_np_cave1", np_cave1); + settings->setNoiseParams("mgvalleys_np_cave2", np_cave2); + settings->setNoiseParams("mgvalleys_np_filler_depth", np_filler_depth); + settings->setNoiseParams("mgvalleys_np_inter_valley_fill", np_inter_valley_fill); + settings->setNoiseParams("mgvalleys_np_inter_valley_slope", np_inter_valley_slope); + settings->setNoiseParams("mgvalleys_np_rivers", np_rivers); + settings->setNoiseParams("mgvalleys_np_massive_caves", np_massive_caves); + settings->setNoiseParams("mgvalleys_np_terrain_height", np_terrain_height); + settings->setNoiseParams("mgvalleys_np_valley_depth", np_valley_depth); + settings->setNoiseParams("mgvalleys_np_valley_profile", np_valley_profile); } @@ -964,7 +966,7 @@ void MapgenValleys::generateCaves(s16 max_stone_y) // when a tunnel undercuts a river. However, that's not for // the mapgen to correct. Fix it in lua. - if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { + if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) { // in a tunnel vm->m_data[index_data] = n_air; tunnel_air_above = true; diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h index 4ad2d207..5224ea54 100644 --- a/src/mapgen_valleys.h +++ b/src/mapgen_valleys.h @@ -47,7 +47,6 @@ class BiomeManager; struct MapgenValleysParams : public MapgenSpecificParams { u32 spflags; - s16 large_cave_depth; s16 massive_cave_depth; u16 altitude_chill; @@ -55,11 +54,7 @@ struct MapgenValleysParams : public MapgenSpecificParams { u16 river_depth; u16 river_size; u16 water_features; - - NoiseParams np_biome_heat; - NoiseParams np_biome_heat_blend; - NoiseParams np_biome_humidity; - NoiseParams np_biome_humidity_blend; + float cave_width; NoiseParams np_cave1; NoiseParams np_cave2; NoiseParams np_filler_depth; @@ -110,23 +105,29 @@ private: float map_gen_limit; - u32 spflags; bool humid_rivers; bool use_altitude_chill; + float humidity_adjust; + s16 cave_water_max_height; + s16 lava_max_height; v3s16 node_min; v3s16 node_max; v3s16 full_node_min; v3s16 full_node_max; + u32 spflags; + float altitude_chill; + s16 lava_features_lim; + s16 massive_cave_depth; + float river_depth_bed; + float river_size_factor; + float *tcave_cache; + s16 water_features_lim; + float cave_width; Noise *noise_filler_depth; - Noise *noise_cave1; Noise *noise_cave2; - Noise *noise_heat; - Noise *noise_heat_blend; - Noise *noise_humidity; - Noise *noise_humidity_blend; Noise *noise_inter_valley_fill; Noise *noise_inter_valley_slope; Noise *noise_rivers; @@ -135,16 +136,10 @@ private: Noise *noise_valley_depth; Noise *noise_valley_profile; - float altitude_chill; - s16 cave_water_max_height; - float humidity_adjust; - s16 lava_features_lim; - s16 lava_max_height; - s16 massive_cave_depth; - float river_depth_bed; - float river_size_factor; - float *tcave_cache; - s16 water_features_lim; + Noise *noise_heat; + Noise *noise_heat_blend; + Noise *noise_humidity; + Noise *noise_humidity_blend; content_t c_cobble; content_t c_desert_stone; From ae75073944f6cdea22d5d4cc40b81937afe4dfa6 Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Sat, 30 Apr 2016 12:29:52 +1000 Subject: [PATCH 456/531] Fix prepreprocessor error in thread.h (related to C++11 threads) --- src/threading/thread.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/threading/thread.h b/src/threading/thread.h index 10732c44..de800ecb 100644 --- a/src/threading/thread.h +++ b/src/threading/thread.h @@ -157,11 +157,11 @@ private: Atomic m_running; Mutex m_mutex; -#if !USE_CPP11_THREADS +#ifndef USE_CPP11_THREADS threadhandle_t m_thread_handle; -#if _WIN32 - threadid_t m_thread_id; -#endif +# if _WIN32 + threadid_t m_thread_id; +# endif #endif static ThreadStartFunc threadProc; From a53357d2917d57966503348e7c030c024e89bb1b Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 30 Apr 2016 09:44:28 -0400 Subject: [PATCH 457/531] Fix POSIX C++11 build I broke this in 46fd114e9a4e05b74576dce682e24357363298e7. --- src/threading/thread.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp index ecf8563f..5161a6c0 100644 --- a/src/threading/thread.cpp +++ b/src/threading/thread.cpp @@ -205,9 +205,9 @@ bool Thread::kill() // We need to pthread_kill instead on Android since NDKv5's pthread // implementation is incomplete. # ifdef __ANDROID__ - pthread_kill(m_thread_handle, SIGKILL); + pthread_kill(getThreadHandle(), SIGKILL); # else - pthread_cancel(m_thread_handle); + pthread_cancel(getThreadHandle()); # endif wait(); #endif @@ -361,7 +361,7 @@ bool Thread::bindToProcessor(unsigned int proc_number) #elif defined(_WIN32) - return SetThreadAffinityMask(m_thread_handle, 1 << proc_number); + return SetThreadAffinityMask(getThreadHandle(), 1 << proc_number); #elif __FreeBSD_version >= 702106 || defined(__linux) || defined(linux) @@ -370,7 +370,7 @@ bool Thread::bindToProcessor(unsigned int proc_number) CPU_ZERO(&cpuset); CPU_SET(proc_number, &cpuset); - return pthread_setaffinity_np(m_thread_handle, sizeof(cpuset), &cpuset) == 0; + return pthread_setaffinity_np(getThreadHandle(), sizeof(cpuset), &cpuset) == 0; #elif defined(__sun) || defined(sun) @@ -385,13 +385,13 @@ bool Thread::bindToProcessor(unsigned int proc_number) pthread_spu_t answer; return pthread_processor_bind_np(PTHREAD_BIND_ADVISORY_NP, - &answer, proc_number, m_thread_handle) == 0; + &answer, proc_number, getThreadHandle()) == 0; #elif defined(__APPLE__) struct thread_affinity_policy tapol; - thread_port_t threadport = pthread_mach_thread_np(m_thread_handle); + thread_port_t threadport = pthread_mach_thread_np(getThreadHandle()); tapol.affinity_tag = proc_number + 1; return thread_policy_set(threadport, THREAD_AFFINITY_POLICY, (thread_policy_t)&tapol, @@ -409,21 +409,21 @@ bool Thread::setPriority(int prio) { #if defined(_WIN32) - return SetThreadPriority(m_thread_handle, prio); + return SetThreadPriority(getThreadHandle(), prio); #else struct sched_param sparam; int policy; - if (pthread_getschedparam(m_thread_handle, &policy, &sparam) != 0) + if (pthread_getschedparam(getThreadHandle(), &policy, &sparam) != 0) return false; int min = sched_get_priority_min(policy); int max = sched_get_priority_max(policy); sparam.sched_priority = min + prio * (max - min) / THREAD_PRIORITY_HIGHEST; - return pthread_setschedparam(m_thread_handle, policy, &sparam) == 0; + return pthread_setschedparam(getThreadHandle(), policy, &sparam) == 0; #endif } From 6e6bd7e774d52d30691fc91b5791256a2aaa3e24 Mon Sep 17 00:00:00 2001 From: Jean-Patrick G Date: Fri, 25 Mar 2016 17:20:51 +0100 Subject: [PATCH 458/531] Translated using Weblate (French) Currently translated at 94.1% (814 of 865 strings) This is a merger of two commits. --- po/fr/minetest.po | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index fc6a0882..5a17e192 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-24 13:27+0000\n" +"PO-Revision-Date: 2016-03-25 17:42+0000\n" "Last-Translator: Jean-Patrick G. \n" "Language-Team: French " "\n" @@ -563,7 +563,7 @@ msgstr "Arbres détaillés" #: builtin/mainmenu/tab_settings.lua msgid "Generate Normalmaps" -msgstr "Générer un carte normal" +msgstr "Normal Mapping" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" @@ -632,7 +632,7 @@ msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé." #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" -msgstr "Sensibilité (px)" +msgstr "Sensibilité du toucher (px)" #: builtin/mainmenu/tab_settings.lua msgid "Trilinear Filter" @@ -1658,11 +1658,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Contrôle l'élévation/profondeur des dépressions lacustres." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Contrôle l'élévation/hauteur des collines." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1673,12 +1673,16 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crée des zones imprévisibles de lave dans les caves.\n" +"Elles rendent le minage plus difficile. 0 les désactivent. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crée des zones aquatiques imprévisibles dans les caves.\n" +"Elles rendent le minage plus difficile. 0 les désactivent. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1776,11 +1780,11 @@ msgstr "Traitement d'API Lua obsolète(s)" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Profondeur en-dessous duquel se trouvent de grandes caves." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Profondeur en-dessous duquel se trouvent des caves massives." #: src/settings_translation_file.cpp msgid "Descending speed" @@ -3026,7 +3030,7 @@ msgstr "Drapeaux de génération de terrain" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Élévation des collines plates" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" @@ -3267,7 +3271,7 @@ msgstr "Bruit des caves massives" #: src/settings_translation_file.cpp msgid "Massive caves form here." -msgstr "" +msgstr "Forme des caves massives." #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -3737,7 +3741,7 @@ msgstr "Taille des rivières" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" -msgstr "" +msgstr "Bruit des rivières" #: src/settings_translation_file.cpp msgid "Rollback recording" From 93fc5556caeb55b3df14c7fb1376653583571409 Mon Sep 17 00:00:00 2001 From: Ian Giestas Pauli Date: Fri, 25 Mar 2016 23:43:50 +0100 Subject: [PATCH 459/531] Translated using Weblate (Portuguese (Brazil)) Currently translated at 71.3% (617 of 865 strings) This is a merger of two commits. --- po/pt_BR/minetest.po | 58 ++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index 638b7727..9e665acd 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-24 15:09+0000\n" -"Last-Translator: Ian Giestas Pauli \n" +"PO-Revision-Date: 2016-03-31 13:45+0000\n" +"Last-Translator: Ian giestas pauli \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -1036,7 +1036,6 @@ msgid "Control" msgstr "Ctrl" #: src/keycode.cpp -#, fuzzy msgid "Convert" msgstr "Convert (tecla)" @@ -1069,7 +1068,6 @@ msgid "Execute" msgstr "Executar" #: src/keycode.cpp -#, fuzzy msgid "Final" msgstr "Final (tecla)" @@ -1519,7 +1517,6 @@ msgid "Chat toggle key" msgstr "Tecla comutadora de chat" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Choice of 18 fractals from 9 formulas.\n" "1 = 4D \"Roundy\" mandelbrot set.\n" @@ -1541,25 +1538,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" -"Escolha de 18 fractais de 9 fórmulas\n" -"1 = 4D \"Roundy\" conjunto de mandelbrot.\n" -"2 = 4D \"Roundy\" conjunto de julia.\n" -"3 = 4D \"Squarry\" conjunto de mandelbrot.\n" -"4 = 4D \"Squarry\" conjunto de julia.\n" -"5 = 4D \"Mandy Cousin\" conjunto de mandelbrot.\n" -"6 = 4D \"Mandy Cousin\" conjunto de julia.\n" -"7 = 4D \"Variação\" conjunto de mandelbrot.\n" -"8 = 4D \"Variação\" conjunto de julia.\n" -"9 = 3D \"Mandelbrot/Mandelbar\" conjunto de mandelbrot.\n" -"10 = 3D \"Mandelbrot/Mandelbar\" conjunto de julia.\n" -"11 = 3D \"Christmas Tree\" conjunto de mandelbrot.\n" -"12 = 3D \"Christmas Tree\" conjunto de julia.\n" -"13 = 3D \"Mandelbulbo\" conjunto de mandelbrot.\n" -"14 = 3D \"Mandelbulbo\" conjunto de julia.\n" -"15 = 3D \"Coseno Mandelbulbo\" conjunto de mandelbrot.\n" -"16 = 3D \"Coseno Mandelbulb\" conjunto de julia.\n" -"17 = 4D \"Mandelbulbo\" conjunto de mandelbrot.\n" -"18 = 4D \"Mandelbulbo\" conjunto de julia." +"Escolha entre 18 fractais com 9 fórmulas\n" +"1 = Conjunto de mandelbrot \"Roundy\" 4D.\n" +"2 = Conjunto de julia \"Roundy\" 4D.\n" +"3 = Conjunto de mandelbrot \"Squarry\" 4D.\n" +"4 = Conjunto de julia \"Squarry\" 4D.\n" +"5 = Conjunto de mandelbrot \"Mandy Cousin\" 4D.\n" +"6 = Conjunto de julia \"Mandy Cousin\" 4D.\n" +"7 = Conjunto de mandelbrot \"Variation\" 4D.\n" +"8 = Conjunto de julia \"Variation\" 4D.\n" +"9 = Conjunto de mandelbrot \"Mandelbrot/Mandelbar\" 3D.\n" +"10 = Conjunto de julia \"Mandelbrot/Mandelbar\" 3D.\n" +"11 = Conjunto de mandelbrot \"Árvore de natal\" 3D.\n" +"12 = Conjunto de julia \"Árvore de natal\" 3D..\n" +"13 = Conjunto de mandelbrot \"Bulbo de Mandelbrot\" 3D.\n" +"14 = Conjunto de julia \"Bulbo de Mandelbrot\" 3D.\n" +"15 = Conjunto de mandelbrot \"Bulbo de Mandelbrot Cosseno\" 3D.\n" +"16 = Conjunto de julia \"Bulbo de Mandelbrot Cosseno\" 3D.\n" +"17 = Conjunto de mandelbrot \"Bulbo de Mandelbrot\" 4D.\n" +"18 = Conjunto de julia \"Bulbo de Mandelbrot\" 4D." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1813,9 +1810,8 @@ msgid "Depth below which you'll find large caves." msgstr "Profundidade em que você encontrará cavernas enormes." #: src/settings_translation_file.cpp -#, fuzzy msgid "Depth below which you'll find massive caves." -msgstr "Profundidade em que você encontrará cavernas longas." +msgstr "Profundidade em que você encontrará cavernas enormes." #: src/settings_translation_file.cpp msgid "Descending speed" @@ -3101,9 +3097,8 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Fractal do Mapgen" +msgstr "Fractal do Mapgen fractal" #: src/settings_translation_file.cpp msgid "Mapgen fractal iterations" @@ -3111,7 +3106,7 @@ msgstr "Iterações no fractal do Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "Largura do fractal julia no Mapgen" +msgstr "Componente W do fractal Julia no Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" @@ -3139,7 +3134,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal slice w" -msgstr "Largura da fatia do fractal do Mapgen" +msgstr "Componente W da fatia do fractal do Mapgen" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -3672,9 +3667,8 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Tecla de alternar campo de visão" +msgstr "Tecla para modo de visão ilimitado" #: src/settings_translation_file.cpp msgid "Remote media" From a760359391dc4b99116932e11727114ec729edb9 Mon Sep 17 00:00:00 2001 From: Ever Medina Date: Sat, 26 Mar 2016 12:16:43 +0100 Subject: [PATCH 460/531] Translated using Weblate (Spanish) Currently translated at 46.2% (400 of 865 strings) --- po/es/minetest.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index ab97b1a8..e912cea6 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-15 07:22+0000\n" -"Last-Translator: Lucas Montenegro \n" +"PO-Revision-Date: 2016-03-26 12:16+0000\n" +"Last-Translator: Ever Medina \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -17,10 +17,9 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua -#, fuzzy msgid "An error occured in a Lua script, such as a mod:" msgstr "Un error ha ocurrido en un script de Lua, tal como en un mod:" From aec0979b27f66b5b4a09e90e974ccf3836fe764e Mon Sep 17 00:00:00 2001 From: Stas Kies Date: Mon, 28 Mar 2016 01:47:32 +0200 Subject: [PATCH 461/531] Translated using Weblate (Russian) Currently translated at 58.9% (510 of 865 strings) --- po/ru/minetest.po | 78 ++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index f404b054..5246c30a 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,21 +8,21 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-02-21 12:34+0000\n" -"Last-Translator: Dmitry Smirnov \n" -"Language-Team: Russian \n" +"PO-Revision-Date: 2016-03-28 01:47+0000\n" +"Last-Translator: Stas Kies \n" +"Language-Team: Russian " +"\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.5-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Ошибка в скрипте Lua в моде:" +msgstr "Ошибка в скрипте Lua, как например в моде:" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -42,7 +42,7 @@ msgstr "Переподключиться" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "Сервер запросил повторное соединение:" +msgstr "Сервер запросил переподключение:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -163,7 +163,9 @@ msgstr "Сид" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "Внимание: \"Minimal development test\" для разработчиков." +msgstr "" +"Внимание: \"Minimal development test\" в основном предназначен для " +"разработчиков." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -171,7 +173,7 @@ msgstr "Название мира" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "У вас не установлено мини-игр." +msgstr "У вас не установлены мини-игры." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -212,7 +214,7 @@ msgstr "Переименовать модпак:" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "\"$1\" is not a valid flag." -msgstr "" +msgstr "\"$1\" не является допустимым знаком." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "(No description of setting given)" @@ -220,7 +222,7 @@ msgstr "(Отсутствует описание настройки)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Назад к странице Настройки" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -228,7 +230,7 @@ msgstr "Выбрать" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Disabled" -msgstr "Отключить" +msgstr "Отключено" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Edit" @@ -504,36 +506,33 @@ msgstr "Начать игру" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "3D облака" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Настройки" +msgstr "расширенные настройки" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Сглаживание:" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" msgstr "Уверены, что хотите сбросить мир одиночной игры?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Билинейная фильтрация" @@ -546,14 +545,12 @@ msgid "Change keys" msgstr "Смена управления" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" msgstr "Стёкла без швов" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Включить всё" +msgstr "Включить частицы" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" @@ -573,9 +570,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "Мипмаппинг с анизотр. фильтром" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Фильтрация" +msgstr "Без Фильтров" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -619,7 +615,6 @@ msgid "Simple Leaves" msgstr "Упрощённая листва" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Мягкое освещение" @@ -636,22 +631,18 @@ msgid "Touchthreshold (px)" msgstr "Чувствительность (пк)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Трилинейная фильтрация" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "Покачивание листвы" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "Покачивание растений" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "Волны на воде" @@ -740,6 +731,7 @@ msgid "Provided world path doesn't exist: " msgstr "По этому пути мира нет: " #: src/fontengine.cpp +#, fuzzy msgid "needs_fallback_font" msgstr "no" @@ -1442,8 +1434,9 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "Приблизительный (X, Y, Z) масштаб рекурсивных в узлах." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1456,12 +1449,11 @@ msgstr "Автоматически добавлять в список серве #: src/settings_translation_file.cpp #, fuzzy msgid "Backward key" -msgstr "Назад" +msgstr "клавиша обратно" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Высота волн на воде" +msgstr "Высота основной местности" #: src/settings_translation_file.cpp msgid "Basic" @@ -1498,15 +1490,15 @@ msgstr "Клавиша переключения обновления камер #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Шум пещеры #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Шум пещеры #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Пещеры и тоннели формируются на перекрестке этих двух шумов" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1553,7 +1545,7 @@ msgstr "Кнопка переключения в кинематографиче #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "очистить прозрачные структуры" #: src/settings_translation_file.cpp msgid "Client and Server" @@ -1609,7 +1601,7 @@ msgstr "Стёкла без швов" #: src/settings_translation_file.cpp msgid "Connect to external media server" -msgstr "Подключение к внешнему серверу..." +msgstr "Подключение к внешнему медиасерверу" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." @@ -1787,7 +1779,9 @@ msgstr "Скорость снижения" msgid "" "Description of server, to be displayed when players join and in the " "serverlist." -msgstr "Описание сервера, показываемое при входе игрока и в списке серверов" +msgstr "" +"Описание сервера, которое будет показано при входе игрока и в списке " +"серверов." #: src/settings_translation_file.cpp #, fuzzy From ac38f4ec9946b6467f5ba947b9ddc85ab5963615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20=E2=80=9CXShell=E2=80=9D=20Schekoldin?= Date: Mon, 28 Mar 2016 01:48:26 +0200 Subject: [PATCH 462/531] Translated using Weblate (Russian) Currently translated at 58.9% (510 of 865 strings) This is a merger of two commits. --- po/ru/minetest.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 5246c30a..60355d5d 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-28 01:47+0000\n" -"Last-Translator: Stas Kies \n" +"PO-Revision-Date: 2016-03-28 01:51+0000\n" +"Last-Translator: Alex “XShell” Schekoldin \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -189,7 +189,7 @@ msgstr "Modmgr: неправильный путь \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" -msgstr "Никак нет!" +msgstr "Нет, конечно нет!" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/tab_settings.lua @@ -331,7 +331,7 @@ msgstr "Закрыть хранилище" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." -msgstr "Загрузка $1..." +msgstr "Загрузка $1, ждите..." #: builtin/mainmenu/store.lua msgid "Install" @@ -395,7 +395,7 @@ msgstr "Описание мода:" #: builtin/mainmenu/tab_mods.lua msgid "No mod description available" -msgstr "Описание к моду отсутствует" +msgstr "Описание мода недоступно" #: builtin/mainmenu/tab_mods.lua msgid "Rename" @@ -403,7 +403,7 @@ msgstr "Переименовать" #: builtin/mainmenu/tab_mods.lua msgid "Select Mod File:" -msgstr "Выберите файл с модом:" +msgstr "Выберите файл мода:" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" From 7a923f5b0b69a76facc7997de0b59a24cf7c3f77 Mon Sep 17 00:00:00 2001 From: Anton Tsyganenko Date: Mon, 28 Mar 2016 01:48:58 +0200 Subject: [PATCH 463/531] Translated using Weblate (Russian) Currently translated at 58.9% (510 of 865 strings) --- po/ru/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 60355d5d..75bb5a9d 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-28 01:51+0000\n" -"Last-Translator: Alex “XShell” Schekoldin \n" +"PO-Revision-Date: 2016-03-28 01:48+0000\n" +"Last-Translator: Anton Tsyganenko \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -214,7 +214,7 @@ msgstr "Переименовать модпак:" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" не является допустимым знаком." +msgstr "\"$1\" не является валидным флагом." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "(No description of setting given)" From 2b1ad6a4dc666fd31f3b1bec911c2ce3a8d2402c Mon Sep 17 00:00:00 2001 From: Pavel Sokolov Date: Mon, 28 Mar 2016 01:50:02 +0200 Subject: [PATCH 464/531] Translated using Weblate (Russian) Currently translated at 58.9% (510 of 865 strings) This is a merger of two commits. --- po/ru/minetest.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 75bb5a9d..137449ef 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-28 01:48+0000\n" -"Last-Translator: Anton Tsyganenko \n" +"PO-Revision-Date: 2016-03-28 01:50+0000\n" +"Last-Translator: Pavel Sokolov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -274,7 +274,7 @@ msgstr "Введите допустимое целое число." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid number." -msgstr "Пожалуйста, введите корректное число." +msgstr "Пожалуйста, введите правильное числовое значение." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Possible values are: " @@ -282,7 +282,7 @@ msgstr "Возможные значения: " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Restore Default" -msgstr "Восстановить по-умолчанию" +msgstr "Восстановить по умолчанию" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Select path" From fe64f93170a6217944d3be90df3c5e1f408e2697 Mon Sep 17 00:00:00 2001 From: Stas Kies Date: Mon, 28 Mar 2016 01:49:35 +0200 Subject: [PATCH 465/531] Translated using Weblate (Russian) Currently translated at 59.3% (513 of 865 strings) This is a merger of 5 commits. --- po/ru/minetest.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 137449ef..9cceb381 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-28 01:50+0000\n" -"Last-Translator: Pavel Sokolov \n" +"PO-Revision-Date: 2016-04-18 23:08+0000\n" +"Last-Translator: Stas Kies \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -242,7 +242,7 @@ msgstr "Включено" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Format is 3 numbers separated by commas and inside brackets." -msgstr "Формат -- это 3 числа в скобках, разделенные точками." +msgstr "Формат 3 цифры через запятую в скобках." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "" @@ -274,7 +274,7 @@ msgstr "Введите допустимое целое число." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid number." -msgstr "Пожалуйста, введите правильное числовое значение." +msgstr "Пожалуйста, введите правильное число." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Possible values are: " @@ -306,7 +306,7 @@ msgid "" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"Установка мода: неподдерживаемый тип файла \"$1\" или битый архив" +"Установка мода: неподдерживаемый тип файла \"$1\" или повреждённый архив" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" @@ -557,7 +557,6 @@ msgid "Fancy Leaves" msgstr "Красивая листва" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "Генерировать карты нормалей" @@ -1432,6 +1431,9 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Объявите списку сервера.\n" +"Если Вы хотите объявить о своем адресе IPv6, используйте serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp #, fuzzy @@ -1712,7 +1714,7 @@ msgstr "Отладочный уровень" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Шаг выделенного сервера" #: src/settings_translation_file.cpp msgid "Default acceleration" From 1e103d08508ce5282653c2032c9e5357205ba39c Mon Sep 17 00:00:00 2001 From: YFdyh000 Date: Tue, 29 Mar 2016 17:59:08 +0200 Subject: [PATCH 466/531] Translated using Weblate (Chinese (China)) Currently translated at 75.3% (652 of 865 strings) This is a merger of 3 commits. --- po/zh_CN/minetest.po | 907 ++++++++++++++++++++----------------------- 1 file changed, 414 insertions(+), 493 deletions(-) diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index 7924a127..5d2bda7a 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -2,14 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-22 07:59+0000\n" -"Last-Translator: akiyama akira \n" +"PO-Revision-Date: 2016-03-30 01:31+0000\n" +"Last-Translator: YFdyh000 \n" "Language-Team: Chinese (China) " "\n" "Language: zh_CN\n" @@ -21,7 +20,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "Lua 脚本错误:" +msgstr "Lua 脚本发生错误，如一个 mod：" #: builtin/fstk/ui.lua msgid "An error occured:" @@ -41,7 +40,7 @@ msgstr "重新连接" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" -msgstr "服务器请求重新连接:" +msgstr "服务器已要求重新连接：" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." @@ -49,27 +48,27 @@ msgstr "载入中..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "协议版本不匹配. " +msgstr "协议版本不匹配。 " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "服务器要求协议版本为 $1. " +msgstr "服务器强制协议版本为 $1。 " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "服务器支持的协议版本为 $1 至 $2. " +msgstr "服务器支持协议版本为 $1 至 $2。 " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." -msgstr "请尝试重新启用公共服务器列表并检查您的网络连接." +msgstr "请尝试重新启用公共服务器列表并检查您的网络连接。" #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "我们只支持协议版本 $1." +msgstr "我们只支持协议版本 $1。" #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "我们支持的协议版本为 $1 至 $2." +msgstr "我们支持的协议版本为 $1 至 $2。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua @@ -80,7 +79,7 @@ msgstr "取消" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua msgid "Depends:" -msgstr "依赖于:" +msgstr "依赖：" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" @@ -98,7 +97,7 @@ msgstr "全部启用" msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." -msgstr "无法启用 MOD \"$1\": 含有不支持的字符. 允许的字符为 [a-z0-9_]." +msgstr "无法启用 MOD \"$1\"：含有不支持的字符。允许的字符为 [a-z0-9_]。" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -110,7 +109,7 @@ msgstr "隐藏MOD包内容" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" -msgstr "MOD：" +msgstr "Mod：" #: builtin/mainmenu/dlg_config_world.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp @@ -135,11 +134,11 @@ msgstr "创建" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "从minetest.net下载一个游戏，例如:minetest_game" +msgstr "从 minetest.net 下载一个子游戏，例如 minetest_game" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "从minetest.net下载一个" +msgstr "从 minetest.net 下载一个" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -151,7 +150,7 @@ msgstr "地图生成器" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" -msgstr "未给定世界名或未选择游戏" +msgstr "未指定世界名或未选择游戏" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" @@ -159,7 +158,7 @@ msgstr "种子" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "警告: 最小化开发测试为开发人员所使用。" +msgstr "警告: 最小化开发测试是为开发者提供。" #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -167,15 +166,15 @@ msgstr "世界名称" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "你没有安装任何游戏." +msgstr "你没有安装任何子游戏。" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" -msgstr "你确认要删除\"$1\"?" +msgstr "你确认要删除“$1”？" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "MOD管理器：无法删除“$1“" +msgstr "MOD管理器：无法删除“$1”" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" @@ -192,7 +191,7 @@ msgstr "是" #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" -msgstr "删除世界“$1”?" +msgstr "删除世界“$1”？" #: builtin/mainmenu/dlg_delete_world.lua msgid "No" @@ -216,7 +215,7 @@ msgstr "(没有关于此设置的信息)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "< 返回到设置页面" +msgstr "< 返回设置页面" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -243,8 +242,8 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" -"格式: , , (, , ), , " -", " +"格式: , , (, , ), , , " +"" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -252,7 +251,7 @@ msgstr "游戏" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua msgid "Mods" -msgstr "MODS" +msgstr "Mod" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Optionally the lacunarity can be appended with a leading comma." @@ -364,11 +363,11 @@ msgstr "积极贡献者" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" -msgstr "内部开发人员" +msgstr "核心开发者" #: builtin/mainmenu/tab_credits.lua msgid "Credits" -msgstr "归功" +msgstr "贡献者" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" @@ -376,7 +375,7 @@ msgstr "前贡献者" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "前核心开发人员" +msgstr "前核心开发者" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -502,7 +501,6 @@ msgid "2x" msgstr "两倍" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "3D 云彩" @@ -520,73 +518,63 @@ msgstr "高级设置" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "反锯齿:" +msgstr "抗锯齿：" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" msgstr "你确定要重置您的单人世界吗？" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "双线性过滤" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -#, fuzzy msgid "Bumpmapping" -msgstr "贴图处理" +msgstr "凹凸贴图" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" -msgstr "改变键位设置" +msgstr "更改键位设置" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" msgstr "连接的玻璃" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "全部启用" +msgstr "启用粒子" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Fancy Leaves" msgstr "华丽的树叶" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" -msgstr "产生法线贴图" +msgstr "生成一般地图" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Mipmap" -msgstr "贴图处理" +msgstr "Mip 贴图" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" -msgstr "" +msgstr "Mip 贴图 + Aniso 过滤" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "各向异性过滤" +msgstr "无过滤" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Mipmap" -msgstr "贴图处理" +msgstr "无 Mip 贴图" #: builtin/mainmenu/tab_settings.lua msgid "No!!!" msgstr "不!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "平滑光照" +msgstr "节点高亮" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -617,7 +605,6 @@ msgid "Simple Leaves" msgstr "简单的树叶" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "平滑光照" @@ -634,7 +621,6 @@ msgid "Touchthreshold (px)" msgstr "触控阈值（像素）" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "三线性过滤" @@ -648,16 +634,15 @@ msgstr "摇摆的植物" #: builtin/mainmenu/tab_settings.lua msgid "Waving Water" -msgstr "鳞波的水面" +msgstr "流动的水面" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "配置 MOD" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" -msgstr "主菜单" +msgstr "主要" #: builtin/mainmenu/tab_simple_main.lua msgid "Start Singleplayer" @@ -673,7 +658,7 @@ msgstr "单人游戏" #: builtin/mainmenu/tab_texturepacks.lua msgid "No information available" -msgstr "无资料可得" +msgstr "无信息可用" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" @@ -685,7 +670,7 @@ msgstr "材质包" #: src/client.cpp msgid "Connection timed out." -msgstr "连接超时." +msgstr "连接超时。" #: src/client.cpp msgid "Done!" @@ -729,7 +714,7 @@ msgstr "没有选择世界或提供地址。未执行操作。" #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "玩家的名字太长了." +msgstr "玩家名称太长了。" #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " @@ -812,12 +797,12 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" -"默认按键:\n" -"菜单界面外:\n" +"默认控制:\n" +"菜单不可见时:\n" "- 单击: 激活按钮\n" "- 双击: 放置/使用\n" "- 滑动手指: 改变视角\n" -"菜单/物品栏:\n" +"菜单/物品栏可见时:\n" "- 双击 (界面区域外):\n" " --> 关闭\n" "- 点击物品, 然后点击栏位:\n" @@ -931,7 +916,7 @@ msgstr "按键已被占用" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "键位配置。（如果这个菜单被弄乱，从minetest.conf中删掉点东西）" +msgstr "键位配置。（如果这个菜单被弄乱，从 minetest.conf 中删掉点东西）" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -1019,7 +1004,7 @@ msgstr "退格" #: src/keycode.cpp msgid "Capital" -msgstr "大写" +msgstr "大写锁定键" #: src/keycode.cpp msgid "Clear" @@ -1055,7 +1040,7 @@ msgstr "Erase OEF键" #: src/keycode.cpp msgid "Escape" -msgstr "Escape键" +msgstr "Esc键" #: src/keycode.cpp msgid "ExSel" @@ -1079,7 +1064,7 @@ msgstr "Home键" #: src/keycode.cpp msgid "Insert" -msgstr "插入" +msgstr "Insert键" #: src/keycode.cpp msgid "Junja" @@ -1087,7 +1072,7 @@ msgstr "Junja键" #: src/keycode.cpp msgid "Kana" -msgstr "假名" +msgstr "Kana键" #: src/keycode.cpp msgid "Kanji" @@ -1103,7 +1088,7 @@ msgstr "左Control键" #: src/keycode.cpp msgid "Left Menu" -msgstr "左菜单" +msgstr "左菜单键" #: src/keycode.cpp msgid "Left Shift" @@ -1111,7 +1096,7 @@ msgstr "左Shift键" #: src/keycode.cpp msgid "Left Windows" -msgstr "左窗口" +msgstr "左Windows键" #: src/keycode.cpp msgid "Menu" @@ -1127,7 +1112,7 @@ msgstr "减号" #: src/keycode.cpp msgid "Mode Change" -msgstr "改变模式" +msgstr "更改模式" #: src/keycode.cpp msgid "Next" @@ -1135,11 +1120,11 @@ msgstr "下一个" #: src/keycode.cpp msgid "Nonconvert" -msgstr "无变换" +msgstr "无转换" #: src/keycode.cpp msgid "Num Lock" -msgstr "小键盘锁" +msgstr "数字锁定键" #: src/keycode.cpp msgid "Numpad *" @@ -1207,7 +1192,7 @@ msgstr "PA1键" #: src/keycode.cpp msgid "Pause" -msgstr "暂停" +msgstr "Pause键" #: src/keycode.cpp msgid "Period" @@ -1219,7 +1204,7 @@ msgstr "加号" #: src/keycode.cpp msgid "Print" -msgstr "打印" +msgstr "Print键" #: src/keycode.cpp msgid "Prior" @@ -1227,7 +1212,7 @@ msgstr "Prior键" #: src/keycode.cpp msgid "Return" -msgstr "回车" +msgstr "回车键" #: src/keycode.cpp msgid "Right Button" @@ -1239,7 +1224,7 @@ msgstr "右Control键" #: src/keycode.cpp msgid "Right Menu" -msgstr "右菜单" +msgstr "右菜单键" #: src/keycode.cpp msgid "Right Shift" @@ -1247,7 +1232,7 @@ msgstr "右Shift键" #: src/keycode.cpp msgid "Right Windows" -msgstr "右窗口" +msgstr "右Windows键" #: src/keycode.cpp msgid "Scroll Lock" @@ -1255,7 +1240,7 @@ msgstr "Scroll Lock键" #: src/keycode.cpp msgid "Select" -msgstr "选择" +msgstr "选择键" #: src/keycode.cpp msgid "Shift" @@ -1329,15 +1314,22 @@ msgid "" "- sidebyside: split screen side by side.\n" "- pageflip: quadbuffer based 3d." msgstr "" +"3D 支持。\n" +"目前已支持：\n" +"- 无: 无 3D输出。\n" +"- 浮雕：青红/品红色彩色 3D。\n" +"- 交错：基于偏振屏的奇偶行支持。\n" +"- 顶底：上下分屏。\n" +"- 并列：左右分屏。\n" +"- 翻页：基于 3D 的四重缓冲。" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" "输入新地图的随机种子值，不填则随机生成。\n" -"创建新地图的时候，将会覆盖原来的值。" +"在主菜单中创建新地图时将被覆盖。" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." @@ -1349,7 +1341,7 @@ msgstr "当关闭服务器时，发送给所有客户端的信息。" #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "生产队列绝对限制" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1357,11 +1349,11 @@ msgstr "空中加速" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "活动块范围" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "活动目标发送范围" #: src/settings_translation_file.cpp msgid "" @@ -1391,7 +1383,7 @@ msgstr "高级联机设置" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "海拔寒冷" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1399,11 +1391,11 @@ msgstr "保持高速飞行" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "环境闭塞伽马" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "放大山谷" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1428,32 +1420,29 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "崩溃后询问重新连接" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "自动报告到服务器列表。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Backward key" -msgstr "向后" +msgstr "后退键" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "摇动的水" +msgstr "基础地形高度" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "基础" #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "双线性过滤" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" msgstr "绑定地址" @@ -1462,43 +1451,40 @@ msgid "Bits per pixel (aka color depth) in fullscreen mode." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "多人游戏" +msgstr "建立内部玩家" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "镜头平滑" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "电影模式下镜头平滑" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "镜头更新切换键" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "洞穴噪音 #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "洞穴噪音 #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "改变键位设置" +msgstr "聊天键" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "改变键位设置" +msgstr "聊天切换键" #: src/settings_translation_file.cpp msgid "" @@ -1525,37 +1511,35 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "块大小" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "创造模式" +msgstr "电影模式" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "创造模式" +msgstr "电影模式键" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "干净透明纹理" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "客户端和服务器" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "攀登速度" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "云高度" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "云半径" #: src/settings_translation_file.cpp msgid "Clouds" @@ -1563,7 +1547,7 @@ msgstr "云彩" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "云是客户端侧效果。" #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1571,7 +1555,7 @@ msgstr "主菜单显示云彩" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "彩色雾" #: src/settings_translation_file.cpp msgid "" @@ -1586,51 +1570,44 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "命令" +msgstr "命令键" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "连接的玻璃" +msgstr "连接玻璃" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "正在连接服务器..." +msgstr "连接到外部媒体服务器" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "连接玻璃，如果节点支持。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "控制台" +msgstr "控制台透明" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "控制台" +msgstr "控制台颜色" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "控制台" +msgstr "控制台键" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "连续前进" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "连续向前移动（仅用于测试）。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Ctrl键" +msgstr "控制" #: src/settings_translation_file.cpp msgid "" @@ -1651,17 +1628,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "控制山丘的坡度/高度。" #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "崩溃信息" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"在山洞中创建不可预知的熔岩特性。\n" +"这可以使挖掘更加困难。0 表示禁用。 (0-10)" #: src/settings_translation_file.cpp msgid "" @@ -1671,80 +1650,83 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "十字透明" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "十字线不透明度（0-255）。" #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "十字颜色" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "十字颜色 (红,绿,蓝)。" #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "蹲伏速度" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "开启伤害风险" +msgstr "伤害" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "调试信息切换键" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "调试日志级别" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "专用服务器步骤" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "默认加速度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "编辑游戏" +msgstr "默认游戏" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"创建新世界时默认游戏。\n" +"从主菜单创建一个新世界时这将被覆盖。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "新密码" +msgstr "默认密码" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "默认权限" #: src/settings_translation_file.cpp msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"cURL 的默认超时，单位毫秒。\n" +"仅使用 cURL 编译时有效果。" #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"定义纹理采样步骤。\n" +"数值越高常态贴图越平滑。" #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." @@ -1756,7 +1738,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "已弃用 Lua API 处理" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." @@ -1768,17 +1750,17 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "下降速度" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." -msgstr "" +msgstr "服务器描述，将显示在提供给玩家的服务器列表。" #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "去同步块动画" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." @@ -1786,7 +1768,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "详细 mod 剖析" #: src/settings_translation_file.cpp msgid "" @@ -1796,59 +1778,56 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "启用粒子效果" +msgstr "禁用反作弊" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "禁止使用空密码" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "服务器域名，将显示在提供给玩家的服务器列表。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "连按两次“跳”切换飞行模式" +msgstr "双击“跳跃”键飞行" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "连按两次“跳”切换飞行模式" +msgstr "连按两次“跳跃”键切换飞行模式。" #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "丢弃物品键" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "转储地图生成器调试信息。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "启用MOD包" +msgstr "启用 VBO" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "网上MOD库" +msgstr "启用 mod 安全" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "启用玩家受到伤害和死亡。" #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "启用随机用户输入（仅用于测试）。" #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"启用简单环境光闭塞的平滑光照。\n" +"禁用可影响速度和获得不同外观。" #: src/settings_translation_file.cpp msgid "" @@ -1876,7 +1855,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "启用库存物品动画。" #: src/settings_translation_file.cpp msgid "" @@ -1891,14 +1870,12 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "开启伤害风险" +msgstr "启用电影基调映射" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "开启伤害风险" +msgstr "启用小地图。" #: src/settings_translation_file.cpp msgid "" @@ -1911,85 +1888,88 @@ msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"启用视差闭塞映射。\n" +"需要着色器已启用。" #: src/settings_translation_file.cpp msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." -msgstr "" +msgstr "实验性选项，设为大于 0 的数字时可能导致块之间出现可见空间。" #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "暂停菜单 FPS" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "坠落上下摆动" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "yes" +msgstr "后备字体" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "后备字体阴影" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "后备字体阴影透明" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "后备字体大小" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "快速移动键" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "快速移动模式加速度" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "快速移动模式速度" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "快速移动" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"快速移动（通过“使用”键）。\n" +"这需要服务器允许“快速移动”权限。" #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "视界" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "视界程度。" #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "" +msgstr "client/serverlist/ 中的文件包含会显示在“多人游戏”选项卡中的您收藏的服务器。" #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "" +msgstr "填充深度" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "电影基调映射" #: src/settings_translation_file.cpp msgid "" @@ -2000,63 +1980,60 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "各向异性过滤" +msgstr "过滤" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "固定地图种子" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fly key" -msgstr "飞行模式" +msgstr "飞行键" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "飞行" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "雾" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "雾切换键" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "字体路径" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "字体阴影" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "字体阴影透明度" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "字体阴影不透明度（0-255）。" #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" +msgstr "字体阴影偏移，0 表示不绘制阴影。" #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "字体大小" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "向前" +msgstr "前进键" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "FreeType 字体" #: src/settings_translation_file.cpp msgid "" @@ -2076,41 +2053,39 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "全屏" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "全屏 BPP" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "全屏模式。" #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "用户图形界面缩放" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "GUI缩放因子" +msgstr "用户图形界面缩放过滤器" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "用户图形界面缩放过滤器 txr2img" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "伽马" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "常规" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" -msgstr "产生法线贴图" +msgstr "生成常规地图" #: src/settings_translation_file.cpp msgid "" @@ -2124,20 +2099,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "图形" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "重力" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "MODS" +msgstr "HTTP Mod" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "HUD 切换键" #: src/settings_translation_file.cpp msgid "" @@ -2153,19 +2127,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "云在多高的高度出现。" #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "高精度 FPU" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "服务器首页，将会显示在服务器列表中。" #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "河流有多深" #: src/settings_translation_file.cpp msgid "" @@ -2191,25 +2165,25 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "河流有多宽" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "IPv6 服务器" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "IPv6 支持。" #: src/settings_translation_file.cpp msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." -msgstr "" +msgstr "如果 FPS 可以超过此值，限制它以节省 CPU 功耗，因为没有更多好处。" #: src/settings_translation_file.cpp msgid "" @@ -2263,12 +2237,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "忽略世界错误" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "游戏" +msgstr "游戏中" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -2288,24 +2261,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "库存物品动画" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "物品栏" +msgstr "库存键" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "反转鼠标" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "反转垂直鼠标移动。" #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "物品实体 TTL" #: src/settings_translation_file.cpp msgid "" @@ -2343,13 +2315,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "跳" +msgstr "跳跃键" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "跳跃速度" #: src/settings_translation_file.cpp msgid "" @@ -2558,23 +2529,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "攀登/降落的键" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "语言" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "巨大洞穴深度" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "熔岩特性" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "树叶风格" #: src/settings_translation_file.cpp msgid "" @@ -2585,9 +2556,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "左菜单" +msgstr "左方向键" #: src/settings_translation_file.cpp msgid "" @@ -2609,11 +2579,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "" +msgstr "磁盘上的生产队列限制" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "" +msgstr "要生成的生产队列绝对限制" #: src/settings_translation_file.cpp msgid "" @@ -2626,45 +2596,43 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "液体流动性" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "液体流动性平滑" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "" +msgstr "液体循环最大" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" -msgstr "" +msgstr "液体队列清除时间" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "" +msgstr "液体下沉" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "液体更新间隔，单位秒。" #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "" +msgstr "液体更新单次" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "主菜单游戏管理器" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "主菜单" +msgstr "主菜单 mode 管理器" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "主菜单" +msgstr "主菜单脚本" #: src/settings_translation_file.cpp msgid "" @@ -2677,7 +2645,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "地图目录" #: src/settings_translation_file.cpp msgid "" @@ -2721,24 +2689,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "地图生成限制" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "地图保存间隔" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "地图块限制" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "" +msgstr "地图块卸载超时" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "地图生成器" +msgstr "地图生成器山谷" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2753,19 +2720,16 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "地图生成器" +msgstr "地图生成器调试" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "地图生成器" +msgstr "地图生成器标志" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "地图生成器" +msgstr "地图生成器平面" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -2780,32 +2744,28 @@ msgid "Mapgen flat filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "地图生成器" +msgstr "地图生成器平面标志" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "地图生成器" +msgstr "地图生成器平地级别" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "地图生成器平面山丘坡度" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "地图生成器平面山丘阈值" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "视差贴图" +msgstr "地图生成器平面湖坡度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "地图生成器" +msgstr "地图生成器平面阈值" #: src/settings_translation_file.cpp msgid "Mapgen flat large cave depth" @@ -2816,9 +2776,8 @@ msgid "Mapgen flat terrain noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "地图生成器" +msgstr "地图生成器分形" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -2833,63 +2792,56 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "地图生成器" +msgstr "地图生成器分形分形" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "视差贴图" +msgstr "地图生成器分形迭代" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "地图生成器分形 julia w" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "地图生成器分形 julia x" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "地图生成器分形 julia y" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "地图生成器分形 julia z" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "地图生成器" +msgstr "地图生成器分形偏移" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "地图生成器" +msgstr "地图生成器分形规模" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "地图生成器" +msgstr "地图生成器分形片 w" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "地图生成器" +msgstr "地图生成器名称" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "地图生成器" +msgstr "地图生成器 v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2912,9 +2864,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "地图生成器" +msgstr "地图生成器 v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2922,7 +2873,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "" +msgstr "地图生成器 v6 沙滩频率" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" @@ -2938,11 +2889,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "地图生成器 v6 沙漠频率" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "" +msgstr "地图生成器 v6 标志" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" @@ -2973,9 +2924,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "地图生成器" +msgstr "地图生成器 v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -2991,7 +2941,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "" +msgstr "地图生成器 v7 标志" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" @@ -3027,11 +2977,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "" +msgstr "巨大洞穴深度" #: src/settings_translation_file.cpp msgid "Massive cave noise" -msgstr "" +msgstr "巨大洞穴噪音" #: src/settings_translation_file.cpp msgid "Massive caves form here." @@ -3055,23 +3005,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" -msgstr "" +msgstr "每次迭代最大包" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "最大 FPS" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "游戏暂停时最高 FPS。" #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "" +msgstr "最大强制载入块" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "最大快捷栏宽度" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." @@ -3091,7 +3041,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "" +msgstr "强制载入地图块最大数量。" #: src/settings_translation_file.cpp msgid "" @@ -3134,24 +3084,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "最大用户" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" msgstr "菜单" #: src/settings_translation_file.cpp msgid "Mesh cache" -msgstr "" +msgstr "Mesh 缓存" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "今日消息" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." @@ -3163,56 +3112,55 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "小地图" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "小地图键" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "小地图扫描高度" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" -msgstr "" +msgstr "纹理过滤器最小大小" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" -msgstr "贴图处理" +msgstr "Mip 贴图处理" #: src/settings_translation_file.cpp msgid "Mod profiling" -msgstr "" +msgstr "Mod 剖析" #: src/settings_translation_file.cpp msgid "Modstore details URL" -msgstr "" +msgstr "Mod 存储详情 URL" #: src/settings_translation_file.cpp msgid "Modstore download URL" -msgstr "" +msgstr "Mod 存储下载 URL" #: src/settings_translation_file.cpp msgid "Modstore mods list URL" -msgstr "" +msgstr "Mod 存储的 Mod 列表 URL" #: src/settings_translation_file.cpp msgid "Monospace font path" -msgstr "" +msgstr "等宽字体路径" #: src/settings_translation_file.cpp msgid "Monospace font size" -msgstr "" +msgstr "等宽字体大小" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "鼠标灵敏度" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "鼠标灵敏度倍数。" #: src/settings_translation_file.cpp msgid "" @@ -3238,37 +3186,42 @@ msgid "" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"玩家名称。\n" +"当运行服务器时，用此名称连接的客户端是管理员。\n" +"从主菜单开始时，此项将被覆盖。" #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." -msgstr "" +msgstr "服务器名称，将显示在提供给玩家的服务器列表。" #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "网络" #: src/settings_translation_file.cpp msgid "" "Network port to listen (UDP).\n" "This value will be overridden when starting from the main menu." msgstr "" +"监听网络端口 (UDP)。\n" +"从主菜单开始时此值将被覆盖。" #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "新用户需要输入此密码。" #: src/settings_translation_file.cpp msgid "Noclip" -msgstr "" +msgstr "无剪辑" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "" +msgstr "无剪辑键" #: src/settings_translation_file.cpp msgid "Node highlighting" -msgstr "" +msgstr "节点高亮" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -3276,19 +3229,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Noises" -msgstr "" +msgstr "噪声" #: src/settings_translation_file.cpp msgid "Normalmaps sampling" -msgstr "" +msgstr "一般地图采样" #: src/settings_translation_file.cpp msgid "Normalmaps strength" -msgstr "" +msgstr "一般地图强度" #: src/settings_translation_file.cpp msgid "Number of emerge threads" -msgstr "" +msgstr "生产线程数" #: src/settings_translation_file.cpp msgid "" @@ -3308,7 +3261,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." -msgstr "" +msgstr "视差闭塞迭代数。" #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." @@ -3316,45 +3269,39 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." -msgstr "" +msgstr "视差闭塞效果的总体比例。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" -msgstr "视差贴图" +msgstr "视差贴图闭塞" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" -msgstr "视差贴图" +msgstr "视差贴图闭塞比例" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "视差贴图" +msgstr "视差贴图闭塞偏移" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "视差贴图" +msgstr "视差贴图闭塞迭代" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "视差贴图" +msgstr "视差贴图闭塞模式" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" -msgstr "视差贴图" +msgstr "视差贴图闭塞强度" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." -msgstr "" +msgstr "TrueType 字体或位图的路径。" #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "屏幕截图保存位置。" #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." @@ -3371,17 +3318,16 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "玩家的名字太长了" +msgstr "玩家名称" #: src/settings_translation_file.cpp msgid "Player transfer distance" -msgstr "" +msgstr "玩家转移距离" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "" +msgstr "玩家对战玩家" #: src/settings_translation_file.cpp msgid "" @@ -3399,11 +3345,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Profiler toggle key" -msgstr "" +msgstr "剖析器切换键" #: src/settings_translation_file.cpp msgid "Profiling print interval" -msgstr "" +msgstr "剖析印出间隔" #: src/settings_translation_file.cpp msgid "" @@ -3418,45 +3364,43 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "随机输入" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "选择范围" +msgstr "范围选择键" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "远程媒体" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "远程端口" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "右菜单" +msgstr "右方向键" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "右击重复间隔" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "" +msgstr "河流深度" #: src/settings_translation_file.cpp msgid "River Noise" -msgstr "" +msgstr "河流噪音" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "" +msgstr "河流大小" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" @@ -3464,11 +3408,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Rollback recording" -msgstr "" +msgstr "回滚记录" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "圆形小地图" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." @@ -3476,7 +3420,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "" +msgstr "保存从服务器收到的地图" #: src/settings_translation_file.cpp msgid "" @@ -3489,24 +3433,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "屏幕高度" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "屏幕宽度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "快照" +msgstr "截图" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "截图文件夹" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "安全" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" @@ -3518,51 +3461,43 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "选择框颜色" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "选择框宽度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "单人游戏" +msgstr "服务器 / 单人游戏" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "服务器" +msgstr "服务器 URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "服务器端口" +msgstr "服务器地址" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "服务器端口" +msgstr "服务器描述" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "服务器" +msgstr "服务器名称" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" msgstr "服务器端口" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "公共服务器列表" +msgstr "服务器列表 URL" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "公共服务器列表" +msgstr "服务器列表文件" #: src/settings_translation_file.cpp msgid "" @@ -3601,11 +3536,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "显示调试信息" #: src/settings_translation_file.cpp msgid "Shutdown message" -msgstr "" +msgstr "关机消息" #: src/settings_translation_file.cpp msgid "" @@ -3618,7 +3553,6 @@ msgid "Slope and fill work together to modify the heights" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" msgstr "平滑光照" @@ -3637,13 +3571,12 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "潜行" +msgstr "潜行键" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "音效" #: src/settings_translation_file.cpp msgid "" @@ -3655,28 +3588,27 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "" +msgstr "静态重生点" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." -msgstr "产生法线贴图" +msgstr "生成的一般地图强度。" #: src/settings_translation_file.cpp msgid "Strength of parallax." -msgstr "" +msgstr "视差强度。" #: src/settings_translation_file.cpp msgid "Strict protocol checking" -msgstr "" +msgstr "严格协议检查" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" -msgstr "" +msgstr "同步 SQLite" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "" +msgstr "地形高度" #: src/settings_translation_file.cpp msgid "" @@ -3693,9 +3625,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "材质包" +msgstr "纹理路径" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" @@ -3703,11 +3634,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" -msgstr "" +msgstr "泥土深度或其他过滤器" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." -msgstr "" +msgstr "服务器监听的网络接口。" #: src/settings_translation_file.cpp msgid "" @@ -3717,7 +3648,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." -msgstr "" +msgstr "Irrlicht 的渲染后端。" #: src/settings_translation_file.cpp msgid "" @@ -3742,7 +3673,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "" +msgstr "用于特定语言的字体。" #: src/settings_translation_file.cpp msgid "" @@ -3752,15 +3683,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Time send interval" -msgstr "" +msgstr "发送间隔时间" #: src/settings_translation_file.cpp msgid "Time speed" -msgstr "" +msgstr "速度时间" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." -msgstr "" +msgstr "客户端从内存中移除未用地图数据的超时。" #: src/settings_translation_file.cpp msgid "" @@ -3772,19 +3703,17 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "" +msgstr "切换拍照模式键" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "贴图处理" +msgstr "色调映射" #: src/settings_translation_file.cpp msgid "Tooltip delay" -msgstr "" +msgstr "工具提示延迟" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "三线性过滤" @@ -3797,7 +3726,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "" +msgstr "可信 MOD" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." @@ -3805,15 +3734,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" -msgstr "" +msgstr "无限的玩家转移距离" #: src/settings_translation_file.cpp msgid "Unload unused server data" -msgstr "" +msgstr "卸载未用服务器数据" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "" +msgstr "使用 3D 云彩，而不是看起来是平面的。" #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." @@ -3828,9 +3757,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "按键" +msgstr "使用按键" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -3841,70 +3769,70 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "内部开发人员" +msgstr "适用 MOD 开发者。" #: src/settings_translation_file.cpp msgid "V-Sync" -msgstr "" +msgstr "垂直同步" #: src/settings_translation_file.cpp msgid "VBO" -msgstr "" +msgstr "VBO" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "" +msgstr "山谷深度" #: src/settings_translation_file.cpp msgid "Valley Fill" -msgstr "" +msgstr "山谷弥漫" #: src/settings_translation_file.cpp msgid "Valley Profile" -msgstr "" +msgstr "山谷轮廓" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "" +msgstr "山谷坡度" #: src/settings_translation_file.cpp msgid "Valleys C Flags" -msgstr "" +msgstr "山谷 C 标志" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "" +msgstr "屏幕垂直同步。" #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "视频驱动程序" #: src/settings_translation_file.cpp msgid "View bobbing" -msgstr "" +msgstr "范围摇动" #: src/settings_translation_file.cpp msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"节点间可视距离。\n" +"最小 = 20" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "" +msgstr "可视范围减小键" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "" +msgstr "可视范围增加键" #: src/settings_translation_file.cpp msgid "Viewing range" -msgstr "" +msgstr "可视范围" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "音量" @@ -3917,57 +3845,48 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "摇动的叶子" +msgstr "步行速度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "物品材质..." +msgstr "水特性" #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "水级别" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "世界水平面级别。" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "摇动的叶子" +msgstr "摇动节点" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" -msgstr "摇动的叶子" +msgstr "摇动树叶" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" -msgstr "摇动的植物" +msgstr "摇动植物" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" -msgstr "摇动的水" +msgstr "摇动水" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "摇动的水" +msgstr "摇动水高度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "摇动的水" +msgstr "摇动水长度" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "摇动的水" +msgstr "摇动水速度" #: src/settings_translation_file.cpp msgid "" @@ -4029,19 +3948,21 @@ msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"是否在一次 (Lua) 崩溃后询问客户端是否重新连接。\n" +"如果你的服务器设为自动重连，将此项设为真。" #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." -msgstr "" +msgstr "是否让雾出现在可视范围末端。" #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "" +msgstr "是否显示客户端调试信息（与按 F5 的效果相同）。" #: src/settings_translation_file.cpp msgid "Width component of the initial window size." -msgstr "" +msgstr "初始化窗口尺寸之宽度组件。" #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." @@ -4055,7 +3976,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Y of flat ground." -msgstr "" +msgstr "平地的 Y。" #: src/settings_translation_file.cpp msgid "Y of upper limit of large pseudorandom caves." @@ -4063,15 +3984,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "cURL 文件下载超时" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "cURL 并发限制" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "cURL 超时" #, fuzzy #~ msgid "If disabled " From 01517e210cb22174d746bfee9274b8818e6f84a8 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 27 Mar 2016 03:07:17 +0200 Subject: [PATCH 467/531] Translated using Weblate (German) Currently translated at 100.0% (865 of 865 strings) This is a merger of two commits. --- po/de/minetest.po | 555 +++++++++++++++++++++++----------------------- 1 file changed, 283 insertions(+), 272 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index d4952c27..d132f3da 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-11-12 18:10+0000\n" +"PO-Revision-Date: 2016-03-30 21:31+0000\n" "Last-Translator: Wuzzy \n" -"Language-Team: German \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -45,7 +45,7 @@ msgstr "Der Server hat um eine Wiederverbindung gebeten:" #: builtin/mainmenu/common.lua src/game.cpp msgid "Loading..." -msgstr "Lädt…" +msgstr "Lädt …" #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " @@ -222,7 +222,7 @@ msgstr "(Keine Beschreibung vorhanden)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Zurück zur Einstellungsseite" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -273,7 +273,7 @@ msgstr "" msgid "Please enter a comma seperated list of flags." msgstr "" "Bitte geben Sie eine mit Kommata getrennte Liste von\n" -"Bitschaltern an." +"Flags an." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid integer." @@ -517,7 +517,6 @@ msgid "2x" msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "3D-Wolken" @@ -530,9 +529,8 @@ msgid "8x" msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Einstellungen" +msgstr "Erweiterte Einstellungen" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" @@ -543,7 +541,6 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Bilinearer Filter" @@ -556,21 +553,18 @@ msgid "Change keys" msgstr "Tasten ändern" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" msgstr "Verbundenes Glas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Alle an" +msgstr "Partikel aktivieren" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Schöne Blätter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Generate Normalmaps" msgstr "Normalmaps generieren" @@ -583,9 +577,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "Mipmap u. Aniso. Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filter" +msgstr "Kein Filter" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" @@ -596,7 +589,6 @@ msgid "No!!!" msgstr "Nein!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" msgstr "Blöcke hervorheben" @@ -629,7 +621,6 @@ msgid "Simple Leaves" msgstr "Einfache Blätter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Geglättetes Licht" @@ -646,22 +637,18 @@ msgid "Touchthreshold (px)" msgstr "Berührungsempfindlichkeit (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Trilinearer Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "Wehende Blätter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "Wehende Pflanzen" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "Wasserwellen" @@ -779,7 +766,7 @@ msgstr "Weiter" #: src/game.cpp msgid "Creating client..." -msgstr "Erstelle Klienten..." +msgstr "Client erstellen ..." #: src/game.cpp msgid "Creating server..." @@ -1317,6 +1304,13 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"(X,Y,Z)-Versatz des Fraktals vom Weltmittelpunkt in Einheiten von „scale“.\n" +"Benutzt, um einen passenden Einstiegsbereich aus niedriegem Gelände in die\n" +"Nähe von (0, 0) zu verschieben. Die Standardeinstellung ist brauchbar für\n" +"Mandelbrotmengen, für Juliamengen muss sie verändert werden. Die Reichweite\n" +"liegt grob zwischen -2 und 2. Mit „scale“ multiplizieren, um einen Versatz " +"in Blöcken\n" +"zu erhalten." #: src/settings_translation_file.cpp msgid "" @@ -1335,7 +1329,6 @@ msgid "3D mode" msgstr "3D-Modus" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1350,9 +1343,11 @@ msgstr "" "Aktuell verfügbar:\n" "- none: Keine 3D-Ausgabe.\n" "- anaglyph: Türkises / magenta 3D.\n" -"- interlaced: Gerade / ungerade zeilenbasierte Polarisation.\n" +"- interlaced: Bildschirmunterstützung für gerade / ungerade " +"zeilenbasierte Polarisation.\n" "- topbottom: Bildschirm horizontal teilen.\n" -"- sidebyside: Bildschirm vertikal teilen." +"- sidebyside: Bildschirm vertikal teilen.\n" +"- pageflip: Quadbuffer-basiertes 3D." #: src/settings_translation_file.cpp msgid "" @@ -1366,13 +1361,13 @@ msgstr "" #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" -"Eine Nachricht, die an alle verbundenen Klienten versendet wird, wenn der " +"Eine Nachricht, die an alle verbundenen Clients versendet wird, wenn der " "Server abstürzt." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" -"Eine Nachricht, die an alle verbundene Klienten gesendet wird, wenn der " +"Eine Nachricht, die an alle verbundene Clients gesendet wird, wenn der " "Server herunterfährt." #: src/settings_translation_file.cpp @@ -1413,7 +1408,7 @@ msgid "" "This setting is for the client only and is ignored by the server." msgstr "" "Ändert die Gammakodierung der Lichttabellen. Kleinere Werte sind heller.\n" -"Diese Einstellung ist klientenseitig und wird vom Server ignoriert." +"Diese Einstellung ist rein clientseitig und wird vom Server ignoriert." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1421,7 +1416,7 @@ msgstr "Erweitert" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Höhenabkühlung" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1433,7 +1428,7 @@ msgstr "Umgebungsverdeckungs-Gamma" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Verstärkt die Täler" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1454,9 +1449,8 @@ msgstr "" "v6.servers.minetest.net gesetzt werden." #: src/settings_translation_file.cpp -#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Nodes." +msgstr "Julia-Menge: Approximative (X,Y,Z)-Skalierungen in Blöcken." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1471,9 +1465,8 @@ msgid "Backward key" msgstr "Rückwärtstaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Wasserwellenhöhe" +msgstr "Basisgeländehöhe" #: src/settings_translation_file.cpp msgid "Basic" @@ -1509,15 +1502,15 @@ msgstr "Taste zum Umschalten der Kameraaktualisierung" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Höhlenrauschen Nr. 1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Höhlenrauschen Nr. 2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Höhlen und Tunnel bilden sich am Schnittpunkt der zwei Rauschen" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1549,6 +1542,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"Auswahl von 18 Fraktalen aus 9 Formeln.\n" +"1 = 4D-Mangelbrotmenge, Typ „rund“.\n" +"2 = 4D-Juliamenge, Typ „rund“.\n" +"3 = 4D-Mangelbrotmenge, Typ „eckig“.\n" +"4 = 4D-Juliamenge, Typ „eckig“.\n" +"5 = 4D-Mangelbrotmenge, Typ „Mandel-Cousin“.\n" +"6 = 4D-Juliamenge, Typ „Mandel-Cousin“.\n" +"7 = 4D-Mangelbrotmenge, Typ „Variante“.\n" +"8 = 4D-Juliamenge, Typ „Variante“.\n" +"9 = 3D-Mangelbrotmenge, Typ „Madelbrot/Mandelbar“.\n" +"10 = 3D-Juliamenge, Typ „Madelbrot/Mandelbar“.\n" +"11 = 3D-Mangelbrotmenge, Typ „Weihnachtsbaum“.\n" +"12 = 3D-Juliamenge, Typ „Weihnachtsbaum“.\n" +"13 = 3D-Mangelbrotmenge, Typ „Mandelbulb“.\n" +"14 = 3D-Juliamenge, Typ „Mandelbulb“.\n" +"15 = 3D-Mangelbrotmenge, Typ „Kosinus-Mandelbulb“.\n" +"16 = 3D-Juliamenge, Typ „Kosinus-Mandelbulb“.\n" +"17 = 4D-Mangelbrotmenge, Typ „Mandelbulb“.\n" +"18 = 4D-Juliamenge, Typ „Mandelbulb“." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1588,7 +1600,7 @@ msgstr "Wolken" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Wolken sind ein klientenseitiger Effekt." +msgstr "Wolken sind ein clientseitiger Effekt." #: src/settings_translation_file.cpp msgid "Clouds in menu" @@ -1614,6 +1626,8 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Kommagetrente Liste von Mods, welche auf HTTP-APIs zugreifen dürfen, was\n" +"es ihnen erlaubt, Daten aus und Daten zum Internet herunter- und hochzuladen." #: src/settings_translation_file.cpp msgid "Command key" @@ -1671,16 +1685,16 @@ msgid "" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" "Verändert die Größe der Wüsten und Strände im\n" -"Kartengenerator v6. Wenn Schneebiome aktiviert sind, wird\n" -"diese Einstellung ignoriert." +"Kartengenerator v6. Falls Schneebiome aktiviert sind, wird\n" +"„mgv6_freq_desert“ ignoriert." #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Steuert die Steilheit/Tiefe von Seesenken." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Steuert die Steilheit/Höhe von Hügeln." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1691,12 +1705,16 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Erstellt unvorhersehbare Lavakammern in Höhlen.\n" +"Sie können das Graben erschweren. Null deaktiviert sie. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Erstellt unvorhersehbare Wasserkammern in Höhlen.\n" +"Sie können das Graben erschweren. Null deaktiviert sie. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" @@ -1795,11 +1813,11 @@ msgstr "Veraltete Lua-API-Handhabung" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Tiefe, unter der man große Höhlen finden wird." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Tiefe, unter der man gigantische Höhlen finden wird." #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1831,6 +1849,9 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Legt die Geländeform fest.\n" +"Die 3 Zahlen in Klammern steuern die Skalierung des\n" +"Geländes, die 3 Zahlen sollten gleich sein." #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1861,9 +1882,8 @@ msgid "Dump the mapgen debug infos." msgstr "Die Kartengenerator-Debuginformationen auf Konsole ausgeben." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "MP aktivieren" +msgstr "VBO aktivieren" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1893,8 +1913,8 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" -"Aktivieren, um alten Klienten die Verbindung zu verwehren.\n" -"Ältere Klienten sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " +"Aktivieren, um alten Clients die Verbindung zu verwehren.\n" +"Ältere Clients sind kompatibel in der Hinsicht, dass sie beim Verbinden zu " "neuen\n" "Servern nicht abstürzen, aber sie könnten nicht alle neuen Funktionen, die " "Sie\n" @@ -1920,12 +1940,12 @@ msgid "" "Ignored if bind_address is set." msgstr "" "Server als IPv6 laufen lassen. Ein IPv6-Server könnte,\n" -"abhängig von der Systemkonfiguration, auf IPv6-Klienten eingeschränkt sein.\n" -"Wird ignoriert, wenn bind_address gesetzt ist." +"abhängig von der Systemkonfiguration, auf IPv6-Clients eingeschränkt sein.\n" +"Wird ignoriert, falls bind_address gesetzt ist." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Aktiviert die Animation von Inventaritems." #: src/settings_translation_file.cpp msgid "" @@ -1947,9 +1967,8 @@ msgstr "" "werden." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Aktiviert die Übersichtskarte." +msgstr "Aktiviert filmisches Tone-Mapping" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -2049,11 +2068,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "" +msgstr "Fülltiefe" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "Filmisches Tone-Mapping" #: src/settings_translation_file.cpp msgid "" @@ -2132,22 +2151,22 @@ msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" -"Von wie weit weg Kartenblöcke für Klienten erzeugt werden.\n" -"1 Kartenblock = 16×16×16 Blöcke." +"Maximale Entfernung, in der Kartenblöcke für Clients erzeugt werden, in\n" +"Kartenblöcken (16 Blöcke) angegeben." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Kartenblöcke zu Klienten gesendet werden.\n" -"1 Kartenblock = 16×16×16 Blöcke." +"Maximale Entfernung, in der Kartenblöcke zu Clients gesendet werden, in\n" +"Kartenblöcken (16 Blöcke) angegeben." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" -"Von wie weit weg Klienten über Objekte bescheid wissen,\n" -"in Kartenblöcken (16 Blöcke)." +"Maximale Entfernung, in der Clients über Objekte bescheid wissen, in\n" +"Kartenblöcken (16 Blöcke) angegeben." #: src/settings_translation_file.cpp msgid "Full screen" @@ -2179,14 +2198,13 @@ msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Allgemein" #: src/settings_translation_file.cpp msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2195,12 +2213,13 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" -"Falls Schneebiome aktiviert sind, werden Dschungel aktiviert und der\n" -"„jungles“-Bitschalter wird ignoriert.\n" -"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"Globale Kartengenerierungsattribute.\n" +"Im Kartengenerator v6 wird das „decorations“-Flag alle Dekorationen außer\n" +"Bäume und Dschungelgras aktivieren, in allen anderen Kartengeneratoren\n" +"wird dieses Flag alle Dekorationen aktivieren.\n" +"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" -"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp @@ -2212,9 +2231,8 @@ msgid "Gravity" msgstr "Gravitation" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Mods" +msgstr "HTTP-Mods" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2236,9 +2254,8 @@ msgstr "" "(empfohlen für Mod-Entwickler)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Height component of the initial window size." -msgstr "Anfängliche Fensterbreite." +msgstr "Höhenkomponente der anfänglichen Fenstergröße." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -2254,7 +2271,7 @@ msgstr "Homepage des Servers. Wird in der Serverliste angezeigt." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Wie tief Flüsse sein sollen" #: src/settings_translation_file.cpp msgid "" @@ -2290,7 +2307,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Wie breit Flüsse sein sollen" #: src/settings_translation_file.cpp msgid "IPv6" @@ -2412,11 +2429,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "Zeitintervall, in dem die Tageszeit an Klienten gesendet wird." +msgstr "Zeitintervall, in dem die Tageszeit an Clients gesendet wird." #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "Animierte Inventaritems" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2435,12 +2452,11 @@ msgid "Item entity TTL" msgstr "Item-Entity-TTL" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Iterations of the recursive function.\n" "Controls the amount of fine detail." msgstr "" -"Julia-Menge: Iterationen der rekursiven Funktion.\n" +"Iterationen der rekursiven Funktion.\n" "Steuert die Skalierung mit einem sehr hohem Detailgrad." #: src/settings_translation_file.cpp @@ -2450,35 +2466,39 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"Nur für Juliamenge: W-Komponente der hyperkomplexen Konstanten, welche die " +"Juliaform festlegt.\n" +"Hat keine Wirkung auf 3D-Fraktale.\n" +"Reichweite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Julia set only: X component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: X-Wert, der die 4D-Form festlegt.\n" +"Julia-Menge: X-Komponente der hyperkomplexen Konstanten, welche die " +"Juliaform festlegt.\n" "Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Julia set only: Y component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: Y-Wert, der die 4D-Form festlegt.\n" +"Julia-Menge: Y-Komponente der hyperkomplexen Konstanten, welche die " +"Juliaform festlegt.\n" "Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Julia set only: Z component of hypercomplex constant determining julia " "shape.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: Z-Wert, der die 4D-Form festlegt.\n" +"Julia-Menge: Z-Komponente der hyperkomplexen Konstanten, welche die " +"Juliaform festlegt.\n" "Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp @@ -2490,15 +2510,14 @@ msgid "Jumping speed" msgstr "Sprunggeschwindigkeit" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for decreasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Taste, um die Sichtweite zu reduzieren.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2511,15 +2530,14 @@ msgstr "" "html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for increasing the viewing range.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Taste, um die Sichtweite zu erhöhen.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2548,8 +2566,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um den Spieler rückwärts zu bewegen.\n" -"See http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2640,8 +2658,10 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Schleichen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Wird auch zum Runterklettern und das Sinken im Wasser verwendet, falls " +"aux1_descends deaktiviert ist.\n" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2660,8 +2680,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zur Erzeugung von Bildschirmfotos.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2670,8 +2690,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Filmmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2680,8 +2700,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Wechseln der Anzeige der Übersichtskarte.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2690,8 +2710,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Schnellmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2700,8 +2720,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Flugmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2710,8 +2730,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Geistmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2721,8 +2741,8 @@ msgid "" msgstr "" "Taste zum Umschalten der Kameraaktualisierung. Nur für die Entwicklung " "benutzt.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2731,8 +2751,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten der Anzeige der Debug-Informationen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2741,8 +2761,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um das HUD zu verbergen oder wieder anzuzeigen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2751,8 +2771,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um das Chatprotokoll zu verbergen oder wieder anzuzeigen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2761,8 +2781,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Nebels.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2771,8 +2791,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten der Profiler-Anzeige. Für die Entwicklung benutzt.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2781,8 +2801,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72e" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2794,11 +2814,11 @@ msgstr "Sprache" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "Tiefe für große Höhlen" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Lavakammern" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -2929,10 +2949,9 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "Weltordner" +msgstr "Kartenordner" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "Flags that are not specified in the flag string are not modified from the " @@ -2943,16 +2962,18 @@ msgid "" "\"humid_rivers\" modifies the humidity around rivers and in areas where " "water would tend to pool. It may interfere with delicately adjusted biomes." msgstr "" -"Globale Kartengenerierungsattribute.\n" -"Bitschalter, welche nicht in der Bitschalterzeichenkette festgelegt sind, " -"werden\n" -"nicht von der Standardeinstellung abweichen.\n" -"Bitschalter, die mit „no“ beginnen, werden benutzt, um sie explizit zu " -"deaktivieren.\n" -"Die Bitschalter „trees“ und „flat“ haben nur mit mgv6 eine Wirkung." +"Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n" +"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" +"werden von der Standardeinstellung unverändert gelassen.\n" +"Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"zu deaktivieren.\n" +"„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen " +"führen könnte.\n" +"„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in Gebieten, " +"in denen das Wasser sich in Pfützen ansammeln würde.\n" +"Dies könnte mit fein abgestimmten Biomen zu Konflikten führen." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills added to the flat world.\n" @@ -2960,11 +2981,11 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für Kartengenerator v7.\n" -"„ridges“ sind die Flüsse.\n" -"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n" +"Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n" +"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" -"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp @@ -2977,11 +2998,12 @@ msgid "" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" "Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" -"Falls Schneebiome aktiviert sind, werden Dschungel aktiviert und der\n" -"„jungles“-Bitschalter wird ignoriert.\n" -"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-" +"Flag\n" +"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben sind," +"\n" "werden von der Standardeinstellung unverändert gelassen.\n" -"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp @@ -2994,9 +3016,9 @@ msgid "" msgstr "" "Kartengenerierungsattribute speziell für Kartengenerator v7.\n" "„ridges“ sind die Flüsse.\n" -"Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" -"Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +"Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp @@ -3005,7 +3027,7 @@ msgstr "Kartenerzeugungsgrenze" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "Speicherintervall der Welt" +msgstr "Speicherintervall der Karte" #: src/settings_translation_file.cpp msgid "Mapblock limit" @@ -3016,9 +3038,8 @@ msgid "Mapblock unload timeout" msgstr "Timeout zum Entladen von Kartenblöcken" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Kartengeneratorname" +msgstr "Täler-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -3038,126 +3059,111 @@ msgstr "Kartengenerator-Debugging" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "Kartenerzeuger-Bitschalter" +msgstr "Kartengenerator-Flags" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Kartenerzeuger-Bitschalter" +msgstr "Flacher Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave1 noise parameters" -msgstr "cave1-Rauschparameter für Fraktale-Kartenerzeuger" +msgstr "cave1-Rauschparameter für flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave2 noise parameters" -msgstr "cave2-Rauschparameter für Fraktale-Kartenerzeuger" +msgstr "cave2-Rauschparameter für flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat filler depth noise parameters" -msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" +msgstr "Fülltiefenrauschparameter für flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Bitschalter für Fraktale-Kartenerzeuger" +msgstr "Flags für flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "Kartenerzeuger-Bitschalter" +msgstr "Basishöhe für flachen Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Hügelsteilheilt für flachen Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "Hügel-Schwellwert für flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" +msgstr "See-Steilheit für flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" +msgstr "See-Schwellwert für flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat large cave depth" -msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" +msgstr "Tiefe für große Höhlen für den flachen Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat terrain noise parameters" -msgstr "Basisgelände-Rauschparameter" +msgstr "Gelände-Rauschparameter für flachen Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal" -msgstr "Fraktale-Kartenerzeuger" +msgstr "Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" -msgstr "cave1-Rauschparameter für Fraktale-Kartenerzeuger" +msgstr "cave1-Rauschparameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave2 noise parameters" -msgstr "cave2-Rauschparameter für Fraktale-Kartenerzeuger" +msgstr "cave2-Rauschparameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal filler depth noise parameters" -msgstr "Fülltiefenrauschparameter für Fraktale-Kartenerzeuger" +msgstr "Fülltiefenrauschparameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Bitschalter für Fraktale-Kartenerzeuger" +msgstr "Fraktale-Kartengenerator-Fraktal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Julia-Iterationen für Fraktale-Kartenerzeuger" +msgstr "Iterationen für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "w-Parameter für Fraktale-Kartenerzeuger" +msgstr "w-Parameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "x-Parameter für Fraktale-Kartenerzeuger" +msgstr "x-Parameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "y-Parameter für Fraktale-Kartenerzeuger" +msgstr "y-Parameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "z-Parameter für Fraktale-Kartenerzeuger" +msgstr "z-Parameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "Julia-Versatz für Fraktale-Kartenerzeuger" +msgstr "Versatz für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "Julia-Skalierung für Fraktale-Kartenerzeuger" +msgstr "Skalierung für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" -msgstr "Meeresgrundrauschparameter für Fraktale-Kartenerzeuger" +msgstr "Meeresgrundrauschparameter für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "w-Ausschnitt für Fraktale-Kartenerzeuger" +msgstr "w-Ausschnitt für Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" @@ -3169,151 +3175,151 @@ msgstr "Kartengeneratorname" #: src/settings_translation_file.cpp msgid "Mapgen v5" -msgstr "Kartengenerator v5" +msgstr "v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "Höhlen-Rauschparameter 1" +msgstr "cave1-Höhlen-Rauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "Höhlen-Rauschparameter 2" +msgstr "cave2-Höhlen-Rauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "Faktor-Rauschparameter" +msgstr "Faktor-Rauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "Fülltiefen-Rauschparameter" +msgstr "Fülltiefen-Rauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "Höhen-Rauschparameter" +msgstr "Höhen-Rauschparameter für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6" -msgstr "Kartengenerator v6" +msgstr "v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "Apfelbaum-Rauschparameter" +msgstr "Apfelbaum-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "Strandhäufigkeit" +msgstr "Strandhäufigkeit für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "Strand-Rauschparameter" +msgstr "Strand-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "Biom-Rauschparameter" +msgstr "Biom-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "Höhlen-Rauschparameter" +msgstr "Höhlen-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "Wüsten-Rauschparameter" +msgstr "Wüsten-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "v6-Kartengenerator-Bitschalter" +msgstr "v6-Kartengenerator-Flags" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "Höhenauswahl-Rauschparameter" +msgstr "Höhenauswahl-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "Luftfeuchtigkeits-Rauschparameter" +msgstr "Luftfeuchtigkeits-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "Schlamm-Rauschparameter" +msgstr "Schlamm-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "Steilheits-Rauschparameter" +msgstr "Steilheits-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "Geländehöhen-Rauschparameter" +msgstr "Geländehöhen-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "Basisgelände-Rauschparameter" +msgstr "Basisgelände-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "Baum-Rauschparameter" +msgstr "Baum-Rauschparameter für v6-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7" -msgstr "Kartengenerator v7" +msgstr "v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "Höhlen-Rauschparameter 1" +msgstr "cave1-Höhlen-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "Höhlen-Rauschparameter 2" +msgstr "cave2-Höhlen-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" -msgstr "Fülltiefen-Rauschparameter" +msgstr "Fülltiefen-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "v7-Kartengenerator-Bitschalter" +msgstr "v7-Kartengenerator-Flags" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "Höhenauswahl-Rauschparameter" +msgstr "Höhenauswahl-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "Berghöhen-Rauschparameter" +msgstr "Berghöhen-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "Berg-Rauschparameter" +msgstr "Berg-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "Fluss-Rauschparameter" +msgstr "Fluss-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "Flusswasser-Rauschparameter" +msgstr "Flusswasser-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "Geländehöhen-Rauschparameter" +msgstr "Geländehöhen-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "Basisgelände-Rauschparameter" +msgstr "Basisgelände-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "Geländepersistenz-Rauschparameter" +msgstr "Geländepersistenz-Rauschparameter für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "" +msgstr "Tiefe für gigantische Höhlen" #: src/settings_translation_file.cpp msgid "Massive cave noise" -msgstr "" +msgstr "Rauschen für gigantische Höhlen" #: src/settings_translation_file.cpp msgid "Massive caves form here." -msgstr "" +msgstr "An dieser Tiefe und darunter bilden sich gigantische Höhlen." #: src/settings_translation_file.cpp msgid "Max block generate distance" @@ -3395,7 +3401,7 @@ msgstr "" "Maximale Anzahl der Pakete, die pro Sende-Schritt gesendet werden. Falls Sie " "eine\n" "langsame Verbindung haben, probieren Sie, diesen Wert zu reduzieren,\n" -"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Klienten, die " +"aber reduzieren Sie ihn nicht unter der doppelten Anzahl der Clients, die " "Sie\n" "anstreben." @@ -3460,7 +3466,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." -msgstr "" +msgstr "Verwendete Methode, um ein ausgewähltes Objekt hervorzuheben." #: src/settings_translation_file.cpp msgid "Minimap" @@ -3548,7 +3554,7 @@ msgid "" "When starting from the main menu, this is overridden." msgstr "" "Name des Spielers.\n" -"Wenn ein Server gestartet wird, werden Klienten mit diesem Namen zu " +"Wenn ein Server gestartet wird, werden Clients mit diesem Namen zu " "Administratoren.\n" "Wird vom Hauptmenü aus gestartet, wird diese Einstellung überschrieben." @@ -3597,7 +3603,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Noises" -msgstr "" +msgstr "Rauschen" #: src/settings_translation_file.cpp msgid "Normalmaps sampling" @@ -3623,9 +3629,9 @@ msgstr "" "erhöhen Sie\n" "diese Zahl, um mehrere Threads zu verwenden. Auf Mehrprozessorsystemen wird " "dies die\n" -"Geschwindigkeit der Kartenerzeugung stark erhöhen auf Kosten von leicht " -"fehlerhaften\n" -"Höhlen." +"Geschwindigkeit der Kartengenerierung auf Kosten von leicht fehlerhaften " +"Höhlen stark\n" +"erhöhen." #: src/settings_translation_file.cpp msgid "" @@ -3750,7 +3756,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "" +msgstr "Erhöht das Gelände, um Täler um den Flüssen zu erzeugen" #: src/settings_translation_file.cpp msgid "Random input" @@ -3782,19 +3788,19 @@ msgstr "Rechtsklick-Wiederholungsrate" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "" +msgstr "Flusstiefe" #: src/settings_translation_file.cpp msgid "River Noise" -msgstr "" +msgstr "Flussrauschen" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "" +msgstr "Flussgröße" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" -msgstr "" +msgstr "Flussrauschen – Flüsse erscheinen in der Nähe von null" #: src/settings_translation_file.cpp msgid "Rollback recording" @@ -3806,7 +3812,7 @@ msgstr "Runde Übersichtskarte" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "Speichert die Karte vom Server im lokalen Speicher." +msgstr "Speichert die vom Client empfangene Karte auf dem Datenträger." #: src/settings_translation_file.cpp msgid "Saving map received from server" @@ -3841,7 +3847,7 @@ msgstr "Bildschirmfoto" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "Bildschirmfotoordner" +msgstr "Bildschirmfotoverzeichnis" #: src/settings_translation_file.cpp msgid "Security" @@ -3960,7 +3966,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" -msgstr "" +msgstr "Hänge und Füllungen arbeiten zusammen, um die Höhen zu verändern" #: src/settings_translation_file.cpp msgid "Smooth lighting" @@ -3997,7 +4003,7 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" -"Spezifiziert die URL, von der die Klienten die Medien (Texturen, Sounds, …) " +"Spezifiziert die URL, von der die Clients die Medien (Texturen, Sounds, …) " "herunterladen.\n" "$Dateiname sollte von $remote_media$Dateiname mittels cURL erreichbar sein\n" "(diese Einstellung sollte also mit einem Schrägstrich enden).\n" @@ -4027,7 +4033,7 @@ msgstr "Synchrones SQLite" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "" +msgstr "Geländehöhe" #: src/settings_translation_file.cpp msgid "" @@ -4035,6 +4041,9 @@ msgid "" "Controls proportion of world area covered by hills.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"Schwellwert für Geländerauschen der Hügel.\n" +"Steuert das Verhältnis des Weltgebiets, das von Hügeln bedeckt ist.\n" +"Passen Sie diesen Wert in Richtung 0.0 für ein größeres Verhältnis an." #: src/settings_translation_file.cpp msgid "" @@ -4042,6 +4051,9 @@ msgid "" "Controls proportion of world area covered by lakes.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"Schwellwert für Geländerauschen der Seen.\n" +"Steuert das Verhältnis des Weltgebiets, das von Seen bedeckt ist.\n" +"Passen Sie diesen Wert in Richtung 0.0 für ein größeres Verhältnis an." #: src/settings_translation_file.cpp msgid "Texture path" @@ -4049,11 +4061,11 @@ msgstr "Texturpfad" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" -msgstr "" +msgstr "Die Höhe, ab der die Temperatur um 20 °C fällt" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" -msgstr "" +msgstr "Die Tiefe von Erde oder einem anderem Füller" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." @@ -4152,9 +4164,8 @@ msgid "Toggle camera mode key" msgstr "Kameraauswahltaste" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-Mapping" +msgstr "Tone-Mapping" #: src/settings_translation_file.cpp msgid "Tooltip delay" @@ -4217,7 +4228,7 @@ msgstr "Benutztaste" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." msgstr "" -"Map-Mapping benutzen, um Texturen zu skalieren. Kann die Performanz\n" +"Mip-Mapping benutzen, um Texturen zu skalieren. Kann die Performanz\n" "leicht erhöhen." #: src/settings_translation_file.cpp @@ -4234,27 +4245,27 @@ msgstr "Vertikale Synchronisation" #: src/settings_translation_file.cpp msgid "VBO" -msgstr "" +msgstr "VBO" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "" +msgstr "Taltiefe" #: src/settings_translation_file.cpp msgid "Valley Fill" -msgstr "" +msgstr "Talfüllung" #: src/settings_translation_file.cpp msgid "Valley Profile" -msgstr "" +msgstr "Talprofil" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "" +msgstr "Talhang" #: src/settings_translation_file.cpp msgid "Valleys C Flags" -msgstr "" +msgstr "C-Täler-Flags" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." @@ -4273,6 +4284,8 @@ msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"Sichtweite in Blöcken.\n" +"Minimum = 20" #: src/settings_translation_file.cpp msgid "View range decrease key" @@ -4283,23 +4296,23 @@ msgid "View range increase key" msgstr "Taste „Sichtweite erhöhen“" #: src/settings_translation_file.cpp -#, fuzzy msgid "Viewing range" -msgstr "Maximale Sichtweite" +msgstr "Sichtweite" #: src/settings_translation_file.cpp msgid "Volume" msgstr "Tonlautstärke" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "W co-ordinate of the generated 3D slice of a 4D fractal.\n" "Determines which 3D slice of the 4D shape is generated.\n" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" -"Julia-Menge: W-Koordinate des generierten 3D-Ausschnitts der 4D-Form.\n" +"W-Koordinate des generierten 3D-Ausschnitts eines 4D-Fraktals.\n" +"Bestimmt, welcher 3D-Ausschnitt der 4D-Form generiert wird.\n" +"Hat keine Auswirkung auf 3D-Fraktale.\n" "Die Weite liegt grob zwischen -2 und 2." #: src/settings_translation_file.cpp @@ -4307,9 +4320,8 @@ msgid "Walking speed" msgstr "Gehgeschwindigkeit" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Meeresspiegel" +msgstr "Wasserkammern" #: src/settings_translation_file.cpp msgid "Water level" @@ -4427,9 +4439,9 @@ msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" -"Ob Spieler an Klienten ohne Distanzbegrenzung angezeit werden.\n" -"Veraltet, benutzen Sie die Einstellung „player_transfer_distance“ " -"stattdessen." +"Ob Spieler an Clients ohne Distanzbegrenzung angezeit werden.\n" +"Veraltet, benutzen Sie stattdessen die Einstellung " +"„player_transfer_distance“." #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." @@ -4440,7 +4452,7 @@ msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" -"Ob Klienten gefragt werden sollen, sich nach einem (Lua-)Absturz\n" +"Ob Clients gefragt werden sollen, sich nach einem (Lua-)Absturz\n" "neu zu verbinden. Auf „wahr“ setzen, falls Ihr Server für auto-\n" "matische Neustarts eingerichtet ist." @@ -4452,17 +4464,16 @@ msgstr "Ob das Ende des sichtbaren Gebietes im Nebel verschwinden soll." msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" -"Ob der Klienten Debug-Informationen zeigen soll (hat die selbe Wirkung\n" +"Ob der Client Debug-Informationen zeigen soll (hat die selbe Wirkung\n" "wie das Drücken von F5)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Width component of the initial window size." -msgstr "Anfängliche Fensterbreite." +msgstr "Breiten-Komponente der anfänglichen Fenstergröße." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "Breite der Linien der Auswahlbox um Blöcke." +msgstr "Breite der Linien der Auswahlbox um Blöcken." #: src/settings_translation_file.cpp msgid "" @@ -4474,11 +4485,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Y of flat ground." -msgstr "" +msgstr "Y-Höhe des flachen Bodens." #: src/settings_translation_file.cpp msgid "Y of upper limit of large pseudorandom caves." -msgstr "" +msgstr "Y-Wert der Obergrenze von großen pseudozufälligen Höhlen." #: src/settings_translation_file.cpp msgid "cURL file download timeout" From cd9177964a478d938701bf2ce0b92d9981173aa3 Mon Sep 17 00:00:00 2001 From: Fernando Reis Date: Fri, 25 Mar 2016 13:26:39 +0100 Subject: [PATCH 468/531] Translated using Weblate (Portuguese) Currently translated at 67.5% (584 of 865 strings) This is a merger of 5 commits. --- po/pt/minetest.po | 795 ++++++++++++++++++++++++++-------------------- 1 file changed, 455 insertions(+), 340 deletions(-) diff --git a/po/pt/minetest.po b/po/pt/minetest.po index f70e378f..e73780cd 100644 --- a/po/pt/minetest.po +++ b/po/pt/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-25 10:43+0000\n" +"PO-Revision-Date: 2016-04-01 00:21+0000\n" "Last-Translator: Fernando Reis \n" "Language-Team: Portuguese " "\n" @@ -110,7 +110,7 @@ msgstr "Esconder Jogo" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "Ocultar conteúdo MP (mod pack)" +msgstr "Ocultar conteúdo do pacote" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -362,7 +362,7 @@ msgstr "Instalado com sucesso:" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "" +msgstr "Não ordenado" #: builtin/mainmenu/store.lua msgid "re-Install" @@ -370,11 +370,11 @@ msgstr "re-Instalar" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" -msgstr "Contribuintes Ativos" +msgstr "Contribuidores Ativos" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" -msgstr "Desenvolvedores Chave" +msgstr "Desenvolvedores Principais" #: builtin/mainmenu/tab_credits.lua msgid "Credits" @@ -455,7 +455,7 @@ msgstr "PvP activado" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" -msgstr "" +msgstr "Endereço Bind" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" @@ -529,7 +529,7 @@ msgstr "Configurações Avançadas" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Antisserrilhamento:" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" @@ -557,7 +557,7 @@ msgstr "Ativar Partículas" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" -msgstr "Folheamento detalhado" +msgstr "Folhas detalhadas" #: builtin/mainmenu/tab_settings.lua msgid "Generate Normalmaps" @@ -569,7 +569,7 @@ msgstr "Mapa MIP" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" -msgstr "" +msgstr "Mapa MIP + Filtro Anisotrópico" #: builtin/mainmenu/tab_settings.lua msgid "No Filter" @@ -584,9 +584,8 @@ msgid "No!!!" msgstr "Não!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "Iluminação Suave" +msgstr "Destaque dos Cubos" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -602,7 +601,7 @@ msgstr "Água Opaca" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Parallax Occlusion" -msgstr "" +msgstr "Oclusão de paralaxe" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -614,10 +613,9 @@ msgstr "Sombras" #: builtin/mainmenu/tab_settings.lua msgid "Simple Leaves" -msgstr "Folheamento simples" +msgstr "Folhas simples" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Iluminação Suave" @@ -639,7 +637,7 @@ msgstr "Filtro tri-linear" #: builtin/mainmenu/tab_settings.lua msgid "Waving Leaves" -msgstr "Folheamento ondulante" +msgstr "Folhas ondulantes" #: builtin/mainmenu/tab_settings.lua msgid "Waving Plants" @@ -679,7 +677,7 @@ msgstr "Selecione um pacote de texturas:" #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" -msgstr "Pacotes de texturas" +msgstr "Pacotes texturas" #: src/client.cpp msgid "Connection timed out." @@ -728,15 +726,15 @@ msgstr "" #: src/client/clientlauncher.cpp msgid "Player name too long." -msgstr "" +msgstr "Nome de jogador demasiado longo." #: src/client/clientlauncher.cpp msgid "Provided world path doesn't exist: " -msgstr "" +msgstr "O caminho fornecido não existe: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "" +msgstr "yes" #: src/game.cpp msgid "" @@ -811,6 +809,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Controles por defeito:\n" +"Se não há nenhum menu visível:\n" +"- Um toque: ativa botão\n" +"- Duplo toque: colocar/usar\n" +"- Deslizar dedo: Olhar em redor\n" +"Se menu/inventário visível:\n" +"- Duplo toque: (fora do menu/inventário):\n" +" -->fechar\n" +"- Tocar Item e depois tocar num compartimento:\n" +" --> mover item\n" +"- Tocar e arrastar, e depois tocar com o 2º dedo\n" +" --> Coloca apenas um item no compartimento\n" #: src/game.cpp msgid "Exit to Menu" @@ -826,7 +836,7 @@ msgstr "Definições dos Itens..." #: src/game.cpp msgid "KiB/s" -msgstr "" +msgstr "KB/s" #: src/game.cpp msgid "Media..." @@ -834,7 +844,7 @@ msgstr "Dados..." #: src/game.cpp msgid "MiB/s" -msgstr "" +msgstr "MiB/s" #: src/game.cpp msgid "Node definitions..." @@ -866,11 +876,11 @@ msgstr "Morreste." #: src/guiFormSpecMenu.cpp msgid "Enter " -msgstr "" +msgstr "Enter " #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "" +msgstr "ok" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1026,7 +1036,7 @@ msgstr "Converter" #: src/keycode.cpp msgid "CrSel" -msgstr "CrSel" +msgstr "Tecla CrSel" #: src/keycode.cpp msgid "Down" @@ -1034,7 +1044,7 @@ msgstr "Baixo" #: src/keycode.cpp msgid "End" -msgstr "End" +msgstr "Tecla End" #: src/keycode.cpp msgid "Erase OEF" @@ -1046,7 +1056,7 @@ msgstr "ESC" #: src/keycode.cpp msgid "ExSel" -msgstr "ExSel" +msgstr "Tecla ExSel" #: src/keycode.cpp msgid "Execute" @@ -1054,7 +1064,7 @@ msgstr "Executar" #: src/keycode.cpp msgid "Final" -msgstr "Final" +msgstr "Tecla Final" #: src/keycode.cpp msgid "Help" @@ -1070,15 +1080,15 @@ msgstr "Insert" #: src/keycode.cpp msgid "Junja" -msgstr "Junja" +msgstr "Tecla Junja" #: src/keycode.cpp msgid "Kana" -msgstr "Kana" +msgstr "Tecla Kana" #: src/keycode.cpp msgid "Kanji" -msgstr "Kanji" +msgstr "Tecla Kanji" #: src/keycode.cpp msgid "Left Button" @@ -1086,7 +1096,7 @@ msgstr "Botão Esquerdo" #: src/keycode.cpp msgid "Left Control" -msgstr "Control Esq" +msgstr "Control Esquerdo" #: src/keycode.cpp msgid "Left Menu" @@ -1106,7 +1116,7 @@ msgstr "Menu" #: src/keycode.cpp msgid "Middle Button" -msgstr "Roda do Rato" +msgstr "Botão Central do Rato" #: src/keycode.cpp msgid "Minus" @@ -1114,7 +1124,7 @@ msgstr "Menos" #: src/keycode.cpp msgid "Mode Change" -msgstr "Mode Change" +msgstr "Tecla Mode Change" #: src/keycode.cpp msgid "Next" @@ -1130,59 +1140,59 @@ msgstr "Num Lock" #: src/keycode.cpp msgid "Numpad *" -msgstr "Numpad *" +msgstr "Tecla numérica *" #: src/keycode.cpp msgid "Numpad +" -msgstr "Numpad +" +msgstr "Tecla numérica +" #: src/keycode.cpp msgid "Numpad -" -msgstr "Numpad -" +msgstr "Tecla numérica -" #: src/keycode.cpp msgid "Numpad /" -msgstr "Numpad /" +msgstr "Tecla numérica /" #: src/keycode.cpp msgid "Numpad 0" -msgstr "Numpad 0" +msgstr "Tecla numérica 0" #: src/keycode.cpp msgid "Numpad 1" -msgstr "Numpad 1" +msgstr "Tecla numérica 1" #: src/keycode.cpp msgid "Numpad 2" -msgstr "Numpad 2" +msgstr "Tecla numérica 2" #: src/keycode.cpp msgid "Numpad 3" -msgstr "Numpad 3" +msgstr "Tecla numérica 3" #: src/keycode.cpp msgid "Numpad 4" -msgstr "Numpad 4" +msgstr "Tecla numérica 4" #: src/keycode.cpp msgid "Numpad 5" -msgstr "Numpad 5" +msgstr "Tecla numérica 5" #: src/keycode.cpp msgid "Numpad 6" -msgstr "Numpad 6" +msgstr "Tecla numérica 6" #: src/keycode.cpp msgid "Numpad 7" -msgstr "Numpad 7" +msgstr "Tecla numérica 7" #: src/keycode.cpp msgid "Numpad 8" -msgstr "Numpad 8" +msgstr "Tecla numérica 8" #: src/keycode.cpp msgid "Numpad 9" -msgstr "Numpad 9" +msgstr "Tecla numérica 9" #: src/keycode.cpp msgid "OEM Clear" @@ -1190,7 +1200,7 @@ msgstr "Limpar OEM" #: src/keycode.cpp msgid "PA1" -msgstr "PAL" +msgstr "PA1" #: src/keycode.cpp msgid "Pause" @@ -1206,7 +1216,7 @@ msgstr "Mais" #: src/keycode.cpp msgid "Print" -msgstr "Print" +msgstr "Tecla Print Screen" #: src/keycode.cpp msgid "Prior" @@ -1288,12 +1298,21 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"Deslocamento (X,Y,Z) do fractal a partir do centro do mundo em unidades " +"'escala'.\n" +"Usado para obter uma área de nascimento apropriada, próxima de (0, 0).\n" +"Valores por defeito apropriados para conjunto de Mandelbrot, necessitam ser " +"adaptados para conjunto de Julia.\n" +"Intervalos aproximadamente entre -2 e 2. Multiplicar por 'escala' para " +"deslocamento em cubos." #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = oclusão paralaxe com dados de inclinação (mais rápido).\n" +"1 = mapeamento de relevo (mais lento, mais preciso)." #: src/settings_translation_file.cpp msgid "3D clouds" @@ -1301,7 +1320,7 @@ msgstr "Nuvens 3D" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "Modo 3D" #: src/settings_translation_file.cpp msgid "" @@ -1314,36 +1333,49 @@ msgid "" "- sidebyside: split screen side by side.\n" "- pageflip: quadbuffer based 3d." msgstr "" +"Suporte 3D.\n" +"Modos atualmente suportados:\n" +"- none: Nenhum efeito 3D.\n" +"- anaglyph: Sistema de cor Ciano/Magenta (Óculos 3D azul vermelho).\n" +"- interlaced: Sistema interlaçado (Óculos com lentes polarizadas).\n" +"- topbottom: Ecrã dividido em dois: uma em cima e outro em baixo.\n" +"- sidebyside: Ecrã dividido em dois: lado a lado." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Semente aleatória para gerar um novo mundo (em branco para deixar o " +"computador escolher).\n" +"Será anulada quando for criado um outro novo mundo no menu principal." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Mensagem a ser mostrada a todos os clientes do servidor quando ele bloqueia." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Uma mensagem para ser mostrada a todos os clientes quando o servidor se " +"desliga." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Limite absoluto da fila de espera emergente" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Aceleração no ar" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Distância de ativação de blocos" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Distância de ativação de objectos" #: src/settings_translation_file.cpp msgid "" @@ -1351,18 +1383,27 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Endereço para conexão.\n" +"Deixe em branco para iniciar um servidor local.\n" +"Note que o campo de endereço no menu principal sobrescreve esta configuração." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Ajustar configuração de dpi ao seu ecrã (não aplicável a X11/Android) e.g. " +"para ecrãs 4K." #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Ajusta a correção gama nas tabelas de luminosidade. Valores mais baixos " +"resultam \n" +"em imagem mais clara. Configuração somente para o cliente e ignorada pelo " +"servidor." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1370,19 +1411,19 @@ msgstr "Avançado" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Altitude de frio extremo" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "" +msgstr "Sempre voar e correr" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Gama de oclusão de ambiente" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Amplia os vales" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1390,7 +1431,7 @@ msgstr "Filtro anisotrópico" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Anunciar servidor" #: src/settings_translation_file.cpp msgid "" @@ -1398,6 +1439,9 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Anunciar a esta lista de servidores.\n" +"Se quiser anunciar o seu endereço IPv6, use serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1405,11 +1449,11 @@ msgstr "Aproxima escala (X,Y,Z) do fractal em cubos." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Pedir para reconectar após de bloqueio de sistema" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Informar automáticamente a lista de servidores." #: src/settings_translation_file.cpp msgid "Backward key" @@ -1417,63 +1461,59 @@ msgstr "Tecla para andar para trás" #: src/settings_translation_file.cpp msgid "Base terrain height" -msgstr "" +msgstr "Altura base do terreno" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Básico" #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Filtro bi-linear" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "A resolver endereço..." +msgstr "Endereço de bind" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bits por pixel (profundidade de cor) no modo de ecrã inteiro." #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "Vários jogadores" +msgstr "Construir com o jogador dentro do cubo" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Suavização da camera" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Suavização da câmera no modo cinematográfico" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Tecla para ativar/desativar atualização da câmera" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Ruído para cavernas #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Ruído para cavernas #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Cavernas e túneis formam-se na interseção entre os dois ruídos" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Mudar teclas" +msgstr "Tecla de conversação" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Mudar teclas" +msgstr "Tecla mostra/esconde conversação" #: src/settings_translation_file.cpp msgid "" @@ -1497,117 +1537,132 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"Escolha entre 18 fractais resultantes de 9 fórmulas\n" +"1 = Conjunto de mandelbrot \"Roundy\" 4D.\n" +"2 = Conjunto de julia \"Roundy\" 4D.\n" +"3 = Conjunto de mandelbrot \"Squarry\" 4D.\n" +"4 = Conjunto de julia \"Squarry\" 4D.\n" +"5 = Conjunto de mandelbrot \"Mandy Cousin\" 4D.\n" +"6 = Conjunto de julia \"Mandy Cousin\" 4D.\n" +"7 = Conjunto de mandelbrot \"Variation\" 4D.\n" +"8 = Conjunto de julia \"Variation\" 4D.\n" +"9 = Conjunto de mandelbrot \"Mandelbrot/Mandelbar\" 3D.\n" +"10 = Conjunto de julia \"Mandelbrot/Mandelbar\" 3D.\n" +"11 = Conjunto de mandelbrot \"Árvore de natal\" 3D.\n" +"12 = Conjunto de julia \"Árvore de natal\" 3D..\n" +"13 = Conjunto de mandelbrot \"Bulbo de Mandelbrot\" 3D.\n" +"14 = Conjunto de julia \"Bulbo de Mandelbrot\" 3D.\n" +"15 = Conjunto de mandelbrot \"Bulbo de Mandelbrot Cosseno\" 3D.\n" +"16 = Conjunto de julia \"Bulbo de Mandelbrot Cosseno\" 3D.\n" +"17 = Conjunto de mandelbrot \"Bulbo de Mandelbrot\" 4D.\n" +"18 = Conjunto de julia \"Bulbo de Mandelbrot\" 4D." #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Dimensão das parcelas" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Modo Criativo" +msgstr "Modo cinematográfico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Modo Criativo" +msgstr "Tecla para modo cinematográfico" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Limpar texturas transparentes" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Cliente e servidor" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Velocidade de escalada" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Altura das nuvens" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Raio das nuvens" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "Nuvens 3D" +msgstr "Nuvens" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "As nuvens são um efeito do lado do cliente." #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Menu Principal" +msgstr "Nuvens no menu" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Névoa colorida" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Lista separada por vírgulas de extras de confiança que podem utilizar " +"funções inseguras \n" +"mesmo quando a segurança de extras está ativada (via " +"request_insecure_environment())." #: src/settings_translation_file.cpp msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Lista separada por vírgulas de extras que podem usar APIs de requisição " +"HTTP, \n" +"que lhes permitem enviar e descarregar dados para/da internet." #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Comando" +msgstr "Tecla de comando" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Ligar" +msgstr "Vidro conectado" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "A conectar ao servidor..." +msgstr "Conectar a servidor media externo" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." msgstr "Conecta o vidro se suportado pelo cubo." #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Consola" +msgstr "Opacidade da consola" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Consola" +msgstr "Cor da consola" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" -msgstr "Consola" +msgstr "Tecla da consola" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "" +msgstr "Avançar continuamente" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "Avanço contínuo (apenas usado para testes)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Control" +msgstr "Controles" #: src/settings_translation_file.cpp msgid "" @@ -1615,155 +1670,172 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Controla a duração do ciclo dia/noite.\n" +"Exemplos: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = O tempo pára e permanece " +"inalterado." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Controla o tamanho dos desertos e das praias no gerador de mapa v6.\n" +"Quando o bioma de neve está ativado 'mgv6_freq_desert' é ignorado." #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Controla a inclinação/profundidade dos lagos." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Controla a inclinação/altura das colinas." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Mensagem de erro" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Cria lagos de lava imprevisíveis nas cavernas, o que pode \n" +"dificultar a mineração. Zero desativa-os por completo. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Cria lagos de água imprevisíveis nas cavernas, o que pode \n" +"dificultar a mineração. Zero desativa-os por completo. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Opacidade do cursor" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Opacidade do cursor (entre 0 e 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Cor do cursor" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Cor do cursor (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Velocidade a agachar" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Ativar Dano" +msgstr "Ativar dano" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Tecla para alternar modo de depuração" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Nível de log de depuração" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Intervalo de atualização do servidor" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Aceleração por defeito" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default game" -msgstr "editar jogo" +msgstr "Jogo por defeito" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Jogo por defeito aquando da criação de um mundo novo.\n" +"É anulado quando o mundo é criado através do menu principal." #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Senha Nova" +msgstr "Senha por defeito" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Privilégios por defeito" #: src/settings_translation_file.cpp msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Tempo limite por defeito para cURL, em milissegundos.\n" +"Só tem efeito se compilado com cURL." #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"Define nível de amostragem de textura.\n" +"Um valor mais alto resulta em mapas normais mais suaves." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" +"Define distância máxima de transferência de jogadores em blocos (0 = " +"ilimitado)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Latência de apresentação de dicas de ferramentas, em milissegundos." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Tratamento de API Lua obsoleto" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Profundidade a partir da qual você encontrará grandes cavernas." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Profundidade a partir da qual você encontrará caves massivas." #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Velocidade de descida" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"Descrição do servidor, a ser exibida quando jogadores se conectam e na lista " +"de servidores." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "Dessincroniza animação de blocos" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." msgstr "" +"Dados de perfil detalhados do extra. Útil para desenvolvedores de extras." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "Dados de perfil detalhados do extra" #: src/settings_translation_file.cpp msgid "" @@ -1771,55 +1843,53 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Determina a forma do terreno\n" +"Os 3 números entre '[' e ']' controlam a escala do\n" +"terreno, os 3 números devem ser idênticos." #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Ativar Partículas" +msgstr "Desativar anti-batota" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Não permitir senhas vazias" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Nome de domínio do servidor, para ser mostrado na lista de servidores." #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "Carregue duas vezes em \"saltar\" para ativar o vôo" +msgstr "Carregue duas vezes em saltar para voar" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Carregue duas vezes em \"saltar\" para ativar o vôo" +msgstr "Carregar duas vezes em saltar ativa/desativa o vôo." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Tecla para largar item" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Mostrar informações de depuração do gerador de mapa." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Ativar Tudo" +msgstr "Ativar VBO" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Repositório Online de Mods" +msgstr "Ativar segurança de extras" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Ativar dano e morte dos jogadores." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Ativa a entrada de comandos aleatória (apenas usado para testes)." #: src/settings_translation_file.cpp msgid "" @@ -1835,6 +1905,11 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Ativar para impedir a conexão de clientes antigos.\n" +"Clientes antigos são compatíveis no sentido em que não bloquearão quando " +"conectam \n" +"a servidores recentes, mas poderão não suportar todos as funcionalidades " +"esperadas." #: src/settings_translation_file.cpp msgid "" @@ -1850,10 +1925,14 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Ativar/desativar a execução de um servidor IPv6. Um servidor IPv6 pode \n" +"estar restringido a clientes com IPv6, dependendo da configuração do sistema." +"\n" +"Ignorado se bind_address estiver definido." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Ativa animação de itens no inventário." #: src/settings_translation_file.cpp msgid "" @@ -1868,14 +1947,12 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Ativar Dano" +msgstr "Ativa mapeamento de tons fílmico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Ativar Dano" +msgstr "Ativa mini-mapa." #: src/settings_translation_file.cpp msgid "" @@ -1888,56 +1965,60 @@ msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"Ativa mapeamento de oclusão de paralaxe.\n" +"Requer sombreadores ativados." #: src/settings_translation_file.cpp msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Opção experimental, pode causar espaços visíveis entre blocos\n" +"quando definido com num úmero superior a 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS em menu de pausa" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA (Antialiasing de ecrã inteiro)" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "Cair balançando" #: src/settings_translation_file.cpp msgid "Fallback font" -msgstr "" +msgstr "Fonte alternativa" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Sombra da fonte alternativa" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Canal de opacidade sombra da fonte alternativa" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Tamanho da fonte alternativa" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Tecla de correr" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Aceleração no modo rápido" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Velocidade no modo rápido" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Modo rápido" #: src/settings_translation_file.cpp msgid "" @@ -1947,17 +2028,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Campo de visão" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Campo de visão em graus." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"Ficheiro na pasta client/serverlist/ que contém os seus servidores favoritos " +"mostrados na separador Multi-jogador." #: src/settings_translation_file.cpp msgid "Filler Depth" @@ -1965,7 +2048,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "Mapeamento de tom fílmico" #: src/settings_translation_file.cpp msgid "" @@ -1976,45 +2059,44 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Filtro Anisotrópico" +msgstr "Filtros" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Semente aleatória do mapa fixa" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "" +msgstr "Tecla de voar" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Voar" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Nevoeiro" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Tecla de ativar/desativar nevoeiro" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Caminho para ficheiro fonte" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Sombra da fonte" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Opacidade da sombra da fonte" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Opacidade da sombra da fonte (entre 0 e 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." @@ -2022,16 +2104,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Tamanho da fonte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Avançar" +msgstr "Tecla para avançar" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Fontes FreeType" #: src/settings_translation_file.cpp msgid "" @@ -2056,35 +2137,35 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Ecrã inteiro" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "BPP em ecrã inteiro" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Modo de ecrã inteiro." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Escala do interface gráfico" #: src/settings_translation_file.cpp msgid "GUI scaling filter" -msgstr "" +msgstr "Filtro de redimensionamento do interface gráfico" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "Filtro txr2img de redimensionamento do interface gráfico" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gama" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Geral" #: src/settings_translation_file.cpp msgid "Generate normalmaps" @@ -2102,16 +2183,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Gráficos" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravidade" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Extras" +msgstr "Extras HTTP" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2124,26 +2204,31 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +"Tratamento de chamadas ao API Lua obsoletas:\n" +"- legacy: (tenta) imitar o comportamento antigo (por defeito em versão de " +"lançamento).\n" +"- log: imita e regista no log (por defeito em versão de depuração).\n" +"- error: aborta (sugerido para desenvolvedores de extras)." #: src/settings_translation_file.cpp msgid "Height component of the initial window size." -msgstr "" +msgstr "Altura da janela inicial." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "Altitude das nuvens." #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "FPU de alta precisão" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "Página web do servidor, a ser exibido na lista de servidores." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Quão profundos são os rios" #: src/settings_translation_file.cpp msgid "" @@ -2171,19 +2256,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Quão largos são os rios" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "Servidor IPv6" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "Suporte IPv6." #: src/settings_translation_file.cpp msgid "" @@ -2221,7 +2306,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "" +msgstr "Se ativado, desativa prevenção de fraude no modo mult-ijogador." #: src/settings_translation_file.cpp msgid "" @@ -2231,7 +2316,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." -msgstr "" +msgstr "Se ativado, novos jogadores não podem entrar com uma senha vazia." #: src/settings_translation_file.cpp msgid "" @@ -2249,12 +2334,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Ignorar erros do mundo" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Jogo" +msgstr "No jogo" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -2262,7 +2346,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Côr de fundo da consola de conversação (R,G,B)." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." @@ -2274,24 +2358,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "Animações dos itens do inventário" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" -msgstr "Inventário" +msgstr "Tecla de inventário" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Inverter rato" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Inverte o movimento vertical do rato." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "Tempo de vida de itens largados" #: src/settings_translation_file.cpp msgid "" @@ -2306,6 +2389,10 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"Apenas fractal Julia: Componente W da constante hypercomplexa que determina " +"a forma.\n" +"Não tem efeito em fractais 3D.\n" +"Valor varia sensivelmente entre -2 e 2." #: src/settings_translation_file.cpp msgid "" @@ -2313,6 +2400,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"Apenas fractal Julia: Componente X da constante hypercomplexa que determina " +"a forma.\n" +"Valor varia sensivelmente entre -2 e 2." #: src/settings_translation_file.cpp msgid "" @@ -2320,6 +2410,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"Apenas fractal Julia: Componente Y da constante hypercomplexa que determina " +"a forma.\n" +"Valor varia sensivelmente entre -2 e 2." #: src/settings_translation_file.cpp msgid "" @@ -2327,11 +2420,13 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"Apenas fractal Julia: Componente Z da constante hypercomplexa que determina " +"a forma.\n" +"Valor varia sensivelmente entre -2 e 2." #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" -msgstr "Saltar" +msgstr "Tecla de saltar" #: src/settings_translation_file.cpp msgid "Jumping speed" @@ -2385,6 +2480,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para mover o jogador para a frente.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2392,6 +2490,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para mover o jogador para a esquerda.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2434,6 +2535,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para imprimir pilhas de depuração. Usado para o desenvolvimento.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2471,6 +2575,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a exibição do mini-mapa.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2506,6 +2613,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tecla para ativar/desativar a exibição de informações de depuração.\n" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" +"01735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2556,11 +2666,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Características da lava" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Estilo de folhas" #: src/settings_translation_file.cpp msgid "" @@ -2569,11 +2679,14 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Estilo de folhas:\n" +"- Fancy: todas as faces visíveis\n" +"- Simple: apenas faces externas, se definidos special_tiles são usados\n" +"- Opaque: desativa transparência" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Menu Esquerdo" +msgstr "Tecla para a esquerda" #: src/settings_translation_file.cpp msgid "" @@ -2592,6 +2705,14 @@ msgid "" "- info\n" "- verbose" msgstr "" +"Nível de registo log a ser guardado em debug.txt:\n" +"- (nada registado)\n" +"- none (mensagens sem nível de log)\n" +"- error\n" +"- warning\n" +"- action\n" +"- info\n" +"- verbose" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" @@ -2643,14 +2764,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Menu Principal" +msgstr "Menu principal do gestor de extras" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Menu Principal" +msgstr "Menu principal de scripts" #: src/settings_translation_file.cpp msgid "" @@ -2722,9 +2841,8 @@ msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Geração de Mapa" +msgstr "Vales do mapgen" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2739,19 +2857,16 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Geração de Mapa" +msgstr "Depuração do gerador de mapa" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Geração de Mapa" +msgstr "Flags do mapgen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Geração de Mapa" +msgstr "Gerador de mapa plano" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -2766,14 +2881,12 @@ msgid "Mapgen flat filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Geração de Mapa" +msgstr "Flags do gerador de mapa plano" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "Geração de Mapa" +msgstr "Nível do terreno para o gerador de mapa plano" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" @@ -2784,14 +2897,12 @@ msgid "Mapgen flat hill threshold" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Geração de Mapa" +msgstr "Inclinação dos lagos no gerador de mapa plano" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Geração de Mapa" +msgstr "Limite de lagos no gerador de mapa plano" #: src/settings_translation_file.cpp msgid "Mapgen flat large cave depth" @@ -2802,80 +2913,73 @@ msgid "Mapgen flat terrain noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Geração de Mapa" +msgstr "Gerador de mapa fractal" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" -msgstr "" +msgstr "Parâmetros de ruído caverna1 no gerador de mapa fractal" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave2 noise parameters" -msgstr "" +msgstr "Parâmetros de ruído caverna2 no gerador de mapa fractal" #: src/settings_translation_file.cpp msgid "Mapgen fractal filler depth noise parameters" msgstr "" +"Parâmetros de ruído da profundidade de enchimento no gerador de mapa fractal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Geração de Mapa" +msgstr "Fractal do gerador de mapa fractal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Geração de Mapa" +msgstr "Iterações no gerador de mapa fractal" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "W do gerador de mapa fractal Julia" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "X do gerador de mapa fractal Julia" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "Y do gerador de mapa fractal Julia" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "Z do gerador de mapa fractal Julia" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "Geração de Mapa" +msgstr "Deslocamento do gerador de mapa fractal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "Geração de Mapa" +msgstr "Escala do gerador de mapa fractal" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" -msgstr "" +msgstr "Parâmetros de ruído do fundo do mar no gerador de mapa fractal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "Geração de Mapa" +msgstr "W do corte do gerador de mapa fractal" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Geração de Mapa" +msgstr "Nome do gerador de mapa" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Geração de Mapa" +msgstr "Gerador de mapa V5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -2898,9 +3002,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Geração de Mapa" +msgstr "Gerador de mapa V6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -2959,9 +3062,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Geração de Mapa" +msgstr "Gerador de mapa V7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -3127,9 +3229,8 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" -msgstr "Menu" +msgstr "Opções para menus" #: src/settings_translation_file.cpp msgid "Mesh cache" @@ -3149,24 +3250,23 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Mini-mapa" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Tecla mini-mapa" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "Altura de varredura do mini-mapa" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" -msgstr "Mip-Mapping" +msgstr "Mapeamento MIP" #: src/settings_translation_file.cpp msgid "Mod profiling" @@ -3242,7 +3342,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "Novos jogadores precisam de introduzir esta senha." #: src/settings_translation_file.cpp msgid "Noclip" @@ -3294,39 +3394,39 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." -msgstr "" +msgstr "Número de iterações de oclusão de paralaxe." #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." -msgstr "" +msgstr "Enviesamento do efeito de oclusão de paralaxe, normalmente escala/2." #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." -msgstr "" +msgstr "Escala do efeito de oclusão de paralaxe." #: src/settings_translation_file.cpp msgid "Parallax occlusion" -msgstr "" +msgstr "Oclusão de paralaxe" #: src/settings_translation_file.cpp msgid "Parallax occlusion Scale" -msgstr "" +msgstr "Escala de oclusão paralaxe" #: src/settings_translation_file.cpp msgid "Parallax occlusion bias" -msgstr "" +msgstr "Enviesamento de oclusão paralaxe" #: src/settings_translation_file.cpp msgid "Parallax occlusion iterations" -msgstr "" +msgstr "Iterações de oclusão paralaxe" #: src/settings_translation_file.cpp msgid "Parallax occlusion mode" -msgstr "" +msgstr "Modo de oclusão paralaxe" #: src/settings_translation_file.cpp msgid "Parallax occlusion strength" -msgstr "" +msgstr "Força da oclusão paralaxe" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." @@ -3395,16 +3495,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "" +msgstr "Eleva o terreno para fazer vales em torno dos rios" #: src/settings_translation_file.cpp msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" -msgstr "Seleccionar Distância" +msgstr "Tecla para modo de visão ilimitado" #: src/settings_translation_file.cpp msgid "Remote media" @@ -3419,9 +3518,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Menu Direito" +msgstr "Tecla para a direita" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3441,7 +3539,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" -msgstr "" +msgstr "Ruído para rios -- rios ocorrem em valores próximos de zero" #: src/settings_translation_file.cpp msgid "Rollback recording" @@ -3449,7 +3547,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "Mini-map redondo" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." @@ -3467,6 +3565,11 @@ msgid "" "pixels when scaling down, at the cost of blurring some\n" "edge pixels when images are scaled by non-integer sizes." msgstr "" +"Redimensiona interface gráfico por um valor especificado pelo \n" +"utilizador. Usa um filtro antisserrilhamento através de interpolação \n" +"por vizinho mais próximo. Isto vai alisar algumas das arestas e \n" +"misturar pixels quando reduzir a dimensão, com o custo de borrar \n" +"alguns pixels das arestas quando o valor não é inteiro." #: src/settings_translation_file.cpp msgid "Screen height" @@ -3477,9 +3580,8 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Screenshot" +msgstr "Captura de ecrã" #: src/settings_translation_file.cpp msgid "Screenshot folder" @@ -3506,44 +3608,36 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Um Jogador" +msgstr "Servidor / Um jogador" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Servidor" +msgstr "URL do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Porta" +msgstr "Endereço do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Porta" +msgstr "Descrição do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Servidor" +msgstr "Nome do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" -msgstr "Porta" +msgstr "Porta do servidor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Lista de Servidores Públicos" +msgstr "URL da lista de servidores" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Lista de Servidores Públicos" +msgstr "Ficheiro da lista de servidores" #: src/settings_translation_file.cpp msgid "" @@ -3556,6 +3650,8 @@ msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"Com o valor TRUE, folhas ondulantes são ativadas.\n" +"Necessita de shaders para estar ativo." #: src/settings_translation_file.cpp msgid "" @@ -3578,11 +3674,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" +msgstr "Formato do mini-mapa. Ativado = redondo, desativado = quadrado." #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "Mostrar informação de depuração" #: src/settings_translation_file.cpp msgid "Shutdown message" @@ -3599,9 +3695,8 @@ msgid "Slope and fill work together to modify the heights" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "Iluminação Suave" +msgstr "Iluminação suave" #: src/settings_translation_file.cpp msgid "" @@ -3618,9 +3713,8 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" -msgstr "Agachar" +msgstr "Tecla para agachar" #: src/settings_translation_file.cpp msgid "Sound" @@ -3673,9 +3767,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Pacotes de Texturas" +msgstr "Caminho para a pasta de texturas" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" @@ -3729,6 +3822,8 @@ msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"Durabilidade em segundos de objectos largados.\n" +"Definir como -1 para desativar funcionalidade." #: src/settings_translation_file.cpp msgid "Time send interval" @@ -3749,24 +3844,25 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" +"Para reduzir a latência, a transferência de blocos é abrandada quando um " +"jogador está \n" +"a construir. Isto determina o quanto é abrandado após a colocação de um cubo." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-Mapping" +msgstr "Mapeamento de tons" #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" -msgstr "Filtro Tri-Linear" +msgstr "Filtro tri-linear" #: src/settings_translation_file.cpp msgid "" @@ -3774,6 +3870,9 @@ msgid "" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"True = 256\n" +"False = 128\n" +"Útil para fazer o mini-mapa mais fluido em computadores mais lentos." #: src/settings_translation_file.cpp msgid "Trusted mods" @@ -3781,7 +3880,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" +msgstr "URL da lista de servidores exibida no separador multi-jogador." #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" @@ -3808,22 +3907,20 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "pressione a tecla" +msgstr "Tecla de usar" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." -msgstr "" +msgstr "Usa mapeamento MIP para escalar texturas. Pode melhorar performance." #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Desenvolvedores Chave" +msgstr "Útil para desenvolvedores de extras." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -3870,6 +3967,8 @@ msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"Distância de visualização, em cubos.\n" +"Mínimo é 20" #: src/settings_translation_file.cpp msgid "View range decrease key" @@ -3884,7 +3983,6 @@ msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Volume do som" @@ -3901,9 +3999,8 @@ msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Texturas dos items..." +msgstr "Características da água" #: src/settings_translation_file.cpp msgid "Water level" @@ -3915,12 +4012,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Waving Nodes" -msgstr "" +msgstr "Cubos Ondulantes" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" -msgstr "Árvores Melhoradas" +msgstr "Folhas ondulantes" #: src/settings_translation_file.cpp msgid "Waving plants" @@ -3948,6 +4044,9 @@ msgid "" "filtered in software, but some images are generated directly\n" "to hardware (e.g. render-to-texture for nodes in inventory)." msgstr "" +"Quando gui_scaling_filter está ativado, todas as imagens do interface \n" +"gráfico são filtradas por software, mas algumas imagens são geradas \n" +"directamente para o hardware (e.g. texturas de cubos no inventário)." #: src/settings_translation_file.cpp msgid "" @@ -3977,6 +4076,14 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" +"Limite da geração do mapa.\n" +"Note:\n" +"- Limitado a 31000 (valor superior não tem efeito)\n" +"- O gerador funciona em grupos de 80x80x80 cubos (5x5x5 MapBlocks).\n" +"- Esses grupos têm um deslocamento de -32, -32 cubos em relação à origem." +"\n" +"- Apenas grupos dentro do limite definido por map_generation_limit são " +"gerados" #: src/settings_translation_file.cpp msgid "" @@ -3986,6 +4093,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." msgstr "" +"Determina se animações das texturas dos cubos devem ser dessincronizadas " +"entre mapblocks." #: src/settings_translation_file.cpp msgid "" @@ -4002,6 +4111,10 @@ msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" +"Se deverá pedir ao cliente para se reconectar após um bloqueio de sistema " +"(Lua).\n" +"Defina como TRUE se o seu servidor está configurado para recomeçar " +"automaticamente." #: src/settings_translation_file.cpp msgid "Whether to fog out the end of the visible area." @@ -4011,6 +4124,8 @@ msgstr "" msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +"Se deve mostrar ao cliente informação de depuração (tem o mesmo efeito que " +"premir F5)." #: src/settings_translation_file.cpp msgid "Width component of the initial window size." @@ -4018,7 +4133,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "" +msgstr "Grossura das linhas de selecção à volta dos cubos." #: src/settings_translation_file.cpp msgid "" From 9fc4415f9d2b3a3ad8d7c50ac5fe8fe7959ced45 Mon Sep 17 00:00:00 2001 From: Jan Harald Date: Sat, 9 Apr 2016 13:53:33 +0200 Subject: [PATCH 469/531] Translated using Weblate (Estonian) Currently translated at 21.8% (189 of 865 strings) --- po/et/minetest.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/et/minetest.po b/po/et/minetest.po index 36aa83d5..e1b0278e 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2015-11-19 16:52+0000\n" -"Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"PO-Revision-Date: 2016-04-09 13:53+0000\n" +"Last-Translator: Jan Harald \n" +"Language-Team: Estonian " +"\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -33,7 +33,7 @@ msgstr "Peamenüü" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" -msgstr "kinnitama" +msgstr "Olgu." #: builtin/fstk/ui.lua msgid "Reconnect" @@ -62,7 +62,7 @@ msgstr "Server toetab protokolli versioone $1 kuni $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" -"Proovi lubada uuesti avalik serverite loend ja kontrollo oma Interneti " +"Proovi lubada uuesti avalike serverite loend ja kontrolli oma Interneti " "ühendust." #: builtin/mainmenu/common.lua @@ -101,8 +101,8 @@ msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" -"Mod \"$1\" kasutamine nurjus, sest ka sisaldab keelatud sümboleid. Lubatud " -"märgid on ainult [a-z0-9_]." +"Mod \"$1\" kasutamine nurjus, sest ta sisaldab keelatud sümboleid. Lubatud " +"on ainult märgid [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -4025,7 +4025,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "cURL faili allalaadimine aegus" #: src/settings_translation_file.cpp msgid "cURL parallel limit" From e9c3824d1b33ac404d4f0ebe2529378164a98826 Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Tue, 12 Apr 2016 18:24:43 +0200 Subject: [PATCH 470/531] Translated using Weblate (Indonesian) Currently translated at 57.4% (497 of 865 strings) This is a merger of three commits. --- po/id/minetest.po | 243 +++++++++++++++++++++++----------------------- 1 file changed, 122 insertions(+), 121 deletions(-) diff --git a/po/id/minetest.po b/po/id/minetest.po index a46e4f33..c9b46348 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -2,13 +2,12 @@ # Copyright (C) 2014 srifqi # This file is distributed under the same license as the PACKAGE package. # Muhammad Rifqi Priyo Susanto , 2014. -# msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-09 17:45+0000\n" +"PO-Revision-Date: 2016-04-12 19:07+0000\n" "Last-Translator: Muhammad Rifqi Priyo Susanto " "\n" "Language-Team: Indonesian " @@ -18,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -138,7 +137,6 @@ msgid "A world named \"$1\" already exists" msgstr "Dunia bernama \"$1\" telah ada" #: builtin/mainmenu/dlg_create_world.lua -#, fuzzy msgid "Create" msgstr "Buat" @@ -216,7 +214,6 @@ msgid "Rename Modpack:" msgstr "Ganti nama paket mod:" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "\"$1\" is not a valid flag." msgstr "\"$1\" bukan sebuah flag yang sah." @@ -225,7 +222,6 @@ msgid "(No description of setting given)" msgstr "(Tidak ada keterangan dari pengaturan yang diberikan)" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "< Back to Settings page" msgstr "< Halaman Pengaturan" @@ -246,7 +242,6 @@ msgid "Enabled" msgstr "Diaktifkan" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" "Format adalah 3 angka yang dipisahkan oleh koma dan di dalam tanda kurung." @@ -295,7 +290,6 @@ msgid "Restore Default" msgstr "Atur ke Bawaan" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "Select path" msgstr "Pilih jalur" @@ -653,17 +647,14 @@ msgid "Trilinear Filter" msgstr "Trilinear Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "Daun Melambai" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "Tanaman Berayun" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "Air Berombak" @@ -1339,7 +1330,6 @@ msgid "3D mode" msgstr "Mode 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1457,11 +1447,10 @@ msgid "" "minetest.net." msgstr "" "Mengumumkan kepada daftar server ini.\n" -"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6." -"servers.minetest.net." +"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp -#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." msgstr "Memperkirakan skala (X,Y,Z) dari fraktal pada node." @@ -1558,6 +1547,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"18 pilihan fraktal dari 9 rumus.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1662,9 +1670,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "Gerakan maju terus-menerus (hanya digunakan untuk pengujian)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Ctrl" +msgstr "Kontrol" #: src/settings_translation_file.cpp msgid "" @@ -1777,7 +1784,6 @@ msgid "Default privileges" msgstr "Izin bawaan" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." @@ -1804,12 +1810,10 @@ msgid "Deprecated Lua API handling" msgstr "Penanganan Lua API usang" #: src/settings_translation_file.cpp -#, fuzzy msgid "Depth below which you'll find large caves." msgstr "Kedalaman minimal di mana Anda akan menemukan gua besar." #: src/settings_translation_file.cpp -#, fuzzy msgid "Depth below which you'll find massive caves." msgstr "Kedalaman minimal di mana Anda akan menemukan gua raksasa." @@ -1848,7 +1852,6 @@ msgstr "" "tanah, ketiganya harus sama." #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" msgstr "Nonaktifkan anticurang (anticheat)" @@ -1877,9 +1880,8 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Aktifkan PM" +msgstr "Aktifkan VBO" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -2070,11 +2072,11 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "Filtering" -msgstr "Tanpa Filter" +msgstr "Filtering" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Seed peta yang diatur" #: src/settings_translation_file.cpp msgid "Fly key" @@ -2082,15 +2084,15 @@ msgstr "Tombol terbang" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Terbang" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Kabut" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Tombol beralih kabut" #: src/settings_translation_file.cpp msgid "Font path" @@ -2114,7 +2116,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Ukuran font" #: src/settings_translation_file.cpp #, fuzzy @@ -2171,7 +2173,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Umum" #: src/settings_translation_file.cpp #, fuzzy @@ -2190,20 +2192,19 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Grafik" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravitasi" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Mod" +msgstr "Mod HTTP" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "Tombol beralih HUD" #: src/settings_translation_file.cpp msgid "" @@ -2261,7 +2262,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" @@ -2269,7 +2270,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "Dukungan IPv6." #: src/settings_translation_file.cpp msgid "" @@ -2294,8 +2295,8 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" -"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node " -"padat.\n" +"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat." +"\n" "Hal ini memerlukan hak istimewa \"noclip\" pada server." #: src/settings_translation_file.cpp @@ -2337,12 +2338,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Abaikan kesalahan pada dunia" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Permainan" +msgstr "Dalam Permainan" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -2442,6 +2442,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk menjatuhkan barang yang sedang dipilih.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp #, fuzzy @@ -2460,6 +2463,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk lompat.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2468,8 +2474,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk bergerak cepat dalam mode cepat.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2477,6 +2483,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk bergerak mundur.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2484,6 +2493,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk bergerak maju.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2491,6 +2503,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk bergerak ke kiri.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2498,6 +2513,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk bergerak ke kanan.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2526,6 +2544,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk membuka inventaris.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2549,6 +2570,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk mengganti kamera antara orang pertama dan ketiga.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2556,6 +2580,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk mengambil tangkapan layar.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2564,8 +2591,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode sinema.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2573,6 +2600,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk mennganti tampilan peta mini.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2581,8 +2611,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode cepat.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2590,17 +2620,19 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tombol untuk beralih terbang.\n" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Key for toggling noclip mode.\n" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode tembus blok.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." -"html#a54da2a0e231901735e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" +"35e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2657,7 +2689,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Bahasa" #: src/settings_translation_file.cpp msgid "Large cave depth" @@ -2669,7 +2701,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Gaya dedaunan" #: src/settings_translation_file.cpp msgid "" @@ -2752,14 +2784,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Menu Utama" +msgstr "Pengelola mod menu utama" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Menu Utama" +msgstr "Skrip menu utama" #: src/settings_translation_file.cpp msgid "" @@ -2772,7 +2802,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Direktori peta" #: src/settings_translation_file.cpp msgid "" @@ -2816,7 +2846,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "Batas generasi peta" #: src/settings_translation_file.cpp msgid "Map save interval" @@ -2831,9 +2861,8 @@ msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Generator peta" +msgstr "Generator peta Valleys" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2977,14 +3006,12 @@ msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Generator peta" +msgstr "Nama generator peta" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Generator peta" +msgstr "Generator peta v5" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -3007,9 +3034,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Generator peta" +msgstr "Generator peta v6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -3068,9 +3094,8 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Generator peta" +msgstr "Generator peta v7" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -3286,9 +3311,8 @@ msgid "Minimum texture size for filters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" -msgstr "Mip-Mapping" +msgstr "Mipmapping" #: src/settings_translation_file.cpp msgid "Mod profiling" @@ -3427,14 +3451,13 @@ msgid "Overall scale of parallax occlusion effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" -msgstr "Parallax Occlusion" +msgstr "Parallax occlusion" #: src/settings_translation_file.cpp #, fuzzy msgid "Parallax occlusion Scale" -msgstr "Parallax Occlusion" +msgstr "Skala parallax occlusion" #: src/settings_translation_file.cpp #, fuzzy @@ -3478,9 +3501,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Nama pemain terlalu panjang." +msgstr "Nama pemain" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -3603,9 +3625,8 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Snapshot" +msgstr "Tangkapan layar" #: src/settings_translation_file.cpp msgid "Screenshot folder" @@ -3632,44 +3653,36 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Mulai Pemain Tunggal" +msgstr "Server / Pemain Tunggal" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Server" +msgstr "URL Server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Port Server" +msgstr "Alamat server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server description" -msgstr "Port Server" +msgstr "Deskripsi server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Server" +msgstr "Nama server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" -msgstr "Port Server" +msgstr "Port server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Daftar Server Publik" +msgstr "URL Daftar server" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Daftar Server Publik" +msgstr "Berkas Daftar server" #: src/settings_translation_file.cpp msgid "" @@ -3725,9 +3738,8 @@ msgid "Slope and fill work together to modify the heights" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "Pencahayaan Halus" +msgstr "Pencahayaan halus" #: src/settings_translation_file.cpp msgid "" @@ -3882,18 +3894,16 @@ msgid "Toggle camera mode key" msgstr "Tombol beralih mode kamera" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-Mapping" +msgstr "Tone Mapping" #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" -msgstr "Trilinear Filter" +msgstr "Trilinear filtering" #: src/settings_translation_file.cpp msgid "" @@ -3948,9 +3958,8 @@ msgid "Use trilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Useful for mod developers." -msgstr "Pengembang Inti Sebelumnya" +msgstr "Berguna untuk pengembang mod." #: src/settings_translation_file.cpp msgid "V-Sync" @@ -4011,7 +4020,6 @@ msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Volume Suara" @@ -4024,9 +4032,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Walking speed" -msgstr "Daun Melambai" +msgstr "Kecepatan berjalan" #: src/settings_translation_file.cpp #, fuzzy @@ -4035,7 +4042,7 @@ msgstr "Tekstur barang..." #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "Ketinggian air" #: src/settings_translation_file.cpp msgid "Water surface level of the world." @@ -4047,34 +4054,28 @@ msgid "Waving Nodes" msgstr "Daun Melambai" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" -msgstr "Daun Melambai" +msgstr "Daun melambai" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving plants" -msgstr "Tanaman Berayun" +msgstr "Tanaman berayun" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water" -msgstr "Air Berombak" +msgstr "Air berombak" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water height" -msgstr "Air Berombak" +msgstr "Ketinggian ombak" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water length" -msgstr "Air Berombak" +msgstr "Panjang ombak" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving water speed" -msgstr "Air Berombak" +msgstr "Kecepatan ombak" #: src/settings_translation_file.cpp msgid "" @@ -4170,15 +4171,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "Batas waktu cURL mengunduh berkas" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "Batas cURL paralel" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "Batas waktu cURL" #~ msgid "\"" #~ msgstr "\"" From b2b8c49d04e8e2379a9f1308a8c7bfe649f43bce Mon Sep 17 00:00:00 2001 From: Thomas Wagner Nielsen Date: Sun, 17 Apr 2016 08:53:06 +0200 Subject: [PATCH 471/531] Translated using Weblate (Danish) Currently translated at 28.7% (249 of 865 strings) --- po/da/minetest.po | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/po/da/minetest.po b/po/da/minetest.po index 9dddf07c..4dc4c326 100644 --- a/po/da/minetest.po +++ b/po/da/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-01-13 09:23+0000\n" -"Last-Translator: Peter Mikkelsen \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2016-04-17 08:53+0000\n" +"Last-Translator: Thomas Wagner Nielsen \n" +"Language-Team: Danish " +"\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -505,9 +505,8 @@ msgid "2x" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" -msgstr "3D skyer" +msgstr "3D-skyer" #: builtin/mainmenu/tab_settings.lua msgid "4x" @@ -518,21 +517,18 @@ msgid "8x" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Indstillinger" +msgstr "Avancerede indstillinger" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Are you sure to reset your singleplayer world?" -msgstr "Enligspiller" +msgstr "Er du sikker på, at du vil nulstille din enkelt spiller-verden?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Bi-lineær filtréring" @@ -546,14 +542,12 @@ msgid "Change keys" msgstr "Skift bindinger" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Forbind" +msgstr "Forbundet glas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Aktivér alle" +msgstr "Aktivér partikler" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -574,9 +568,8 @@ msgid "Mipmap + Aniso. Filter" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Anisotropisk filtréring" +msgstr "Intet filter" #: builtin/mainmenu/tab_settings.lua #, fuzzy @@ -593,7 +586,6 @@ msgid "Node Highlighting" msgstr "Glat belysning" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua -#, fuzzy msgid "None" msgstr "Ingen" @@ -620,12 +612,10 @@ msgid "Shaders" msgstr "Shadere" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Simple Leaves" -msgstr "Opakt (uigennemsigtigt) vand" +msgstr "Enkle blade" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Glat belysning" @@ -642,7 +632,6 @@ msgid "Touchthreshold (px)" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Tri-lineær filtréring" @@ -999,9 +988,8 @@ msgid "Sound Volume: " msgstr "" #: src/keycode.cpp -#, fuzzy msgid "Apps" -msgstr "Applikationer" +msgstr "Apps" #: src/keycode.cpp msgid "Attn" From 2a12ebd6523148f48c2fc595de0b7f4b10d27a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Cipri=C3=A0=20Moreno=20Teodoro?= Date: Sat, 16 Apr 2016 11:26:36 +0200 Subject: [PATCH 472/531] Translated using Weblate (Catalan) Currently translated at 46.5% (403 of 865 strings) This is a merger of two commits. --- po/ca/minetest.po | 212 ++++++++++++++++++++++++++++++---------------- 1 file changed, 141 insertions(+), 71 deletions(-) diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 31657fda..5cd438fc 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-21 19:40+0000\n" +"PO-Revision-Date: 2016-04-20 13:21+0000\n" "Last-Translator: Joan Ciprià Moreno Teodoro \n" "Language-Team: Catalan " "\n" @@ -573,7 +573,7 @@ msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" -msgstr "" +msgstr "Mipmap + Aniso. Filtre" #: builtin/mainmenu/tab_settings.lua msgid "No Filter" @@ -589,7 +589,7 @@ msgstr "No!!!" #: builtin/mainmenu/tab_settings.lua msgid "Node Highlighting" -msgstr "" +msgstr "Node ressaltat" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -633,23 +633,23 @@ msgstr "Per habilitar les ombres el controlador OpenGL ha ser utilitzat." #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" -msgstr "" +msgstr "Llindar tàctil (px)" #: builtin/mainmenu/tab_settings.lua msgid "Trilinear Filter" -msgstr "" +msgstr "Filtratge Trilineal" #: builtin/mainmenu/tab_settings.lua msgid "Waving Leaves" -msgstr "" +msgstr "Moviment de les Fulles" #: builtin/mainmenu/tab_settings.lua msgid "Waving Plants" -msgstr "" +msgstr "Moviment de Plantes" #: builtin/mainmenu/tab_settings.lua msgid "Waving Water" -msgstr "" +msgstr "Onatge" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" @@ -717,7 +717,7 @@ msgstr "No es pot trobar o carregar el joc \"" #: src/client/clientlauncher.cpp msgid "Invalid gamespec." -msgstr "" +msgstr "El Joc especificat no és vàlid." #: src/client/clientlauncher.cpp msgid "Main Menu" @@ -1141,7 +1141,7 @@ msgstr "Següent" #: src/keycode.cpp msgid "Nonconvert" -msgstr "" +msgstr "No convertir" #: src/keycode.cpp msgid "Num Lock" @@ -1302,6 +1302,7 @@ msgid "Zoom" msgstr "Zoom" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" "Used to move a suitable spawn area of low land close to (0, 0).\n" @@ -1309,20 +1310,28 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"(X, Y, Z) compensar de fractal del món centre en unitats d \"escala\".\n" +"Solia passar un adequat respawn de terra baixa a prop de (0, 0).\n" +"L'omissió és adequat per als conjunts de mandelbrot, que necessita ser " +"editats per julia estableix.\n" +"Gamma aproximadament -2 a 2. Multiplicar per el \"escala\" per a òfset de " +"nodes." #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = oclusió de la paral.laxi amb informació d'inclinació (més ràpid).\n" +"1 = mapa de relleu (més lent, més precís)." #: src/settings_translation_file.cpp msgid "3D clouds" -msgstr "" +msgstr "Núvols 3D" #: src/settings_translation_file.cpp msgid "3D mode" -msgstr "" +msgstr "Mode 3D" #: src/settings_translation_file.cpp msgid "" @@ -1335,36 +1344,48 @@ msgid "" "- sidebyside: split screen side by side.\n" "- pageflip: quadbuffer based 3d." msgstr "" +"Suport 3D.\n" +"Currently supported:\n" +"- none: no 3d output.\n" +"- anaglyph: cyan/magenta color 3d.\n" +"- interlaced: odd/even line based polarisation screen support.\n" +"- topbottom: split screen top/bottom.\n" +"- sidebyside: split screen side by side.\n" +"- pageflip: quadbuffer based 3d." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" +"Elegeix una llavor per al nou mapa, deixa buit per a una llavor a l'atzar.\n" +"Serà anul·lat si es crea un nou món al menú principal." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." msgstr "" +"Un missatge que es mostrarà a tots els clients quan el servidor s'estavella." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." msgstr "" +"Un missatge que es mostrarà a tots els clients quan el servidor s'apaga." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "" +msgstr "Límit absolut de cues emergents" #: src/settings_translation_file.cpp msgid "Acceleration in air" -msgstr "" +msgstr "Acceleració en l'aire" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "" +msgstr "Rang del bloc actiu" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Rang d'enviament de l'objecte actiu" #: src/settings_translation_file.cpp msgid "" @@ -1372,12 +1393,18 @@ msgid "" "Leave this blank to start a local server.\n" "Note that the address field in the main menu overrides this setting." msgstr "" +"Adreça a connectar-se.\n" +"Deixar aquest espai en buit per començar un servidor local.\n" +"Tingueu en compte que el camp d'adreça en el menú principal invalida aquest " +"paràmetre." #: src/settings_translation_file.cpp msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Ajustar la configuració de punts per polsada (dpi) a la teva pantalla (no " +"X11/Sols Android) Ex. per a pantalles amb 4K." #: src/settings_translation_file.cpp msgid "" @@ -1387,11 +1414,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Advanced" -msgstr "" +msgstr "Avançat" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Fred d'altitud" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1399,19 +1426,19 @@ msgstr "Sempre volar y ràpid" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Gamma d'oclusió d'ambient" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Amplifica les valls" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" -msgstr "" +msgstr "Filtrat anisotròpic" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "" +msgstr "Anunciar servidor" #: src/settings_translation_file.cpp msgid "" @@ -1419,18 +1446,21 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Anunciar a aquesta llista de servidors.\n" +"Si vols anunciar el teu direcció ipv6, fes servir serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "Aproximar (X, Y, Z) escala del fractal en els nodes." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Preguntar per tornar a connectar després d'una caiguda" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Automàticament informar a la llista del servidor." #: src/settings_translation_file.cpp msgid "Backward key" @@ -1438,27 +1468,27 @@ msgstr "Tecla de retrocés" #: src/settings_translation_file.cpp msgid "Base terrain height" -msgstr "" +msgstr "Alçada del terreny base" #: src/settings_translation_file.cpp msgid "Basic" -msgstr "" +msgstr "Bàsic" #: src/settings_translation_file.cpp msgid "Bilinear filtering" -msgstr "" +msgstr "Filtre bilineal" #: src/settings_translation_file.cpp msgid "Bind address" -msgstr "" +msgstr "Adreça BIND" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "Bits per píxel (profunditat de color) en el mode de pantalla completa." #: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "" +msgstr "Construir dins el jugador" #: src/settings_translation_file.cpp msgid "Camera smoothing" @@ -1470,27 +1500,27 @@ msgstr "Suavitzat de la càmera en mode cinematogràfic" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "" +msgstr "Tecla alternativa per a l'actualització de la càmera" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Soroll de cova #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Soroll de cova #2" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Coves i túnels es formen en la intersecció dels dos sorolls" #: src/settings_translation_file.cpp msgid "Chat key" -msgstr "" +msgstr "Tecla del xat" #: src/settings_translation_file.cpp msgid "Chat toggle key" -msgstr "" +msgstr "Tecla alternativa per al xat" #: src/settings_translation_file.cpp msgid "" @@ -1514,10 +1544,29 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"Selecció de 18 fractals de 9 fórmules.\n" +"1 = 4D \"Roundy\" mandelbrot set.\n" +"2 = 4D \"Roundy\" julia set.\n" +"3 = 4D \"Squarry\" mandelbrot set.\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "" +msgstr "Mida del chunk" #: src/settings_translation_file.cpp msgid "Cinematic mode" @@ -1525,83 +1574,91 @@ msgstr "Mode cinematogràfic" #: src/settings_translation_file.cpp msgid "Cinematic mode key" -msgstr "" +msgstr "Tecla mode cinematogràfic" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Netejar textures transparents" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "" +msgstr "Client i Servidor" #: src/settings_translation_file.cpp msgid "Climbing speed" -msgstr "" +msgstr "Velocitat d'escalada" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "" +msgstr "Alçada del núvol" #: src/settings_translation_file.cpp msgid "Cloud radius" -msgstr "" +msgstr "Radi del núvol" #: src/settings_translation_file.cpp msgid "Clouds" -msgstr "" +msgstr "Núvols" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "" +msgstr "Els núvols són un efecte de costat del client." #: src/settings_translation_file.cpp msgid "Clouds in menu" -msgstr "" +msgstr "Núvols en el menú" #: src/settings_translation_file.cpp msgid "Colored fog" -msgstr "" +msgstr "Boira de color" #: src/settings_translation_file.cpp msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Llista de mods de fiar separada per comes que tenen permís per accedir a " +"funcions\n" +"insegures fins i tot quan \"mod security\" està activat (via " +"request_insecure_environment ())." #: src/settings_translation_file.cpp msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Llista de mods separada per comes que tenen permís per accedir a les APIs " +"HTTP,\n" +"les quals els permeten pujar/descarregar informació de/cap a internet." #: src/settings_translation_file.cpp msgid "Command key" -msgstr "" +msgstr "Tecla comandament" #: src/settings_translation_file.cpp msgid "Connect glass" -msgstr "" +msgstr "Connectar vidre" #: src/settings_translation_file.cpp msgid "Connect to external media server" -msgstr "" +msgstr "Connectar a servidor de mitjans externs" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "" +msgstr "Connecta vidre si el node ho admet." #: src/settings_translation_file.cpp +#, fuzzy msgid "Console alpha" -msgstr "" +msgstr "Consola Alpha" #: src/settings_translation_file.cpp msgid "Console color" -msgstr "" +msgstr "Color de la consola" #: src/settings_translation_file.cpp msgid "Console key" -msgstr "" +msgstr "Tecla de la consola" #: src/settings_translation_file.cpp msgid "Continuous forward" @@ -1621,40 +1678,49 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"Controla la duració del cicle dia/nit.\n" +"Exemples: 72 = 20min, 360 = 4min, 1 = 24hora, 0 = dia/nit/el que sigui es " +"queda inalterat." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"Controla la mida dels deserts i platges a Mapgen v6.\n" +"Quan \"snowbiomes\" estan activats 'mgv6_freq_desert' és ignorat." #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Controla el pendent o la profunditat de les depressions de llac." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Controla la pendent i alçada dels turons." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "" +msgstr "Missatge d'error" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crea característiques imprevisibles de la lava en coves.\n" +"Aquestes poden fer difícil minar. Zero els inhabilita (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crea característiques imprevisibles de l'aigua en coves.\n" +"Aquestes poden fer difícil minar. Zero els inhabilita (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Punt de mira Alpha" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." @@ -1662,63 +1728,67 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "Color del punt de mira" #: src/settings_translation_file.cpp msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "Color del punt de mira (R, G, B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "" +msgstr "Velocitat al ajupir-se" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI (punts per polsada)" #: src/settings_translation_file.cpp msgid "Damage" -msgstr "" +msgstr "Dany" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "" +msgstr "Tecla alternativa per a la informació de la depuració" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Nivell de registre de depuració" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Pas de servidor dedicat" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "" +msgstr "Acceleració per defecte" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "" +msgstr "Joc per defecte" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Joc per defecte en crear un nou món.\n" +"Aço será invalid quan es cree un món des del menú principal." #: src/settings_translation_file.cpp msgid "Default password" -msgstr "" +msgstr "Contrasenya per defecte" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Privilegis per defecte" #: src/settings_translation_file.cpp msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Temporització per defecte per a cURL, manifestat en mil·lisegons.\n" +"Només té un efecte si és compilat amb cURL." #: src/settings_translation_file.cpp msgid "" From 3de452e0d21283dd38d2f1f11ed3681d3f60515c Mon Sep 17 00:00:00 2001 From: Claybiokiller Date: Sun, 24 Apr 2016 15:15:50 +0200 Subject: [PATCH 473/531] Translated using Weblate (Chinese (China)) Currently translated at 75.4% (653 of 865 strings) --- po/zh_CN/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index 5d2bda7a..fa527aa5 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-30 01:31+0000\n" -"Last-Translator: YFdyh000 \n" +"PO-Revision-Date: 2016-04-24 15:15+0000\n" +"Last-Translator: Claybiokiller \n" "Language-Team: Chinese (China) " "\n" "Language: zh_CN\n" @@ -255,7 +255,7 @@ msgstr "Mod" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" +msgstr "可选附加一逗号起始的孔隙度参数。" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a comma seperated list of flags." From 6667ffc0ab680783aad4ea50200d9b09fe9b8e96 Mon Sep 17 00:00:00 2001 From: Emon Omen Date: Fri, 29 Apr 2016 21:48:10 +0200 Subject: [PATCH 474/531] Translated using Weblate (Italian) Currently translated at 100.0% (865 of 865 strings) This is a merger of two commits. --- po/it/minetest.po | 1755 +++++++++++++++++++++++++++------------------ 1 file changed, 1062 insertions(+), 693 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index cb9e1f34..8f1353aa 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -1,15 +1,14 @@ -# Italian translation for Minetest. -# Copyright (C) 2011 Perttu Ahola "celeron55" +# Minetest's Italian localization. +# Copyright (C) 2011-2016 Perttu Ahola # This file is distributed under the same license as the Minetest package. -# Giuseppe Bilotta , 2011. -# +# Emon , 2016. msgid "" msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-12 13:59+0000\n" -"Last-Translator: Elia Zammuto \n" +"PO-Revision-Date: 2016-04-29 22:02+0000\n" +"Last-Translator: Emon Omen \n" "Language-Team: Italian " "\n" "Language: it\n" @@ -17,28 +16,27 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" -msgstr "" -"Si è verificato un errore in uno script in Lua, come ad esempio una mod:" +msgstr "E' avvenuto un errore in uno script Lua, come un mod.:" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "Si è verificato un errore:" +msgstr "E' avvenuto un errore:" #: builtin/fstk/ui.lua msgid "Main menu" -msgstr "Menù principale" +msgstr "Menu principale" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" -msgstr "Ok" +msgstr "Va bene" #: builtin/fstk/ui.lua msgid "Reconnect" -msgstr "Riconnettersi" +msgstr "Riconnettere" #: builtin/fstk/ui.lua msgid "The server has requested a reconnect:" @@ -50,36 +48,36 @@ msgstr "Caricamento..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "La versione dei protocolli non coincide. " +msgstr "Versione del protocollo non corrispondente. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "Il server richiede la versione $1 del protocollo. " +msgstr "Il server impone la versione di protocollo $1. " #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " -msgstr "Il server supporta versioni del protocollo comprese fra $1 e $2. " +msgstr "Il server supporta versioni di protocollo comprese tra $1 e $2. " #: builtin/mainmenu/common.lua msgid "Try reenabling public serverlist and check your internet connection." msgstr "" -"Prova a riabilitare la lista dei server pubblici e controlla la tua " -"connessione ad Internet." +"Provate a riabilitare l'elenco dei server pubblici e controllate la vostra " +"connessione internet." #: builtin/mainmenu/common.lua msgid "We only support protocol version $1." -msgstr "Supportiamo soltanto la versione $1 del protocollo." +msgstr "Supportiamo solo il protocollo versione $1." #: builtin/mainmenu/common.lua msgid "We support protocol versions between version $1 and $2." -msgstr "Supportiamo soltanto versioni del protocollo comprese tra $1 e $2." +msgstr "Supportiamo versioni di protocollo comprese tra $1 e $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp msgid "Cancel" -msgstr "Annulla" +msgstr "Annullare" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_mods.lua msgid "Depends:" @@ -87,31 +85,31 @@ msgstr "Dipendenze:" #: builtin/mainmenu/dlg_config_world.lua msgid "Disable MP" -msgstr "Disattiva modpack" +msgstr "Disabilitare p.m." #: builtin/mainmenu/dlg_config_world.lua msgid "Enable MP" -msgstr "Attiva modpack" +msgstr "Abilitare p.m." #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" -msgstr "Attivali tutti" +msgstr "Abilitarli tutti" #: builtin/mainmenu/dlg_config_world.lua msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." msgstr "" -"Impossibile abilitare il modulo \"$1\" perché contiene caratteri non " -"permessi. Soltanto i caratteri [a-z0-9_] sono permessi." +"Abilitazione del mod. \"$1\" fallita perché contiene caratteri non ammessi. " +"Sono ammessi solo i caratteri [a-z0-9_]." #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" -msgstr "Nasc. gioco" +msgstr "Nasc. del gioco" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide mp content" -msgstr "Nasc. cont. pacchetti" +msgstr "Nasc. il cont. dei pacchetti" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -120,7 +118,7 @@ msgstr "Mod.:" #: builtin/mainmenu/dlg_config_world.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp msgid "Save" -msgstr "Salva" +msgstr "Salvare" #: builtin/mainmenu/dlg_config_world.lua msgid "World:" @@ -128,7 +126,7 @@ msgstr "Mondo:" #: builtin/mainmenu/dlg_config_world.lua msgid "enabled" -msgstr "attivata" +msgstr "abilitato" #: builtin/mainmenu/dlg_create_world.lua msgid "A world named \"$1\" already exists" @@ -136,15 +134,15 @@ msgstr "Esiste già un mondo chiamato \"$1\"" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" -msgstr "Crea" +msgstr "Creare" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "Scaricare un sottogioco, ad esempio minetest_game, da minetest.net" +msgstr "Scaricare un sottogioco, come minetest_game, da minetest.net" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" -msgstr "Scaricane uno da minetest.net" +msgstr "Scaricarne uno da minetest.net" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Game" @@ -152,13 +150,11 @@ msgstr "Gioco" #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp msgid "Mapgen" -msgstr "Generat. mappe" +msgstr "Generatore mappa" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" -msgstr "" -"Non è stato fornito nessun nome del mondo oppure non è stato selezionato " -"nessun gioco" +msgstr "Non è stato dato nessun nome di mondo o non è stato scelto nessun gioco" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" @@ -166,8 +162,7 @@ msgstr "Seme casuale" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." -msgstr "" -"Attenzione: il test di sviluppo minimale è pensato per gli sviluppatori." +msgstr "Avviso: il \"minimal development test\" è inteso per gli sviluppatori." #: builtin/mainmenu/dlg_create_world.lua msgid "World name" @@ -175,7 +170,7 @@ msgstr "Nome del mondo" #: builtin/mainmenu/dlg_create_world.lua msgid "You have no subgames installed." -msgstr "Non hai installato nessun sottogioco." +msgstr "Non avete sottogiochi installati." #: builtin/mainmenu/dlg_delete_mod.lua msgid "Are you sure you want to delete \"$1\"?" @@ -183,11 +178,11 @@ msgstr "Siete certi di volere cancellare \"$1\"?" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" -msgstr "Gestore dei moduli: la cancellazione di \"$1\" è fallita" +msgstr "Modmgr: cancellazione di \"$1\" fallita" #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: invalid modpath \"$1\"" -msgstr "Gestore dei moduli: percorso del modulo \"$1\" non valido" +msgstr "Modmgr: percorso mod. non valido \"$1\"" #: builtin/mainmenu/dlg_delete_mod.lua msgid "No of course not!" @@ -212,23 +207,23 @@ msgstr "Accettare" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "Rinominare il pacchetto moduli:" +msgstr "Rinominare il pacchetto mod.:" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "\"$1\" is not a valid flag." -msgstr "\"$1\" non è una bandiera valida." +msgstr "\"$1\" non è un marcatore valido." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "(No description of setting given)" -msgstr "(Non è disponibile nessuna descrizione dell'impostazione)" +msgstr "(Non è stata fornita nessuna descrizione dell'impostazione)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr ", , (, , ), , " ", " msgstr "" -"Formato: , , (, , ), , " -", " +"Formato: , , (, , " +"), , , " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -260,23 +255,24 @@ msgstr "Giochi" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua msgid "Mods" -msgstr "Moduli" +msgstr "Mod." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Optionally the lacunarity can be appended with a leading comma." msgstr "" +"Facoltativamente si può aggiungere la lacunarità con una virgola davanti." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a comma seperated list of flags." -msgstr "Inserire una lista di impostazioni separate da virgola." +msgstr "Inserite un elenco di valori separati da virgole, prego." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid integer." -msgstr "Inserire un intero valido." +msgstr "Inserite un numero intero valido, prego." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a valid number." -msgstr "Inserire un numero valido." +msgstr "Inserite un numero valido, prego." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Possible values are: " @@ -284,15 +280,15 @@ msgstr "I valori possibili sono: " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Restore Default" -msgstr "Ripristina predefiniti" +msgstr "Ripristino predefinite" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Select path" -msgstr "Selezionare il percorso" +msgstr "Scegliere il percorso" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Show technical names" -msgstr "Mostra nomi tecnici" +msgstr "Mostrare i nomi tecnici" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "The value must be greater than $1." @@ -308,30 +304,29 @@ msgid "" "Install Mod: unsupported filetype \"$1\" or broken archive" msgstr "" "\n" -"Installazione modulo: tipo di file non supportato \"$1\"" +"Insallatore mod.: tipo di file non supportato \"$1\" o archivio danneggiato" #: builtin/mainmenu/modmgr.lua msgid "Failed to install $1 to $2" -msgstr "L'installazione di $1 in $2 è fallita" +msgstr "Installazione di $1 in $2 fallita" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: file: \"$1\"" -msgstr "Installazione modulo: file: \"$1\"" +msgstr "Installatore mod.: file: \"$1\"" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find real modname for: $1" -msgstr "" -"Installazione modulo: impossibile trovare il vero nome del modulo per: $1" +msgstr "Installatore mod.: impossibile trovare il vero nome mod per: $1" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" msgstr "" -"Installazione modulo: impossibile trovare un nome di cartella appropriato " -"per il pacchetto moduli $1" +"Installatore mod.: impossibile trovare un nome cartella adatto per il " +"pacchetto mod $1" #: builtin/mainmenu/store.lua msgid "Close store" -msgstr "Chiudi deposito" +msgstr "Chiudere il negozio" #: builtin/mainmenu/store.lua msgid "Downloading $1, please wait..." @@ -351,11 +346,11 @@ msgstr "Valutazione" #: builtin/mainmenu/store.lua msgid "Search" -msgstr "Cerca" +msgstr "Cercare" #: builtin/mainmenu/store.lua msgid "Shortname:" -msgstr "Nome corto:" +msgstr "Nome abbreviato:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" @@ -363,11 +358,11 @@ msgstr "Installato con successo:" #: builtin/mainmenu/store.lua msgid "Unsorted" -msgstr "Non categorizzato" +msgstr "Non ordinati" #: builtin/mainmenu/store.lua msgid "re-Install" -msgstr "Reinstallare" +msgstr "reinstallare" #: builtin/mainmenu/tab_credits.lua msgid "Active Contributors" @@ -379,7 +374,7 @@ msgstr "Sviluppatori principali" #: builtin/mainmenu/tab_credits.lua msgid "Credits" -msgstr "Riconoscimenti" +msgstr "Crediti" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" @@ -387,7 +382,7 @@ msgstr "Contributori precedenti" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "Precedente Nucleo sviluppatori" +msgstr "Sviluppatori principali precedenti" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -407,19 +402,19 @@ msgstr "Rinominare" #: builtin/mainmenu/tab_mods.lua msgid "Select Mod File:" -msgstr "Selezionare il file modulo:" +msgstr "Scegliere il file mod.:" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected mod" -msgstr "Disinstalla la mod selezionata" +msgstr "Disinstallare il modulo scelto" #: builtin/mainmenu/tab_mods.lua msgid "Uninstall selected modpack" -msgstr "Disinstallare il pacchetto moduli selezionato" +msgstr "Disinstallare il pacchetto mod. scelto" #: builtin/mainmenu/tab_multiplayer.lua msgid "Address / Port :" -msgstr "Indirizzo / Porta:" +msgstr "Indirizzo / Porta :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -427,7 +422,7 @@ msgstr "Client" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" -msgstr "Connettiti" +msgstr "Connettersi" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" @@ -435,16 +430,16 @@ msgstr "Modalità creativa" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Damage enabled" -msgstr "Danni abilitati" +msgstr "Danno abilitato" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Delete" -msgstr "Cancella" +msgstr "Cancellare" #: builtin/mainmenu/tab_multiplayer.lua msgid "Name / Password :" -msgstr "Nome / Password:" +msgstr "Nome / Password :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Public Serverlist" @@ -452,11 +447,11 @@ msgstr "Elenco dei server pubblici" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" -msgstr "attiva PvP" +msgstr "GcG abilitato" #: builtin/mainmenu/tab_server.lua msgid "Bind Address" -msgstr "" +msgstr "Legare indirizzo" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Configure" @@ -482,7 +477,7 @@ msgstr "Nuovo" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "No world created or selected!" -msgstr "Nessun mondo creato o selezionato!" +msgstr "Nessun mondo creato o scelto!" #: builtin/mainmenu/tab_server.lua msgid "Port" @@ -494,7 +489,7 @@ msgstr "Pubblico" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua msgid "Select World:" -msgstr "Selezionare il mondo:" +msgstr "Scegliere il mondo:" #: builtin/mainmenu/tab_server.lua msgid "Server" @@ -510,37 +505,33 @@ msgstr "Avviare il gioco" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" -msgstr "Nuvole 3D" +msgstr "Nuvole in 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Impostazioni" +msgstr "Impostazioni avanzate" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Antialias:" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Are you sure to reset your singleplayer world?" -msgstr "Giocatore singolo" +msgstr "Siete certi di volere azzerare il vostro mondo di giocatore singolo?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Filtro bilineare" @@ -550,58 +541,51 @@ msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" -msgstr "Cambiare i tasti" +msgstr "Modificare i tasti" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Vetro connesso" +msgstr "Vetri uniti" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Enable Particles" -msgstr "Attivali tutti" +msgstr "Abilitare particelle" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Fancy Leaves" -msgstr "Foglie opache" +msgstr "Foglie decorative" #: builtin/mainmenu/tab_settings.lua msgid "Generate Normalmaps" -msgstr "" +msgstr "Generare normalmap" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Mipmap" -msgstr "Mip-Mapping" +msgstr "Mipmap" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" -msgstr "Mipmap + Filtro Anisotropico" +msgstr "Mipmap + Filtro aniso." #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filtraggio" +msgstr "Nessun filtro" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Mipmap" -msgstr "Mip-Mapping" +msgstr "Niente mipmap" #: builtin/mainmenu/tab_settings.lua msgid "No!!!" msgstr "No!!!" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "Evidenziamento Nodi" +msgstr "Evidenz. nodo" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" -msgstr "Niente" +msgstr "Nessuno" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" @@ -613,7 +597,7 @@ msgstr "Acqua opaca" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp msgid "Parallax Occlusion" -msgstr "" +msgstr "Occlusione di parallasse" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -628,54 +612,48 @@ msgid "Simple Leaves" msgstr "Foglie semplici" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" -msgstr "Raffinatezza ombreggiature" +msgstr "Illuminaz. uniforme" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" -msgstr "" +msgstr "Immagini:" #: builtin/mainmenu/tab_settings.lua msgid "To enable shaders the OpenGL driver needs to be used." -msgstr "E' necessario usare i driver OpenGL per abilitare gli shader." +msgstr "Per abilitare gli shader è necessario usare i driver OpenGL." #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" -msgstr "" +msgstr "Soglia di tocco (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Filtro trilineare" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "Foglie ondeggianti" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "Piante ondeggianti" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "Acqua ondeggiante" #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" -msgstr "Config. moduli" +msgstr "Config. mod." #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" -msgstr "Menù principale" +msgstr "Principale" #: builtin/mainmenu/tab_simple_main.lua msgid "Start Singleplayer" -msgstr "Avvia giocatore singolo" +msgstr "Avviare il giocatore singolo" #: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp msgid "Play" @@ -691,15 +669,15 @@ msgstr "Nessuna informazione disponibile" #: builtin/mainmenu/tab_texturepacks.lua msgid "Select texture pack:" -msgstr "Selezionare un pacchetto di immagini:" +msgstr "Scegliere il pacchetto di immagini:" #: builtin/mainmenu/tab_texturepacks.lua msgid "Texturepacks" -msgstr "Pacch. Texture" +msgstr "Pacch. di imm." #: src/client.cpp msgid "Connection timed out." -msgstr "Connessione scaduta." +msgstr "Tempo di connessione scaduto." #: src/client.cpp msgid "Done!" @@ -707,11 +685,11 @@ msgstr "Fatto!" #: src/client.cpp msgid "Initializing nodes" -msgstr "Inizializzazione nodi" +msgstr "Inizializzazione dei nodi" #: src/client.cpp msgid "Initializing nodes..." -msgstr "Inizializzazione nodi..." +msgstr "Inizializzazione dei nodi..." #: src/client.cpp msgid "Loading textures..." @@ -719,7 +697,7 @@ msgstr "Caricamento delle texture..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "Ricompilazione degli shader..." +msgstr "Ricostruzione degli shader..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -731,17 +709,15 @@ msgstr "Impossibile trovare o caricare il gioco \"" #: src/client/clientlauncher.cpp msgid "Invalid gamespec." -msgstr "Specifica del gioco non valida." +msgstr "Spec. di gioco non valide." #: src/client/clientlauncher.cpp msgid "Main Menu" -msgstr "Menù principale" +msgstr "Menu principale" #: src/client/clientlauncher.cpp msgid "No world selected and no address provided. Nothing to do." -msgstr "" -"Non è stato selezionato nessun mondo e non è stato fornito nessun indirizzo. " -"Niente da fare." +msgstr "Nessun mondo scelto e nessun indirizzo fornito. Niente da fare." #: src/client/clientlauncher.cpp msgid "Player name too long." @@ -753,7 +729,7 @@ msgstr "Il percorso del mondo fornito non esiste: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "richiedi_fallback_font" +msgstr "necessita_font_ripiego" #: src/game.cpp msgid "" @@ -761,15 +737,15 @@ msgid "" "Check debug.txt for details." msgstr "" "\n" -"Controllare debug.txt per i dettagli." +"Controllate debug.txt per i dettagli." #: src/game.cpp msgid "Change Keys" -msgstr "Cambia i tasti" +msgstr "Modificare i tasti" #: src/game.cpp msgid "Change Password" -msgstr "Cambiare la password" +msgstr "Modificare la password" #: src/game.cpp msgid "Connecting to server..." @@ -777,7 +753,7 @@ msgstr "Connessione al server..." #: src/game.cpp msgid "Continue" -msgstr "Continuare" +msgstr "Proseguire" #: src/game.cpp msgid "Creating client..." @@ -803,15 +779,15 @@ msgid "" msgstr "" "Controlli predefiniti:\n" "- WASD: muoversi\n" -"- Space: saltare/arrampicarsi\n" -"- Shift: strisciare/scendere\n" -"- Q: scartare l'oggetto\n" +"- Spazio: saltare/salire\n" +"- Maiusc: strisciare/scendere\n" +"- Q: lasciare cadere l'oggetto\n" "- I: inventario\n" "- Mouse: girarsi/guardare\n" -"- Tasto sinistro del mouse: scavare/colpire\n" -"- Tasto destro del mouse: posizionare/usare\n" -"- Rotella del mouse: scegliere l'oggetto\n" -"- T: chat\n" +"- Mouse sin.: scavare/colpire\n" +"- Mouse des.: posizionare/usare\n" +"- Rot. mouse: scegliere l'oggetto\n" +"- T: messaggistica\n" #: src/game.cpp msgid "" @@ -828,31 +804,30 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" -"Comandi predefiniti:\n" -"Nessun menù visibile:\n" -"- tocco singolo: attiva pulsante\n" -"- doppio tocco: posiziona/usa\n" -"- scorri le dita: guardati intorno\n" +"Controlli predefiniti:\n" +"Menu non visibile:\n" +"- colpetto: attivare pulsante\n" +"- doppio colpetto: posizionare/usare\n" +"- trascinare col dito: guardare attorno\n" "Menu/Inventario visibile:\n" -"- doppio tocco(fuori):\n" -"--> chiudi\n" -"- tocca una pila poi uno slot:\n" -"--> sposta la pila\n" -"- tocca e trascina, tocca col\n" -"secondo dito: --> posiziona\n" -"un solo oggetto sullo slot\n" +"- doppio colpetto (fuori):\n" +" -->chiudere\n" +"- toccare pila, toccare alloggio:\n" +" --> muovere pila\n" +"- tocco&trascina, colpetto 2o dito\n" +" --> posizionere oggetto singolo nell'alloggio\n" #: src/game.cpp msgid "Exit to Menu" -msgstr "Tornare al menù" +msgstr "Tornare al menu" #: src/game.cpp msgid "Exit to OS" -msgstr "Tornare al sistema operativo" +msgstr "Tornare al s.o." #: src/game.cpp msgid "Item definitions..." -msgstr "Definizioni degli oggetti..." +msgstr "Definizioni dell'oggetto..." #: src/game.cpp msgid "KiB/s" @@ -860,7 +835,7 @@ msgstr "KiB/s" #: src/game.cpp msgid "Media..." -msgstr "Media..." +msgstr "Multimedia..." #: src/game.cpp msgid "MiB/s" @@ -868,7 +843,7 @@ msgstr "MiB/s" #: src/game.cpp msgid "Node definitions..." -msgstr "Definizioni dei cubi..." +msgstr "Definizioni del nodo..." #: src/game.cpp src/guiFormSpecMenu.cpp msgid "Proceed" @@ -880,15 +855,15 @@ msgstr "Risoluzione dell'indirizzo..." #: src/game.cpp msgid "Respawn" -msgstr "Riapparire" +msgstr "Ricomparire" #: src/game.cpp msgid "Shutting down..." -msgstr "Arresto..." +msgstr "Spegnimento..." #: src/game.cpp msgid "Sound Volume" -msgstr "Volume del suono" +msgstr "Volume dell'audio" #: src/game.cpp msgid "You died." @@ -900,7 +875,7 @@ msgstr "Invio " #: src/guiFormSpecMenu.cpp msgid "ok" -msgstr "ok" +msgstr "va bene" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -912,7 +887,7 @@ msgstr "Indietro" #: src/guiKeyChangeMenu.cpp msgid "Chat" -msgstr "Chat" +msgstr "Messaggistica" #: src/guiKeyChangeMenu.cpp msgid "Command" @@ -924,11 +899,11 @@ msgstr "Console" #: src/guiKeyChangeMenu.cpp msgid "Double tap \"jump\" to toggle fly" -msgstr "Volare On/Off = due volte \"saltare\"" +msgstr "Doppio \"saltare\" per il volo" #: src/guiKeyChangeMenu.cpp msgid "Drop" -msgstr "Scartare" +msgstr "Lasciare cadere" #: src/guiKeyChangeMenu.cpp msgid "Forward" @@ -949,7 +924,7 @@ msgstr "Tasto già in uso" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" -"Collegamenti dei tasti. (Se questo menù si incasina, rimuovete la roba da " +"Collegamenti dei tasti. (Se questo menu si incasina, togliete la roba da " "minetest.conf)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp @@ -958,11 +933,11 @@ msgstr "Sinistra" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp msgid "Print stacks" -msgstr "Stampa stack" +msgstr "Stampare stack" #: src/guiKeyChangeMenu.cpp msgid "Range select" -msgstr "Selez. ad area" +msgstr "Raggio visivo" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Right" @@ -974,19 +949,19 @@ msgstr "Strisciare" #: src/guiKeyChangeMenu.cpp msgid "Toggle Cinematic" -msgstr "Cinematico On/Off" +msgstr "Attiv. cinematic" #: src/guiKeyChangeMenu.cpp msgid "Toggle fast" -msgstr "Correre On/Off" +msgstr "Attivare veloce" #: src/guiKeyChangeMenu.cpp msgid "Toggle fly" -msgstr "Volare On/Off" +msgstr "Attivare volo" #: src/guiKeyChangeMenu.cpp msgid "Toggle noclip" -msgstr "Fantasma On/Off" +msgstr "Attivare noclip" #: src/guiKeyChangeMenu.cpp msgid "Use" @@ -994,7 +969,7 @@ msgstr "Usare" #: src/guiKeyChangeMenu.cpp msgid "press key" -msgstr "premere il tasto" +msgstr "prem. il tasto" #: src/guiPasswordChange.cpp msgid "Change" @@ -1014,7 +989,7 @@ msgstr "Vecchia password" #: src/guiPasswordChange.cpp msgid "Passwords do not match!" -msgstr "Le password non coincidono!" +msgstr "Le password non sono uguali!" #: src/guiVolumeChange.cpp msgid "Exit" @@ -1022,28 +997,27 @@ msgstr "Uscire" #: src/guiVolumeChange.cpp msgid "Sound Volume: " -msgstr "Volume suono: " +msgstr "Volume dell'audio: " #: src/keycode.cpp msgid "Apps" msgstr "Applicazioni" #: src/keycode.cpp -#, fuzzy msgid "Attn" -msgstr "Attn" +msgstr "Attenzione" #: src/keycode.cpp msgid "Back" -msgstr "Backspace" +msgstr "Indietro" #: src/keycode.cpp msgid "Capital" -msgstr "Bloc Maiusc" +msgstr "Bloc maiusc" #: src/keycode.cpp msgid "Clear" -msgstr "Canc" +msgstr "Pulire" #: src/keycode.cpp msgid "Comma" @@ -1055,7 +1029,7 @@ msgstr "Control" #: src/keycode.cpp msgid "Convert" -msgstr "Converti" +msgstr "Convertire" #: src/keycode.cpp msgid "CrSel" @@ -1063,7 +1037,7 @@ msgstr "CrSel" #: src/keycode.cpp msgid "Down" -msgstr "Pag. giù" +msgstr "Giù" #: src/keycode.cpp msgid "End" @@ -1071,7 +1045,7 @@ msgstr "Fine" #: src/keycode.cpp msgid "Erase OEF" -msgstr "Cancella OEF" +msgstr "Cancellare l'OEF" #: src/keycode.cpp msgid "Escape" @@ -1087,11 +1061,11 @@ msgstr "Eseguire" #: src/keycode.cpp msgid "Final" -msgstr "Fine" +msgstr "Finale" #: src/keycode.cpp msgid "Help" -msgstr "Aiuto" +msgstr "Help" #: src/keycode.cpp msgid "Home" @@ -1107,7 +1081,7 @@ msgstr "Junja" #: src/keycode.cpp msgid "Kana" -msgstr "Kana" +msgstr "ì" #: src/keycode.cpp msgid "Kanji" @@ -1115,31 +1089,31 @@ msgstr "Kanji" #: src/keycode.cpp msgid "Left Button" -msgstr "Tasto sinistro" +msgstr "Pulsante sinistro" #: src/keycode.cpp msgid "Left Control" -msgstr "Ctrl sx" +msgstr "Ctrl sinistro" #: src/keycode.cpp msgid "Left Menu" -msgstr "Menù a sinistra" +msgstr "Alt sinistro" #: src/keycode.cpp msgid "Left Shift" -msgstr "Maiusc sx" +msgstr "Maiusc sin." #: src/keycode.cpp msgid "Left Windows" -msgstr "Finestre a sinistra" +msgstr "Super sinistro" #: src/keycode.cpp msgid "Menu" -msgstr "Menù" +msgstr "Menu" #: src/keycode.cpp msgid "Middle Button" -msgstr "Tasto centrale" +msgstr "Pulsante centrale" #: src/keycode.cpp msgid "Minus" @@ -1147,11 +1121,11 @@ msgstr "Meno" #: src/keycode.cpp msgid "Mode Change" -msgstr "Cambio di modalità" +msgstr "Cambiare modalità" #: src/keycode.cpp msgid "Next" -msgstr "Successivo" +msgstr "Pag giù" #: src/keycode.cpp msgid "Nonconvert" @@ -1219,7 +1193,7 @@ msgstr "Tast. num. 9" #: src/keycode.cpp msgid "OEM Clear" -msgstr "Ripulisci OEM" +msgstr "Pulire l'OEM" #: src/keycode.cpp msgid "PA1" @@ -1243,7 +1217,7 @@ msgstr "Stamp" #: src/keycode.cpp msgid "Prior" -msgstr "Precedente" +msgstr "Pag su" #: src/keycode.cpp msgid "Return" @@ -1251,27 +1225,27 @@ msgstr "Invio" #: src/keycode.cpp msgid "Right Button" -msgstr "Tasto destro" +msgstr "Pulsante destro" #: src/keycode.cpp msgid "Right Control" -msgstr "Ctrl dx" +msgstr "Ctrl destro" #: src/keycode.cpp msgid "Right Menu" -msgstr "Menù a destra" +msgstr "Alt destro" #: src/keycode.cpp msgid "Right Shift" -msgstr "Maiusc dx" +msgstr "Maiusc des." #: src/keycode.cpp msgid "Right Windows" -msgstr "Finestre a destra" +msgstr "Super destro" #: src/keycode.cpp msgid "Scroll Lock" -msgstr "Bloc Scorr" +msgstr "Bloc" #: src/keycode.cpp msgid "Select" @@ -1287,7 +1261,7 @@ msgstr "Sospensione" #: src/keycode.cpp msgid "Snapshot" -msgstr "Istantanea" +msgstr "Stamp" #: src/keycode.cpp msgid "Space" @@ -1299,7 +1273,7 @@ msgstr "Tab" #: src/keycode.cpp msgid "Up" -msgstr "Pag. su" +msgstr "Su" #: src/keycode.cpp msgid "X Button 1" @@ -1321,23 +1295,32 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"(X, Y, Z) compensazione del frattale dal centro del mondo in unità di " +"'scala'.\n" +"Usata per muovere un'adeguata area di comparsa di terreno basso vicino a (0, " +"0).\n" +"La predefinita è adatta alle serie mandelbrot, necessita modifiche per le " +"serie julia.\n" +"Spazia pressapoco tra -2 e 2. Moltiplicate per 'scala' per una compensazione " +"in nodi." #: src/settings_translation_file.cpp msgid "" "0 = parallax occlusion with slope information (faster).\n" "1 = relief mapping (slower, more accurate)." msgstr "" +"0 = occlusione di parallasse con informazione di pendenza (più veloce).\n" +"1 = mappatura di rilievo (più lenta, più accurata)." #: src/settings_translation_file.cpp msgid "3D clouds" -msgstr "Nuvole 3D" +msgstr "Nuvole in 3D" #: src/settings_translation_file.cpp msgid "3D mode" msgstr "Modalità 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1349,36 +1332,34 @@ msgid "" "- pageflip: quadbuffer based 3d." msgstr "" "Supporto 3D.\n" -"Supportati attualmente:\n" -"- none: nessuna uscita 3d.\n" -"- anaglyph: 3d anaglifico ciano/magenta.\n" -"- interlaced: interlacciato linee pari/dispari basato sul supporto di " -"polarizzazione dello schermo.\n" -"- topbottom: dividi lo schermo sopra e sotto.\n" -"- sidebyside: dividi lo schermo a destra e sinistra." +"Attualmente supportati:\n" +"- nessuno: nessun output 3D.\n" +"- anaglifo: 3D in colori ciano/magenta.\n" +"- intrecciato: supporto per polarizzazione schermo basata su linea " +"pari/dispari.\n" +"- superiore-inferiore: divisione dello schermo in superiore/inferiore.\n" +"- fianco-a-fianco: divisione dello schermo fianco a fianco.\n" +"- sfoglia-pagina: 3D basato su buffer quadruplo." #: src/settings_translation_file.cpp msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Un seme scelto per la generazione di una nuova mappa, lascialo vuoto per uno " -"casuale.\n" -"Verrà sovrascritto quando verrà creata un nuovo mondo nel menù principale." +"Un seme predefinito per la nuova mappa, lasciate vuoto per uno casuale.\n" +"Verrà ignorato alla creazione di un nuovo mondo nel menu principale." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server crashes." -msgstr "" -"Un messaggio da mostrare a tutti i giocatori quando il server va in errore." +msgstr "Un messaggio da mostrare a tutti i client quando il server cade." #: src/settings_translation_file.cpp msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" -"Un messaggio da mostrare a tutti i giocatori quando il server si spegne." +msgstr "Un messaggio da mostrare a tutti i client quando il server si spegne." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" -msgstr "Limite assoluto delle code degli emerge" +msgstr "Limite assoluto di code 'emerge'" #: src/settings_translation_file.cpp msgid "Acceleration in air" @@ -1386,11 +1367,11 @@ msgstr "Accelerazione in aria" #: src/settings_translation_file.cpp msgid "Active block range" -msgstr "Distanza di attivazione blocchi" +msgstr "Portata del blocco attivo" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "Distanza di invio oggetti ativi" +msgstr "Portata di invio dell'oggetto attivo" #: src/settings_translation_file.cpp msgid "" @@ -1399,8 +1380,8 @@ msgid "" "Note that the address field in the main menu overrides this setting." msgstr "" "Indirizzo a cui connettersi.\n" -"Lascialo bianco per avviare un server locale.\n" -"Nota che l'indirizzo impostato nel menù principale sovrascrive questa " +"Lasciatelo vuoto per avviare un server locale.\n" +"Si noti che il campo indirizzo nel menu principale ignora questa " "impostazione." #: src/settings_translation_file.cpp @@ -1408,34 +1389,37 @@ msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" -"Regola i dpi del tuo schermo (no X11/solo Android) per esempio schermi 4K." +"Adattate la configurazione dpi al vostro schermo (non X11/solo Android) ad " +"es. per schermi 4k." #: src/settings_translation_file.cpp msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"Adattate la codifica di gamma per le tavole di illuminazione. I numeri più " +"bassi sono più chiari.\n" +"Questa impostazione è solo per il client ed è ignorata dal server." #: src/settings_translation_file.cpp msgid "Advanced" -msgstr "Avanzato" +msgstr "Avanzate" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Congelamento da altitudine" #: src/settings_translation_file.cpp msgid "Always fly and fast" -msgstr "Volo veloce permanentemente abilitato" +msgstr "Sempre 'volo' e 'veloce'" #: src/settings_translation_file.cpp -#, fuzzy msgid "Ambient occlusion gamma" -msgstr "Ambient occlusion gamma" +msgstr "Gamma di occlusione ambientale" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Ingrandisce le vallate" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1443,7 +1427,7 @@ msgstr "Filtro anisotropico" #: src/settings_translation_file.cpp msgid "Announce server" -msgstr "Annuncia il server" +msgstr "Rendere noto il server" #: src/settings_translation_file.cpp msgid "" @@ -1451,27 +1435,29 @@ msgid "" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"Rendere noto a questo elenco di server.\n" +"Se volete rendere noto il vostro indirizzo ipv6, usate serverlist_url = " +"v6.servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "Scala (X, Y, Z) approssimativa del frattale in nodi." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" -msgstr "Chiedi se riconnettersi dopo un errore" +msgstr "Chiedere di riconnettersi dopo un crollo" #: src/settings_translation_file.cpp msgid "Automaticaly report to the serverlist." -msgstr "Rapporto automatico alla lista di server." +msgstr "Rapporto automatico all'elenco dei server." #: src/settings_translation_file.cpp msgid "Backward key" -msgstr "Tasto Indietro" +msgstr "Tasto all'indietro" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Altezza delle onde dell'acqua" +msgstr "Altezza base del terreno" #: src/settings_translation_file.cpp msgid "Basic" @@ -1482,49 +1468,48 @@ msgid "Bilinear filtering" msgstr "Filtro bilineare" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "Risoluzione dell'indirizzo..." +msgstr "Lega indirizzo" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "Bit per pixel (profondita del colore) in schermo intero." +msgstr "Bit per pixel (cioè profondità di colore) in modalità schermo intero." #: src/settings_translation_file.cpp msgid "Build inside player" -msgstr "" +msgstr "Costruisci nel giocatore" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "Ammorbidisci la visuale" +msgstr "Camera scorrevole" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "Ammorbidisci la visuale in modalità cinematica" +msgstr "Camera scorrevole in modalità cinematic" #: src/settings_translation_file.cpp msgid "Camera update toggle key" -msgstr "Tasto Attiva/Disattiva aggiornamento della camera" +msgstr "Tasto di scelta di aggiornamento della camera" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "'Rumore' n°1 della caverna" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "'Rumore' n°2 della caverna" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Caverne e gallerie si formano all'intersezione dei due 'rumori'" #: src/settings_translation_file.cpp msgid "Chat key" -msgstr "Tasto Chat" +msgstr "Tasto della messaggistica" #: src/settings_translation_file.cpp msgid "Chat toggle key" -msgstr "Tasto mostra/nascondi chat" +msgstr "Tasto di scelta della messaggistica" #: src/settings_translation_file.cpp msgid "" @@ -1548,26 +1533,45 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"Scelta di 18 frattali da 9 formule.\n" +"1 = 4D \"Arrotondato\" serie mandelbrot.\n" +"2 = 4D \"Arrotondato\" serie julia.\n" +"3 = 4D \"Squadrato\" serie mandelbrot.\n" +"4 = 4D \"Squadrato\" serie julia.\n" +"5 = 4D \"Cugino Mandy\" serie mandelbrot.\n" +"6 = 4D \"Cugino Mandy\" serie julia.\n" +"7 = 4D \"Variazione\" serie mandelbrot.\n" +"8 = 4D \"Variazione\" serie julia.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" serie mandelbrot.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" serie julia.\n" +"11 = 3D \"Albero di Natale\" serie mandelbrot.\n" +"12 = 3D \"Albero di Natale\" serie julia.\n" +"13 = 3D \"Mandelbulb\" serie mandelbrot.\n" +"14 = 3D \"Mandelbulb\" serie julia.\n" +"15 = 3D \"Coseno Mandelbulb\" serie mandelbrot.\n" +"16 = 3D \"Coseno Mandelbulb\" serie julia.\n" +"17 = 4D \"Mandelbulb\" serie mandelbrot.\n" +"18 = 4D \"Mandelbulb\" serie julia." #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "dimensione del blocco" +msgstr "Dimensione del pezzo" #: src/settings_translation_file.cpp msgid "Cinematic mode" -msgstr "Modalità cinematica" +msgstr "Modalità cinematic" #: src/settings_translation_file.cpp msgid "Cinematic mode key" -msgstr "Tasto modalità cinematica" +msgstr "Tasto della modalità cinematic" #: src/settings_translation_file.cpp msgid "Clean transparent textures" -msgstr "" +msgstr "Immagini trasparenti pulite" #: src/settings_translation_file.cpp msgid "Client and Server" -msgstr "Client e Server" +msgstr "Client e server" #: src/settings_translation_file.cpp msgid "Climbing speed" @@ -1575,7 +1579,7 @@ msgstr "Velocità di arrampicata" #: src/settings_translation_file.cpp msgid "Cloud height" -msgstr "Altezza delle nuvole" +msgstr "Altitudine delle nuvole" #: src/settings_translation_file.cpp msgid "Cloud radius" @@ -1587,11 +1591,11 @@ msgstr "Nuvole" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." -msgstr "Le nuvole sono un effetto lato client." +msgstr "Le nuvole sono un effetto sul lato client." #: src/settings_translation_file.cpp msgid "Clouds in menu" -msgstr "Nuvole nel menù" +msgstr "Nuvole nel menu" #: src/settings_translation_file.cpp msgid "Colored fog" @@ -1602,33 +1606,39 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"Elenco separato da virgole di mod. fidati a cui è permesso l'accesso a " +"funzioni\n" +"non sicure anche quando la sicurezza dei mod è attivata (tramite " +"request_insecure_environment())." #: src/settings_translation_file.cpp msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Elenco separato da virgole di mod. a cui è permesso l'accesso alle API HTTP," +"\n" +"che gli permettono di caricare e scaricare dati su/da internet." #: src/settings_translation_file.cpp msgid "Command key" -msgstr "Tasto del comando" +msgstr "Tasto di comando" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Vetro connesso" +msgstr "Unire i vetri" #: src/settings_translation_file.cpp msgid "Connect to external media server" -msgstr "Connettiti al server dati esterno" +msgstr "Connettere a un server di media esterni" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." -msgstr "Collega il vetro se supportato dal nodo." +msgstr "Connettere il vetro se è supportato dal nodo." #: src/settings_translation_file.cpp msgid "Console alpha" -msgstr "Console primaira" +msgstr "Trasparenza della console" #: src/settings_translation_file.cpp msgid "Console color" @@ -1636,15 +1646,15 @@ msgstr "Colore della console" #: src/settings_translation_file.cpp msgid "Console key" -msgstr "Tasto per la console" +msgstr "Tasto della console" #: src/settings_translation_file.cpp msgid "Continuous forward" -msgstr "Avanti automatico continuo" +msgstr "Avanti continuo" #: src/settings_translation_file.cpp msgid "Continuous forward movement (only used for testing)." -msgstr "Movimento in avanti continuo (usato solo per i test)." +msgstr "Movimento in avanti continuo (usato solo per le prove)." #: src/settings_translation_file.cpp msgid "Controls" @@ -1656,49 +1666,53 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" -"Definisce la lunghezza del ciclo giorno/notte.\n" -"Ad esempio: 72 = 20min, 360 = 4min, 1 = 24ore, 0 =giorno e notte rimangono " -"fissi." +"Controlla la durata del ciclo giorno/notte.\n" +"Esempi: 72 = 20min, 360 = 4min, 1 = 24ore, 0 = giorno/notte/ecc. restano " +"invariati." #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" -"Definisce la dimensione di deserti e spiagge nel generatoe delle mappe v6.\n" -"Quando i biomi innevati sono abilitati 'mgv6_freq_desert' viene ignorato." +"Controlla la dimensione di spiagge e deserti nel Generatore mappa v.6.\n" +"Quando sono attivati i biomi di neve 'mgv6_freq_desert' viene ignorato." #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Controlla la ripidità/profondità delle depressioni lacustri." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Controlla la ripidità/altezza delle colline." #: src/settings_translation_file.cpp msgid "Crash message" -msgstr "Messaggio di errore" +msgstr "Messaggio di crollo" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crea imprevedibili caratteristiche di lava nelle caverne.\n" +"Queste possono rendere difficile minare. Zero le disabilita. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crea imprevedibili caratteristiche di acqua nelle caverne.\n" +"Queste possono rendere difficile minare. Zero le disabilita. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "Alfa del mirino" +msgstr "Trasparenza del mirino" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "Alfa del mirino (opacità, tra 0 e 255)." +msgstr "Trasparenza del mirino (opacità, tra 0 e 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" @@ -1710,103 +1724,114 @@ msgstr "Colore del mirino (R,G,B)." #: src/settings_translation_file.cpp msgid "Crouch speed" -msgstr "Velocita da accovacciato" +msgstr "Velocità di accovacciamento" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "" +msgstr "DPI" #: src/settings_translation_file.cpp msgid "Damage" -msgstr "Abilitare il danno" +msgstr "Danno" #: src/settings_translation_file.cpp msgid "Debug info toggle key" -msgstr "Comando attiva/disattiva informazioni del debug" +msgstr "Chiave di attivazione delle info. di debug" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Livello del registro di debug" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Passo del server dedicato" #: src/settings_translation_file.cpp msgid "Default acceleration" -msgstr "Accelerazione di default" +msgstr "Accelerazione predefinita" #: src/settings_translation_file.cpp msgid "Default game" -msgstr "Gioco di default" +msgstr "Gioco predefinito" #: src/settings_translation_file.cpp msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Gioco predefinito quando si crea un nuovo mondo.\n" +"Questo sarà ignorato quando si crea un mondo dal menu principale." #: src/settings_translation_file.cpp msgid "Default password" -msgstr "Password di default" +msgstr "Password predefinita" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Privilegi predefiniti" #: src/settings_translation_file.cpp msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Tempo di scadenza predefinito per cURL, espresso in millisecondi.\n" +"Ha effetto solo se si è compilato con cURL." #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"Stabilisce il passo di campionamento dell'immagine.\n" +"Un valore elevato fornisce normal map più uniformi." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" +"Stabilisce la massima distanza di trasferimento del giocatore in blocchi (0 =" +" illimitata)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Ritarda la comparsa dei suggerimenti, espressa in millisecondi." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Gestione delle API Lua deplorate" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Profondità sotto cui troverete caverne grandi." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Profondità sotto cui troverete caverne imponenti." #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Velocità di discesa" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"Descrizione del server, da mostrare quando si unisce un giocatore e " +"nell'elenco dei server." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "De-sincronizza l'animazione del blocco" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." msgstr "" +"Dati di profilo del mod. dettagliati. Utile per gli sviluppatori di mod." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "Profilo dettagliato del mod." #: src/settings_translation_file.cpp msgid "" @@ -1814,59 +1839,63 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Stabilisce la forma del terreno.\n" +"I tre numeri tra parentesi controllano la scala del\n" +"terreno, i tre numeri dovrebbero essere identici." #: src/settings_translation_file.cpp msgid "Disable anticheat" -msgstr "Disattiva l'anticheat" +msgstr "Disabilita anti-trucchi" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "Non permettere password vuote" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "Nome di dominio del server, da mostrare nell'elenco dei server." #: src/settings_translation_file.cpp msgid "Double tap jump for fly" -msgstr "Schiaccia due volte il tasto \"salto\" per volare" +msgstr "Doppio colpetto su salta per volare" #: src/settings_translation_file.cpp msgid "Double-tapping the jump key toggles fly mode." msgstr "" -"Doppio click sul tasto \"salto\" per attivare/disattivare la modalità volo." +"Colpire brevemente il tasto di salto due volte attiva la modalità di volo." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Tasto per lasciare a terra l'oggetto" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Scarico delle info. di debug del gen. mappa." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Attiva modpack" +msgstr "Abilitare VBO" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable mod security" -msgstr "Archivio in linea" +msgstr "Abilitare la sicurezza dei mod." #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Permette il danneggiamento e la morte dei giocatori." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." msgstr "" +"Permette l'input casuale da parte dell'utente (usato solo per le prove)." #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"Abilita l'illuminazione uniforme con l'occlusione ambientale semplice.\n" +"Disabilitare per velocizzare o per un aspetto diverso." #: src/settings_translation_file.cpp msgid "" @@ -1876,6 +1905,11 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Permette di impedire la connessione dei client vecchi.\n" +"I client vecchi sono compatibili nel senso che non crolleranno alla " +"connessione\n" +"ai nuovi server, ma potrebbero non supportare tutte le nuove caratteristiche " +"che vi aspettate." #: src/settings_translation_file.cpp msgid "" @@ -1884,6 +1918,10 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Abilitare l'uso di un server di media remoti (se fornito dal server).\n" +"I server remoti offrono un modo significativamente più veloce per scaricare " +"i media\n" +"(ad es. le immagini) quando ci si connette al server." #: src/settings_translation_file.cpp msgid "" @@ -1891,10 +1929,14 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Abilita/disabilita l'esecuzione di un server IPv6. Un server IPv6 potrebbe " +"essere ristretto\n" +"a client IPv6, dipendentemente dalla configurazione del sistema.\n" +"Viene ignorata se si imposta bind_address." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Abilita l'animazione degli oggetti dell'inventario." #: src/settings_translation_file.cpp msgid "" @@ -1903,109 +1945,122 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"Abilita il bumpmapping per le immagini. E' necessario che il pacchetto " +"texture fornisca le normalmap\n" +"o è necessario che siano generate automaticamente.\n" +"Richiede l'attivazione degli shader." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." -msgstr "" +msgstr "Abilita la cache delle mesh ruotate con facedir." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Abilita la minimap." +msgstr "Abilita il tone mapping filmico" #: src/settings_translation_file.cpp msgid "Enables minimap." -msgstr "Abilita la minimap." +msgstr "Abilita il minimap." #: src/settings_translation_file.cpp msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" +"Abilita la generazione al volo delle normalmap (effetto a sbalzo).\n" +"Richiede l'attivazione del bumpmapping." #: src/settings_translation_file.cpp msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"Abilita la mappatura dell'occlusione di parallasse.\n" +"Richiede l'attivazione degli shader." #: src/settings_translation_file.cpp msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Opzione sperimentale, potrebbe causare spazi visibili tra i blocchi\n" +"quando impostata su valori maggiori di 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS nel menu di pausa" #: src/settings_translation_file.cpp msgid "FSAA" -msgstr "" +msgstr "FSAA" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "Ondeggiamento visuale quando si cade" +msgstr "Ondeggiamento in caduta" #: src/settings_translation_file.cpp msgid "Fallback font" -msgstr "Fallback font" +msgstr "Font di ripiego" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Ombreggiatura del font di ripiego" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Trasparenza del font di ripiego" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Dimensione del font di ripiego" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Tasto 'veloce'" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Accelerazione della modalità veloce" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Velocità della modalità veloce" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Movimento veloce" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Movimento veloce (tramite il tasto usare).\n" +"Ciò richiede il privilegio \"fast\" sul server." #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Campo visivo" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Campo visivo in gradi." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"File in client/serverlist/ contenente i vostri server preferiti mostrati " +"nella linguetta Giocatori multipli." #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "" +msgstr "Profondità dello riempitore" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "Mappatura del tono filmico" #: src/settings_translation_file.cpp msgid "" @@ -2014,6 +2069,13 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" +"Le immagini filtrate possono miscelare valori RGB coi vicini completamente " +"trasparenti,\n" +"che gli ottimizzatori PNG solitamente scartano, risultando a volte in un " +"bordo chiaro o\n" +"scuro verso le immagini trasparenti. Applicate questo filtro per ripulire " +"quell'effetto\n" +"al momento del caricamento delle immagini." #: src/settings_translation_file.cpp msgid "Filtering" @@ -2021,107 +2083,114 @@ msgstr "Filtraggio" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Seme fisso della mappa" #: src/settings_translation_file.cpp msgid "Fly key" -msgstr "" +msgstr "Tasto di volo" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "In volo" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Nebbia" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Tasto di attivazione della nebbia" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Percorso del font" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Ombreggiatura del font" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Trasparenza dell'ombreggiatura del font" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Trasparenza dell'ombreggiatura del font (opacità, tra 0 e 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." msgstr "" +"Compensazione dell'ombra del font, se 0 allora l'ombra non verrà disegnata." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Dimensione del font" #: src/settings_translation_file.cpp msgid "Forward key" -msgstr "Avanti" +msgstr "Tasto avanti" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Font freetype" #: src/settings_translation_file.cpp msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"Da che distanza vengono generati i blocchi per i client, espressa in blocchi " +"mappa (16 nodi)." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"Da che distanza i blocchi sono inviati ai client, espressa in blocchi mappa (" +"16 nodi)." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" +"Da che distanza i client sanno degli oggetti, espressa in blocchi mappa (16 " +"nodi)." #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Schermo intero" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "BPP schermo intero" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Modalità a schermo intero." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Scala GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter" -msgstr "" +msgstr "Filtro di scala GUI" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "Filtro di scala GUI txr2img" #: src/settings_translation_file.cpp msgid "Gamma" -msgstr "" +msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Generali" #: src/settings_translation_file.cpp msgid "Generate normalmaps" -msgstr "" +msgstr "Generare le normalmap" #: src/settings_translation_file.cpp msgid "" @@ -2132,23 +2201,33 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Attributi globali di generazione della mappa.\n" +"In Generatore mappa v. 6 l'impostazione 'decorazioni' controlla tutte le " +"decorazioni\n" +"eccetto alberi ed erba della giungla, in tutti gli altri gen. di mappe " +"questa\n" +"impostazione controlla tutte le decorazioni.\n" +"Le impostazioni che non vengono specificate nella stringa delle " +"impostazioni\n" +"mantengono i valori predefiniti.\n" +"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +"esplicitamente." #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Grafiche" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Gravità" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Moduli" +msgstr "Mod. HTTP" #: src/settings_translation_file.cpp msgid "HUD toggle key" -msgstr "" +msgstr "Tasto di attivazione dello HUD" #: src/settings_translation_file.cpp msgid "" @@ -2157,27 +2236,33 @@ msgid "" "- log: mimic and log backtrace of deprecated call (default for debug).\n" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" +"Gestione delle chiamate deplorate alle API Lua:\n" +"- eredita: (prova a) mimare il vecchio comportamento (predefinita per i " +"rilasci).\n" +"- registra: mima e registra la traccia della chiamata deplorata (" +"predefinita per il debug).\n" +"- errore: abortire all'uso della chiamata deplorata (suggerita per gli " +"sviluppatori di mod.)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Height component of the initial window size." -msgstr "Dimensione iniziale verticale della finestra." +msgstr "Componente dell'altezza della dimensione della finestra iniziale." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." -msgstr "" +msgstr "Altezza alla quale appaiono le nuvole." #: src/settings_translation_file.cpp msgid "High-precision FPU" -msgstr "" +msgstr "FPU ad alta precisione" #: src/settings_translation_file.cpp msgid "Homepage of server, to be displayed in the serverlist." -msgstr "" +msgstr "Sito del server, da mostrare nell'elenco dei server." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Quale profondità di creazione dei fiumi" #: src/settings_translation_file.cpp msgid "" @@ -2185,49 +2270,59 @@ msgid "" "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." msgstr "" +"Quanto larghe le aree di blocchi sono soggette alle cose del blocco attivo, " +"espresso in blocchi mappa (16 nodi).\n" +"Nei blocchi attivi vengono caricati gli oggetti ed eseguiti gli ABM." #: src/settings_translation_file.cpp msgid "" "How many blocks are flying in the wire simultaneously for the whole server." -msgstr "" +msgstr "Quanti blocchi volano nel cavo simultaneamente per l'intero server." #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." -msgstr "" +msgstr "Quanti blocchi volano nel cavo simultaneamente per ogni client." #: src/settings_translation_file.cpp msgid "" "How much the server will wait before unloading unused mapblocks.\n" "Higher value is smoother, but will use more RAM." msgstr "" +"Quanto il server aspetterà prima di scaricare i blocchi mappa non usati.\n" +"Un valore alto è più scorrevole, ma userà più RAM." #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Larghezza di creazione dei fiumi" #: src/settings_translation_file.cpp msgid "IPv6" -msgstr "" +msgstr "IPv6" #: src/settings_translation_file.cpp msgid "IPv6 server" -msgstr "" +msgstr "Server IPv6" #: src/settings_translation_file.cpp msgid "IPv6 support." -msgstr "" +msgstr "Supporto IPv6." #: src/settings_translation_file.cpp msgid "" "If FPS would go higher than this, limit it by sleeping\n" "to not waste CPU power for no benefit." msgstr "" +"Se i FPS dovessero superare questo, limitarli con la sospensione\n" +"per non sprecare la potenza della CPU per nessun beneficio." #: src/settings_translation_file.cpp msgid "" "If disabled \"use\" key is used to fly fast if both fly and fast mode are " "enabled." msgstr "" +"Se disabilitata il tasto \"usare\" è utilizzato per volare veloce se " +"entrambe le\n" +"modalità 'volo' e 'veloce' sono abilitate." #: src/settings_translation_file.cpp msgid "" @@ -2235,32 +2330,43 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" +"Se abilitata assieme alla modalità di volo, il giocatore può volare " +"attraverso i nodi solidi.\n" +"Questo richiede il privilegio \"noclip\" sul server." #: src/settings_translation_file.cpp msgid "" "If enabled, \"use\" key instead of \"sneak\" key is used for climbing down " "and descending." msgstr "" +"Se abilitata, il tasto \"usare\" viene utilizzato al posto di \"strisciare\" " +"per scendere." #: src/settings_translation_file.cpp msgid "" "If enabled, actions are recorded for rollback.\n" "This option is only read when server starts." msgstr "" +"Se abilitata, le azioni sono registrate per il ripristino.\n" +"Questa opzione viene letta solo all'avvio del server." #: src/settings_translation_file.cpp msgid "If enabled, disable cheat prevention in multiplayer." -msgstr "" +msgstr "Se abilitata, disattiva l'impedimento dei trucchi nel gioco multiplo." #: src/settings_translation_file.cpp msgid "" "If enabled, invalid world data won't cause the server to shut down.\n" "Only enable this if you know what you are doing." msgstr "" +"Se abilitata, i dati mondo non validi non causeranno lo spegnimento del " +"server.\n" +"Abilitatela solo se sapete cosa state facendo." #: src/settings_translation_file.cpp msgid "If enabled, new players cannot join with an empty password." msgstr "" +"Se abilitata, i nuovi giocatori non possono unirsi con una password vuota." #: src/settings_translation_file.cpp msgid "" @@ -2268,60 +2374,69 @@ msgid "" "you stand.\n" "This is helpful when working with nodeboxes in small areas." msgstr "" +"Se abilitata, potete posizionare blocchi nella posizione (piedi + livello " +"degli occhi) dove state.\n" +"Questo è utile quando si lavora con le scatole dei nodi in piccole aree." #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." -msgstr "" +msgstr "Se si imposta, i giocatori (ri)compariranno sempre alla posizione data." #: src/settings_translation_file.cpp msgid "Ignore world errors" -msgstr "" +msgstr "Ignorare gli errori del mondo" #: src/settings_translation_file.cpp msgid "In-Game" -msgstr "Nel gioco" +msgstr "In gioco" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." msgstr "" +"Trasparenza in gioco dello sfondo della console dei messaggi (opacità, tra 0 " +"e 255)." #: src/settings_translation_file.cpp msgid "In-game chat console background color (R,G,B)." -msgstr "" +msgstr "Colore in gioco dello sfondo della console dei messaggi (R,G,B)." #: src/settings_translation_file.cpp msgid "Interval of saving important changes in the world, stated in seconds." msgstr "" +"Intervallo di salvataggio dei cambiamenti importanti nel mondo, espresso in " +"secondi." #: src/settings_translation_file.cpp msgid "Interval of sending time of day to clients." -msgstr "" +msgstr "Intervallo di invio ai client dell'ora del giorno." #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "Animazioni degli oggetti dell'inventario" #: src/settings_translation_file.cpp msgid "Inventory key" -msgstr "Inventario" +msgstr "Tasto dell'inventario" #: src/settings_translation_file.cpp msgid "Invert mouse" -msgstr "" +msgstr "Invertire il mouse" #: src/settings_translation_file.cpp msgid "Invert vertical mouse movement." -msgstr "" +msgstr "Inverte il movimento verticale del mouse." #: src/settings_translation_file.cpp msgid "Item entity TTL" -msgstr "" +msgstr "Entità TTL (tempo di vita) oggetto" #: src/settings_translation_file.cpp msgid "" "Iterations of the recursive function.\n" "Controls the amount of fine detail." msgstr "" +"Iterazioni della funzione ricorsiva.\n" +"Controlla l'ammontare del dettaglio fine." #: src/settings_translation_file.cpp msgid "" @@ -2330,6 +2445,10 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"Solo serie julia: componente W della costante iper-complessa determinante la " +"forma julia.\n" +"Non ha effetto sui frattali in 3D.\n" +"Spazia pressapoco tra -2 e 2." #: src/settings_translation_file.cpp msgid "" @@ -2337,6 +2456,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"Solo serie julia: componente X della costante iper-complessa determinante la " +"forma julia.\n" +"Spazia pressapoco tra -2 e 2." #: src/settings_translation_file.cpp msgid "" @@ -2344,6 +2466,9 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"Solo serie julia: componente Y della costante iper-complessa determinante la " +"forma julia.\n" +"Spazia pressapoco tra -2 e 2." #: src/settings_translation_file.cpp msgid "" @@ -2351,14 +2476,17 @@ msgid "" "shape.\n" "Range roughly -2 to 2." msgstr "" +"Solo serie julia: componente Z della costante iper-complessa determinante la " +"forma julia.\n" +"Spazia pressapoco tra -2 e 2." #: src/settings_translation_file.cpp msgid "Jump key" -msgstr "Salto" +msgstr "Tasto di salto" #: src/settings_translation_file.cpp msgid "Jumping speed" -msgstr "" +msgstr "Velocità di salto" #: src/settings_translation_file.cpp msgid "" @@ -2366,6 +2494,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per ridurre il raggio visivo.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2373,6 +2504,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per lasciare a terra l'oggetto attualmente selezionato.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2380,6 +2514,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per aumentare il raggio visivo.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2387,6 +2524,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per saltare.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2394,6 +2534,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per muoversi rapidamente nella modalità veloce.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2401,6 +2544,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per muovere indietro il giocatore.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2408,6 +2554,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per muovere avanti il giocatore.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2415,6 +2564,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per muovere a sinistra il giocatore.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2422,6 +2574,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per muovere a destra il giocatore.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2429,6 +2584,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per aprire la console dei messaggi.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2436,6 +2594,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per aprire la finestra dei messaggi per scrivere comandi.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2443,6 +2604,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per aprire la finestra dei messaggi.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2450,6 +2614,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per aprire l'inventario.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2457,6 +2624,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per stampare le stack di debug. Usato per lo sviluppo.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2466,6 +2636,11 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per strisciare.\n" +"Usato anche per scendere dalle scale e scendere in acqua se aux1_descends è " +"disabilitata.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2473,6 +2648,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per passare tra la camera in prima persona a quella in terza persona.." +"\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2480,6 +2659,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per scattare istantanee.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2487,6 +2669,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la modalità cinematic.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2494,6 +2679,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la visualizzatore della minimappa.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2501,6 +2689,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la modalità veloce.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2508,6 +2699,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare il volo.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2515,6 +2709,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la modalità noclip.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2522,6 +2719,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare l'aggiornamento della camera. Usato solo per lo sviluppo." +"\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2529,6 +2730,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la visualizzazione delle info. di debug.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2536,6 +2740,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la visualizzazione dello HUD.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2543,6 +2750,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la visualizzazione della messaggistica.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2550,6 +2760,9 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la visualizzazione della nebbia.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2557,6 +2770,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare la visualizzazione del profilatore. Usato per lo sviluppo." +"\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2564,26 +2781,29 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" +"Tasto per attivare il raggio visivo illimitato.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" +"1735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "" +msgstr "Tasto 'usare' per arrampicarsi/scendere" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Linua" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "Profondità delle caverne grandi" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Caratteristiche della lava" #: src/settings_translation_file.cpp msgid "Leaves style" -msgstr "" +msgstr "Stile delle foglie" #: src/settings_translation_file.cpp msgid "" @@ -2592,16 +2812,22 @@ msgid "" "- Simple: only outer faces, if defined special_tiles are used\n" "- Opaque: disable transparency" msgstr "" +"Stile delle foglie:\n" +"- Decorative: tutte le facce visibili\n" +"- Semplici: solo le facce esterne, se impostate special_tiles sono usate\n" +"- Opache: disattiva la trasparenza" #: src/settings_translation_file.cpp msgid "Left key" -msgstr "Sinistra" +msgstr "Tasto sinistro" #: src/settings_translation_file.cpp msgid "" "Length of a server tick and the interval at which objects are generally " "updated over network." msgstr "" +"Lunghezza di uno scatto del server e intervallo per cui gli oggetti sono " +"aggiornati in generale sulla rete." #: src/settings_translation_file.cpp msgid "" @@ -2614,14 +2840,22 @@ msgid "" "- info\n" "- verbose" msgstr "" +"Livello di registro da scrivere su debug.txt:\n" +"- (nessun registro)\n" +"- nessuno (messaggi senza livello)\n" +"- errore\n" +"- avviso\n" +"- azione\n" +"- informazione\n" +"- verboso" #: src/settings_translation_file.cpp msgid "Limit of emerge queues on disk" -msgstr "" +msgstr "Limite di code 'emerge' su disco" #: src/settings_translation_file.cpp msgid "Limit of emerge queues to generate" -msgstr "" +msgstr "Limite di code 'emerge' da generare" #: src/settings_translation_file.cpp msgid "" @@ -2631,59 +2865,66 @@ msgid "" "- Downloads performed by main menu (e.g. mod manager).\n" "Only has an effect if compiled with cURL." msgstr "" +"Limita il numero di richieste HTTP parallele. Influisce:- Recupero dei " +"media se il server usa l'impostazione remote_media.\n" +"- Scaricamento dell'elenco dei server e notifica del server.\n" +"- Scaricamenti effettuati dal menu principale (ad es.il gestore mod.).\n" +"Ha effetto solo se compilato con cURL." #: src/settings_translation_file.cpp msgid "Liquid fluidity" -msgstr "" +msgstr "Fluidità del liquido" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "Raffinatezza dello scorrere dei liquidi" +msgstr "Uniformazione della fluidità del liquido" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "" +msgstr "Max. giri del liquido" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" -msgstr "" +msgstr "Tempo di svuotamento della coda del liquido" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "Velocità di caduta del liquiddi" +msgstr "Discesa del liquido" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." -msgstr "" +msgstr "Intervallo di aggiornamento del liquido in secondi." #: src/settings_translation_file.cpp msgid "Liquid update tick" -msgstr "" +msgstr "Scatto di aggiornamento del liquido" #: src/settings_translation_file.cpp msgid "Main menu game manager" -msgstr "" +msgstr "Menu principale gestore giochi" #: src/settings_translation_file.cpp msgid "Main menu mod manager" -msgstr "Pannello di controllo mod del menù principale" +msgstr "Menu principale del gestore mod." #: src/settings_translation_file.cpp msgid "Main menu script" -msgstr "Script del menù principale" +msgstr "Script del menu principale" #: src/settings_translation_file.cpp msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" +"Far sì che i colori di cielo e nebbia dipendano dall'ora del giorno " +"(alba/tramonto) e direzione visiva." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." -msgstr "" +msgstr "Fa lavorare DirectX con LuaJIT. Disabilitare se causa problemi." #: src/settings_translation_file.cpp msgid "Map directory" -msgstr "" +msgstr "Cartella della mappa" #: src/settings_translation_file.cpp msgid "" @@ -2696,6 +2937,15 @@ msgid "" "\"humid_rivers\" modifies the humidity around rivers and in areas where " "water would tend to pool. It may interfere with delicately adjusted biomes." msgstr "" +"Attributi di generazione della mappa specifici per Generatore mappa valli.\n" +"Le impostazioni che non sono specificate nella stringa mantengono i valori " +"predefiniti.\n" +"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +"esplicitamente.\n" +"\"altitude_chill\" rende più fredde le elevazioni maggiori, il che potrebbe " +"causare problemi ai biomi.\n" +"\"humid_rivers\" modifica l'umidità attorno ai fiumi e nelle aree in cui " +"l'acqua tenderebbe a stagnare. Potrebbe interferire con biomi" #: src/settings_translation_file.cpp msgid "" @@ -2705,6 +2955,12 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Attributi di generazione della mappa specifici per Generatore mappa piatto.\n" +"Al mondo piatto sono aggiunte colline e laghi occasionali.\n" +"Le impostazioni che non sono specificate nella stringa mantengono i valori " +"predefiniti.\n" +"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +"esplicitamente." #: src/settings_translation_file.cpp msgid "" @@ -2715,6 +2971,13 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n" +"Quando i biomi di neve sono abilitati l'impostazione jungles è ignorata e le " +"giungle sono abilitate.\n" +"Le impostazioni che non sono specificate nella stringa mantengono i valori " +"predefiniti.\n" +"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +"esplicitamente." #: src/settings_translation_file.cpp msgid "" @@ -2724,380 +2987,383 @@ msgid "" "default.\n" "Flags starting with \"no\" are used to explicitly disable them." msgstr "" +"Attributi di generazione della mappa specifici per Generatore mappa v. 7.\n" +"'ridges' sono i fiumi.\n" +"Le impostazioni che non sono specificate nella stringa mantengono i valori " +"predefiniti.\n" +"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +"esplicitamente." #: src/settings_translation_file.cpp msgid "Map generation limit" -msgstr "" +msgstr "Limite di generazione della mappa" #: src/settings_translation_file.cpp msgid "Map save interval" -msgstr "" +msgstr "Intervallo di salvataggio della mappa" #: src/settings_translation_file.cpp msgid "Mapblock limit" -msgstr "" +msgstr "Limite del blocco mappa" #: src/settings_translation_file.cpp msgid "Mapblock unload timeout" -msgstr "" +msgstr "Tempo di scad. dello scaric. del blocco mappa" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Nome del genratore delle mappe" +msgstr "Generatore mappa valli" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" -msgstr "" +msgstr "Param. del gen. mappa del 'rumore' del calore del bioma" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity blend noise parameters" -msgstr "" +msgstr "Param. del gen. mappa di misc. del 'rumore' dell'umidità del bioma" #: src/settings_translation_file.cpp msgid "Mapgen biome humidity noise parameters" -msgstr "" +msgstr "Param. del gen. mappa del 'rumore' dell'umidità del bioma" #: src/settings_translation_file.cpp msgid "Mapgen debug" -msgstr "Debug del generatore delle mappe" +msgstr "Debug del generatore mappa" #: src/settings_translation_file.cpp msgid "Mapgen flags" -msgstr "flags del generatore delle mappe" +msgstr "Impostazioni del generatore mappa" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "flags del generatore delle mappe" +msgstr "Generatore mappa piatto" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" -msgstr "" +msgstr "Gen. mappa piatto, parametri del 1° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen flat cave2 noise parameters" -msgstr "" +msgstr "Gen. mappa piatto, parametri del 2° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen flat filler depth noise parameters" msgstr "" +"Gen. mappa piatto, parametri del 'rumore' dello riempitore di profondità" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Generat. mappe" +msgstr "Impostazioni del Generatore mappa piatto" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "flags del generatore delle mappe" +msgstr "Livello del terreno del Generatore mappa piatto" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Ripidità delle colline del Generatore mappa piatto" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "Limite delle colline del Generatore mappa piatto" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Generat. mappe" +msgstr "Ripidità dei laghi del Generatore mappa piatto" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Generat. mappe" +msgstr "Limite dei laghi del Generatore mappa piatto" #: src/settings_translation_file.cpp msgid "Mapgen flat large cave depth" -msgstr "" +msgstr "Profondità delle caverne grandi del Generatore mappa piatto" #: src/settings_translation_file.cpp msgid "Mapgen flat terrain noise parameters" -msgstr "" +msgstr "Parametri del 'rumore' del terreno del Generatore mappa piatto" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Generat. mappe" +msgstr "Generatore mappa frattale" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" -msgstr "" +msgstr "Gen. mappa frattale, parametri del 1° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave2 noise parameters" -msgstr "" +msgstr "Gen. mappa frattale, parametri del 2° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen fractal filler depth noise parameters" msgstr "" +"Gen. mappa frattale, parametri del 'rumore' dello riempitore di profondità" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Generat. mappe" +msgstr "Frattale del Generatore mappa frattale" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Generat. mappe" +msgstr "Iterazioni del Generatore mappa frattale" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" -msgstr "" +msgstr "Gen. mappa frattale, julia w" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia x" -msgstr "" +msgstr "Gen. mappa frattale, julia x" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia y" -msgstr "" +msgstr "Gen. mappa frattale, julia y" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia z" -msgstr "" +msgstr "Gen. mappa frattale, julia z" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "Generat. mappe" +msgstr "Compensazione del Generatore mappa frattale" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "Generat. mappe" +msgstr "Scala del Generatore mappa frattale" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" -msgstr "" +msgstr "Param. del 'rumore' del fondale marino del Gen. mappa frattale" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "Generat. mappe" +msgstr "Gen. mappa frattale, fetta w" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" -msgstr "" +msgstr "Param. del gen. mappa di miscelazione del 'rumore' del calore" #: src/settings_translation_file.cpp msgid "Mapgen name" -msgstr "Nome del genratore delle mappe" +msgstr "Nome del gen. mappa" #: src/settings_translation_file.cpp msgid "Mapgen v5" -msgstr "Generatore mappe v5" +msgstr "Generatore mappa v. 5." #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" -msgstr "" +msgstr "Gen. mappa v. 5, parametri del 1° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave2 noise parameters" -msgstr "" +msgstr "Gen. mappa v. 5, parametri del 2° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen v5 factor noise parameters" -msgstr "" +msgstr "Gen. mappa v. 5, parametri del 'rumore' di fabbrica" #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" -msgstr "" +msgstr "Gen. mappa v. 5, parametri del 'rumore' dello riempitore di profondità" #: src/settings_translation_file.cpp msgid "Mapgen v5 height noise parameters" -msgstr "" +msgstr "Gen. mappa v. 5, parametri 'rumore' dell'altezza" #: src/settings_translation_file.cpp msgid "Mapgen v6" -msgstr "Generatore mappe v6" +msgstr "Generatore mappa v. 6" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' degli alberi" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach frequency" -msgstr "" +msgstr "Gen. mappa v. 6, frequenza della spiaggia" #: src/settings_translation_file.cpp msgid "Mapgen v6 beach noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' della spiaggia" #: src/settings_translation_file.cpp msgid "Mapgen v6 biome noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' del bioma" #: src/settings_translation_file.cpp msgid "Mapgen v6 cave noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen v6 desert frequency" -msgstr "" +msgstr "Gen. mappa v. 6, frequenza del deserto" #: src/settings_translation_file.cpp msgid "Mapgen v6 flags" -msgstr "" +msgstr "Impostazioni del Generatore mappa v. 6" #: src/settings_translation_file.cpp msgid "Mapgen v6 height select noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' della selezione di altezza" #: src/settings_translation_file.cpp msgid "Mapgen v6 humidity noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' dell'umidità" #: src/settings_translation_file.cpp msgid "Mapgen v6 mud noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' del fango" #: src/settings_translation_file.cpp msgid "Mapgen v6 steepness noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' della ripidità" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain altitude noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' di altitudine del terreno" #: src/settings_translation_file.cpp msgid "Mapgen v6 terrain base noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' di base del terreno" #: src/settings_translation_file.cpp msgid "Mapgen v6 trees noise parameters" -msgstr "" +msgstr "Gen. mappa v. 6, parametri del 'rumore' degli alberi" #: src/settings_translation_file.cpp msgid "Mapgen v7" -msgstr "Generatore mappe v7" +msgstr "Gen. mappa v. 7, parametri del 'rumore'" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, parametri del 1° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave2 noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, parametri del 2° 'rumore' delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen v7 filler depth noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' dello riempitore di profondità" #: src/settings_translation_file.cpp msgid "Mapgen v7 flags" -msgstr "" +msgstr "Impostazioni del Generatore mappa v. 7" #: src/settings_translation_file.cpp msgid "Mapgen v7 height select noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' della selezione di altezza" #: src/settings_translation_file.cpp msgid "Mapgen v7 mount height noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' di altezza delle montagne" #: src/settings_translation_file.cpp msgid "Mapgen v7 mountain noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' delle montagne" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' dei fiumi" #: src/settings_translation_file.cpp msgid "Mapgen v7 ridge water noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' dell'acqua dei fiumi" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain altitude noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' di altitudine del terreno" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain base noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' di base del terreno" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "" +msgstr "Gen. mappa v. 7, param. del 'rumore' di continuità del terreno" #: src/settings_translation_file.cpp msgid "Massive cave depth" -msgstr "" +msgstr "Profondità delle caverne imponenti" #: src/settings_translation_file.cpp msgid "Massive cave noise" -msgstr "" +msgstr "'Rumore' delle caverne imponenti" #: src/settings_translation_file.cpp msgid "Massive caves form here." -msgstr "" +msgstr "Caverne imponenti da qui." #: src/settings_translation_file.cpp msgid "Max block generate distance" -msgstr "" +msgstr "Distanza massima di generazione dei blocchi" #: src/settings_translation_file.cpp msgid "Max block send distance" -msgstr "" +msgstr "Distanza massima di invio dei blocchi" #: src/settings_translation_file.cpp msgid "Max liquids processed per step." -msgstr "" +msgstr "Numero massimo di liquidi elaborati per passaggio." #: src/settings_translation_file.cpp msgid "Max. clearobjects extra blocks" -msgstr "" +msgstr "Clearobjects massimo per blocchi extra" #: src/settings_translation_file.cpp msgid "Max. packets per iteration" -msgstr "" +msgstr "Numero massimo di pacchetti per iterazione" #: src/settings_translation_file.cpp msgid "Maximum FPS" -msgstr "" +msgstr "FPS massimi" #: src/settings_translation_file.cpp msgid "Maximum FPS when game is paused." -msgstr "" +msgstr "FPS massimi quando il gioco è in pausa." #: src/settings_translation_file.cpp msgid "Maximum forceloaded blocks" -msgstr "" +msgstr "Numero massimo di blocchi caricati a forza" #: src/settings_translation_file.cpp msgid "Maximum hotbar width" -msgstr "" +msgstr "Larghezza massima della barra oggetti" #: src/settings_translation_file.cpp msgid "Maximum number of blocks that can be queued for loading." msgstr "" +"Numero massimo di blocchi che possono essere accodati per il caricamento." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be generated.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Numero massimo di blocchi da generare da accodare.\n" +"Lasciate vuoto per scegliere automaticamente una quantità adatta." #: src/settings_translation_file.cpp msgid "" "Maximum number of blocks to be queued that are to be loaded from file.\n" "Set to blank for an appropriate amount to be chosen automatically." msgstr "" +"Numero massimo di blocchi da accodare per essere caricati da file.\n" +"Lasciate vuoto per scegliere automaticamente una quantità adatta." #: src/settings_translation_file.cpp msgid "Maximum number of forceloaded mapblocks." -msgstr "" +msgstr "Numero massimo di blocchi mappa caricati a forza." #: src/settings_translation_file.cpp msgid "" "Maximum number of mapblocks for client to be kept in memory.\n" "Set to -1 for unlimited amount." msgstr "" +"Numero massimo di blocchi mappa per client da tenere in memoria.\n" +"Impostare a -1 per una quantità illimitata." #: src/settings_translation_file.cpp msgid "" @@ -3105,131 +3371,145 @@ msgid "" "try reducing it, but don't reduce it to a number below double of targeted\n" "client number." msgstr "" +"Numero massimo di pacchetti inviati per passo di invio, se avete una " +"connessione lenta\n" +"provate a ridurlo, ma non riducetelo a un numero inferiore al doppio del " +"numero\n" +"dei client interessati." #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "Numero di giocatori che si possono connettere simultaneamente." +msgstr "Numero massimo di giocatori che possono connettersi contemporaneamente." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "" +msgstr "Numero massimo di oggetti immagazzinati stabilmente in un blocco." #: src/settings_translation_file.cpp msgid "" "Maximum proportion of current window to be used for hotbar.\n" "Useful if there's something to be displayed right or left of hotbar." msgstr "" +"Proporzione massima della finestra attuale da usarsi per la barra oggetti.\n" +"Utile se c'è qualcosa da mostrare a destra o sinistra della barra." #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "" +msgstr "Num. mass. di blocchi inviati contemp. per client" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "" +msgstr "Totale massimo di invio contemporaneo di blocchi" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." msgstr "" -"Tempo massimo per il download di un file, ad esempio una mod, espresso in ms." +"Tempo massimo in ms che può richiedere lo scaricamento di un file (ad es. un " +"mod.)." #: src/settings_translation_file.cpp msgid "Maximum users" -msgstr "" +msgstr "Utenti massimi" #: src/settings_translation_file.cpp msgid "Maxmimum objects per block" -msgstr "" +msgstr "Oggetti massimi per blocco" #: src/settings_translation_file.cpp msgid "Menus" -msgstr "Menù" +msgstr "Menu" #: src/settings_translation_file.cpp msgid "Mesh cache" -msgstr "" +msgstr "Cache mesh" #: src/settings_translation_file.cpp msgid "Message of the day" -msgstr "" +msgstr "Messaggio del giorno" #: src/settings_translation_file.cpp msgid "Message of the day displayed to players connecting." -msgstr "" +msgstr "Messaggio del giorno mostrato ai giocatori che si connettono." #: src/settings_translation_file.cpp msgid "Method used to highlight selected object." -msgstr "" +msgstr "Metodo usato per evidenziare l'oggetto scelto." #: src/settings_translation_file.cpp msgid "Minimap" -msgstr "" +msgstr "Minimappa" #: src/settings_translation_file.cpp msgid "Minimap key" -msgstr "" +msgstr "Tasto della minimappa" #: src/settings_translation_file.cpp msgid "Minimap scan height" -msgstr "" +msgstr "Altezza di scansione della minimappa" #: src/settings_translation_file.cpp msgid "Minimum texture size for filters" -msgstr "" +msgstr "Dimensione minima dell'immagine per i filtri" #: src/settings_translation_file.cpp msgid "Mipmapping" -msgstr "Mip-Mapping" +msgstr "Mipmapping" #: src/settings_translation_file.cpp msgid "Mod profiling" -msgstr "" +msgstr "Creazione del profilo dei mod." #: src/settings_translation_file.cpp msgid "Modstore details URL" -msgstr "" +msgstr "URL dei dettagli del deposito mod." #: src/settings_translation_file.cpp msgid "Modstore download URL" -msgstr "" +msgstr "URL di scaricamento del deposito mod." #: src/settings_translation_file.cpp msgid "Modstore mods list URL" -msgstr "" +msgstr "URL dell'elenco dei mod. del deposito mod." #: src/settings_translation_file.cpp msgid "Monospace font path" -msgstr "" +msgstr "Percorso del font a spaziatura fissa" #: src/settings_translation_file.cpp msgid "Monospace font size" -msgstr "" +msgstr "Dimensione del font a spaziatura fissa" #: src/settings_translation_file.cpp msgid "Mouse sensitivity" -msgstr "" +msgstr "Sensibilità del mouse" #: src/settings_translation_file.cpp msgid "Mouse sensitivity multiplier." -msgstr "" +msgstr "Moltiplicatore della sensibilità del mouse." #: src/settings_translation_file.cpp msgid "" "Multiplier for fall bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Moltiplicatore per l'ondeggiamento in caduta.\n" +"Per esempio: 0 per nessun ondeggiamento visivo; 1.0 normale; 2.0 doppio." #: src/settings_translation_file.cpp msgid "" "Multiplier for view bobbing.\n" "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double." msgstr "" +"Moltiplicatore per l'ondeggiamento visivo.\n" +"Per esempio: 0 per nessun ondeggiamento visivo; 1.0 normale; 2.0 doppio." #: src/settings_translation_file.cpp msgid "" "Name of map generator to be used when creating a new world.\n" "Creating a world in the main menu will override this." msgstr "" +"Nome del generatore mappa da usare quando si crea un nuovo mondo.\n" +"Creare un nuovo mondo nel menu principale ignorerà questa impostazione." #: src/settings_translation_file.cpp msgid "" @@ -3237,57 +3517,67 @@ msgid "" "When running a server, clients connecting with this name are admins.\n" "When starting from the main menu, this is overridden." msgstr "" +"Nome del giocatore.\n" +"Quando si esegue un server, i client che si connettono con questo nome sono " +"amministratori.\n" +"Quando si avvia dal menu principale, questa impostazione viene ignorata." #: src/settings_translation_file.cpp msgid "" "Name of the server, to be displayed when players join and in the serverlist." msgstr "" +"Nome del server, da mostrare quando si uniscono dei giocatori e nell'elenco " +"dei server." #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "Rete" #: src/settings_translation_file.cpp msgid "" "Network port to listen (UDP).\n" "This value will be overridden when starting from the main menu." msgstr "" +"Porta di rete da ascoltare (UDP).\n" +"Questo valore verrà ignorato quando si avvia dal menu principale." #: src/settings_translation_file.cpp msgid "New users need to input this password." -msgstr "" +msgstr "I nuovi utenti devono inserire questa password." #: src/settings_translation_file.cpp msgid "Noclip" -msgstr "" +msgstr "Movimento libero" #: src/settings_translation_file.cpp msgid "Noclip key" -msgstr "" +msgstr "Tasto noclip" #: src/settings_translation_file.cpp msgid "Node highlighting" -msgstr "Evidenziamento Nodi" +msgstr "Evidenziamento nodo" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" +"Parametri di 'rumore' per l'API di temperatura del bioma, umidità e fusione " +"di bioma." #: src/settings_translation_file.cpp msgid "Noises" -msgstr "" +msgstr "Rumori" #: src/settings_translation_file.cpp msgid "Normalmaps sampling" -msgstr "" +msgstr "Campionamento normalmap" #: src/settings_translation_file.cpp msgid "Normalmaps strength" -msgstr "" +msgstr "Intensità normalmap" #: src/settings_translation_file.cpp msgid "Number of emerge threads" -msgstr "Numero degli emerge threads" +msgstr "Numero di thread emerge" #: src/settings_translation_file.cpp msgid "" @@ -3297,11 +3587,11 @@ msgid "" "speed greatly\n" "at the cost of slightly buggy caves." msgstr "" -"Numero degli emerge threads da usare. Lascia questa voce vuota o aumenta " +"Numero di thread emerge da usare. Lasciate vuoto questo campo, o aumentate " "questo numero\n" -"per usare più di un thread. Su sistemi muliprocessore questo migliorerà " -"notevolmente la velocità della generazione delle mappe\n" -"ma potrebbe causare bug." +"per usare thread multipli. Su sistemi multiprocessore, questo migliorerà " +"molto la velocità del\n" +"generatore mappa al costo di caverne un po' buggate." #: src/settings_translation_file.cpp msgid "" @@ -3309,64 +3599,74 @@ msgid "" "This is a trade-off between sqlite transaction overhead and\n" "memory consumption (4096=100MB, as a rule of thumb)." msgstr "" +"Numero di blocchi extra che possono essere caricati da /clearobjects in una " +"volta.\n" +"Questo è un controbilanciare tra spesa di transazione sqlite e\n" +"consumo di memoria (4096=100MB, come regola generale)." #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." -msgstr "" +msgstr "Numero di iterazioni di occlusione di parallasse." #: src/settings_translation_file.cpp msgid "Overall bias of parallax occlusion effect, usually scale/2." msgstr "" +"Deviazione complessiva dell'effetto di occlusione di parallasse, solitamente " +"scala/2." #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." -msgstr "" +msgstr "Scala complessiva dell'effetto di occlusione di parallasse." #: src/settings_translation_file.cpp msgid "Parallax occlusion" -msgstr "" +msgstr "Occlusione di parallasse" #: src/settings_translation_file.cpp msgid "Parallax occlusion Scale" -msgstr "" +msgstr "Scala dell'occlusione di parallasse" #: src/settings_translation_file.cpp msgid "Parallax occlusion bias" -msgstr "" +msgstr "Deviazione dell'occlusione di parallasse" #: src/settings_translation_file.cpp msgid "Parallax occlusion iterations" -msgstr "" +msgstr "Iterazioni dell'occlusione di parallasse" #: src/settings_translation_file.cpp msgid "Parallax occlusion mode" -msgstr "" +msgstr "Modalità occlusione di parallasse" #: src/settings_translation_file.cpp msgid "Parallax occlusion strength" -msgstr "" +msgstr "Intensità dell'occlusione di parallasse" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." -msgstr "" +msgstr "Percorso per il font TrueType o bitmap." #: src/settings_translation_file.cpp msgid "Path to save screenshots at." -msgstr "" +msgstr "Percorso dove salvare le istantanee." #: src/settings_translation_file.cpp msgid "Path to texture directory. All textures are first searched from here." msgstr "" +"Percorso della cartella immagini. Tutte le immagini vengono cercate a " +"partire da qui." #: src/settings_translation_file.cpp msgid "Physics" -msgstr "" +msgstr "Fisiche" #: src/settings_translation_file.cpp msgid "" "Player is able to fly without being affected by gravity.\n" "This requires the \"fly\" privilege on the server." msgstr "" +"Il giocatore può volare senza essere interessato dalla gravità.\n" +"Ciò richiede il privilegio \"fly\" sul server." #: src/settings_translation_file.cpp msgid "Player name" @@ -3374,33 +3674,39 @@ msgstr "Nome del giocatore" #: src/settings_translation_file.cpp msgid "Player transfer distance" -msgstr "" +msgstr "Distanza di trasferimento del giocatore" #: src/settings_translation_file.cpp msgid "Player versus Player" -msgstr "PvP" +msgstr "Giocatore contro Giocatore" #: src/settings_translation_file.cpp msgid "" "Port to connect to (UDP).\n" "Note that the port field in the main menu overrides this setting." msgstr "" +"Porta a cui connettersi (UDP).\n" +"Si noti che il campo porta nel menu principale ignora questa impostazione." #: src/settings_translation_file.cpp msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +"Impedisce che i mod. facciano cose non sicure come eseguire comandi della " +"shell." #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" +"Intervallo di stampa del profilatore. 0 = disabilitato. Utile per gli " +"sviluppatori." #: src/settings_translation_file.cpp msgid "Profiler toggle key" -msgstr "" +msgstr "Tasto di attivazione del profilatore" #: src/settings_translation_file.cpp msgid "Profiling print interval" -msgstr "" +msgstr "Intervallo di stampa del profilamento" #: src/settings_translation_file.cpp msgid "" @@ -3408,70 +3714,74 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" +"Raggio dell'area delle nuvole espresso in numero di 64 nodi nuvola quadrati." +"\n" +"Valori maggiori di 26 cominceranno a produrre interruzioni appuntite agli " +"angoli delle aree nuvola." #: src/settings_translation_file.cpp msgid "Raises terrain to make valleys around the rivers" -msgstr "" +msgstr "Solleva il terreno per creare vallate attorno ai fiumi" #: src/settings_translation_file.cpp msgid "Random input" -msgstr "" +msgstr "Input casuale" #: src/settings_translation_file.cpp msgid "Range select key" -msgstr "Comando della selezione ad area" +msgstr "Tasto di selezione del raggio" #: src/settings_translation_file.cpp msgid "Remote media" -msgstr "" +msgstr "Media remoti" #: src/settings_translation_file.cpp msgid "Remote port" -msgstr "" +msgstr "Porta remota" #: src/settings_translation_file.cpp msgid "Replaces the default main menu with a custom one." -msgstr "" +msgstr "Sostituisce il menu principale predefinito con uno personalizzato." #: src/settings_translation_file.cpp msgid "Right key" -msgstr "Destra" +msgstr "Tasto destro" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" -msgstr "" +msgstr "Intervallo di ripetizione del click destro" #: src/settings_translation_file.cpp msgid "River Depth" -msgstr "" +msgstr "Profondità dei fiumi" #: src/settings_translation_file.cpp msgid "River Noise" -msgstr "" +msgstr "'Rumore' dei fiumi" #: src/settings_translation_file.cpp msgid "River Size" -msgstr "" +msgstr "Dimensione dei fiumi" #: src/settings_translation_file.cpp msgid "River noise -- rivers occur close to zero" -msgstr "" +msgstr "'Rumore' dei fiumi - i fiumi si manifestano vicino a zero" #: src/settings_translation_file.cpp msgid "Rollback recording" -msgstr "" +msgstr "Registrazione di ripristino" #: src/settings_translation_file.cpp msgid "Round minimap" -msgstr "" +msgstr "Minimappa rotonda" #: src/settings_translation_file.cpp msgid "Save the map received by the client on disk." -msgstr "" +msgstr "Salvare su disco la mappa ricevuta dal client." #: src/settings_translation_file.cpp msgid "Saving map received from server" -msgstr "" +msgstr "Salvataggio della mappa ricevuta dal server" #: src/settings_translation_file.cpp msgid "" @@ -3481,42 +3791,48 @@ msgid "" "pixels when scaling down, at the cost of blurring some\n" "edge pixels when images are scaled by non-integer sizes." msgstr "" +"Ridimensionare l'interfaccia secondo un valore specificato dall'utente.\n" +"Usate un filtro anti-alias-vicino-più-vicino per ridimensionare " +"l'interfaccia.\n" +"Questo liscerà alcuni degli spigoli vivi, e armonizzerà i pixel al\n" +"rimpicciolimento, al costo di sfocare alcuni pixel di punta\n" +"quando le immagini sono ridimensionate per valori frazionari." #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "Altezza dello schermo" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "Larghezza dello schermo" #: src/settings_translation_file.cpp msgid "Screenshot" -msgstr "Istantanea schermo" +msgstr "Istantanea" #: src/settings_translation_file.cpp msgid "Screenshot folder" -msgstr "" +msgstr "Cartella delle istantanee" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "Sicurezza" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" -msgstr "" +msgstr "Si veda http://www.sqlite.org/pragma.html#pragma_synchronous" #: src/settings_translation_file.cpp msgid "Selection box border color (R,G,B)." -msgstr "" +msgstr "Colore del bordo del riquadro di selezione (R,G,B)." #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "Colore del riquadro di selezione" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "Larghezza del riquadro di selezione" #: src/settings_translation_file.cpp msgid "Server / Singleplayer" @@ -3544,35 +3860,43 @@ msgstr "Porta del server" #: src/settings_translation_file.cpp msgid "Serverlist URL" -msgstr "URL della lista server" +msgstr "URL dell'elenco dei server" #: src/settings_translation_file.cpp msgid "Serverlist file" -msgstr "File della lista server" +msgstr "File dell'elenco dei server" #: src/settings_translation_file.cpp msgid "" "Set the language. Leave empty to use the system language.\n" "A restart is required after changing this." msgstr "" +"Impostate la lingua. Lasciate vuoto per usare la lingua di sistema.\n" +"E' necessario il riavvio dopo avere modificato questa impostazione." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving leaves.\n" "Requires shaders to be enabled." msgstr "" +"Impostata a true abilita le foglie ondeggianti.\n" +"Necessita l'attivazione degli shader." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving plants.\n" "Requires shaders to be enabled." msgstr "" +"Impostata su true abilita le piante ondeggianti.\n" +"Necessita l'attivazione degli shader." #: src/settings_translation_file.cpp msgid "" "Set to true enables waving water.\n" "Requires shaders to be enabled." msgstr "" +"Impostata su true abilita l'acqua ondeggiante.\n" +"Necessita l'attivazione degli shader." #: src/settings_translation_file.cpp msgid "" @@ -3580,54 +3904,63 @@ msgid "" "video cards.\n" "Thy only work with the OpenGL video backend." msgstr "" +"Gli shader permettono effetti visivi avanzati e potrebbero aumentare il " +"rendimento su certe\n" +"schede video. Funzionano solo col supporto OpenGL." #: src/settings_translation_file.cpp msgid "Shape of the minimap. Enabled = round, disabled = square." -msgstr "" +msgstr "Forma del minimap. Abilitata = rotonda, disabilitata = quadrata." #: src/settings_translation_file.cpp msgid "Show debug info" -msgstr "" +msgstr "Mostrare le info. di debug" #: src/settings_translation_file.cpp msgid "Shutdown message" -msgstr "" +msgstr "Messaggio di spegnimento" #: src/settings_translation_file.cpp msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" +"Dimensione dei pezzi da generare immediatamente dal generatore mappa, " +"espressa in blocchi mappa (16 nodi)." #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" -msgstr "" +msgstr "Pendenza e riempimento lavorano assieme per modificare le altezze" #: src/settings_translation_file.cpp msgid "Smooth lighting" -msgstr "Raffinatezza ombreggiature" +msgstr "Illuminazione uniforme" #: src/settings_translation_file.cpp msgid "" "Smooths camera when moving and looking around.\n" "Useful for recording videos." msgstr "" +"Rende fluida la camera quando ci si muove e si guarda attorno.\n" +"Utile per registrare video." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera in cinematic mode. 0 to disable." msgstr "" +"Rende fluida la rotazione della camera in modalità cinematic. 0 per " +"disabilitare." #: src/settings_translation_file.cpp msgid "Smooths rotation of camera. 0 to disable." -msgstr "" +msgstr "Rende fluida la rotazione della camera. 0 per disabilitare." #: src/settings_translation_file.cpp msgid "Sneak key" -msgstr "Abbassati" +msgstr "Tasto per strisciare" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "Suono" #: src/settings_translation_file.cpp msgid "" @@ -3636,30 +3969,35 @@ msgid "" "(obviously, remote_media should end with a slash).\n" "Files that are not present will be fetched the usual way." msgstr "" +"Specifica l'URL da cui il client recupera i media al posto di usare UDP.\n" +"$filename dovrebbe essere accessibile da $remote_media$filename tramite " +"cURL\n" +"(ovviamente, remote_media dovrebbe finire con una barra).\n" +"I file che non sono presenti saranno recuperati nel solito modo." #: src/settings_translation_file.cpp msgid "Static spawnpoint" -msgstr "" +msgstr "Punto stabile di comparsa" #: src/settings_translation_file.cpp msgid "Strength of generated normalmaps." -msgstr "" +msgstr "Intensità delle normalmap generate." #: src/settings_translation_file.cpp msgid "Strength of parallax." -msgstr "" +msgstr "Intensità di parallasse." #: src/settings_translation_file.cpp msgid "Strict protocol checking" -msgstr "" +msgstr "Controllo stretto del protocollo" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" -msgstr "" +msgstr "SQLite simultaneo" #: src/settings_translation_file.cpp msgid "Terrain Height" -msgstr "" +msgstr "Altezza terreno" #: src/settings_translation_file.cpp msgid "" @@ -3667,6 +4005,9 @@ msgid "" "Controls proportion of world area covered by hills.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"Limite di 'rumore' del terreno per le colline.\n" +"Controlla la porzione d'area del mondo coperta da colline.\n" +"Sistemare verso 0.0 per una porzione più ampia." #: src/settings_translation_file.cpp msgid "" @@ -3674,32 +4015,38 @@ msgid "" "Controls proportion of world area covered by lakes.\n" "Adjust towards 0.0 for a larger proportion." msgstr "" +"Limite di 'rumore' del terreno per i laghi.\n" +"Controlla la porzione d'area del mondo coperta da laghi.\n" +"Sistemare verso 0.0 per una porzione più ampia." #: src/settings_translation_file.cpp msgid "Texture path" -msgstr "Trama delle texture" +msgstr "Percorso delle immagini" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" -msgstr "" +msgstr "L'altitudine a cui le temperature crollano di 20°C" #: src/settings_translation_file.cpp msgid "The depth of dirt or other filler" -msgstr "" +msgstr "La profondità della terra o altri riempitori" #: src/settings_translation_file.cpp msgid "The network interface that the server listens on." -msgstr "" +msgstr "L'interfaccia di rete ascoltata dal server." #: src/settings_translation_file.cpp msgid "" "The privileges that new users automatically get.\n" "See /privs in game for a full list on your server and mod configuration." msgstr "" +"I privilegi ricevuti automaticamente dai nuovi utenti.\n" +"Si veda /privs in gioco per un elenco completo sul vostro server e la " +"configurazione dei mod." #: src/settings_translation_file.cpp msgid "The rendering back-end for Irrlicht." -msgstr "" +msgstr "Il supporto di rendering per Irrlicht." #: src/settings_translation_file.cpp msgid "" @@ -3708,6 +4055,13 @@ msgid "" "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" "set to the nearest valid value." msgstr "" +"L'intensità (oscurità) dell'ombreggiatura di occlusione ambientale dei nodi." +"\n" +"Minore è più scuro, maggiore è più chiaro. L'intervallo di valori validi " +"per\n" +"questa impostazione è tra 0.25 e 4.0 inclusi. Se il valore è fuori " +"intervallo\n" +"verrà impostato sul valore valido più vicino." #: src/settings_translation_file.cpp msgid "" @@ -3715,28 +4069,35 @@ msgid "" "capacity until an attempt is made to decrease its size by dumping old queue\n" "items. A value of 0 disables the functionality." msgstr "" +"Il tempo (in secondi) in cui la coda dei liquidi può crescere oltre alla " +"capacità\n" +"di elaborazione finché viene fatto un tentativo di diminuirne la dimensione\n" +"scaricando gli oggetti della vecchia coda. Un valore 0 disattiva questa " +"funzionalità." #: src/settings_translation_file.cpp msgid "" "The time in seconds it takes between repeated right clicks when holding the " "right mouse button." msgstr "" -"Il tempo in secondi che intercorre tra pressioni ripetute del tasto destro " -"quando viene trattenuto il pulsante destro del mouse." +"Il tempo in secondi richiesto tra click destri ripetuti quando si tiene il " +"pulsante mouse destro." #: src/settings_translation_file.cpp msgid "This font will be used for certain languages." -msgstr "Questo font verrà utilizzato per alcune lingue." +msgstr "Questo font sarà usato per certe lingue." #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" "Setting it to -1 disables the feature." msgstr "" +"Tempo in secondi di vita per le entità oggetto (oggetti lasciati a terra).\n" +"Impostandola a 0 si disattiva la caratteristica." #: src/settings_translation_file.cpp msgid "Time send interval" -msgstr "" +msgstr "Intervallo del tempo di invio" #: src/settings_translation_file.cpp msgid "Time speed" @@ -3745,8 +4106,8 @@ msgstr "Velocità del tempo" #: src/settings_translation_file.cpp msgid "Timeout for client to remove unused map data from memory." msgstr "" -"Tempo impiegato dai client per rimuovere dati della mappa non utilizzati " -"dalla memoria." +"Tempo di scadenza per i client per rimuovere dati mappa inutilizzati dalla " +"memoria." #: src/settings_translation_file.cpp msgid "" @@ -3755,23 +4116,23 @@ msgid "" "This determines how long they are slowed down after placing or removing a " "node." msgstr "" -"Per ridurre il ritardo, i trasferimenti dei blocchi vengono rallentati " -"quando un giocatore sta costruendo qualcosa.\n" -"Questo determina per quanto vengono rallentati dopo aver posizionato o " -"rimosso un nodo." +"Per ridurre il ritardo, i trasferimenti di blocchi sono rallentati quando un " +"giocatore sta\n" +"costruendo qualcosa. Questo stabilisce per quanto a lungo sono rallentati " +"dopo avere\n" +"posizionato o rimosso un nodo." #: src/settings_translation_file.cpp msgid "Toggle camera mode key" -msgstr "Tasto per variare la visuale" +msgstr "Chiave di impostazione della modalità camera" #: src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-Mapping" +msgstr "Mappatura toni" #: src/settings_translation_file.cpp msgid "Tooltip delay" -msgstr "" +msgstr "Ritardo dei suggerimenti" #: src/settings_translation_file.cpp msgid "Trilinear filtering" @@ -3783,55 +4144,55 @@ msgid "" "False = 128\n" "Useable to make minimap smoother on slower machines." msgstr "" +"Vero = 256\n" +"Falso = 128\n" +"Utilizzabile per rendere più fluida la minimappa su macchine più lente." #: src/settings_translation_file.cpp msgid "Trusted mods" -msgstr "Moduli fidati" +msgstr "Mod. fidati" #: src/settings_translation_file.cpp msgid "URL to the server list displayed in the Multiplayer Tab." -msgstr "" -"URL che punta alla lista di server mostrata nella scheda Multigiocatore." +msgstr "URL dell'elenco server mostrato nella linguetta Giocatori multipli." #: src/settings_translation_file.cpp -#, fuzzy msgid "Unlimited player transfer distance" -msgstr "Distanza illimitata di visualizzazione dei giocatori" +msgstr "Distanza di trasferimento illimitata" #: src/settings_translation_file.cpp msgid "Unload unused server data" -msgstr "" +msgstr "Scaricare i dati server inutilizzati" #: src/settings_translation_file.cpp msgid "Use 3D cloud look instead of flat." -msgstr "Dai alle nuvole un aspetto 3D invece che piatto." +msgstr "Usare le nuvole in 3D invece delle piatte." #: src/settings_translation_file.cpp msgid "Use a cloud animation for the main menu background." -msgstr "Usa un'animazione di nuvole come sfondo del menù principale." +msgstr "Usare un'animazione con le nuvole per lo sfondo del menu principale." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "" -"Usa un filtro anisotropico per migliorare le texture viste da un angolo." +msgstr "Usare il filtro anisotropico quando si vedono le immagini da un angolo." #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." -msgstr "Usa un filtro bilineare quando si scalano le texture." +msgstr "Usare il filtro bilineare quando si ridimensionano le immagini." #: src/settings_translation_file.cpp msgid "Use key" -msgstr "Tasto Usa" +msgstr "Tasto 'usare'" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." msgstr "" -"Usa il mip mapping per ridurre le texture. Potrebbe decrementare leggermente " -"le prestazioni." +"Usare il mipmapping per ridimensionare le immagini. Potrebbe aumentare " +"leggermente la resa." #: src/settings_translation_file.cpp msgid "Use trilinear filtering when scaling textures." -msgstr "Usa un filtro trilineare quando si scalano le texture." +msgstr "Usare il filtro trilineare quando si ridimensionano le immagini." #: src/settings_translation_file.cpp msgid "Useful for mod developers." @@ -3843,62 +4204,63 @@ msgstr "Sincronia verticale" #: src/settings_translation_file.cpp msgid "VBO" -msgstr "" +msgstr "VBO" #: src/settings_translation_file.cpp msgid "Valley Depth" -msgstr "" +msgstr "Profondità valli" #: src/settings_translation_file.cpp msgid "Valley Fill" -msgstr "" +msgstr "Riempimento valli" #: src/settings_translation_file.cpp msgid "Valley Profile" -msgstr "" +msgstr "Profilo valli" #: src/settings_translation_file.cpp msgid "Valley Slope" -msgstr "" +msgstr "Pendenza valli" #: src/settings_translation_file.cpp msgid "Valleys C Flags" -msgstr "" +msgstr "Impostazioni C delle valli" #: src/settings_translation_file.cpp msgid "Vertical screen synchronization." -msgstr "Dimensione iniziale orizzontale della finestra." +msgstr "Sincronizzazione verticale dello schermo." #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "Driver del video" +msgstr "Driver video" #: src/settings_translation_file.cpp msgid "View bobbing" -msgstr "" +msgstr "Ondeggiamento visuale" #: src/settings_translation_file.cpp msgid "" "View distance in nodes.\n" "Min = 20" msgstr "" +"Distanza visiva in nodi.\n" +"Min = 20" #: src/settings_translation_file.cpp msgid "View range decrease key" -msgstr "Tasto per decrementare la visibilità" +msgstr "Tasto di riduzione del raggio visivo" #: src/settings_translation_file.cpp msgid "View range increase key" -msgstr "Tasto per incrementare la visibilità" +msgstr "Tasto di aumento del raggio visivo" #: src/settings_translation_file.cpp -#, fuzzy msgid "Viewing range" -msgstr "Distanza massima di visibilità" +msgstr "Raggio visivo" #: src/settings_translation_file.cpp msgid "Volume" -msgstr "Volume del suono" +msgstr "Volume" #: src/settings_translation_file.cpp msgid "" @@ -3907,15 +4269,18 @@ msgid "" "Has no effect on 3D fractals.\n" "Range roughly -2 to 2." msgstr "" +"Coordinata W della fetta in 3D generata di un frattale in 4D.\n" +"Determina quale fetta in 3D viene generata della forma in 4D.\n" +"Non ha effetto su frattali in 3D.\n" +"Spazia pressapoco tra -2 e 2." #: src/settings_translation_file.cpp msgid "Walking speed" -msgstr "Velocità di movimento" +msgstr "Velocità di camminata" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Livello dell'acqua" +msgstr "Caratteristiche dell'acqua" #: src/settings_translation_file.cpp msgid "Water level" @@ -3923,12 +4288,11 @@ msgstr "Livello dell'acqua" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "Livello della superficie dell'acqua del mondo." +msgstr "Livello di superficie dell'acqua del mondo." #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving Nodes" -msgstr "Inizializzazione nodi" +msgstr "Nodi ondeggianti" #: src/settings_translation_file.cpp msgid "Waving leaves" @@ -3944,15 +4308,15 @@ msgstr "Acqua ondeggiante" #: src/settings_translation_file.cpp msgid "Waving water height" -msgstr "Altezza delle onde dell'acqua" +msgstr "Altezza dell'acqua ondeggiante" #: src/settings_translation_file.cpp msgid "Waving water length" -msgstr "Lunghezza delle onde dell'acqua" +msgstr "Durata di ondeggiamento dell'acqua" #: src/settings_translation_file.cpp msgid "Waving water speed" -msgstr "Velocità dell'ondeggiamento dell'acqua" +msgstr "Velocità di ondeggiamento dell'acqua" #: src/settings_translation_file.cpp msgid "" @@ -3960,6 +4324,10 @@ msgid "" "filtered in software, but some images are generated directly\n" "to hardware (e.g. render-to-texture for nodes in inventory)." msgstr "" +"Quando gui_scaling_filter è vero, tutte le immagini dell'interfaccia\n" +"necessitano il filtraggio software, ma alcune immagini sono generate\n" +"direttamente dall'hardware (ad es.. render-to-texture per i nodi " +"nell'inventario)." #: src/settings_translation_file.cpp msgid "" @@ -3968,6 +4336,11 @@ msgid "" "to the old scaling method, for video drivers that don't\n" "propery support downloading textures back from hardware." msgstr "" +"Quando gui_scaling_filter_txr2img è vero, copia quelle immagini\n" +"dall'hardware al software per il ridimensionamento. Quando è falso,\n" +"ripiega sul vecchio metodo di ridimensionamento, per i driver video\n" +"che non supportano correttamente lo scaricamento delle immagini\n" +"dall'hardware." #: src/settings_translation_file.cpp msgid "" @@ -3979,17 +4352,15 @@ msgid "" "have a visible effect unless bilinear/trilinear/anisotropic filtering is\n" "enabled." msgstr "" -"Quando si usano filtri bilineari/trilineari/anisotropici, le superfici a " +"Quando si usano i filtri bilineare/trilineare/anisotropico, le immagini a " "bassa\n" -"risoluzione possono apparire sfocate, quindi ingrandiscile automaticamente\n" -"con l'interpolazione nearest-neighbor per preservare pixel nitidi. Questo\n" -"imposta la minima dimensione delle texture per le texture ingrandite; " -"valori\n" -"più elevati appaiono più nitidi, ma richiedono più memoria. Sono\n" -"raccomandate potenze di 2. Impostare questo più alto di 1 potrebbe non\n" -"avere un effetto visibile a meno che un filtro bilineari/trilineari/" -"anisotropici\n" -"sia abilitato." +"risoluzione possono essere sfocate, perciò ingranditele automaticamente\n" +"con l'interpolazione vicino-più-vicino per conservare pixel vivaci. Questa\n" +"imposta la dimensione minima dell'immagine per le immagini ingrandite;\n" +"valori maggiori risultano più a fuoco, ma richiedono più memoria. Sono\n" +"raccomandate le potenze di 2. Impostare questa a un valore maggiore di\n" +"1 potrebbe non avere un effetto visibile a meno che non sia attivato\n" +"il filtro bilineare/trilineare/anisotropico." #: src/settings_translation_file.cpp msgid "" @@ -4000,43 +4371,45 @@ msgid "" "- Those groups have an offset of -32, -32 nodes from the origin.\n" "- Only groups which are within the map_generation_limit are generated" msgstr "" -"Dove fermare il generatore di mappe.\n" -"Nota bene:\n" -"- limitato a 31000 (valori più alti non hanno effetto).\n" -"- il generatore di mappe funziona con gruppi di nodi da 80x80x80 (5x5x5 " -"MapBlocks).\n" -"- questi gruppi hanno uno scostamento di -32, -32 nodi dall'origine.\n" -"- solo i gruppi che si trovano all'interno di map_generation_limit " -"vengono generati" +"Dove si ferma il generatore mappa.\n" +"Si noti prego:\n" +"- Limitato a 31.000 (impostazioni superiori non hanno effetto)\n" +"- Il generatore mappa lavora in gruppi di 80x80x80 nodi (5x5x5 nodi mappa)." +"\n" +"- Quei gruppi hanno una compensazione di -32, -32 nodi dall'origine.\n" +"- Solo i gruppi che rientrano nel map_generation_limit vengono generati." #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." msgstr "" +"Se si usano font freetype, richiede la compilazione col supporto freetype." #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." msgstr "" +"Se le animazioni delle immagini dei nodi dovrebbero essere asincrone per " +"blocco mappa." #: src/settings_translation_file.cpp msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" -"Se i giocatori vengono mostrati ai client senza alcun limite di distanza.\n" -"Deprecato, usare l'impostazione player_transfer_distance invece." +"Se i giocatori sono mostrati ai client senza alcun limite di raggio.\n" +"Deplorata, usate invece l'impostazione player_transfer_distance." #: src/settings_translation_file.cpp msgid "Whether to allow players to damage and kill each other." -msgstr "Permettere ai giocatori di danneggiarsi e uccidersi a vicenda." +msgstr "Se permettere ai giocatori di danneggiarsi e uccidersi l'un l'altro." #: src/settings_translation_file.cpp msgid "" "Whether to ask clients to reconnect after a (Lua) crash.\n" "Set this to true if your server is set up to restart automatically." msgstr "" -"Se chiedere ai client di ricollegarsi dopo un crash (Lua).\n" -"Imposta questo su true se il tuo server è impostato per riavviarsi " +"Se chiedere ai client di riconnettersi dopo un crollo (Lua).\n" +"Impostatela a vero se il vostro server è impostato per ripartire " "automaticamente." #: src/settings_translation_file.cpp @@ -4047,55 +4420,51 @@ msgstr "Se annebbiare la fine dell'area visibile." msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" -"Se mostrare al client le informazioni di debug (ha lo stesso effetto di " -"premere F5)." +"Se mostrare le info. di debug del client (ha lo stesso effetto di premere " +"F5)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Width component of the initial window size." -msgstr "Dimensione iniziale verticale della finestra." +msgstr "Componente larghezza della dimensione iniziale della finestra." #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." -msgstr "Larghezza dei riquadri attorno ai nodi." +msgstr "Larghezza delle linee del riquadro di selezione attorno ai nodi." #: src/settings_translation_file.cpp msgid "" "World directory (everything in the world is stored here).\n" "Not needed if starting from the main menu." msgstr "" -"Cartella del mondo (tutto il mondo si trova qui).\n" -"Non è necessario se si inizia dal menù principale." +"Cartella del mondo (ogni cosa nel mondo viene depositata qui).\n" +"Non necessaria se si avvia dal menu principale." #: src/settings_translation_file.cpp msgid "Y of flat ground." -msgstr "" +msgstr "Y del terreno piatto." #: src/settings_translation_file.cpp msgid "Y of upper limit of large pseudorandom caves." -msgstr "" +msgstr "Y del limite superiore delle caverne pseudocasuali grandi." #: src/settings_translation_file.cpp msgid "cURL file download timeout" -msgstr "" +msgstr "Tempo di scadenza cURL dello scaricamento dei file" #: src/settings_translation_file.cpp msgid "cURL parallel limit" -msgstr "" +msgstr "Limite cURL parallelo" #: src/settings_translation_file.cpp msgid "cURL timeout" -msgstr "" +msgstr "Tempo di scadenza cURL" -#, fuzzy #~ msgid "If disabled " #~ msgstr "Disatt. pacch." -#, fuzzy #~ msgid "If enabled, " #~ msgstr "attivata" -#, fuzzy #~ msgid "Restart minetest for driver change to take effect" #~ msgstr "Riavviare minetest per rendere effettive le modifiche" From 0d40bb83a7eed5f271a345cd6770658f0bf30fd5 Mon Sep 17 00:00:00 2001 From: Rui Date: Wed, 30 Mar 2016 13:09:05 +0200 Subject: [PATCH 475/531] Translated using Weblate (Japanese) Currently translated at 51.7% (448 of 865 strings) This is a merger of two commits. --- po/ja/minetest.po | 315 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 237 insertions(+), 78 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 68013ff7..96c4eee2 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-27 05:49+0100\n" -"PO-Revision-Date: 2016-03-15 09:07+0000\n" +"PO-Revision-Date: 2016-04-30 05:38+0000\n" "Last-Translator: Rui \n" "Language-Team: Japanese " "\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -1275,6 +1275,7 @@ msgid "Zoom" msgstr "ズーム" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "(X,Y,Z) offset of fractal from world centre in units of 'scale'.\n" "Used to move a suitable spawn area of low land close to (0, 0).\n" @@ -1282,6 +1283,10 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"（X,Y,Z）『スケール』の単位の世界センターからのフラクタルのオフセット。\n" +"動きに低い土地の適当な卵区域を使われます（0、0）。\n" +"デフォルトはmandelbrotセットに適しています、それはjuliaセットのために編集される必要があります。\n" +"およそ-2～2変動してください。ノードでオフセットのために『スケール』によって増えてください。" #: src/settings_translation_file.cpp msgid "" @@ -1367,30 +1372,36 @@ msgid "" msgstr "4kスクリーンなどのための、画面の解像度の設定です (非X11/Android環境のみ)。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"光のテーブルのガンマ補正を調整します。数値が低くなるほど明るくなります。\n" +"この設定はクライアント用であり、サーバの設定は無視されます。" #: src/settings_translation_file.cpp msgid "Advanced" msgstr "詳細" #: src/settings_translation_file.cpp +#, fuzzy msgid "Altitude Chill" -msgstr "" +msgstr "高所の寒さ" #: src/settings_translation_file.cpp msgid "Always fly and fast" msgstr "飛行時に加速する" #: src/settings_translation_file.cpp +#, fuzzy msgid "Ambient occlusion gamma" -msgstr "" +msgstr "アンビエントオクルージョンガンマ" #: src/settings_translation_file.cpp +#, fuzzy msgid "Amplifies the valleys" -msgstr "" +msgstr "谷の高低差" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1401,23 +1412,28 @@ msgid "Announce server" msgstr "サーバを公開" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Announce to this serverlist.\n" "If you want to announce your ipv6 address, use serverlist_url = v6.servers." "minetest.net." msgstr "" +"公開サーバの通知先のサーバ一覧です。\n" +"IPv6アドレスを通知したい場合は、serverlist_url = v6.servers.minetest.netを使用してください。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "ノードにおけるフラクタルのおおよその(X,Y,Z)の大きさ。" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" msgstr "クラッシュ後に再接続を促す" #: src/settings_translation_file.cpp +#, fuzzy msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "自動的にサーバ一覧に報告します。" #: src/settings_translation_file.cpp msgid "Backward key" @@ -1440,36 +1456,44 @@ msgid "Bind address" msgstr "バインドアドレス" #: src/settings_translation_file.cpp +#, fuzzy msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "フルスクリーンモードでの1ピクセル(色深度)あたりのビット数。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Build inside player" -msgstr "" +msgstr "プレイヤーの位置に設置" #: src/settings_translation_file.cpp +#, fuzzy msgid "Camera smoothing" -msgstr "" +msgstr "滑らかなカメラ" #: src/settings_translation_file.cpp +#, fuzzy msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "映画風モードでのカメラの滑らかさ" #: src/settings_translation_file.cpp +#, fuzzy msgid "Camera update toggle key" -msgstr "" +msgstr "カメラ更新切り替えキー" #: src/settings_translation_file.cpp +#, fuzzy msgid "Cave noise #1" -msgstr "" +msgstr "洞窟ノイズ#1" #: src/settings_translation_file.cpp +#, fuzzy msgid "Cave noise #2" -msgstr "" +msgstr "洞窟ノイズ#2" #: src/settings_translation_file.cpp +#, fuzzy msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "洞窟やトンネルは2つのノイズの交差部分に形成されます" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1480,6 +1504,7 @@ msgid "Chat toggle key" msgstr "チャットトグルキー" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Choice of 18 fractals from 9 formulas.\n" "1 = 4D \"Roundy\" mandelbrot set.\n" @@ -1501,6 +1526,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"9つの形式からなる18のフラクタルの選択。\n" +"1 = 4D 「Roundy」 マンデルブロ集合。\n" +"2 = 4D 「Roundy」 ジュリア集合。\n" +"3 = 4D \"Squarry\" マンデルブロ集合。\n" +"4 = 4D \"Squarry\" julia set.\n" +"5 = 4D \"Mandy Cousin\" mandelbrot set.\n" +"6 = 4D \"Mandy Cousin\" julia set.\n" +"7 = 4D \"Variation\" mandelbrot set.\n" +"8 = 4D \"Variation\" julia set.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n" +"11 = 3D \"Christmas Tree\" mandelbrot set.\n" +"12 = 3D \"Christmas Tree\" julia set.\n" +"13 = 3D \"Mandelbulb\" mandelbrot set.\n" +"14 = 3D \"Mandelbulb\" julia set.\n" +"15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n" +"16 = 3D \"Cosine Mandelbulb\" julia set.\n" +"17 = 4D \"Mandelbulb\" mandelbrot set.\n" +"18 = 4D \"Mandelbulb\" julia set." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1551,16 +1595,22 @@ msgid "Colored fog" msgstr "色つきの霧" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"流行の最先端の安全対策がオンの（request_insecure_environment（）を通して）ときでも、不安定な機能にアクセスしてもよい信用された" +"モッズのコンマで区切られたリスト。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"HTTP API（彼らがインターネットに出入りするデータをアップロードして、ダウンロードするのを許します）にアクセスしてもよいモッズのコンマseperat" +"edされたリスト。" #: src/settings_translation_file.cpp msgid "Command key" @@ -1575,8 +1625,9 @@ msgid "Connect to external media server" msgstr "外部メディアサーバに接続中" #: src/settings_translation_file.cpp +#, fuzzy msgid "Connects glass if supported by node." -msgstr "" +msgstr "ノードが対応している場合は、ガラスを繋ぎます。" #: src/settings_translation_file.cpp msgid "Console alpha" @@ -1591,73 +1642,92 @@ msgid "Console key" msgstr "コンソールキー" #: src/settings_translation_file.cpp +#, fuzzy msgid "Continuous forward" -msgstr "" +msgstr "オートラン" #: src/settings_translation_file.cpp +#, fuzzy msgid "Continuous forward movement (only used for testing)." -msgstr "" +msgstr "オートラン (テスト用)。" #: src/settings_translation_file.cpp msgid "Controls" -msgstr "操作法" +msgstr "操作" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Controls length of day/night cycle.\n" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"昼夜交代の長さを制御します。\n" +"例: 72 = 20分、360 = 4分、1 = 24時間、0 = 時間は変更されません。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"砂漠の規制サイズとMapgen v6のビーチ。\n" +"snowbiomesが許可されるとき、『mgv6_freq_desert』は無視されます。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "湖底の険しさ/深さの設定。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Controls steepness/height of hills." -msgstr "" +msgstr "丘の険しさ/高さの設定。" #: src/settings_translation_file.cpp msgid "Crash message" msgstr "クラッシュメッセージ" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"洞窟に予測不可能な溶岩を生成します。\n" +"これによって採掘を難しくできます。ゼロを指定すると無効になります。(0-10)" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"洞窟に予測不可能な水を生成します。\n" +"これによって採掘を難しくできます。ゼロを指定すると無効になります。(0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" msgstr "照準の透過度" #: src/settings_translation_file.cpp +#, fuzzy msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "照準線の透過 (不透明性、0から255)" #: src/settings_translation_file.cpp msgid "Crosshair color" -msgstr "" +msgstr "照準線の色" #: src/settings_translation_file.cpp +#, fuzzy msgid "Crosshair color (R,G,B)." -msgstr "" +msgstr "照準線の色 (R、G、B)。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Crouch speed" -msgstr "" +msgstr "しゃがみ状態の速度" #: src/settings_translation_file.cpp msgid "DPI" @@ -1676,22 +1746,27 @@ msgid "Debug log level" msgstr "デバッグログのレベル" #: src/settings_translation_file.cpp +#, fuzzy msgid "Dedicated server step" -msgstr "" +msgstr "サーバのステップ" #: src/settings_translation_file.cpp +#, fuzzy msgid "Default acceleration" -msgstr "" +msgstr "標準の加速度" #: src/settings_translation_file.cpp msgid "Default game" msgstr "標準ゲーム" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"新しいワールドを作成する際の標準のゲームです。\n" +"メインメニューでワールドを作成する際に上書きされる可能性があります。" #: src/settings_translation_file.cpp msgid "Default password" @@ -1702,93 +1777,118 @@ msgid "Default privileges" msgstr "標準権限" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"cURL（ミリ秒に述べられる）のためのデフォルト・タイムアウト。\n" +"cURLで編集されるならば、影響を持っているだけです。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"Defines sampling step of texture.\n" +"A higher value results in smoother normal maps." #: src/settings_translation_file.cpp +#, fuzzy msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." -msgstr "" +msgstr "ブロック（0無制限の=）で、最大限のプレーヤー移転距離を定めます。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "ツールチップを表示するまでの遅延です。ミリ秒で指定してください。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Deprecated Lua API handling" -msgstr "" +msgstr "廃止予定のLua APIの処理" #: src/settings_translation_file.cpp +#, fuzzy msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "あなたが大きな洞穴を見つける深さ。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "あなたが大きい洞穴を見つける深さ。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Descending speed" -msgstr "" +msgstr "降りる速度" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Description of server, to be displayed when players join and in the " "serverlist." -msgstr "" +msgstr "サーバの説明です。プレイヤーがサーバ一覧から接続する際に表示されます。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Desynchronize block animation" -msgstr "" +msgstr "ブロックのアニメーションの非同期化" #: src/settings_translation_file.cpp +#, fuzzy msgid "Detailed mod profile data. Useful for mod developers." -msgstr "" +msgstr "詳細なModのプロファイルデータです。Mod開発者に便利です。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Detailed mod profiling" -msgstr "" +msgstr "詳細なModのプロファイル化" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Determines terrain shape.\n" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"地形形を決定します。\n" +"ブラケットの3番号は地形の目盛りを制御します、\n" +"3番号は同一でなければなりません。" #: src/settings_translation_file.cpp msgid "Disable anticheat" msgstr "対チート機関無効化" #: src/settings_translation_file.cpp +#, fuzzy msgid "Disallow empty passwords" -msgstr "" +msgstr "空のパスワードを無効化" #: src/settings_translation_file.cpp +#, fuzzy msgid "Domain name of server, to be displayed in the serverlist." -msgstr "" +msgstr "サーバのドメイン名です。サーバ一覧に表示されます。" #: src/settings_translation_file.cpp msgid "Double tap jump for fly" msgstr "「ジャンプ」キー二回押しで飛行モード" #: src/settings_translation_file.cpp +#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "「ジャンプ」キー二回押しで飛行モード" +msgstr "「ジャンプ」キー二回押しで飛行モード。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Drop item key" -msgstr "" +msgstr "アイテムを捨てるキー" #: src/settings_translation_file.cpp +#, fuzzy msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "マップ生成のデバッグ情報を出力します。" #: src/settings_translation_file.cpp msgid "Enable VBO" @@ -1796,23 +1896,29 @@ msgstr "有効化" #: src/settings_translation_file.cpp msgid "Enable mod security" -msgstr "オンラインでModを検索" +msgstr "Modのセキュリティを有効化" #: src/settings_translation_file.cpp +#, fuzzy msgid "Enable players getting damage and dying." -msgstr "" +msgstr "損害を得ていて、死んでいるプレーヤーを使用可能にしてください。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "入力される（テストのために使われるだけの）ランダムなユーザーに許可を与えてください。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"単純な周囲の閉塞でスムーズな照明を使用可能にしてください。\n" +"速度のために、または、異なるルックスのために働かなくしてください。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enable to disallow old clients from connecting.\n" "Older clients are compatible in the sense that they will not crash when " @@ -1820,37 +1926,53 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"つながることから古いクライアントを認めないのを可能にしてください。\n" +"新しいサーバーに接続するとき彼らが完敗しないという点で、年上の依頼人は互換性を持ちます、しかし、彼らがあなたが期待しているすべての新機能を支えるというわけ" +"ではないかもしれません。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enable usage of remote media server (if provided by server).\n" "Remote servers offer a significantly faster way to download media (e.g. " "textures)\n" "when connecting to the server." msgstr "" +"遠隔メディア・サーバー（サーバーで提供されるならば）の使用法をイネーブルしてください。\n" +"サーバーに接続するとき、遠隔サーバーはメディア（例えばテクスチャー）をダウンロードするかなりより高速道を提供します。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enable/disable running an IPv6 server. An IPv6 server may be restricted\n" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"IPv6サーバーを動かすことを可能にして/働かなくしてください。システム構成に従い、IPv6サーバーは、IPv6クライアントに制限されるかもしれません。" +"\n" +"bind_addressがセットされるならば、無視されます。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Enables animation of inventory items." -msgstr "" +msgstr "インベントリのアイテムのアニメーションを有効にします。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " "texture pack\n" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"テクスチャーのためにbumpmappingすることを可能にします。ノル悪地図はテクスチャー・パックで供給される必要があるか、自動発生する必要があります。" +"\n" +"許可されることを遮光物に要求します。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Enables caching of facedir rotated meshes." -msgstr "" +msgstr "facedir回転するメッシュのキャッシングを可能にします。" #: src/settings_translation_file.cpp msgid "Enables filmic tone mapping" @@ -1861,138 +1983,173 @@ msgid "Enables minimap." msgstr "ミニマップを有効にする。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" +"自動的にその場で、ノル悪地図生成（影響に浮彫りします）を可能にします。\n" +"許可されるためにbumpmappingすることを必要とします。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"視差オクルージョンマッピングを有効にします。\n" +"シェーダーが有効である必要があります。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." -msgstr "" +msgstr "0より高い数に設定されるとき、実験的なオプションはブロックの間の見える隙間を引き起こすかもしれません。" #: src/settings_translation_file.cpp +#, fuzzy msgid "FPS in pause menu" -msgstr "" +msgstr "ポーズメニューのFPS" #: src/settings_translation_file.cpp +#, fuzzy msgid "FSAA" -msgstr "" +msgstr "アンチエイリアス" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fall bobbing" -msgstr "" +msgstr "落下による上下の揺れ" #: src/settings_translation_file.cpp msgid "Fallback font" msgstr "フォールバックフォント" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fallback font shadow" -msgstr "" +msgstr "フォールバックフォントの影" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fallback font shadow alpha" -msgstr "" +msgstr "フォールバックフォントの影の透過" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fallback font size" -msgstr "" +msgstr "フォールバックフォントの大きさ" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fast key" -msgstr "" +msgstr "高速移動キー" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fast mode acceleration" -msgstr "" +msgstr "高速モードの加速度" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fast mode speed" -msgstr "" +msgstr "高速モードの速度" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fast movement" -msgstr "" +msgstr "高速移動" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"高速移動 (使用キー)。\n" +"サーバによる「fast」権限が必要です。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Field of view" -msgstr "" +msgstr "視野" #: src/settings_translation_file.cpp +#, fuzzy msgid "Field of view in degrees." -msgstr "" +msgstr "視野角。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "" +msgstr "マルチプレーヤー・タブで示されるあなたの大好きなサーバーを含むclient/serverlist/でファイルしてください。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Filler Depth" -msgstr "" +msgstr "詰め物深さ" #: src/settings_translation_file.cpp +#, fuzzy msgid "Filmic tone mapping" -msgstr "" +msgstr "映画トーン・マッピング" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Filtered textures can blend RGB values with fully-transparent neighbors,\n" "which PNG optimizers usually discard, sometimes resulting in a dark or\n" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" +"フィルタ処理したテクスチャーは、透明なテクスチャーに暗いか明るい端に終わって、RGBの価値と完全に透明な隣人（それをPNGオプティマイザーは通常捨てます）" +"を、時々混ぜ合わせることができます。テクスチャー荷時間にそれをきれいにするために、このフィルタを使用してください。" #: src/settings_translation_file.cpp msgid "Filtering" msgstr "フィルタリング" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fixed map seed" -msgstr "" +msgstr "固定マップシード値" #: src/settings_translation_file.cpp msgid "Fly key" msgstr "飛行キー" #: src/settings_translation_file.cpp +#, fuzzy msgid "Flying" -msgstr "" +msgstr "飛行" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fog" -msgstr "" +msgstr "霧" #: src/settings_translation_file.cpp +#, fuzzy msgid "Fog toggle key" -msgstr "" +msgstr "霧切り替えキー" #: src/settings_translation_file.cpp +#, fuzzy msgid "Font path" -msgstr "" +msgstr "フォントパス" #: src/settings_translation_file.cpp +#, fuzzy msgid "Font shadow" -msgstr "" +msgstr "フォントの影" #: src/settings_translation_file.cpp +#, fuzzy msgid "Font shadow alpha" -msgstr "" +msgstr "フォントの影の透過" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." @@ -2078,7 +2235,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "グラフィック" #: src/settings_translation_file.cpp msgid "Gravity" @@ -3173,7 +3330,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Network" -msgstr "" +msgstr "ネットワーク" #: src/settings_translation_file.cpp msgid "" @@ -3423,7 +3580,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Security" -msgstr "" +msgstr "セキュリティ" #: src/settings_translation_file.cpp msgid "See http://www.sqlite.org/pragma.html#pragma_synchronous" @@ -3443,7 +3600,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Server / Singleplayer" -msgstr "シングルプレイ開始" +msgstr "サーバ / シングルプレイヤー" #: src/settings_translation_file.cpp msgid "Server URL" @@ -3550,7 +3707,7 @@ msgstr "スニークキー" #: src/settings_translation_file.cpp msgid "Sound" -msgstr "" +msgstr "サウンド" #: src/settings_translation_file.cpp msgid "" @@ -3942,7 +4099,7 @@ msgstr "クライアントのデバッグ情報を表示するかどうかの設 #: src/settings_translation_file.cpp msgid "Width component of the initial window size." -msgstr "" +msgstr "ウィンドウ幅の初期値。" #: src/settings_translation_file.cpp msgid "Width of the selectionbox's lines around nodes." @@ -3957,12 +4114,14 @@ msgstr "" "メインメニューから開始する場合必要ありません。" #: src/settings_translation_file.cpp +#, fuzzy msgid "Y of flat ground." -msgstr "" +msgstr "フラットマップの地面の高さ" #: src/settings_translation_file.cpp +#, fuzzy msgid "Y of upper limit of large pseudorandom caves." -msgstr "" +msgstr "大きい擬似ランダム洞窟の高さ(Y)の上限。" #: src/settings_translation_file.cpp msgid "cURL file download timeout" From 29877dfb4588c9a7fa4fb6321f625bcd8e0bcd84 Mon Sep 17 00:00:00 2001 From: Rui Date: Sat, 30 Apr 2016 17:09:59 +0900 Subject: [PATCH 476/531] Mainmenu: Remove space under mod list --- builtin/mainmenu/tab_mods.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/mainmenu/tab_mods.lua b/builtin/mainmenu/tab_mods.lua index 69027c01..5b59aa11 100644 --- a/builtin/mainmenu/tab_mods.lua +++ b/builtin/mainmenu/tab_mods.lua @@ -28,7 +28,7 @@ local function get_formspec(tabview, name, tabdata) local retval = "label[0.05,-0.25;".. fgettext("Installed Mods:") .. "]" .. - "textlist[0,0.25;5.1,4.35;modlist;" .. + "textlist[0,0.25;5.1,5;modlist;" .. modmgr.render_modlist(modmgr.global_mods) .. ";" .. tabdata.selected_mod .. "]" From c95734654caf1064907926978b2cbbc3601fdae9 Mon Sep 17 00:00:00 2001 From: gregorycu Date: Sun, 1 May 2016 17:27:29 +1000 Subject: [PATCH 477/531] Use MoveFileEx to rename files on Windows (not rename) --- src/filesys.cpp | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/filesys.cpp b/src/filesys.cpp index 501f9ad6..b4c52ab7 100644 --- a/src/filesys.cpp +++ b/src/filesys.cpp @@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include "log.h" #include "config.h" +#include "porting.h" namespace fs { @@ -698,22 +699,37 @@ bool safeWriteToFile(const std::string &path, const std::string &content) return false; } + bool rename_success = false; + // Move the finished temporary file over the real file #ifdef _WIN32 + // When creating the file, it can cause Windows Search indexer, virus scanners and other apps + // to query the file. This can make the move file call below fail. + // We retry up to 5 times, with a 1ms sleep between, before we consider the whole operation failed + int number_attempts = 0; + while (number_attempts < 5) { + rename_success = MoveFileEx(tmp_file.c_str(), path.c_str(), + MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH); + if (rename_success) + break; + sleep_ms(1); + ++number_attempts; + } +#else // On POSIX compliant systems rename() is specified to be able to swap the // file in place of the destination file, making this a truly error-proof // transaction. - // However, on Windows, the target file has to be removed first. - remove(path.c_str()); + rename_success = rename(tmp_file.c_str(), path.c_str()) == 0; #endif - if(rename(tmp_file.c_str(), path.c_str())) { + if (!rename_success) { + warningstream << "Failed to write to file: " << path.c_str() << std::endl; // Remove the temporary file because moving it over the target file // failed. remove(tmp_file.c_str()); return false; - } else { - return true; } + + return true; } bool Rename(const std::string &from, const std::string &to) From c1a0ebb725d6ac05e94cc6ad8507106636b63326 Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Sun, 1 May 2016 16:47:08 +1000 Subject: [PATCH 478/531] Fix use of uninitialised variable in class Event --- src/threading/event.cpp | 9 ++++++--- src/threading/event.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/threading/event.cpp b/src/threading/event.cpp index c3c2ca02..b7f16154 100644 --- a/src/threading/event.cpp +++ b/src/threading/event.cpp @@ -25,17 +25,20 @@ DEALINGS IN THE SOFTWARE. #include "threading/event.h" -#if __cplusplus < 201103L Event::Event() + : notified(false) { -#ifdef _WIN32 +#if __cplusplus < 201103L +# ifdef _WIN32 event = CreateEvent(NULL, false, false, NULL); -#else +# else pthread_cond_init(&cv, NULL); pthread_mutex_init(&mutex, NULL); +# endif #endif } +#if __cplusplus < 201103L Event::~Event() { #ifdef _WIN32 diff --git a/src/threading/event.h b/src/threading/event.h index 43f2b04b..dd516457 100644 --- a/src/threading/event.h +++ b/src/threading/event.h @@ -48,8 +48,8 @@ DEALINGS IN THE SOFTWARE. */ class Event { public: -#if __cplusplus < 201103L Event(); +#if __cplusplus < 201103L ~Event(); #endif void wait(); From 46e5ef4e9a19a162c8baee15d314233c0bb0e331 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 1 Apr 2016 01:20:34 +0200 Subject: [PATCH 479/531] Move pathfinder classes to cpp file There is no need to put them into the header, they are solely used inside the pathfinder. Another advantage of this change is that only the pathfinder.cpp has to be compiled if PATHFINDER_DEBUG gets defined or undefined, not all files including the .h. This commit moves the pathfinder classes to the cpp file without modifications. Also, the PATHFINDER_DEBUG macro gets moved to the cpp file and the PATHFINDER_CALC_TIME macro gets moved to a plce where it actually does work. --- src/pathfinder.cpp | 295 ++++++++++++++++++++++++++++++++++++++++++++- src/pathfinder.h | 284 ------------------------------------------- 2 files changed, 292 insertions(+), 287 deletions(-) diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp index 673d5077..90fc4ecd 100644 --- a/src/pathfinder.cpp +++ b/src/pathfinder.cpp @@ -26,8 +26,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "map.h" #include "log.h" +//#define PATHFINDER_DEBUG +//#define PATHFINDER_CALC_TIME + #ifdef PATHFINDER_DEBUG -#include + #include +#endif +#ifdef PATHFINDER_DEBUG + #include #endif #ifdef PATHFINDER_CALC_TIME #include @@ -37,8 +43,6 @@ with this program; if not, write to the Free Software Foundation, Inc., /* Typedefs and macros */ /******************************************************************************/ -//#define PATHFINDER_CALC_TIME - /** shortcut to print a 3d pos */ #define PPOS(pos) "(" << pos.X << "," << pos.Y << "," << pos.Z << ")" @@ -56,6 +60,291 @@ with this program; if not, write to the Free Software Foundation, Inc., #define ERROR_TARGET errorstream << "pathfinder: " #endif +/******************************************************************************/ +/* Class definitions */ +/******************************************************************************/ + + +/** representation of cost in specific direction */ +class path_cost { +public: + + /** default constructor */ + path_cost(); + + /** copy constructor */ + path_cost(const path_cost& b); + + /** assignment operator */ + path_cost& operator= (const path_cost& b); + + bool valid; /**< movement is possible */ + int value; /**< cost of movement */ + int direction; /**< y-direction of movement */ + bool updated; /**< this cost has ben calculated */ + +}; + + +/** representation of a mapnode to be used for pathfinding */ +class path_gridnode { + +public: + /** default constructor */ + path_gridnode(); + + /** copy constructor */ + path_gridnode(const path_gridnode& b); + + /** + * assignment operator + * @param b node to copy + */ + path_gridnode& operator= (const path_gridnode& b); + + /** + * read cost in a specific direction + * @param dir direction of cost to fetch + */ + path_cost get_cost(v3s16 dir); + + /** + * set cost value for movement + * @param dir direction to set cost for + * @cost cost to set + */ + void set_cost(v3s16 dir,path_cost cost); + + bool valid; /**< node is on surface */ + bool target; /**< node is target position */ + bool source; /**< node is stating position */ + int totalcost; /**< cost to move here from starting point */ + v3s16 sourcedir; /**< origin of movement for current cost */ + int surfaces; /**< number of surfaces with same x,z value*/ + v3s16 pos; /**< real position of node */ + path_cost directions[4]; /**< cost in different directions */ + + /* debug values */ + bool is_element; /**< node is element of path detected */ + char type; /**< type of node */ +}; + +/** class doing pathfinding */ +class pathfinder { + +public: + /** + * default constructor + */ + pathfinder(); + + /** + * path evaluation function + * @param env environment to look for path + * @param source origin of path + * @param destination end position of path + * @param searchdistance maximum number of nodes to look in each direction + * @param max_jump maximum number of blocks a path may jump up + * @param max_drop maximum number of blocks a path may drop + * @param algo algorithm to use for finding a path + */ + std::vector get_Path(ServerEnvironment* env, + v3s16 source, + v3s16 destination, + unsigned int searchdistance, + unsigned int max_jump, + unsigned int max_drop, + algorithm algo); + +private: + /** data struct for storing internal information */ + struct limits { + struct limit { + int min; + int max; + }; + + limit X; + limit Y; + limit Z; + }; + + /* helper functions */ + + /** + * transform index pos to mappos + * @param ipos a index position + * @return map position + */ + v3s16 getRealPos(v3s16 ipos); + + /** + * transform mappos to index pos + * @param pos a real pos + * @return index position + */ + v3s16 getIndexPos(v3s16 pos); + + /** + * get gridnode at a specific index position + * @param ipos index position + * @return gridnode for index + */ + path_gridnode& getIndexElement(v3s16 ipos); + + /** + * invert a 3d position + * @param pos 3d position + * @return pos *-1 + */ + v3s16 invert(v3s16 pos); + + /** + * check if a index is within current search area + * @param index position to validate + * @return true/false + */ + bool valid_index(v3s16 index); + + /** + * translate position to float position + * @param pos integer position + * @return float position + */ + v3f tov3f(v3s16 pos); + + + /* algorithm functions */ + + /** + * calculate 2d manahttan distance to target + * @param pos position to calc distance + * @return integer distance + */ + int get_manhattandistance(v3s16 pos); + + /** + * get best direction based uppon heuristics + * @param directions list of unchecked directions + * @param g_pos mapnode to start from + * @return direction to check + */ + v3s16 get_dir_heuristic(std::vector& directions,path_gridnode& g_pos); + + /** + * build internal data representation of search area + * @return true/false if costmap creation was successfull + */ + bool build_costmap(); + + /** + * calculate cost of movement + * @param pos real world position to start movement + * @param dir direction to move to + * @return cost information + */ + path_cost calc_cost(v3s16 pos,v3s16 dir); + + /** + * recursive update whole search areas total cost information + * @param ipos position to check next + * @param srcdir positionc checked last time + * @param total_cost cost of moving to ipos + * @param level current recursion depth + * @return true/false path to destination has been found + */ + bool update_all_costs(v3s16 ipos,v3s16 srcdir,int total_cost,int level); + + /** + * recursive try to find a patrh to destionation + * @param ipos position to check next + * @param srcdir positionc checked last time + * @param total_cost cost of moving to ipos + * @param level current recursion depth + * @return true/false path to destination has been found + */ + bool update_cost_heuristic(v3s16 ipos,v3s16 srcdir,int current_cost,int level); + + /** + * recursive build a vector containing all nodes from source to destination + * @param path vector to add nodes to + * @param pos pos to check next + * @param level recursion depth + */ + void build_path(std::vector& path,v3s16 pos, int level); + + /* variables */ + int m_max_index_x; /**< max index of search area in x direction */ + int m_max_index_y; /**< max index of search area in y direction */ + int m_max_index_z; /**< max index of search area in z direction */ + + + int m_searchdistance; /**< max distance to search in each direction */ + int m_maxdrop; /**< maximum number of blocks a path may drop */ + int m_maxjump; /**< maximum number of blocks a path may jump */ + int m_min_target_distance; /**< current smalest path to target */ + + bool m_prefetch; /**< prefetch cost data */ + + v3s16 m_start; /**< source position */ + v3s16 m_destination; /**< destination position */ + + limits m_limits; /**< position limits in real map coordinates */ + + /** 3d grid containing all map data already collected and analyzed */ + std::vector > > m_data; + + ServerEnvironment* m_env; /**< minetest environment pointer */ + +#ifdef PATHFINDER_DEBUG + + /** + * print collected cost information + */ + void print_cost(); + + /** + * print collected cost information in a specific direction + * @param dir direction to print + */ + void print_cost(path_directions dir); + + /** + * print type of node as evaluated + */ + void print_type(); + + /** + * print pathlenght for all nodes in search area + */ + void print_pathlen(); + + /** + * print a path + * @param path path to show + */ + void print_path(std::vector path); + + /** + * print y direction for all movements + */ + void print_ydir(); + + /** + * print y direction for moving in a specific direction + * @param dir direction to show data + */ + void print_ydir(path_directions dir); + + /** + * helper function to translate a direction to speaking text + * @param dir direction to translate + * @return textual name of direction + */ + std::string dir_to_name(path_directions dir); +#endif +}; + /******************************************************************************/ /* implementation */ /******************************************************************************/ diff --git a/src/pathfinder.h b/src/pathfinder.h index dd41227f..31ea2f28 100644 --- a/src/pathfinder.h +++ b/src/pathfinder.h @@ -24,10 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc., /* Includes */ /******************************************************************************/ #include - #include "irr_v3d.h" - /******************************************************************************/ /* Forward declarations */ /******************************************************************************/ @@ -38,8 +36,6 @@ class ServerEnvironment; /* Typedefs and macros */ /******************************************************************************/ -//#define PATHFINDER_DEBUG - typedef enum { DIR_XP, DIR_XM, @@ -67,284 +63,4 @@ std::vector get_Path(ServerEnvironment* env, unsigned int max_drop, algorithm algo); -/** representation of cost in specific direction */ -class path_cost { -public: - - /** default constructor */ - path_cost(); - - /** copy constructor */ - path_cost(const path_cost& b); - - /** assignment operator */ - path_cost& operator= (const path_cost& b); - - bool valid; /**< movement is possible */ - int value; /**< cost of movement */ - int direction; /**< y-direction of movement */ - bool updated; /**< this cost has ben calculated */ - -}; - - -/** representation of a mapnode to be used for pathfinding */ -class path_gridnode { - -public: - /** default constructor */ - path_gridnode(); - - /** copy constructor */ - path_gridnode(const path_gridnode& b); - - /** - * assignment operator - * @param b node to copy - */ - path_gridnode& operator= (const path_gridnode& b); - - /** - * read cost in a specific direction - * @param dir direction of cost to fetch - */ - path_cost get_cost(v3s16 dir); - - /** - * set cost value for movement - * @param dir direction to set cost for - * @cost cost to set - */ - void set_cost(v3s16 dir,path_cost cost); - - bool valid; /**< node is on surface */ - bool target; /**< node is target position */ - bool source; /**< node is stating position */ - int totalcost; /**< cost to move here from starting point */ - v3s16 sourcedir; /**< origin of movement for current cost */ - int surfaces; /**< number of surfaces with same x,z value*/ - v3s16 pos; /**< real position of node */ - path_cost directions[4]; /**< cost in different directions */ - - /* debug values */ - bool is_element; /**< node is element of path detected */ - char type; /**< type of node */ -}; - -/** class doing pathfinding */ -class pathfinder { - -public: - /** - * default constructor - */ - pathfinder(); - - /** - * path evaluation function - * @param env environment to look for path - * @param source origin of path - * @param destination end position of path - * @param searchdistance maximum number of nodes to look in each direction - * @param max_jump maximum number of blocks a path may jump up - * @param max_drop maximum number of blocks a path may drop - * @param algo algorithm to use for finding a path - */ - std::vector get_Path(ServerEnvironment* env, - v3s16 source, - v3s16 destination, - unsigned int searchdistance, - unsigned int max_jump, - unsigned int max_drop, - algorithm algo); - -private: - /** data struct for storing internal information */ - struct limits { - struct limit { - int min; - int max; - }; - - limit X; - limit Y; - limit Z; - }; - - /* helper functions */ - - /** - * transform index pos to mappos - * @param ipos a index position - * @return map position - */ - v3s16 getRealPos(v3s16 ipos); - - /** - * transform mappos to index pos - * @param pos a real pos - * @return index position - */ - v3s16 getIndexPos(v3s16 pos); - - /** - * get gridnode at a specific index position - * @param ipos index position - * @return gridnode for index - */ - path_gridnode& getIndexElement(v3s16 ipos); - - /** - * invert a 3d position - * @param pos 3d position - * @return pos *-1 - */ - v3s16 invert(v3s16 pos); - - /** - * check if a index is within current search area - * @param index position to validate - * @return true/false - */ - bool valid_index(v3s16 index); - - /** - * translate position to float position - * @param pos integer position - * @return float position - */ - v3f tov3f(v3s16 pos); - - - /* algorithm functions */ - - /** - * calculate 2d manahttan distance to target - * @param pos position to calc distance - * @return integer distance - */ - int get_manhattandistance(v3s16 pos); - - /** - * get best direction based uppon heuristics - * @param directions list of unchecked directions - * @param g_pos mapnode to start from - * @return direction to check - */ - v3s16 get_dir_heuristic(std::vector& directions,path_gridnode& g_pos); - - /** - * build internal data representation of search area - * @return true/false if costmap creation was successfull - */ - bool build_costmap(); - - /** - * calculate cost of movement - * @param pos real world position to start movement - * @param dir direction to move to - * @return cost information - */ - path_cost calc_cost(v3s16 pos,v3s16 dir); - - /** - * recursive update whole search areas total cost information - * @param ipos position to check next - * @param srcdir positionc checked last time - * @param total_cost cost of moving to ipos - * @param level current recursion depth - * @return true/false path to destination has been found - */ - bool update_all_costs(v3s16 ipos,v3s16 srcdir,int total_cost,int level); - - /** - * recursive try to find a patrh to destionation - * @param ipos position to check next - * @param srcdir positionc checked last time - * @param total_cost cost of moving to ipos - * @param level current recursion depth - * @return true/false path to destination has been found - */ - bool update_cost_heuristic(v3s16 ipos,v3s16 srcdir,int current_cost,int level); - - /** - * recursive build a vector containing all nodes from source to destination - * @param path vector to add nodes to - * @param pos pos to check next - * @param level recursion depth - */ - void build_path(std::vector& path,v3s16 pos, int level); - - /* variables */ - int m_max_index_x; /**< max index of search area in x direction */ - int m_max_index_y; /**< max index of search area in y direction */ - int m_max_index_z; /**< max index of search area in z direction */ - - - int m_searchdistance; /**< max distance to search in each direction */ - int m_maxdrop; /**< maximum number of blocks a path may drop */ - int m_maxjump; /**< maximum number of blocks a path may jump */ - int m_min_target_distance; /**< current smalest path to target */ - - bool m_prefetch; /**< prefetch cost data */ - - v3s16 m_start; /**< source position */ - v3s16 m_destination; /**< destination position */ - - limits m_limits; /**< position limits in real map coordinates */ - - /** 3d grid containing all map data already collected and analyzed */ - std::vector > > m_data; - - ServerEnvironment* m_env; /**< minetest environment pointer */ - -#ifdef PATHFINDER_DEBUG - - /** - * print collected cost information - */ - void print_cost(); - - /** - * print collected cost information in a specific direction - * @param dir direction to print - */ - void print_cost(path_directions dir); - - /** - * print type of node as evaluated - */ - void print_type(); - - /** - * print pathlenght for all nodes in search area - */ - void print_pathlen(); - - /** - * print a path - * @param path path to show - */ - void print_path(std::vector path); - - /** - * print y direction for all movements - */ - void print_ydir(); - - /** - * print y direction for moving in a specific direction - * @param dir direction to show data - */ - void print_ydir(path_directions dir); - - /** - * helper function to translate a direction to speaking text - * @param dir direction to translate - * @return textual name of direction - */ - std::string dir_to_name(path_directions dir); -#endif -}; - #endif /* PATHFINDER_H_ */ From ac8bb457aae58867cbb96a5e64d286e7edc18e16 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 1 Apr 2016 01:52:17 +0200 Subject: [PATCH 480/531] Pathfinder: Fix style * Fix naming style for methods and classes: Use camelCase for methods and PascalCase for classes as code style demands it. And use sneak_case for methods that are not member of a class. * Replace "* " with " *" for Pointers * Same for references * Put function body opening braces on new line * Other misc minor non functional style improvements --- src/pathfinder.cpp | 379 ++++++++++++++++++----------------- src/pathfinder.h | 14 +- src/script/lua_api/l_env.cpp | 10 +- 3 files changed, 211 insertions(+), 192 deletions(-) diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp index 90fc4ecd..28cad173 100644 --- a/src/pathfinder.cpp +++ b/src/pathfinder.cpp @@ -55,9 +55,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #define ERROR_TARGET std::cout #else #define DEBUG_OUT(a) while(0) -#define INFO_TARGET infostream << "pathfinder: " -#define VERBOSE_TARGET verbosestream << "pathfinder: " -#define ERROR_TARGET errorstream << "pathfinder: " +#define INFO_TARGET infostream << "Pathfinder: " +#define VERBOSE_TARGET verbosestream << "Pathfinder: " +#define ERROR_TARGET errorstream << "Pathfinder: " #endif /******************************************************************************/ @@ -66,17 +66,17 @@ with this program; if not, write to the Free Software Foundation, Inc., /** representation of cost in specific direction */ -class path_cost { +class PathCost { public: /** default constructor */ - path_cost(); + PathCost(); /** copy constructor */ - path_cost(const path_cost& b); + PathCost(const PathCost &b); /** assignment operator */ - path_cost& operator= (const path_cost& b); + PathCost &operator= (const PathCost &b); bool valid; /**< movement is possible */ int value; /**< cost of movement */ @@ -87,33 +87,33 @@ public: /** representation of a mapnode to be used for pathfinding */ -class path_gridnode { +class PathGridnode { public: /** default constructor */ - path_gridnode(); + PathGridnode(); /** copy constructor */ - path_gridnode(const path_gridnode& b); + PathGridnode(const PathGridnode &b); /** * assignment operator * @param b node to copy */ - path_gridnode& operator= (const path_gridnode& b); + PathGridnode &operator= (const PathGridnode &b); /** * read cost in a specific direction * @param dir direction of cost to fetch */ - path_cost get_cost(v3s16 dir); + PathCost getCost(v3s16 dir); /** * set cost value for movement * @param dir direction to set cost for * @cost cost to set */ - void set_cost(v3s16 dir,path_cost cost); + void setCost(v3s16 dir, PathCost cost); bool valid; /**< node is on surface */ bool target; /**< node is target position */ @@ -122,7 +122,7 @@ public: v3s16 sourcedir; /**< origin of movement for current cost */ int surfaces; /**< number of surfaces with same x,z value*/ v3s16 pos; /**< real position of node */ - path_cost directions[4]; /**< cost in different directions */ + PathCost directions[4]; /**< cost in different directions */ /* debug values */ bool is_element; /**< node is element of path detected */ @@ -130,13 +130,13 @@ public: }; /** class doing pathfinding */ -class pathfinder { +class Pathfinder { public: /** * default constructor */ - pathfinder(); + Pathfinder(); /** * path evaluation function @@ -146,15 +146,15 @@ public: * @param searchdistance maximum number of nodes to look in each direction * @param max_jump maximum number of blocks a path may jump up * @param max_drop maximum number of blocks a path may drop - * @param algo algorithm to use for finding a path + * @param algo Algorithm to use for finding a path */ - std::vector get_Path(ServerEnvironment* env, + std::vector getPath(ServerEnvironment *env, v3s16 source, v3s16 destination, unsigned int searchdistance, unsigned int max_jump, unsigned int max_drop, - algorithm algo); + PathAlgorithm algo); private: /** data struct for storing internal information */ @@ -190,7 +190,7 @@ private: * @param ipos index position * @return gridnode for index */ - path_gridnode& getIndexElement(v3s16 ipos); + PathGridnode &getIndexElement(v3s16 ipos); /** * invert a 3d position @@ -204,7 +204,7 @@ private: * @param index position to validate * @return true/false */ - bool valid_index(v3s16 index); + bool isValidIndex(v3s16 index); /** * translate position to float position @@ -217,11 +217,11 @@ private: /* algorithm functions */ /** - * calculate 2d manahttan distance to target + * calculate 2d manahttan distance to target on the xz plane * @param pos position to calc distance * @return integer distance */ - int get_manhattandistance(v3s16 pos); + int getXZManhattanDist(v3s16 pos); /** * get best direction based uppon heuristics @@ -229,13 +229,13 @@ private: * @param g_pos mapnode to start from * @return direction to check */ - v3s16 get_dir_heuristic(std::vector& directions,path_gridnode& g_pos); + v3s16 getDirHeuristic(std::vector &directions, PathGridnode &g_pos); /** * build internal data representation of search area * @return true/false if costmap creation was successfull */ - bool build_costmap(); + bool buildCostmap(); /** * calculate cost of movement @@ -243,7 +243,7 @@ private: * @param dir direction to move to * @return cost information */ - path_cost calc_cost(v3s16 pos,v3s16 dir); + PathCost calcCost(v3s16 pos, v3s16 dir); /** * recursive update whole search areas total cost information @@ -253,7 +253,7 @@ private: * @param level current recursion depth * @return true/false path to destination has been found */ - bool update_all_costs(v3s16 ipos,v3s16 srcdir,int total_cost,int level); + bool updateAllCosts(v3s16 ipos, v3s16 srcdir, int total_cost, int level); /** * recursive try to find a patrh to destionation @@ -263,7 +263,7 @@ private: * @param level current recursion depth * @return true/false path to destination has been found */ - bool update_cost_heuristic(v3s16 ipos,v3s16 srcdir,int current_cost,int level); + bool updateCostHeuristic(v3s16 ipos, v3s16 srcdir, int current_cost, int level); /** * recursive build a vector containing all nodes from source to destination @@ -271,7 +271,7 @@ private: * @param pos pos to check next * @param level recursion depth */ - void build_path(std::vector& path,v3s16 pos, int level); + void buildPath(std::vector &path, v3s16 pos, int level); /* variables */ int m_max_index_x; /**< max index of search area in x direction */ @@ -292,56 +292,56 @@ private: limits m_limits; /**< position limits in real map coordinates */ /** 3d grid containing all map data already collected and analyzed */ - std::vector > > m_data; + std::vector > > m_data; - ServerEnvironment* m_env; /**< minetest environment pointer */ + ServerEnvironment *m_env; /**< minetest environment pointer */ #ifdef PATHFINDER_DEBUG /** * print collected cost information */ - void print_cost(); + void printCost(); /** * print collected cost information in a specific direction * @param dir direction to print */ - void print_cost(path_directions dir); + void printCost(PathDirections dir); /** * print type of node as evaluated */ - void print_type(); + void printType(); /** * print pathlenght for all nodes in search area */ - void print_pathlen(); + void printPathLen(); /** * print a path * @param path path to show */ - void print_path(std::vector path); + void printPath(std::vector path); /** * print y direction for all movements */ - void print_ydir(); + void printYdir(); /** * print y direction for moving in a specific direction * @param dir direction to show data */ - void print_ydir(path_directions dir); + void printYdir(PathDirections dir); /** * helper function to translate a direction to speaking text * @param dir direction to translate * @return textual name of direction */ - std::string dir_to_name(path_directions dir); + std::string dirToName(PathDirections dir); #endif }; @@ -349,23 +349,23 @@ private: /* implementation */ /******************************************************************************/ -std::vector get_Path(ServerEnvironment* env, +std::vector get_path(ServerEnvironment* env, v3s16 source, v3s16 destination, unsigned int searchdistance, unsigned int max_jump, unsigned int max_drop, - algorithm algo) { + PathAlgorithm algo) +{ + Pathfinder searchclass; - pathfinder searchclass; - - return searchclass.get_Path(env, - source,destination, - searchdistance,max_jump,max_drop,algo); + return searchclass.getPath(env, + source, destination, + searchdistance, max_jump, max_drop, algo); } /******************************************************************************/ -path_cost::path_cost() +PathCost::PathCost() : valid(false), value(0), direction(0), @@ -375,7 +375,8 @@ path_cost::path_cost() } /******************************************************************************/ -path_cost::path_cost(const path_cost& b) { +PathCost::PathCost(const PathCost &b) +{ valid = b.valid; direction = b.direction; value = b.value; @@ -383,7 +384,8 @@ path_cost::path_cost(const path_cost& b) { } /******************************************************************************/ -path_cost& path_cost::operator= (const path_cost& b) { +PathCost &PathCost::operator= (const PathCost &b) +{ valid = b.valid; direction = b.direction; value = b.value; @@ -393,14 +395,14 @@ path_cost& path_cost::operator= (const path_cost& b) { } /******************************************************************************/ -path_gridnode::path_gridnode() +PathGridnode::PathGridnode() : valid(false), target(false), source(false), totalcost(-1), - sourcedir(v3s16(0,0,0)), + sourcedir(v3s16(0, 0, 0)), surfaces(0), - pos(v3s16(0,0,0)), + pos(v3s16(0, 0, 0)), is_element(false), type('u') { @@ -408,7 +410,7 @@ path_gridnode::path_gridnode() } /******************************************************************************/ -path_gridnode::path_gridnode(const path_gridnode& b) +PathGridnode::PathGridnode(const PathGridnode &b) : valid(b.valid), target(b.target), source(b.source), @@ -418,7 +420,7 @@ path_gridnode::path_gridnode(const path_gridnode& b) pos(b.pos), is_element(b.is_element), type(b.type) - { +{ directions[DIR_XP] = b.directions[DIR_XP]; directions[DIR_XM] = b.directions[DIR_XM]; @@ -427,7 +429,8 @@ path_gridnode::path_gridnode(const path_gridnode& b) } /******************************************************************************/ -path_gridnode& path_gridnode::operator= (const path_gridnode& b) { +PathGridnode &PathGridnode::operator= (const PathGridnode &b) +{ valid = b.valid; target = b.target; source = b.source; @@ -447,7 +450,8 @@ path_gridnode& path_gridnode::operator= (const path_gridnode& b) { } /******************************************************************************/ -path_cost path_gridnode::get_cost(v3s16 dir) { +PathCost PathGridnode::getCost(v3s16 dir) +{ if (dir.X > 0) { return directions[DIR_XP]; } @@ -460,12 +464,13 @@ path_cost path_gridnode::get_cost(v3s16 dir) { if (dir.Z < 0) { return directions[DIR_ZM]; } - path_cost retval; + PathCost retval; return retval; } /******************************************************************************/ -void path_gridnode::set_cost(v3s16 dir,path_cost cost) { +void PathGridnode::setCost(v3s16 dir, PathCost cost) +{ if (dir.X > 0) { directions[DIR_XP] = cost; } @@ -481,13 +486,14 @@ void path_gridnode::set_cost(v3s16 dir,path_cost cost) { } /******************************************************************************/ -std::vector pathfinder::get_Path(ServerEnvironment* env, +std::vector Pathfinder::getPath(ServerEnvironment *env, v3s16 source, v3s16 destination, unsigned int searchdistance, unsigned int max_jump, unsigned int max_drop, - algorithm algo) { + PathAlgorithm algo) +{ #ifdef PATHFINDER_CALC_TIME timespec ts; clock_gettime(CLOCK_REALTIME, &ts); @@ -509,18 +515,18 @@ std::vector pathfinder::get_Path(ServerEnvironment* env, m_min_target_distance = -1; m_prefetch = true; - if (algo == A_PLAIN_NP) { + if (algo == PA_PLAIN_NP) { m_prefetch = false; } - int min_x = MYMIN(source.X,destination.X); - int max_x = MYMAX(source.X,destination.X); + int min_x = MYMIN(source.X, destination.X); + int max_x = MYMAX(source.X, destination.X); - int min_y = MYMIN(source.Y,destination.Y); - int max_y = MYMAX(source.Y,destination.Y); + int min_y = MYMIN(source.Y, destination.Y); + int max_y = MYMAX(source.Y, destination.Y); - int min_z = MYMIN(source.Z,destination.Z); - int max_z = MYMAX(source.Z,destination.Z); + int min_z = MYMIN(source.Z, destination.Z); + int max_z = MYMAX(source.Z, destination.Z); m_limits.X.min = min_x - searchdistance; m_limits.X.max = max_x + searchdistance; @@ -534,22 +540,22 @@ std::vector pathfinder::get_Path(ServerEnvironment* env, m_max_index_z = m_limits.Z.max - m_limits.Z.min; //build data map - if (!build_costmap()) { + if (!buildCostmap()) { ERROR_TARGET << "failed to build costmap" << std::endl; return retval; } #ifdef PATHFINDER_DEBUG - print_type(); - print_cost(); - print_ydir(); + printType(); + printCost(); + printYdir(); #endif //validate and mark start and end pos v3s16 StartIndex = getIndexPos(source); v3s16 EndIndex = getIndexPos(destination); - path_gridnode& startpos = getIndexElement(StartIndex); - path_gridnode& endpos = getIndexElement(EndIndex); + PathGridnode &startpos = getIndexElement(StartIndex); + PathGridnode &endpos = getIndexElement(EndIndex); if (!startpos.valid) { VERBOSE_TARGET << "invalid startpos" << @@ -571,15 +577,15 @@ std::vector pathfinder::get_Path(ServerEnvironment* env, bool update_cost_retval = false; switch (algo) { - case DIJKSTRA: - update_cost_retval = update_all_costs(StartIndex,v3s16(0,0,0),0,0); + case PA_DIJKSTRA: + update_cost_retval = updateAllCosts(StartIndex, v3s16(0, 0, 0), 0, 0); break; - case A_PLAIN_NP: - case A_PLAIN: - update_cost_retval = update_cost_heuristic(StartIndex,v3s16(0,0,0),0,0); + case PA_PLAIN_NP: + case PA_PLAIN: + update_cost_retval = updateCostHeuristic(StartIndex, v3s16(0, 0, 0), 0, 0); break; default: - ERROR_TARGET << "missing algorithm"<< std::endl; + ERROR_TARGET << "missing PathAlgorithm"<< std::endl; break; } @@ -587,16 +593,16 @@ std::vector pathfinder::get_Path(ServerEnvironment* env, #ifdef PATHFINDER_DEBUG std::cout << "Path to target found!" << std::endl; - print_pathlen(); + printPathLen(); #endif //find path std::vector path; - build_path(path,EndIndex,0); + buildPath(path, EndIndex, 0); #ifdef PATHFINDER_DEBUG std::cout << "Full index path:" << std::endl; - print_path(path); + printPath(path); #endif //finalize path @@ -608,7 +614,7 @@ std::vector pathfinder::get_Path(ServerEnvironment* env, #ifdef PATHFINDER_DEBUG std::cout << "full path:" << std::endl; - print_path(full_path); + printPath(full_path); #endif #ifdef PATHFINDER_CALC_TIME timespec ts2; @@ -626,7 +632,7 @@ std::vector pathfinder::get_Path(ServerEnvironment* env, } else { #ifdef PATHFINDER_DEBUG - print_pathlen(); + printPathLen(); #endif ERROR_TARGET << "failed to update cost map"<< std::endl; } @@ -637,7 +643,7 @@ std::vector pathfinder::get_Path(ServerEnvironment* env, } /******************************************************************************/ -pathfinder::pathfinder() : +Pathfinder::Pathfinder() : m_max_index_x(0), m_max_index_y(0), m_max_index_z(0), @@ -646,8 +652,8 @@ pathfinder::pathfinder() : m_maxjump(0), m_min_target_distance(0), m_prefetch(true), - m_start(0,0,0), - m_destination(0,0,0), + m_start(0, 0, 0), + m_destination(0, 0, 0), m_limits(), m_data(), m_env(0) @@ -656,8 +662,8 @@ pathfinder::pathfinder() : } /******************************************************************************/ -v3s16 pathfinder::getRealPos(v3s16 ipos) { - +v3s16 Pathfinder::getRealPos(v3s16 ipos) +{ v3s16 retval = ipos; retval.X += m_limits.X.min; @@ -668,7 +674,7 @@ v3s16 pathfinder::getRealPos(v3s16 ipos) { } /******************************************************************************/ -bool pathfinder::build_costmap() +bool Pathfinder::buildCostmap() { INFO_TARGET << "Pathfinder build costmap: (" << m_limits.X.min << "," << m_limits.Z.min << ") (" @@ -683,12 +689,12 @@ bool pathfinder::build_costmap() int surfaces = 0; for (int y = 0; y < m_max_index_y; y++) { - v3s16 ipos(x,y,z); + v3s16 ipos(x, y, z); v3s16 realpos = getRealPos(ipos); MapNode current = m_env->getMap().getNodeNoEx(realpos); - MapNode below = m_env->getMap().getNodeNoEx(realpos + v3s16(0,-1,0)); + MapNode below = m_env->getMap().getNodeNoEx(realpos + v3s16(0, -1, 0)); if ((current.param0 == CONTENT_IGNORE) || @@ -727,13 +733,13 @@ bool pathfinder::build_costmap() if (m_prefetch) { m_data[x][z][y].directions[DIR_XP] = - calc_cost(realpos,v3s16( 1,0, 0)); + calcCost(realpos,v3s16( 1, 0, 0)); m_data[x][z][y].directions[DIR_XM] = - calc_cost(realpos,v3s16(-1,0, 0)); + calcCost(realpos,v3s16(-1, 0, 0)); m_data[x][z][y].directions[DIR_ZP] = - calc_cost(realpos,v3s16( 0,0, 1)); + calcCost(realpos,v3s16( 0, 0, 1)); m_data[x][z][y].directions[DIR_ZM] = - calc_cost(realpos,v3s16( 0,0,-1)); + calcCost(realpos,v3s16( 0, 0,-1)); } } @@ -751,8 +757,9 @@ bool pathfinder::build_costmap() } /******************************************************************************/ -path_cost pathfinder::calc_cost(v3s16 pos,v3s16 dir) { - path_cost retval; +PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) +{ + PathCost retval; retval.updated = true; @@ -779,12 +786,12 @@ path_cost pathfinder::calc_cost(v3s16 pos,v3s16 dir) { if (node_at_pos2.param0 == CONTENT_AIR) { MapNode node_below_pos2 = - m_env->getMap().getNodeNoEx(pos2 + v3s16(0,-1,0)); + m_env->getMap().getNodeNoEx(pos2 + v3s16(0, -1, 0)); //did we get information about node? if (node_below_pos2.param0 == CONTENT_IGNORE ) { VERBOSE_TARGET << "Pathfinder: (2) area at pos: " - << PPOS((pos2 + v3s16(0,-1,0))) << " not loaded"; + << PPOS((pos2 + v3s16(0, -1, 0))) << " not loaded"; return retval; } @@ -796,13 +803,13 @@ path_cost pathfinder::calc_cost(v3s16 pos,v3s16 dir) { << " cost same height found" << std::endl); } else { - v3s16 testpos = pos2 - v3s16(0,-1,0); + v3s16 testpos = pos2 - v3s16(0, -1, 0); MapNode node_at_pos = m_env->getMap().getNodeNoEx(testpos); while ((node_at_pos.param0 != CONTENT_IGNORE) && (node_at_pos.param0 == CONTENT_AIR) && (testpos.Y > m_limits.Y.min)) { - testpos += v3s16(0,-1,0); + testpos += v3s16(0, -1, 0); node_at_pos = m_env->getMap().getNodeNoEx(testpos); } @@ -836,7 +843,7 @@ path_cost pathfinder::calc_cost(v3s16 pos,v3s16 dir) { while ((node_at_pos.param0 != CONTENT_IGNORE) && (node_at_pos.param0 != CONTENT_AIR) && (testpos.Y < m_limits.Y.max)) { - testpos += v3s16(0,1,0); + testpos += v3s16(0, 1, 0); node_at_pos = m_env->getMap().getNodeNoEx(testpos); } @@ -864,8 +871,8 @@ path_cost pathfinder::calc_cost(v3s16 pos,v3s16 dir) { } /******************************************************************************/ -v3s16 pathfinder::getIndexPos(v3s16 pos) { - +v3s16 Pathfinder::getIndexPos(v3s16 pos) +{ v3s16 retval = pos; retval.X -= m_limits.X.min; retval.Y -= m_limits.Y.min; @@ -875,12 +882,14 @@ v3s16 pathfinder::getIndexPos(v3s16 pos) { } /******************************************************************************/ -path_gridnode& pathfinder::getIndexElement(v3s16 ipos) { +PathGridnode &Pathfinder::getIndexElement(v3s16 ipos) +{ return m_data[ipos.X][ipos.Z][ipos.Y]; } /******************************************************************************/ -bool pathfinder::valid_index(v3s16 index) { +bool Pathfinder::isValidIndex(v3s16 index) +{ if ( (index.X < m_max_index_x) && (index.Y < m_max_index_y) && (index.Z < m_max_index_z) && @@ -893,7 +902,8 @@ bool pathfinder::valid_index(v3s16 index) { } /******************************************************************************/ -v3s16 pathfinder::invert(v3s16 pos) { +v3s16 Pathfinder::invert(v3s16 pos) +{ v3s16 retval = pos; retval.X *=-1; @@ -904,12 +914,12 @@ v3s16 pathfinder::invert(v3s16 pos) { } /******************************************************************************/ -bool pathfinder::update_all_costs( v3s16 ipos, - v3s16 srcdir, - int current_cost, - int level) { - - path_gridnode& g_pos = getIndexElement(ipos); +bool Pathfinder::updateAllCosts(v3s16 ipos, + v3s16 srcdir, + int current_cost, + int level) +{ + PathGridnode &g_pos = getIndexElement(ipos); g_pos.totalcost = current_cost; g_pos.sourcedir = srcdir; @@ -933,14 +943,14 @@ bool pathfinder::update_all_costs( v3s16 ipos, for (unsigned int i=0; i < directions.size(); i++) { if (directions[i] != srcdir) { - path_cost cost = g_pos.get_cost(directions[i]); + PathCost cost = g_pos.getCost(directions[i]); if (cost.valid) { directions[i].Y = cost.direction; v3s16 ipos2 = ipos + directions[i]; - if (!valid_index(ipos2)) { + if (!isValidIndex(ipos2)) { DEBUG_OUT(LVL " Pathfinder: " << PPOS(ipos2) << " out of range (" << m_limits.X.max << "," << m_limits.Y.max << "," << m_limits.Z.max @@ -948,7 +958,7 @@ bool pathfinder::update_all_costs( v3s16 ipos, continue; } - path_gridnode& g_pos2 = getIndexElement(ipos2); + PathGridnode &g_pos2 = getIndexElement(ipos2); if (!g_pos2.valid) { VERBOSE_TARGET << LVL "Pathfinder: no data for new position: " @@ -971,8 +981,8 @@ bool pathfinder::update_all_costs( v3s16 ipos, DEBUG_OUT(LVL "Pathfinder: updating path at: "<< PPOS(ipos2) << " from: " << g_pos2.totalcost << " to "<< new_cost << std::endl); - if (update_all_costs(ipos2,invert(directions[i]), - new_cost,level)) { + if (updateAllCosts(ipos2, invert(directions[i]), + new_cost, level)) { retval = true; } } @@ -993,20 +1003,21 @@ bool pathfinder::update_all_costs( v3s16 ipos, } /******************************************************************************/ -int pathfinder::get_manhattandistance(v3s16 pos) { - - int min_x = MYMIN(pos.X,m_destination.X); - int max_x = MYMAX(pos.X,m_destination.X); - int min_z = MYMIN(pos.Z,m_destination.Z); - int max_z = MYMAX(pos.Z,m_destination.Z); +int Pathfinder::getXZManhattanDist(v3s16 pos) +{ + int min_x = MYMIN(pos.X, m_destination.X); + int max_x = MYMAX(pos.X, m_destination.X); + int min_z = MYMIN(pos.Z, m_destination.Z); + int max_z = MYMAX(pos.Z, m_destination.Z); return (max_x - min_x) + (max_z - min_z); } /******************************************************************************/ -v3s16 pathfinder::get_dir_heuristic(std::vector& directions,path_gridnode& g_pos) { +v3s16 Pathfinder::getDirHeuristic(std::vector &directions, PathGridnode &g_pos) +{ int minscore = -1; - v3s16 retdir = v3s16(0,0,0); + v3s16 retdir = v3s16(0, 0, 0); v3s16 srcpos = g_pos.pos; DEBUG_OUT("Pathfinder: remaining dirs at beginning:" << directions.size() << std::endl); @@ -1015,14 +1026,14 @@ v3s16 pathfinder::get_dir_heuristic(std::vector& directions,path_gridnode iter != directions.end(); ++iter) { - v3s16 pos1 = v3s16(srcpos.X + iter->X,0,srcpos.Z+iter->Z); + v3s16 pos1 = v3s16(srcpos.X + iter->X, 0, srcpos.Z+iter->Z); - int cur_manhattan = get_manhattandistance(pos1); - path_cost cost = g_pos.get_cost(*iter); + int cur_manhattan = getXZManhattanDist(pos1); + PathCost cost = g_pos.getCost(*iter); if (!cost.updated) { - cost = calc_cost(g_pos.pos,*iter); - g_pos.set_cost(*iter,cost); + cost = calcCost(g_pos.pos, *iter); + g_pos.setCost(*iter, cost); } if (cost.valid) { @@ -1035,7 +1046,7 @@ v3s16 pathfinder::get_dir_heuristic(std::vector& directions,path_gridnode } } - if (retdir != v3s16(0,0,0)) { + if (retdir != v3s16(0, 0, 0)) { for (std::vector::iterator iter = directions.begin(); iter != directions.end(); ++iter) { @@ -1057,12 +1068,13 @@ v3s16 pathfinder::get_dir_heuristic(std::vector& directions,path_gridnode } /******************************************************************************/ -bool pathfinder::update_cost_heuristic( v3s16 ipos, - v3s16 srcdir, - int current_cost, - int level) { +bool Pathfinder::updateCostHeuristic( v3s16 ipos, + v3s16 srcdir, + int current_cost, + int level) +{ - path_gridnode& g_pos = getIndexElement(ipos); + PathGridnode &g_pos = getIndexElement(ipos); g_pos.totalcost = current_cost; g_pos.sourcedir = srcdir; @@ -1079,38 +1091,38 @@ bool pathfinder::update_cost_heuristic( v3s16 ipos, std::vector directions; - directions.push_back(v3s16( 1,0, 0)); - directions.push_back(v3s16(-1,0, 0)); - directions.push_back(v3s16( 0,0, 1)); - directions.push_back(v3s16( 0,0,-1)); + directions.push_back(v3s16( 1, 0, 0)); + directions.push_back(v3s16(-1, 0, 0)); + directions.push_back(v3s16( 0, 0, 1)); + directions.push_back(v3s16( 0, 0, -1)); - v3s16 direction = get_dir_heuristic(directions,g_pos); + v3s16 direction = getDirHeuristic(directions, g_pos); - while (direction != v3s16(0,0,0) && (!retval)) { + while (direction != v3s16(0, 0, 0) && (!retval)) { if (direction != srcdir) { - path_cost cost = g_pos.get_cost(direction); + PathCost cost = g_pos.getCost(direction); if (cost.valid) { direction.Y = cost.direction; v3s16 ipos2 = ipos + direction; - if (!valid_index(ipos2)) { + if (!isValidIndex(ipos2)) { DEBUG_OUT(LVL " Pathfinder: " << PPOS(ipos2) << " out of range (" << m_limits.X.max << "," << m_limits.Y.max << "," << m_limits.Z.max <<")" << std::endl); - direction = get_dir_heuristic(directions,g_pos); + direction = getDirHeuristic(directions, g_pos); continue; } - path_gridnode& g_pos2 = getIndexElement(ipos2); + PathGridnode &g_pos2 = getIndexElement(ipos2); if (!g_pos2.valid) { VERBOSE_TARGET << LVL "Pathfinder: no data for new position: " << PPOS(ipos2) << std::endl; - direction = get_dir_heuristic(directions,g_pos); + direction = getDirHeuristic(directions, g_pos); continue; } @@ -1133,8 +1145,8 @@ bool pathfinder::update_cost_heuristic( v3s16 ipos, PPOS(ipos2) << " from: " << g_pos2.totalcost << " to "<< new_cost << " srcdir=" << PPOS(invert(direction))<< std::endl); - if (update_cost_heuristic(ipos2,invert(direction), - new_cost,level)) { + if (updateCostHeuristic(ipos2, invert(direction), + new_cost, level)) { retval = true; } } @@ -1155,24 +1167,25 @@ bool pathfinder::update_cost_heuristic( v3s16 ipos, " skipping srcdir: " << PPOS(direction) << std::endl); } - direction = get_dir_heuristic(directions,g_pos); + direction = getDirHeuristic(directions, g_pos); } return retval; } /******************************************************************************/ -void pathfinder::build_path(std::vector& path,v3s16 pos, int level) { +void Pathfinder::buildPath(std::vector &path, v3s16 pos, int level) +{ level ++; if (level > 700) { ERROR_TARGET - << LVL "Pathfinder: path is too long aborting" << std::endl; + << LVL "Pathfinder: path is too long aborting" << std::endl; return; } - path_gridnode& g_pos = getIndexElement(pos); + PathGridnode &g_pos = getIndexElement(pos); if (!g_pos.valid) { ERROR_TARGET - << LVL "Pathfinder: invalid next pos detected aborting" << std::endl; + << LVL "Pathfinder: invalid next pos detected aborting" << std::endl; return; } @@ -1184,37 +1197,40 @@ void pathfinder::build_path(std::vector& path,v3s16 pos, int level) { return; } - build_path(path,pos + g_pos.sourcedir,level); + buildPath(path, pos + g_pos.sourcedir, level); path.push_back(pos); } /******************************************************************************/ -v3f pathfinder::tov3f(v3s16 pos) { - return v3f(BS*pos.X,BS*pos.Y,BS*pos.Z); +v3f Pathfinder::tov3f(v3s16 pos) +{ + return v3f(BS * pos.X, BS * pos.Y, BS * pos.Z); } #ifdef PATHFINDER_DEBUG /******************************************************************************/ -void pathfinder::print_cost() { - print_cost(DIR_XP); - print_cost(DIR_XM); - print_cost(DIR_ZP); - print_cost(DIR_ZM); +void Pathfinder::printCost() +{ + printCost(DIR_XP); + printCost(DIR_XM); + printCost(DIR_ZP); + printCost(DIR_ZM); } /******************************************************************************/ -void pathfinder::print_ydir() { - print_ydir(DIR_XP); - print_ydir(DIR_XM); - print_ydir(DIR_ZP); - print_ydir(DIR_ZM); +void Pathfinder::printYdir() +{ + printYdir(DIR_XP); + printYdir(DIR_XM); + printYdir(DIR_ZP); + printYdir(DIR_ZM); } /******************************************************************************/ -void pathfinder::print_cost(path_directions dir) { - - std::cout << "Cost in direction: " << dir_to_name(dir) << std::endl; +void Pathfinder::printCost(PathDirections dir) +{ + std::cout << "Cost in direction: " << dirToName(dir) << std::endl; std::cout << std::setfill('-') << std::setw(80) << "-" << std::endl; std::cout << std::setfill(' '); for (int y = 0; y < m_max_index_y; y++) { @@ -1243,9 +1259,9 @@ void pathfinder::print_cost(path_directions dir) { } /******************************************************************************/ -void pathfinder::print_ydir(path_directions dir) { - - std::cout << "Height difference in direction: " << dir_to_name(dir) << std::endl; +void Pathfinder::printYdir(PathDirections dir) +{ + std::cout << "Height difference in direction: " << dirToName(dir) << std::endl; std::cout << std::setfill('-') << std::setw(80) << "-" << std::endl; std::cout << std::setfill(' '); for (int y = 0; y < m_max_index_y; y++) { @@ -1274,7 +1290,8 @@ void pathfinder::print_ydir(path_directions dir) { } /******************************************************************************/ -void pathfinder::print_type() { +void Pathfinder::printType() +{ std::cout << "Type of node:" << std::endl; std::cout << std::setfill('-') << std::setw(80) << "-" << std::endl; std::cout << std::setfill(' '); @@ -1302,7 +1319,8 @@ void pathfinder::print_type() { } /******************************************************************************/ -void pathfinder::print_pathlen() { +void Pathfinder::printPathLen() +{ std::cout << "Pathlen:" << std::endl; std::cout << std::setfill('-') << std::setw(80) << "-" << std::endl; std::cout << std::setfill(' '); @@ -1329,7 +1347,8 @@ void pathfinder::print_pathlen() { } /******************************************************************************/ -std::string pathfinder::dir_to_name(path_directions dir) { +std::string Pathfinder::dirToName(PathDirections dir) +{ switch (dir) { case DIR_XP: return "XP"; @@ -1349,8 +1368,8 @@ std::string pathfinder::dir_to_name(path_directions dir) { } /******************************************************************************/ -void pathfinder::print_path(std::vector path) { - +void Pathfinder::printPath(std::vector path) +{ unsigned int current = 0; for (std::vector::iterator i = path.begin(); i != path.end(); ++i) { diff --git a/src/pathfinder.h b/src/pathfinder.h index 31ea2f28..ba95aaf1 100644 --- a/src/pathfinder.h +++ b/src/pathfinder.h @@ -41,26 +41,26 @@ typedef enum { DIR_XM, DIR_ZP, DIR_ZM -} path_directions; +} PathDirections; /** List of supported algorithms */ typedef enum { - DIJKSTRA, /**< Dijkstra shortest path algorithm */ - A_PLAIN, /**< A* algorithm using heuristics to find a path */ - A_PLAIN_NP /**< A* algorithm without prefetching of map data */ -} algorithm; + PA_DIJKSTRA, /**< Dijkstra shortest path algorithm */ + PA_PLAIN, /**< A* algorithm using heuristics to find a path */ + PA_PLAIN_NP /**< A* algorithm without prefetching of map data */ +} PathAlgorithm; /******************************************************************************/ /* declarations */ /******************************************************************************/ /** c wrapper function to use from scriptapi */ -std::vector get_Path(ServerEnvironment* env, +std::vector get_path(ServerEnvironment *env, v3s16 source, v3s16 destination, unsigned int searchdistance, unsigned int max_jump, unsigned int max_drop, - algorithm algo); + PathAlgorithm algo); #endif /* PATHFINDER_H_ */ diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index af89da9a..8284c3fc 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -915,19 +915,19 @@ int ModApiEnvMod::l_find_path(lua_State *L) unsigned int searchdistance = luaL_checkint(L, 3); unsigned int max_jump = luaL_checkint(L, 4); unsigned int max_drop = luaL_checkint(L, 5); - algorithm algo = A_PLAIN_NP; + PathAlgorithm algo = PA_PLAIN_NP; if (!lua_isnil(L, 6)) { std::string algorithm = luaL_checkstring(L,6); if (algorithm == "A*") - algo = A_PLAIN; + algo = PA_PLAIN; if (algorithm == "Dijkstra") - algo = DIJKSTRA; + algo = PA_DIJKSTRA; } - std::vector path = - get_Path(env,pos1,pos2,searchdistance,max_jump,max_drop,algo); + std::vector path = get_path(env, pos1, pos2, + searchdistance, max_jump, max_drop, algo); if (path.size() > 0) { From f0de237de729b7b68091210570f10545134b7cf2 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 1 Apr 2016 02:43:28 +0200 Subject: [PATCH 481/531] Pathfinder: use core::aabbox3d instead of own type There is no need to reinvent the wheel here, we have great classes from irrlicht. --- src/pathfinder.cpp | 102 ++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 66 deletions(-) diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp index 28cad173..29a39233 100644 --- a/src/pathfinder.cpp +++ b/src/pathfinder.cpp @@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "environment.h" #include "map.h" #include "log.h" +#include "irr_aabb3d.h" //#define PATHFINDER_DEBUG //#define PATHFINDER_CALC_TIME @@ -157,18 +158,6 @@ public: PathAlgorithm algo); private: - /** data struct for storing internal information */ - struct limits { - struct limit { - int min; - int max; - }; - - limit X; - limit Y; - limit Z; - }; - /* helper functions */ /** @@ -274,27 +263,27 @@ private: void buildPath(std::vector &path, v3s16 pos, int level); /* variables */ - int m_max_index_x; /**< max index of search area in x direction */ - int m_max_index_y; /**< max index of search area in y direction */ - int m_max_index_z; /**< max index of search area in z direction */ + int m_max_index_x; /**< max index of search area in x direction */ + int m_max_index_y; /**< max index of search area in y direction */ + int m_max_index_z; /**< max index of search area in z direction */ - int m_searchdistance; /**< max distance to search in each direction */ - int m_maxdrop; /**< maximum number of blocks a path may drop */ - int m_maxjump; /**< maximum number of blocks a path may jump */ - int m_min_target_distance; /**< current smalest path to target */ + int m_searchdistance; /**< max distance to search in each direction */ + int m_maxdrop; /**< maximum number of blocks a path may drop */ + int m_maxjump; /**< maximum number of blocks a path may jump */ + int m_min_target_distance; /**< current smalest path to target */ - bool m_prefetch; /**< prefetch cost data */ + bool m_prefetch; /**< prefetch cost data */ - v3s16 m_start; /**< source position */ - v3s16 m_destination; /**< destination position */ + v3s16 m_start; /**< source position */ + v3s16 m_destination; /**< destination position */ - limits m_limits; /**< position limits in real map coordinates */ + core::aabbox3d m_limits; /**< position limits in real map coordinates */ /** 3d grid containing all map data already collected and analyzed */ std::vector > > m_data; - ServerEnvironment *m_env; /**< minetest environment pointer */ + ServerEnvironment *m_env; /**< minetest environment pointer */ #ifdef PATHFINDER_DEBUG @@ -528,16 +517,19 @@ std::vector Pathfinder::getPath(ServerEnvironment *env, int min_z = MYMIN(source.Z, destination.Z); int max_z = MYMAX(source.Z, destination.Z); - m_limits.X.min = min_x - searchdistance; - m_limits.X.max = max_x + searchdistance; - m_limits.Y.min = min_y - searchdistance; - m_limits.Y.max = max_y + searchdistance; - m_limits.Z.min = min_z - searchdistance; - m_limits.Z.max = max_z + searchdistance; + m_limits.MinEdge.X = min_x - searchdistance; + m_limits.MinEdge.Y = min_y - searchdistance; + m_limits.MinEdge.Z = min_z - searchdistance; - m_max_index_x = m_limits.X.max - m_limits.X.min; - m_max_index_y = m_limits.Y.max - m_limits.Y.min; - m_max_index_z = m_limits.Z.max - m_limits.Z.min; + m_limits.MaxEdge.X = max_x + searchdistance; + m_limits.MaxEdge.Y = max_y + searchdistance; + m_limits.MaxEdge.Z = max_z + searchdistance; + + v3s16 diff = m_limits.MaxEdge - m_limits.MinEdge; + + m_max_index_x = diff.X; + m_max_index_y = diff.Y; + m_max_index_z = diff.Z; //build data map if (!buildCostmap()) { @@ -654,7 +646,6 @@ Pathfinder::Pathfinder() : m_prefetch(true), m_start(0, 0, 0), m_destination(0, 0, 0), - m_limits(), m_data(), m_env(0) { @@ -664,23 +655,14 @@ Pathfinder::Pathfinder() : /******************************************************************************/ v3s16 Pathfinder::getRealPos(v3s16 ipos) { - v3s16 retval = ipos; - - retval.X += m_limits.X.min; - retval.Y += m_limits.Y.min; - retval.Z += m_limits.Z.min; - - return retval; + return m_limits.MinEdge + ipos; } /******************************************************************************/ bool Pathfinder::buildCostmap() { - INFO_TARGET << "Pathfinder build costmap: (" << m_limits.X.min << "," - << m_limits.Z.min << ") (" - << m_limits.X.max << "," - << m_limits.Z.max << ")" - << std::endl; + INFO_TARGET << "Pathfinder build costmap: min=" + << PPOS(m_limits.MinEdge) << ", max=" << PPOS(m_limits.MaxEdge) << std::endl; m_data.resize(m_max_index_x); for (int x = 0; x < m_max_index_x; x++) { m_data[x].resize(m_max_index_z); @@ -766,10 +748,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) v3s16 pos2 = pos + dir; //check limits - if ( (pos2.X < m_limits.X.min) || - (pos2.X >= m_limits.X.max) || - (pos2.Z < m_limits.Z.min) || - (pos2.Z >= m_limits.Z.max)) { + if (!m_limits.isPointInside(pos2)) { DEBUG_OUT("Pathfinder: " << PPOS(pos2) << " no cost -> out of limits" << std::endl); return retval; @@ -808,13 +787,13 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) while ((node_at_pos.param0 != CONTENT_IGNORE) && (node_at_pos.param0 == CONTENT_AIR) && - (testpos.Y > m_limits.Y.min)) { + (testpos.Y > m_limits.MinEdge.Y)) { testpos += v3s16(0, -1, 0); node_at_pos = m_env->getMap().getNodeNoEx(testpos); } //did we find surface? - if ((testpos.Y >= m_limits.Y.min) && + if ((testpos.Y >= m_limits.MinEdge.Y) && (node_at_pos.param0 != CONTENT_IGNORE) && (node_at_pos.param0 != CONTENT_AIR)) { if ((pos2.Y - testpos.Y - 1) <= m_maxdrop) { @@ -842,13 +821,13 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) while ((node_at_pos.param0 != CONTENT_IGNORE) && (node_at_pos.param0 != CONTENT_AIR) && - (testpos.Y < m_limits.Y.max)) { + (testpos.Y < m_limits.MaxEdge.Y)) { testpos += v3s16(0, 1, 0); node_at_pos = m_env->getMap().getNodeNoEx(testpos); } //did we find surface? - if ((testpos.Y <= m_limits.Y.max) && + if ((testpos.Y <= m_limits.MaxEdge.Y) && (node_at_pos.param0 == CONTENT_AIR)) { if (testpos.Y - pos2.Y <= m_maxjump) { @@ -873,12 +852,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) /******************************************************************************/ v3s16 Pathfinder::getIndexPos(v3s16 pos) { - v3s16 retval = pos; - retval.X -= m_limits.X.min; - retval.Y -= m_limits.Y.min; - retval.Z -= m_limits.Z.min; - - return retval; + return pos - m_limits.MinEdge; } /******************************************************************************/ @@ -952,9 +926,7 @@ bool Pathfinder::updateAllCosts(v3s16 ipos, if (!isValidIndex(ipos2)) { DEBUG_OUT(LVL " Pathfinder: " << PPOS(ipos2) << - " out of range (" << m_limits.X.max << "," << - m_limits.Y.max << "," << m_limits.Z.max - <<")" << std::endl); + " out of range, max=" << PPOS(m_limits.MaxEdge) << std::endl); continue; } @@ -1110,9 +1082,7 @@ bool Pathfinder::updateCostHeuristic( v3s16 ipos, if (!isValidIndex(ipos2)) { DEBUG_OUT(LVL " Pathfinder: " << PPOS(ipos2) << - " out of range (" << m_limits.X.max << "," << - m_limits.Y.max << "," << m_limits.Z.max - <<")" << std::endl); + " out of range, max=" << PPOS(m_limits.MaxEdge) << std::endl); direction = getDirHeuristic(directions, g_pos); continue; } From 9aec701a4cb999b3d1eb097d4b01df0480b4ebd0 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 1 Apr 2016 03:13:24 +0200 Subject: [PATCH 482/531] Pathfinder: improve GridNode storage Before, the GridNodes were stored in vector>>, and initialized in advance. Putting three vectors inside each other puts lots of unneccessary stress onto the allocator, costs more memory, and has worse cache locality than a flat vector. For larger search distances, an the array getting initialized means essentially O(distance^3) complexity in both time and memory, which makes the current path search a joke. In order to really profit from the dijkstra/A* algorithms, other data structures need to be used for larger distances. For shorter distances, a map based GridNode storage may be slow as it requires lots of levels of indirection, which is bad for things like cache locality, and an array based storage may be faster. This commit does: 1. remove the vector>> based GridNodes storage that is allocated and initialized in advance and for the whole possible area. 2. Add a vector based GridNodes storage that is allocated and initialized in advance for the whole possible area. 3. Add a map based GridNodes storage whose elements are allocated and initialized, when the path search code demands it. 4. Add code to decide between approach 2 and 3, based on the length of the path. 5. Remove the unused "surfaces" member of the PathGridnode class. Setting this isn't as easy anymore for the map based GridNodes storage. --- src/pathfinder.cpp | 259 ++++++++++++++++++++++++++++----------------- 1 file changed, 161 insertions(+), 98 deletions(-) diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp index 29a39233..cfbadd1e 100644 --- a/src/pathfinder.cpp +++ b/src/pathfinder.cpp @@ -1,6 +1,7 @@ /* Minetest Copyright (C) 2013 sapier, sapier at gmx dot net +Copyright (C) 2016 est31, This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -121,7 +122,6 @@ public: bool source; /**< node is stating position */ int totalcost; /**< cost to move here from starting point */ v3s16 sourcedir; /**< origin of movement for current cost */ - int surfaces; /**< number of surfaces with same x,z value*/ v3s16 pos; /**< real position of node */ PathCost directions[4]; /**< cost in different directions */ @@ -130,6 +130,41 @@ public: char type; /**< type of node */ }; +class Pathfinder; + +/** Abstract class to manage the map data */ +class GridNodeContainer { +public: + virtual PathGridnode &access(v3s16 p)=0; + virtual ~GridNodeContainer() {} +protected: + Pathfinder *m_pathf; + + void initNode(v3s16 ipos, PathGridnode *p_node); +}; + +class ArrayGridNodeContainer : public GridNodeContainer { +public: + virtual ~ArrayGridNodeContainer() {} + ArrayGridNodeContainer(Pathfinder *pathf, v3s16 dimensions); + virtual PathGridnode &access(v3s16 p); +private: + v3s16 m_dimensions; + + int m_x_stride; + int m_y_stride; + std::vector m_nodes_array; +}; + +class MapGridNodeContainer : public GridNodeContainer { +public: + virtual ~MapGridNodeContainer() {} + MapGridNodeContainer(Pathfinder *pathf); + virtual PathGridnode &access(v3s16 p); +private: + std::map m_nodes; +}; + /** class doing pathfinding */ class Pathfinder { @@ -139,6 +174,8 @@ public: */ Pathfinder(); + ~Pathfinder(); + /** * path evaluation function * @param env environment to look for path @@ -181,6 +218,12 @@ private: */ PathGridnode &getIndexElement(v3s16 ipos); + /** + * Get gridnode at a specific index position + * @return gridnode for index + */ + PathGridnode &getIdxElem(s16 x, s16 y, s16 z); + /** * invert a 3d position * @param pos 3d position @@ -280,8 +323,10 @@ private: core::aabbox3d m_limits; /**< position limits in real map coordinates */ - /** 3d grid containing all map data already collected and analyzed */ - std::vector > > m_data; + /** contains all map data already collected and analyzed. + Access it via the getIndexElement/getIdxElem methods. */ + friend class GridNodeContainer; + GridNodeContainer *m_nodes_container; ServerEnvironment *m_env; /**< minetest environment pointer */ @@ -390,7 +435,6 @@ PathGridnode::PathGridnode() source(false), totalcost(-1), sourcedir(v3s16(0, 0, 0)), - surfaces(0), pos(v3s16(0, 0, 0)), is_element(false), type('u') @@ -405,7 +449,6 @@ PathGridnode::PathGridnode(const PathGridnode &b) source(b.source), totalcost(b.totalcost), sourcedir(b.sourcedir), - surfaces(b.surfaces), pos(b.pos), is_element(b.is_element), type(b.type) @@ -426,7 +469,6 @@ PathGridnode &PathGridnode::operator= (const PathGridnode &b) is_element = b.is_element; totalcost = b.totalcost; sourcedir = b.sourcedir; - surfaces = b.surfaces; pos = b.pos; type = b.type; @@ -474,6 +516,96 @@ void PathGridnode::setCost(v3s16 dir, PathCost cost) } } +void GridNodeContainer::initNode(v3s16 ipos, PathGridnode *p_node) +{ + PathGridnode &elem = *p_node; + + v3s16 realpos = m_pathf->getRealPos(ipos); + + MapNode current = m_pathf->m_env->getMap().getNodeNoEx(realpos); + MapNode below = m_pathf->m_env->getMap().getNodeNoEx(realpos + v3s16(0, -1, 0)); + + + if ((current.param0 == CONTENT_IGNORE) || + (below.param0 == CONTENT_IGNORE)) { + DEBUG_OUT("Pathfinder: " << PPOS(realpos) << + " current or below is invalid element" << std::endl); + if (current.param0 == CONTENT_IGNORE) { + elem.type = 'i'; + DEBUG_OUT(PPOS(ipos) << ": " << 'i' << std::endl); + } + return; + } + + //don't add anything if it isn't an air node + if ((current.param0 != CONTENT_AIR) || + (below.param0 == CONTENT_AIR )) { + DEBUG_OUT("Pathfinder: " << PPOS(realpos) + << " not on surface" << std::endl); + if (current.param0 != CONTENT_AIR) { + elem.type = 's'; + DEBUG_OUT(PPOS(ipos) << ": " << 's' << std::endl); + } else { + elem.type = '-'; + DEBUG_OUT(PPOS(ipos) << ": " << '-' << std::endl); + } + return; + } + + elem.valid = true; + elem.pos = realpos; + elem.type = 'g'; + DEBUG_OUT(PPOS(ipos) << ": " << 'a' << std::endl); + + if (m_pathf->m_prefetch) { + elem.directions[DIR_XP] = m_pathf->calcCost(realpos, v3s16( 1, 0, 0)); + elem.directions[DIR_XM] = m_pathf->calcCost(realpos, v3s16(-1, 0, 0)); + elem.directions[DIR_ZP] = m_pathf->calcCost(realpos, v3s16( 0, 0, 1)); + elem.directions[DIR_ZM] = m_pathf->calcCost(realpos, v3s16( 0, 0,-1)); + } +} + +ArrayGridNodeContainer::ArrayGridNodeContainer(Pathfinder *pathf, v3s16 dimensions) : + m_x_stride(dimensions.Y * dimensions.Z), + m_y_stride(dimensions.Z) +{ + m_pathf = pathf; + + m_nodes_array.resize(dimensions.X * dimensions.Y * dimensions.Z); + INFO_TARGET << "Pathfinder ArrayGridNodeContainer constructor." << std::endl; + for (int x = 0; x < dimensions.X; x++) { + for (int y = 0; y < dimensions.Y; y++) { + for (int z= 0; z < dimensions.Z; z++) { + v3s16 ipos(x, y, z); + initNode(ipos, &access(ipos)); + } + } + } +} + +PathGridnode &ArrayGridNodeContainer::access(v3s16 p) +{ + return m_nodes_array[p.X * m_x_stride + p.Y * m_y_stride + p.Z]; +} + +MapGridNodeContainer::MapGridNodeContainer(Pathfinder *pathf) +{ + m_pathf = pathf; +} + +PathGridnode &MapGridNodeContainer::access(v3s16 p) +{ + std::map::iterator it = m_nodes.find(p); + if (it != m_nodes.end()) { + return it->second; + } + PathGridnode &n = m_nodes[p]; + initNode(p, &n); + return n; +} + + + /******************************************************************************/ std::vector Pathfinder::getPath(ServerEnvironment *env, v3s16 source, @@ -531,10 +663,11 @@ std::vector Pathfinder::getPath(ServerEnvironment *env, m_max_index_y = diff.Y; m_max_index_z = diff.Z; - //build data map - if (!buildCostmap()) { - ERROR_TARGET << "failed to build costmap" << std::endl; - return retval; + delete m_nodes_container; + if (diff.getLength() > 5) { + m_nodes_container = new MapGridNodeContainer(this); + } else { + m_nodes_container = new ArrayGridNodeContainer(this, diff); } #ifdef PATHFINDER_DEBUG printType(); @@ -646,98 +779,22 @@ Pathfinder::Pathfinder() : m_prefetch(true), m_start(0, 0, 0), m_destination(0, 0, 0), - m_data(), + m_nodes_container(NULL), m_env(0) { //intentionaly empty } +Pathfinder::~Pathfinder() +{ + delete m_nodes_container; +} /******************************************************************************/ v3s16 Pathfinder::getRealPos(v3s16 ipos) { return m_limits.MinEdge + ipos; } -/******************************************************************************/ -bool Pathfinder::buildCostmap() -{ - INFO_TARGET << "Pathfinder build costmap: min=" - << PPOS(m_limits.MinEdge) << ", max=" << PPOS(m_limits.MaxEdge) << std::endl; - m_data.resize(m_max_index_x); - for (int x = 0; x < m_max_index_x; x++) { - m_data[x].resize(m_max_index_z); - for (int z = 0; z < m_max_index_z; z++) { - m_data[x][z].resize(m_max_index_y); - - int surfaces = 0; - for (int y = 0; y < m_max_index_y; y++) { - v3s16 ipos(x, y, z); - - v3s16 realpos = getRealPos(ipos); - - MapNode current = m_env->getMap().getNodeNoEx(realpos); - MapNode below = m_env->getMap().getNodeNoEx(realpos + v3s16(0, -1, 0)); - - - if ((current.param0 == CONTENT_IGNORE) || - (below.param0 == CONTENT_IGNORE)) { - DEBUG_OUT("Pathfinder: " << PPOS(realpos) << - " current or below is invalid element" << std::endl); - if (current.param0 == CONTENT_IGNORE) { - m_data[x][z][y].type = 'i'; - DEBUG_OUT(x << "," << y << "," << z << ": " << 'i' << std::endl); - } - continue; - } - - //don't add anything if it isn't an air node - if ((current.param0 != CONTENT_AIR) || - (below.param0 == CONTENT_AIR )) { - DEBUG_OUT("Pathfinder: " << PPOS(realpos) - << " not on surface" << std::endl); - if (current.param0 != CONTENT_AIR) { - m_data[x][z][y].type = 's'; - DEBUG_OUT(x << "," << y << "," << z << ": " << 's' << std::endl); - } - else { - m_data[x][z][y].type = '-'; - DEBUG_OUT(x << "," << y << "," << z << ": " << '-' << std::endl); - } - continue; - } - - surfaces++; - - m_data[x][z][y].valid = true; - m_data[x][z][y].pos = realpos; - m_data[x][z][y].type = 'g'; - DEBUG_OUT(x << "," << y << "," << z << ": " << 'a' << std::endl); - - if (m_prefetch) { - m_data[x][z][y].directions[DIR_XP] = - calcCost(realpos,v3s16( 1, 0, 0)); - m_data[x][z][y].directions[DIR_XM] = - calcCost(realpos,v3s16(-1, 0, 0)); - m_data[x][z][y].directions[DIR_ZP] = - calcCost(realpos,v3s16( 0, 0, 1)); - m_data[x][z][y].directions[DIR_ZM] = - calcCost(realpos,v3s16( 0, 0,-1)); - } - - } - - if (surfaces >= 1 ) { - for (int y = 0; y < m_max_index_y; y++) { - if (m_data[x][z][y].valid) { - m_data[x][z][y].surfaces = surfaces; - } - } - } - } - } - return true; -} - /******************************************************************************/ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) { @@ -858,7 +915,13 @@ v3s16 Pathfinder::getIndexPos(v3s16 pos) /******************************************************************************/ PathGridnode &Pathfinder::getIndexElement(v3s16 ipos) { - return m_data[ipos.X][ipos.Z][ipos.Y]; + return m_nodes_container->access(ipos); +} + +/******************************************************************************/ +inline PathGridnode &Pathfinder::getIdxElem(s16 x, s16 y, s16 z) +{ + return m_nodes_container->access(v3s16(x,y,z)); } /******************************************************************************/ @@ -1216,9 +1279,9 @@ void Pathfinder::printCost(PathDirections dir) for (int z = 0; z < m_max_index_z; z++) { std::cout << std::setw(4) << z <<": "; for (int x = 0; x < m_max_index_x; x++) { - if (m_data[x][z][y].directions[dir].valid) + if (getIdxElem(x, y, z).directions[dir].valid) std::cout << std::setw(4) - << m_data[x][z][y].directions[dir].value; + << getIdxElem(x, y, z).directions[dir].value; else std::cout << std::setw(4) << "-"; } @@ -1247,9 +1310,9 @@ void Pathfinder::printYdir(PathDirections dir) for (int z = 0; z < m_max_index_z; z++) { std::cout << std::setw(4) << z <<": "; for (int x = 0; x < m_max_index_x; x++) { - if (m_data[x][z][y].directions[dir].valid) + if (getIdxElem(x, y, z).directions[dir].valid) std::cout << std::setw(4) - << m_data[x][z][y].directions[dir].direction; + << getIdxElem(x, y, z).directions[dir].direction; else std::cout << std::setw(4) << "-"; } @@ -1278,7 +1341,7 @@ void Pathfinder::printType() for (int z = 0; z < m_max_index_z; z++) { std::cout << std::setw(3) << z <<": "; for (int x = 0; x < m_max_index_x; x++) { - char toshow = m_data[x][z][y].type; + char toshow = getIdxElem(x, y, z).type; std::cout << std::setw(3) << toshow; } std::cout << std::endl; @@ -1307,7 +1370,7 @@ void Pathfinder::printPathLen() for (int z = 0; z < m_max_index_z; z++) { std::cout << std::setw(3) << z <<": "; for (int x = 0; x < m_max_index_x; x++) { - std::cout << std::setw(3) << m_data[x][z][y].totalcost; + std::cout << std::setw(3) << getIdxElem(x, y, z).totalcost; } std::cout << std::endl; } From aa8c88cf4a61362ada473fc058fbfb50aa235d23 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 25 Apr 2016 17:14:57 -0700 Subject: [PATCH 483/531] find_path: consider walkable instead of CONTENT_AIR The path finding code works fairly well except that it considers anythin not CONTENT_AIR to be "above the surface". This results in paths that are unwalkable for entities since e.g. plants are not walkable. The path would force them to jump on top of grass plants, etc.. The obvious solution is not to use CONTENT_AIR as a criteria, but instead distinguish between walkable and non-walkable nodes. This results in paths that properly walk through grass nodes. This was extensively tested by a flock of electric sheep. Note that for underwater purposes this changes the behaviour from "the surface is walkable" to "ignore water entirely" making the path go across the water bottom, and pathing fail likely from the water surface. This is intentional. --- src/pathfinder.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp index cfbadd1e..57a008ea 100644 --- a/src/pathfinder.cpp +++ b/src/pathfinder.cpp @@ -24,6 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "pathfinder.h" #include "environment.h" +#include "gamedef.h" +#include "nodedef.h" #include "map.h" #include "log.h" #include "irr_aabb3d.h" @@ -518,6 +520,7 @@ void PathGridnode::setCost(v3s16 dir, PathCost cost) void GridNodeContainer::initNode(v3s16 ipos, PathGridnode *p_node) { + INodeDefManager *ndef = m_pathf->m_env->getGameDef()->ndef(); PathGridnode &elem = *p_node; v3s16 realpos = m_pathf->getRealPos(ipos); @@ -538,11 +541,10 @@ void GridNodeContainer::initNode(v3s16 ipos, PathGridnode *p_node) } //don't add anything if it isn't an air node - if ((current.param0 != CONTENT_AIR) || - (below.param0 == CONTENT_AIR )) { + if (ndef->get(current).walkable || !ndef->get(below).walkable) { DEBUG_OUT("Pathfinder: " << PPOS(realpos) << " not on surface" << std::endl); - if (current.param0 != CONTENT_AIR) { + if (ndef->get(current).walkable) { elem.type = 's'; DEBUG_OUT(PPOS(ipos) << ": " << 's' << std::endl); } else { @@ -798,6 +800,7 @@ v3s16 Pathfinder::getRealPos(v3s16 ipos) /******************************************************************************/ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) { + INodeDefManager *ndef = m_env->getGameDef()->ndef(); PathCost retval; retval.updated = true; @@ -820,7 +823,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) return retval; } - if (node_at_pos2.param0 == CONTENT_AIR) { + if (!ndef->get(node_at_pos2).walkable) { MapNode node_below_pos2 = m_env->getMap().getNodeNoEx(pos2 + v3s16(0, -1, 0)); @@ -831,7 +834,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) return retval; } - if (node_below_pos2.param0 != CONTENT_AIR) { + if (ndef->get(node_below_pos2).walkable) { retval.valid = true; retval.value = 1; retval.direction = 0; @@ -843,7 +846,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) MapNode node_at_pos = m_env->getMap().getNodeNoEx(testpos); while ((node_at_pos.param0 != CONTENT_IGNORE) && - (node_at_pos.param0 == CONTENT_AIR) && + (!ndef->get(node_at_pos).walkable) && (testpos.Y > m_limits.MinEdge.Y)) { testpos += v3s16(0, -1, 0); node_at_pos = m_env->getMap().getNodeNoEx(testpos); @@ -852,7 +855,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) //did we find surface? if ((testpos.Y >= m_limits.MinEdge.Y) && (node_at_pos.param0 != CONTENT_IGNORE) && - (node_at_pos.param0 != CONTENT_AIR)) { + (ndef->get(node_at_pos).walkable)) { if ((pos2.Y - testpos.Y - 1) <= m_maxdrop) { retval.valid = true; retval.value = 2; @@ -877,7 +880,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) MapNode node_at_pos = m_env->getMap().getNodeNoEx(testpos); while ((node_at_pos.param0 != CONTENT_IGNORE) && - (node_at_pos.param0 != CONTENT_AIR) && + (ndef->get(node_at_pos).walkable) && (testpos.Y < m_limits.MaxEdge.Y)) { testpos += v3s16(0, 1, 0); node_at_pos = m_env->getMap().getNodeNoEx(testpos); @@ -885,7 +888,7 @@ PathCost Pathfinder::calcCost(v3s16 pos, v3s16 dir) //did we find surface? if ((testpos.Y <= m_limits.MaxEdge.Y) && - (node_at_pos.param0 == CONTENT_AIR)) { + (!ndef->get(node_at_pos).walkable)) { if (testpos.Y - pos2.Y <= m_maxjump) { retval.valid = true; From 8fe753c3d96957cb9d58d9f82677b993effe3652 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Thu, 28 Apr 2016 20:27:59 +0200 Subject: [PATCH 484/531] FileSelectMenu: Fix formspec parsing broken by Irrlicht file-chooser --- src/guiFileSelectMenu.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/guiFileSelectMenu.cpp b/src/guiFileSelectMenu.cpp index e0240742..0bb02f8a 100644 --- a/src/guiFileSelectMenu.cpp +++ b/src/guiFileSelectMenu.cpp @@ -36,6 +36,7 @@ GUIModalMenu(env, parent, id, menumgr) GUIFileSelectMenu::~GUIFileSelectMenu() { removeChildren(); + setlocale(LC_NUMERIC, "C"); } void GUIFileSelectMenu::removeChildren() From c92cff5d52efa0f811b605efd8d77ff23e44b226 Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Mon, 2 May 2016 15:01:17 +1000 Subject: [PATCH 485/531] Fix Windows build Fixes the issue introduced by c1a0ebb (Fix use of uninitialised variable in class Event) causing Windows builds to fail --- src/threading/event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/threading/event.cpp b/src/threading/event.cpp index b7f16154..165f9d83 100644 --- a/src/threading/event.cpp +++ b/src/threading/event.cpp @@ -26,7 +26,6 @@ DEALINGS IN THE SOFTWARE. #include "threading/event.h" Event::Event() - : notified(false) { #if __cplusplus < 201103L # ifdef _WIN32 @@ -34,6 +33,7 @@ Event::Event() # else pthread_cond_init(&cv, NULL); pthread_mutex_init(&mutex, NULL); + notified = false; # endif #endif } From b22de6470b9ad97c5d3854ec433a959e4123ce22 Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 2 May 2016 23:16:28 +0100 Subject: [PATCH 486/531] Settings_translation_file: Update mapgen with cave width parameter --- src/settings_translation_file.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index beb56d9f..23b46625 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -454,6 +454,8 @@ fake_function() { gettext("Mapgen biome humidity noise parameters"); gettext("Mapgen biome humidity blend noise parameters"); gettext("Mapgen v5"); + gettext("Mapgen v5 cave width"); + gettext("Controls width of tunnels, a smaller value creates wider tunnels."); gettext("Mapgen v5 filler depth noise parameters"); gettext("Mapgen v5 factor noise parameters"); gettext("Mapgen v5 height noise parameters"); @@ -479,6 +481,8 @@ fake_function() { gettext("Mapgen v7"); gettext("Mapgen v7 flags"); gettext("Map generation attributes specific to Mapgen v7.\nThe 'ridges' flag controls the rivers.\nThe default flags set in the engine are: mountains, ridges\nThe flags string modifies the engine defaults.\nFlags that are not specified in the flag string are not modified from the default.\nFlags starting with 'no' are used to explicitly disable them."); + gettext("Mapgen v7 cave width"); + gettext("Controls width of tunnels, a smaller value creates wider tunnels."); gettext("Mapgen v7 terrain base noise parameters"); gettext("Mapgen v7 terrain altitude noise parameters"); gettext("Mapgen v7 terrain persistation noise parameters"); @@ -497,6 +501,8 @@ fake_function() { gettext("Y of flat ground."); gettext("Mapgen flat large cave depth"); gettext("Y of upper limit of large pseudorandom caves."); + gettext("Mapgen flat cave width"); + gettext("Controls width of tunnels, a smaller value creates wider tunnels."); gettext("Mapgen flat lake threshold"); gettext("Terrain noise threshold for lakes.\nControls proportion of world area covered by lakes.\nAdjust towards 0.0 for a larger proportion."); gettext("Mapgen flat lake steepness"); @@ -511,6 +517,8 @@ fake_function() { gettext("Mapgen flat cave1 noise parameters"); gettext("Mapgen flat cave2 noise parameters"); gettext("Mapgen fractal"); + gettext("Mapgen fractal cave width"); + gettext("Controls width of tunnels, a smaller value creates wider tunnels."); gettext("Mapgen fractal fractal"); gettext("Choice of 18 fractals from 9 formulas.\n1 = 4D \"Roundy\" mandelbrot set.\n2 = 4D \"Roundy\" julia set.\n3 = 4D \"Squarry\" mandelbrot set.\n4 = 4D \"Squarry\" julia set.\n5 = 4D \"Mandy Cousin\" mandelbrot set.\n6 = 4D \"Mandy Cousin\" julia set.\n7 = 4D \"Variation\" mandelbrot set.\n8 = 4D \"Variation\" julia set.\n9 = 3D \"Mandelbrot/Mandelbar\" mandelbrot set.\n10 = 3D \"Mandelbrot/Mandelbar\" julia set.\n11 = 3D \"Christmas Tree\" mandelbrot set.\n12 = 3D \"Christmas Tree\" julia set.\n13 = 3D \"Mandelbulb\" mandelbrot set.\n14 = 3D \"Mandelbulb\" julia set.\n15 = 3D \"Cosine Mandelbulb\" mandelbrot set.\n16 = 3D \"Cosine Mandelbulb\" julia set.\n17 = 4D \"Mandelbulb\" mandelbrot set.\n18 = 4D \"Mandelbulb\" julia set."); gettext("Mapgen fractal iterations"); @@ -551,6 +559,8 @@ fake_function() { gettext("How wide to make rivers"); gettext("Water Features"); gettext("Creates unpredictable water features in caves.\nThese can make mining difficult. Zero disables them. (0-10)"); + gettext("Cave width"); + gettext("Controls width of tunnels, a smaller value creates wider tunnels."); gettext("Noises"); gettext("Cave noise #1"); gettext("Caves and tunnels form at the intersection of the two noises"); From d864c1333303f0f38df1a8106c4b11ecfce529ad Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Wed, 4 May 2016 21:21:13 +1000 Subject: [PATCH 487/531] Fix holding down F10 (open console) causing GUI to freeze --- src/guiChatConsole.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index ec9d3ffd..17a1689c 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -247,7 +247,9 @@ void GUIChatConsole::animate(u32 msec) s32 goal = m_open ? m_desired_height : 0; // Set invisible if close animation finished (reset by openConsole) - if (!m_open && m_height == 0) + // This function (animate()) is never called once its visibility becomes false so do not + // actually set visible to false before the inhibited period is over + if (!m_open && m_height == 0 && m_open_inhibited == 0) IGUIElement::setVisible(false); if (m_height != goal) From 063be8a126b5f5131f190f318921d707db981322 Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 5 May 2016 16:12:58 +0200 Subject: [PATCH 488/531] Update settings translation file and minetest.conf.example --- minetest.conf.example | 9 +++++---- src/settings_translation_file.cpp | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/minetest.conf.example b/minetest.conf.example index e72c7e35..5090a620 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -253,9 +253,9 @@ # type: bool # enable_local_map_saving = false -# Show entity selection boxes. +# Show entity selection boxes # type: bool -# show_entity_selectionbox true +# show_entity_selectionbox = true # Enable usage of remote media server (if provided by server). # Remote servers offer a significantly faster way to download media (e.g. textures) @@ -988,7 +988,7 @@ # type: float # dedicated_server_step = 0.1 -# Length of time between Active Block Management execution cycles +# Time in between active block management cycles # type: float # active_block_mgmt_interval = 2.0 @@ -1372,7 +1372,7 @@ # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers -# mgvalleys_spflags = altitude_chill,humid_rivers +# mg_valleys_spflags = altitude_chill,humid_rivers # The altitude at which temperature drops by 20C # type: int @@ -1537,3 +1537,4 @@ # type: string # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/ + diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index 23b46625..f7e14dd6 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -103,6 +103,7 @@ fake_function() { gettext("Saving map received from server"); gettext("Save the map received by the client on disk."); gettext("Show entity selection boxes"); + gettext("Show entity selection boxes"); gettext("Connect to external media server"); gettext("Enable usage of remote media server (if provided by server).\nRemote servers offer a significantly faster way to download media (e.g. textures)\nwhen connecting to the server."); gettext("Serverlist URL"); @@ -343,6 +344,8 @@ fake_function() { gettext("New users need to input this password."); gettext("Default privileges"); gettext("The privileges that new users automatically get.\nSee /privs in game for a full list on your server and mod configuration."); + gettext("Basic Privileges"); + gettext("Privileges that players with basic_privs can grant"); gettext("Unlimited player transfer distance"); gettext("Whether players are shown to clients without any range limit.\nDeprecated, use the setting player_transfer_distance instead."); gettext("Player transfer distance"); @@ -412,7 +415,7 @@ fake_function() { gettext("Length of a server tick and the interval at which objects are generally updated over network."); gettext("Active Block Management interval"); gettext("Time in between active block management cycles"); - gettext("ABM modifier interval"); + gettext("Active Block Modifier interval"); gettext("Length of time between ABM execution cycles"); gettext("NodeTimer interval"); gettext("Length of time between NodeTimer execution cycles"); From ae02d1eb8f4222d5cd3f885352011e4e699e6a3f Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 5 May 2016 16:14:09 +0200 Subject: [PATCH 489/531] Run updatepo.sh --- po/be/minetest.po | 223 +++++++--- po/ca/minetest.po | 262 +++++++++--- po/cs/minetest.po | 431 ++++++++++++------- po/da/minetest.po | 395 +++++++++++------ po/de/minetest.po | 997 +++++++++++++++++++++++++------------------ po/eo/minetest.po | 294 +++++++++---- po/es/minetest.po | 316 ++++++++++---- po/et/minetest.po | 460 ++++++++++++-------- po/fr/minetest.po | 947 +++++++++++++++++++++++----------------- po/he/minetest.po | 237 +++++++--- po/hu/minetest.po | 610 ++++++++++++++++---------- po/id/minetest.po | 392 +++++++++++------ po/it/minetest.po | 705 ++++++++++++++++++------------ po/ja/minetest.po | 414 ++++++++++++------ po/jbo/minetest.po | 256 ++++++++--- po/ko/minetest.po | 223 +++++++--- po/ky/minetest.po | 362 ++++++++++------ po/lt/minetest.po | 331 +++++++++----- po/minetest.pot | 215 +++++++--- po/nb/minetest.po | 267 ++++++++---- po/nl/minetest.po | 883 ++++++++++++++++++++++---------------- po/pl/minetest.po | 518 +++++++++++++--------- po/pt/minetest.po | 530 ++++++++++++++--------- po/pt_BR/minetest.po | 640 +++++++++++++++++---------- po/ro/minetest.po | 403 +++++++++++------ po/ru/minetest.po | 644 +++++++++++++++++----------- po/tr/minetest.po | 328 +++++++++----- po/uk/minetest.po | 405 ++++++++++++------ po/zh_CN/minetest.po | 493 +++++++++++++-------- po/zh_TW/minetest.po | 534 +++++++++++++++-------- 30 files changed, 8902 insertions(+), 4813 deletions(-) diff --git a/po/be/minetest.po b/po/be/minetest.po index dbd2e2ea..c8a707a8 100644 --- a/po/be/minetest.po +++ b/po/be/minetest.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2013-11-23 17:37+0100\n" "Last-Translator: Selat \n" "Language-Team: Belarusian\n" @@ -68,6 +68,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -169,6 +170,12 @@ msgstr "" msgid "Are you sure you want to delete \"$1\"?" msgstr "" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "" @@ -177,23 +184,10 @@ msgstr "" msgid "Modmgr: invalid modpath \"$1\"" msgstr "" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "" @@ -399,7 +393,7 @@ msgid "Uninstall selected modpack" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +msgid "Address / Port" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -418,17 +412,16 @@ msgstr "" msgid "Damage enabled" msgstr "" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Del. Favorite" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" +msgid "Favorite" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Name / Password" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua @@ -453,7 +446,7 @@ msgstr "" msgid "Enable Damage" msgstr "" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "" @@ -521,8 +514,8 @@ msgstr "" msgid "Bilinear Filter" msgstr "" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +msgid "Bump Mapping" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -533,18 +526,10 @@ msgstr "" msgid "Connected Glass" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "" @@ -553,6 +538,10 @@ msgstr "" msgid "Mipmap + Aniso. Filter" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "" @@ -562,17 +551,21 @@ msgid "No Mipmap" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" +msgid "Node Highlighting" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Normal Mapping" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "" @@ -585,6 +578,10 @@ msgstr "" msgid "Parallax Occlusion" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Particles" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "" @@ -609,6 +606,10 @@ msgstr "" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "" @@ -629,6 +630,10 @@ msgstr "" msgid "Waving Water" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "" @@ -806,10 +811,6 @@ msgstr "" msgid "Node definitions..." msgstr "" -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "" - #: src/game.cpp msgid "Resolving address..." msgstr "" @@ -830,12 +831,16 @@ msgstr "" msgid "You died." msgstr "" +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "" #: src/guiFormSpecMenu.cpp -msgid "ok" +msgid "Proceed" msgstr "" #: src/guiKeyChangeMenu.cpp @@ -1303,6 +1308,14 @@ msgstr "" msgid "Acceleration in air" msgstr "" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "" @@ -1389,6 +1402,10 @@ msgstr "" msgid "Basic" msgstr "" +#: src/settings_translation_file.cpp +msgid "Basic Privileges" +msgstr "" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "" @@ -1405,6 +1422,10 @@ msgstr "" msgid "Build inside player" msgstr "" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1425,6 +1446,10 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1581,6 +1606,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" @@ -1964,6 +1993,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "" @@ -2029,9 +2062,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2502,6 +2537,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2587,41 +2630,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2668,6 +2720,10 @@ msgstr "" msgid "Mapgen flat" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2716,6 +2772,10 @@ msgstr "" msgid "Mapgen fractal" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2780,6 +2840,10 @@ msgstr "" msgid "Mapgen v5" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2864,6 +2928,10 @@ msgstr "" msgid "Mapgen v7" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3155,6 +3223,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3271,6 +3343,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3379,6 +3455,21 @@ msgstr "" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +msgid "Screenshot format" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot quality" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3470,6 +3561,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3534,6 +3629,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3607,6 +3706,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3637,10 +3740,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3888,6 +3987,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 5cd438fc..c81cfa76 100644 --- a/po/ca/minetest.po +++ b/po/ca/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-20 13:21+0000\n" "Last-Translator: Joan Ciprià Moreno Teodoro \n" -"Language-Team: Catalan " -"\n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,6 +75,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nosaltres suportem versions del protocol entre la versió $1 i la $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -181,6 +182,12 @@ msgstr "No tens subjocs instal·lats." msgid "Are you sure you want to delete \"$1\"?" msgstr "Realment desitja esborrar \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Esborrar" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: Error al esborrar \"$1\"" @@ -189,23 +196,10 @@ msgstr "Modmgr: Error al esborrar \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: Ruta del mod \"$1\" invàlida" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "No, per descomptat que no!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Sí" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Eliminar el món \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "No" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Acceptar" @@ -418,7 +412,8 @@ msgid "Uninstall selected modpack" msgstr "Desinstal·lar el paquet de mods seleccionat" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Adreça / Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -437,18 +432,18 @@ msgstr "Mode creatiu" msgid "Damage enabled" msgstr "Dany activat" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Esborrar" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nom / Contrasenya:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Del. Favorite" +msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Llista de servidors públics" +msgid "Favorite" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nom / Contrasenya:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -472,7 +467,7 @@ msgstr "Mode Creatiu" msgid "Enable Damage" msgstr "Permetre Danys" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nom/Contrasenya" @@ -541,8 +536,9 @@ msgstr "Esteu segur que voleu reiniciar el seu món d'un sol jugador?" msgid "Bilinear Filter" msgstr "Filtre Bilineal" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Mapat de relleu" #: builtin/mainmenu/tab_settings.lua @@ -554,19 +550,10 @@ msgstr "Configurar controls" msgid "Connected Glass" msgstr "Connectar" -#: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "Enable Particles" -msgstr "Activar tot" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Fulles Boniques" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Generar Mapes Normals" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mipmap" @@ -575,6 +562,10 @@ msgstr "Mipmap" msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Aniso. Filtre" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "No" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Sense Filtre" @@ -584,17 +575,22 @@ msgid "No Mipmap" msgstr "Sense MipMap" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "No!!!" +msgid "Node Highlighting" +msgstr "Node ressaltat" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "Node ressaltat" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Ningun" +#: builtin/mainmenu/tab_settings.lua +msgid "Normal Mapping" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Fulles opaques" @@ -607,6 +603,11 @@ msgstr "Aigua opaca" msgid "Parallax Occlusion" msgstr "Oclusió de paral·laxi" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Activar tot" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Configuració" @@ -631,6 +632,10 @@ msgstr "Texturització:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Per habilitar les ombres el controlador OpenGL ha ser utilitzat." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Llindar tàctil (px)" @@ -651,6 +656,10 @@ msgstr "Moviment de Plantes" msgid "Waving Water" msgstr "Onatge" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Sí" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Configurar mods" @@ -853,10 +862,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Definicions dels nodes ..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Continuar" - #: src/game.cpp msgid "Resolving address..." msgstr "Resolent adreça ..." @@ -877,13 +882,17 @@ msgstr "Volum del so" msgid "You died." msgstr "Has mort." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "Acceptar" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Introdueix " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "Acceptar" +msgid "Proceed" +msgstr "Continuar" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1379,6 +1388,16 @@ msgstr "Límit absolut de cues emergents" msgid "Acceleration in air" msgstr "Acceleració en l'aire" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Rang del bloc actiu" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Rang del bloc actiu" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Rang del bloc actiu" @@ -1447,8 +1466,8 @@ msgid "" "minetest.net." msgstr "" "Anunciar a aquesta llista de servidors.\n" -"Si vols anunciar el teu direcció ipv6, fes servir serverlist_url = " -"v6.servers.minetest.net." +"Si vols anunciar el teu direcció ipv6, fes servir serverlist_url = v6." +"servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1474,6 +1493,11 @@ msgstr "Alçada del terreny base" msgid "Basic" msgstr "Bàsic" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Privilegis per defecte" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Filtre bilineal" @@ -1490,6 +1514,10 @@ msgstr "Bits per píxel (profunditat de color) en el mode de pantalla completa." msgid "Build inside player" msgstr "Construir dins el jugador" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Mapat de relleu" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Suavitzat de la càmera" @@ -1510,6 +1538,10 @@ msgstr "Soroll de cova #1" msgid "Cave noise #2" msgstr "Soroll de cova #2" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "Coves i túnels es formen en la intersecció dels dos sorolls" @@ -1698,6 +1730,10 @@ msgstr "Controla el pendent o la profunditat de les depressions de llac." msgid "Controls steepness/height of hills." msgstr "Controla la pendent i alçada dels turons." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Missatge d'error" @@ -2092,6 +2128,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Tecla Avançar" @@ -2157,9 +2197,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2657,6 +2699,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2742,41 +2792,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2825,6 +2884,11 @@ msgstr "" msgid "Mapgen flat" msgstr "Generador de mapes" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Generador de mapes" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2873,6 +2937,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Generador de mapes" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2937,6 +3006,10 @@ msgstr "" msgid "Mapgen v5" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -3021,6 +3094,10 @@ msgstr "" msgid "Mapgen v7" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3312,6 +3389,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3428,6 +3509,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3536,6 +3621,21 @@ msgstr "" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +msgid "Screenshot format" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot quality" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3627,6 +3727,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3694,6 +3798,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3769,6 +3877,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3799,10 +3911,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4051,6 +4159,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4084,3 +4200,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "cURL timeout" msgstr "" + +#~ msgid "No!!!" +#~ msgstr "No!!!" + +#~ msgid "Generate Normalmaps" +#~ msgstr "Generar Mapes Normals" + +#~ msgid "Public Serverlist" +#~ msgstr "Llista de servidors públics" + +#~ msgid "No of course not!" +#~ msgstr "No, per descomptat que no!" diff --git a/po/cs/minetest.po b/po/cs/minetest.po index 2356eb2d..a3d57a4d 100644 --- a/po/cs/minetest.po +++ b/po/cs/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-03-04 04:45+0000\n" "Last-Translator: Jakub Vaněk \n" -"Language-Team: Czech " -"\n" +"Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Podporujeme verze protokolů mezi $1 a $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -177,6 +178,12 @@ msgstr "Nemáte nainstalované žádné podhry." msgid "Are you sure you want to delete \"$1\"?" msgstr "Skutečně chcete odstranit \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Smazat" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: Nepodařilo se odstranit \"$1\"" @@ -185,23 +192,10 @@ msgstr "Modmgr: Nepodařilo se odstranit \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: Neplatná cesta k modu \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Jistě že ne!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Ano" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Doopravdy chcete smazat svět \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Ne" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Přijmout" @@ -412,7 +406,8 @@ msgid "Uninstall selected modpack" msgstr "Odinstalovat označený balíček" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Adresa / Port :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -431,18 +426,20 @@ msgstr "Kreativní mód" msgid "Damage enabled" msgstr "Poškození povoleno" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Smazat" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Jméno / Heslo :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Oblíbené:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Seznam veřejných serverů" +#, fuzzy +msgid "Favorite" +msgstr "Oblíbené:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Jméno / Heslo :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -466,7 +463,7 @@ msgstr "Kreativní mód" msgid "Enable Damage" msgstr "Povolit poškození" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Jméno/Heslo" @@ -536,8 +533,9 @@ msgstr "Jste si jisti, že chcete resetovat místní svět?" msgid "Bilinear Filter" msgstr "Bilineární filtrování" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Bump mapování" #: builtin/mainmenu/tab_settings.lua @@ -549,19 +547,10 @@ msgstr "Změnit nastavení kláves" msgid "Connected Glass" msgstr "Propojené sklo" -#: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "Enable Particles" -msgstr "Povolit částice" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Vícevrstevné listí" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Generovat normálové mapy" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mipmapa" @@ -570,6 +559,10 @@ msgstr "Mipmapa" msgid "Mipmap + Aniso. Filter" msgstr "Mipmapa + Anizo. filtr" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Ne" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Žádné filtr" @@ -579,17 +572,23 @@ msgid "No Mipmap" msgstr "Žádné Mipmapy" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Ne!!!" +msgid "Node Highlighting" +msgstr "Zvýraznění bloků" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "Zvýraznění bloků" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Žádný" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Tone mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Neprůhledné listí" @@ -602,6 +601,11 @@ msgstr "Neprůhledná voda" msgid "Parallax Occlusion" msgstr "Parallax Occlusion" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Povolit částice" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Nastavení" @@ -627,6 +631,10 @@ msgstr "Texturování:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Pro povolení shaderů musíte používat OpenGL ovladač." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "Tone mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Dosah dotyku (px)" @@ -651,6 +659,10 @@ msgstr "Vlnění rostlin" msgid "Waving Water" msgstr "Vlnění vody" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Ano" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Nastavení modů" @@ -854,10 +866,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Definice bloků..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Pokračovat" - #: src/game.cpp msgid "Resolving address..." msgstr "Překládám adresu..." @@ -878,13 +886,17 @@ msgstr "Hlasitost" msgid "You died." msgstr "Zemřel jsi." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "OK" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Zadejte " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "OK" +msgid "Proceed" +msgstr "Pokračovat" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1365,6 +1377,14 @@ msgstr "" msgid "Acceleration in air" msgstr "Zrychlení ve vzduchu" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "" @@ -1456,6 +1476,11 @@ msgstr "Základní výška terénu" msgid "Basic" msgstr "Základní" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Výchozí práva" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Bilineární filtrování" @@ -1472,6 +1497,10 @@ msgstr "Bitová hloubka (bity na pixel) v celoobrazovkovém režimu." msgid "Build inside player" msgstr "Stavění uvnitř hráče" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bump mapování" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1492,6 +1521,11 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "Šířka obrazovky" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1655,6 +1689,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Zpráva o havárii" @@ -2051,6 +2089,10 @@ msgstr "Odsazení stínu písma, pokud je nastaveno na 0, stín nebude vykreslen msgid "Font size" msgstr "Velikost písma" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Vpřed" @@ -2116,9 +2158,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2589,6 +2633,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2674,41 +2726,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2755,6 +2816,11 @@ msgstr "" msgid "Mapgen flat" msgstr "Mapgen plochy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Mapgen plochy" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2803,6 +2869,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Mapgen plochy" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2867,6 +2938,11 @@ msgstr "Jméno generátoru mapy" msgid "Mapgen v5" msgstr "Mapgen v5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Mapgen v5" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2951,6 +3027,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Mapgen v7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Mapgen v7" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3242,6 +3323,10 @@ msgstr "" msgid "Node highlighting" msgstr "Zvýraznění označených bloků" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3359,6 +3444,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3467,6 +3556,23 @@ msgstr "Snímek obrazovky" msgid "Screenshot folder" msgstr "Složka se snímky obrazovky" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Složka se snímky obrazovky" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Snímek obrazovky" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "Zabezpečení" @@ -3558,6 +3664,10 @@ msgstr "" msgid "Show debug info" msgstr "Zobrazit ladící informace" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3622,6 +3732,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3695,6 +3809,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3725,10 +3843,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "Tone mapping" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3976,6 +4090,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4010,105 +4132,114 @@ msgstr "cURL limit paralelních stahování" msgid "cURL timeout" msgstr "cURL timeout" -#~ msgid "\"" -#~ msgstr "\"" +#~ msgid "Preload inventory textures" +#~ msgstr "Přednačíst inventářové textury" -#~ msgid "If disabled " -#~ msgstr "Je-li zakázáno " +#~ msgid "Reset singleplayer world" +#~ msgstr "Reset místního světa" -#~ msgid "If enabled, " -#~ msgstr "Je-li povoleno, " +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Měřítko aplikované na prvky menu: " -#~ msgid "Rendering:" -#~ msgstr "Renderování:" +#~ msgid "Touch free target" +#~ msgstr "Středový kurzor" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest" +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid "Downloading" +#~ msgstr "Stahuji" + +#~ msgid "Game Name" +#~ msgstr "Název hry" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\"" + +#~ msgid "GAMES" +#~ msgstr "HRY" + +#~ msgid "Mods:" +#~ msgstr "Mody:" + +#~ msgid "new game" +#~ msgstr "nová hra" + +#~ msgid "EDIT GAME" +#~ msgstr "UPRAVIT HRU" + +#~ msgid "Remove selected mod" +#~ msgstr "Odstranit vybraný mod" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Přidat mod" + +#~ msgid "CLIENT" +#~ msgstr "KLIENT" + +#~ msgid "START SERVER" +#~ msgstr "MÍSTNÍ SERVER" + +#~ msgid "Name" +#~ msgstr "Jméno" + +#~ msgid "Password" +#~ msgstr "Heslo" + +#~ msgid "SETTINGS" +#~ msgstr "NASTAVENÍ" + +#~ msgid "Preload item visuals" +#~ msgstr "Přednačíst textury předmětů" + +#~ msgid "Finite Liquid" +#~ msgstr "Konečná voda" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "HRA JEDNOHO HRÁČE" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "BALÍČKY TEXTUR" + +#~ msgid "MODS" +#~ msgstr "MODY" + +#~ msgid "Add mod:" +#~ msgstr "Přidat mod:" + +#~ msgid "Local install" +#~ msgstr "Místní instalace" #~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" #~ "Levý klik: Přesunout všechny předměty, Pravý klik: Přesunout jeden předmět" -#~ msgid "Local install" -#~ msgstr "Místní instalace" +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Aby se změna ovladače projevila, restartujte Minetest" -#~ msgid "Add mod:" -#~ msgstr "Přidat mod:" +#~ msgid "Rendering:" +#~ msgstr "Renderování:" -#~ msgid "MODS" -#~ msgstr "MODY" +#~ msgid "If enabled, " +#~ msgstr "Je-li povoleno, " -#~ msgid "TEXTURE PACKS" -#~ msgstr "BALÍČKY TEXTUR" +#~ msgid "If disabled " +#~ msgstr "Je-li zakázáno " -#~ msgid "SINGLE PLAYER" -#~ msgstr "HRA JEDNOHO HRÁČE" +#~ msgid "\"" +#~ msgstr "\"" -#~ msgid "Finite Liquid" -#~ msgstr "Konečná voda" +#~ msgid "No!!!" +#~ msgstr "Ne!!!" -#~ msgid "Preload item visuals" -#~ msgstr "Přednačíst textury předmětů" +#~ msgid "Generate Normalmaps" +#~ msgstr "Generovat normálové mapy" -#~ msgid "SETTINGS" -#~ msgstr "NASTAVENÍ" +#~ msgid "Public Serverlist" +#~ msgstr "Seznam veřejných serverů" -#~ msgid "Password" -#~ msgstr "Heslo" - -#~ msgid "Name" -#~ msgstr "Jméno" - -#~ msgid "START SERVER" -#~ msgstr "MÍSTNÍ SERVER" - -#~ msgid "Favorites:" -#~ msgstr "Oblíbené:" - -#~ msgid "CLIENT" -#~ msgstr "KLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Přidat mod" - -#~ msgid "Remove selected mod" -#~ msgstr "Odstranit vybraný mod" - -#~ msgid "EDIT GAME" -#~ msgstr "UPRAVIT HRU" - -#~ msgid "new game" -#~ msgstr "nová hra" - -#~ msgid "Mods:" -#~ msgstr "Mody:" - -#~ msgid "GAMES" -#~ msgstr "HRY" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Nepovedlo se zkopírovat mod \"$1\" do hry \"$2\"" - -#~ msgid "Game Name" -#~ msgstr "Název hry" - -#~ msgid "Downloading" -#~ msgstr "Stahuji" - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid "Touch free target" -#~ msgstr "Středový kurzor" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Měřítko aplikované na prvky menu: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Reset místního světa" - -#~ msgid "Preload inventory textures" -#~ msgstr "Přednačíst inventářové textury" +#~ msgid "No of course not!" +#~ msgstr "Jistě že ne!" diff --git a/po/da/minetest.po b/po/da/minetest.po index 4dc4c326..e3537f15 100644 --- a/po/da/minetest.po +++ b/po/da/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-17 08:53+0000\n" "Last-Translator: Thomas Wagner Nielsen \n" -"Language-Team: Danish " -"\n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Vi understøtter protokol versioner mellem $1 og $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -177,6 +178,12 @@ msgstr "Du har ikke installeret nogle subgames." msgid "Are you sure you want to delete \"$1\"?" msgstr "Er du sikker på du vil slette \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Slet" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: Kunne ikke slette \"$1\"" @@ -185,23 +192,10 @@ msgstr "Modmgr: Kunne ikke slette \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: ugyldig mod-sti \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Nej selvfølgelig ikke!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Ja" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Slet verden \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Nej" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Accepter" @@ -410,7 +404,8 @@ msgid "Uninstall selected modpack" msgstr "Afinstaller den valgte modpack" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Adresse/port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -429,18 +424,20 @@ msgstr "Kreativ tilstand" msgid "Damage enabled" msgstr "Skade aktiveret" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Slet" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Navn/kodeord:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Vis favoritter" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Offentlig serverliste" +#, fuzzy +msgid "Favorite" +msgstr "Vis favoritter" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Navn/kodeord:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -464,7 +461,7 @@ msgstr "Kreativ tilstand" msgid "Enable Damage" msgstr "Aktivér skade" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Navn/kodeord" @@ -532,9 +529,9 @@ msgstr "Er du sikker på, at du vil nulstille din enkelt spiller-verden?" msgid "Bilinear Filter" msgstr "Bi-lineær filtréring" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Bumpmapping" +msgid "Bump Mapping" msgstr "Mip-mapping" #: builtin/mainmenu/tab_settings.lua @@ -545,19 +542,11 @@ msgstr "Skift bindinger" msgid "Connected Glass" msgstr "Forbundet glas" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Aktivér partikler" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Fancy Leaves" msgstr "Opakt (uigennemsigtigt) vand" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Mipmap" @@ -567,6 +556,10 @@ msgstr "Mip-mapping" msgid "Mipmap + Aniso. Filter" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Nej" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Intet filter" @@ -577,18 +570,24 @@ msgid "No Mipmap" msgstr "Mip-mapping" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "" +#, fuzzy +msgid "Node Highlighting" +msgstr "Glat belysning" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Glat belysning" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Ingen" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Mip-mapping" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Opaque Leaves" @@ -603,6 +602,11 @@ msgstr "Opakt (uigennemsigtigt) vand" msgid "Parallax Occlusion" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Aktivér partikler" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Indstillinger" @@ -627,6 +631,11 @@ msgstr "" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "" @@ -650,6 +659,10 @@ msgstr "\"Smarte\" træer" msgid "Waving Water" msgstr "\"Smarte\" træer" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Ja" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Konfigurér mods" @@ -830,10 +843,6 @@ msgstr "" msgid "Node definitions..." msgstr "" -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Fortsæt" - #: src/game.cpp msgid "Resolving address..." msgstr "" @@ -854,13 +863,17 @@ msgstr "Lydniveau" msgid "You died." msgstr "Du døde." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "ok" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "" #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "ok" +msgid "Proceed" +msgstr "Fortsæt" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1335,6 +1348,14 @@ msgstr "" msgid "Acceleration in air" msgstr "" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "" @@ -1423,6 +1444,10 @@ msgstr "" msgid "Basic" msgstr "" +#: src/settings_translation_file.cpp +msgid "Basic Privileges" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Bilinear filtering" @@ -1441,6 +1466,11 @@ msgstr "" msgid "Build inside player" msgstr "Flerspiller" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip-mapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1461,6 +1491,10 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1628,6 +1662,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" @@ -2024,6 +2062,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Forward key" @@ -2090,9 +2132,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2568,6 +2612,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2655,41 +2707,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2738,6 +2799,11 @@ msgstr "" msgid "Mapgen flat" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2786,6 +2852,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2850,6 +2921,10 @@ msgstr "" msgid "Mapgen v5" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2934,6 +3009,10 @@ msgstr "" msgid "Mapgen v7" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3227,6 +3306,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3343,6 +3426,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3454,6 +3541,23 @@ msgstr "Tilstandsbillede" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Tilstandsbillede" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Tilstandsbillede" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3546,6 +3650,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3612,6 +3720,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3685,6 +3797,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3715,11 +3831,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Mip-mapping" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -3970,6 +4081,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4005,44 +4124,53 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Deaktivér alle" +#~ msgid "Downloading" +#~ msgstr "Ned" -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "aktiveret" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed" -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Spil" +#~ msgid "is required by:" +#~ msgstr "er påkrævet af:" -#, fuzzy -#~ msgid "Favorites:" +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguration gemt. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver" + +#~ msgid "Show Public" +#~ msgstr "Vis offentlig" + +#~ msgid "Show Favorites" #~ msgstr "Vis favoritter" -#, fuzzy -#~ msgid "Password" -#~ msgstr "Gammelt kodeord" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server." -#~ msgid "Preload item visuals" -#~ msgstr "For-indlæs elementernes grafik" +#~ msgid "Create world" +#~ msgstr "Skab verden" -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n" -#~ "De vil blive aktiveret som standard når du gemmer konfigurationen. " +#~ msgid "Address required." +#~ msgstr "Adresse påkrævet." -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n" -#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen. " +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kan ikke slette verden: ingenting valgt" -#~ msgid "Delete map" -#~ msgstr "Slet mappen" +#~ msgid "Files to be deleted" +#~ msgstr "Filer som slettes" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kan ikke skabe verden: ingen spil fundet" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kan ikke konfigurere verden: ingenting valgt" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Mislykkedes i at slette alle verdenens filer" #~ msgid "" #~ "Default Controls:\n" @@ -4069,51 +4197,44 @@ msgstr "" #~ "- ESC: denne menu\n" #~ "- T: snak\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Mislykkedes i at slette alle verdenens filer" +#~ msgid "Delete map" +#~ msgstr "Slet mappen" -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kan ikke konfigurere verden: ingenting valgt" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: nogle konfigurerede modifikationer mangler.\n" +#~ "Deres indstillinger vil blive fjernet når du gemmer konfigurationen. " -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kan ikke skabe verden: ingen spil fundet" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Advarsel: nogle modifikationer er endnu ikke konfigureret.\n" +#~ "De vil blive aktiveret som standard når du gemmer konfigurationen. " -#~ msgid "Files to be deleted" -#~ msgstr "Filer som slettes" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kan ikke slette verden: ingenting valgt" - -#~ msgid "Address required." -#~ msgstr "Adresse påkrævet." - -#~ msgid "Create world" -#~ msgstr "Skab verden" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Lad adresse-feltet være tomt for at starte en lokal server." - -#~ msgid "Show Favorites" -#~ msgstr "Vis favoritter" - -#~ msgid "Show Public" -#~ msgstr "Vis offentlig" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Advarsel: konfigurationen er ikke sammenhængende. " - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguration gemt. " - -#~ msgid "is required by:" -#~ msgstr "er påkrævet af:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed" +#~ msgid "Preload item visuals" +#~ msgstr "For-indlæs elementernes grafik" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ned" +#~ msgid "Password" +#~ msgstr "Gammelt kodeord" + +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Spil" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "aktiveret" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Deaktivér alle" + +#~ msgid "Public Serverlist" +#~ msgstr "Offentlig serverliste" + +#~ msgid "No of course not!" +#~ msgstr "Nej selvfølgelig ikke!" diff --git a/po/de/minetest.po b/po/de/minetest.po index d132f3da..baa39017 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-03-30 21:31+0000\n" "Last-Translator: Wuzzy \n" -"Language-Team: German " -"\n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Wir unterstützen Protokollversionen zwischen $1 und $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -179,6 +180,12 @@ msgstr "Keine Spiele installiert." msgid "Are you sure you want to delete \"$1\"?" msgstr "Sind Sie sich sicher, dass Sie „$1“ löschen wollen?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Entfernen" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: Fehler beim Löschen von „$1“" @@ -187,23 +194,10 @@ msgstr "Modmgr: Fehler beim Löschen von „$1“" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: Unzulässiger Modpfad „$1“" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Nein, natürlich nicht!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Ja" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Welt „$1“ löschen?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Nein" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Annehmen" @@ -422,7 +416,8 @@ msgid "Uninstall selected modpack" msgstr "Ausgewähltes Modpack deinstallieren" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Adresse / Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -441,18 +436,20 @@ msgstr "Kreativmodus" msgid "Damage enabled" msgstr "Schaden aktiviert" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Entfernen" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Name / Passwort:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Favoriten:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Öffentliche Serverliste" +#, fuzzy +msgid "Favorite" +msgstr "Favoriten:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Name / Passwort:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -476,7 +473,7 @@ msgstr "Kreativmodus" msgid "Enable Damage" msgstr "Schaden einschalten" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Name/Passwort" @@ -544,8 +541,9 @@ msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?" msgid "Bilinear Filter" msgstr "Bilinearer Filter" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua @@ -556,18 +554,10 @@ msgstr "Tasten ändern" msgid "Connected Glass" msgstr "Verbundenes Glas" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Partikel aktivieren" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Schöne Blätter" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Normalmaps generieren" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mipmap" @@ -576,6 +566,10 @@ msgstr "Mipmap" msgid "Mipmap + Aniso. Filter" msgstr "Mipmap u. Aniso. Filter" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Nein" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Kein Filter" @@ -585,17 +579,23 @@ msgid "No Mipmap" msgstr "Keine Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Nein!!!" +msgid "Node Highlighting" +msgstr "Blöcke hervorheben" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "Blöcke hervorheben" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Keines" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Normalmaps-Sampling" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Undurchs. Blätter" @@ -608,6 +608,11 @@ msgstr "Undurchs. Wasser" msgid "Parallax Occlusion" msgstr "Parallax-Occlusion" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Partikel aktivieren" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Einstellungen" @@ -632,6 +637,10 @@ msgstr "Texturierung:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Um Shader zu benutzen, muss der OpenGL-Treiber benutzt werden." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "Tone-Mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Berührungsempfindlichkeit (px)" @@ -652,6 +661,10 @@ msgstr "Wehende Pflanzen" msgid "Waving Water" msgstr "Wasserwellen" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Ja" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Mods konfigurieren" @@ -854,10 +867,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Blockdefinitionen..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Fortsetzen" - #: src/game.cpp msgid "Resolving address..." msgstr "Löse Adresse auf..." @@ -878,13 +887,17 @@ msgstr "Tonlautstärke" msgid "You died." msgstr "Sie sind gestorben." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "OK" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Enter " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "OK" +msgid "Proceed" +msgstr "Fortsetzen" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1378,6 +1391,16 @@ msgstr "Absolute Grenze der Erzeugungswarteschlangen" msgid "Acceleration in air" msgstr "Beschleunigung in der Luft" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Reichweite aktiver Kartenblöcke" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Reichweite aktiver Kartenblöcke" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Reichweite aktiver Kartenblöcke" @@ -1472,6 +1495,11 @@ msgstr "Basisgeländehöhe" msgid "Basic" msgstr "Grundlegend" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Standardprivilegien" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Bilinearer Filter" @@ -1488,6 +1516,10 @@ msgstr "Bits pro Pixel (Farbtiefe) im Vollbildmodus." msgid "Build inside player" msgstr "Innerhalb des Spielers bauen" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bumpmapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Kameraglättung" @@ -1508,6 +1540,11 @@ msgstr "Höhlenrauschen Nr. 1" msgid "Cave noise #2" msgstr "Höhlenrauschen Nr. 2" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "Bildschirmbreite" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "Höhlen und Tunnel bilden sich am Schnittpunkt der zwei Rauschen" @@ -1696,6 +1733,10 @@ msgstr "Steuert die Steilheit/Tiefe von Seesenken." msgid "Controls steepness/height of hills." msgstr "Steuert die Steilheit/Höhe von Hügeln." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Absturzmeldung" @@ -2138,6 +2179,11 @@ msgstr "" msgid "Font size" msgstr "Schriftgröße" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Format of screenshots." +msgstr "Pfad, in dem Bildschirmfotos abgespeichert werden." + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Vorwärtstaste" @@ -2205,13 +2251,16 @@ msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Globale Kartengenerierungsattribute.\n" "Im Kartengenerator v6 wird das „decorations“-Flag alle Dekorationen außer\n" @@ -2516,8 +2565,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um die Sichtweite zu reduzieren.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2536,8 +2585,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um die Sichtweite zu erhöhen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2566,8 +2615,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um den Spieler rückwärts zu bewegen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2660,8 +2709,8 @@ msgstr "" "Taste zum Schleichen.\n" "Wird auch zum Runterklettern und das Sinken im Wasser verwendet, falls " "aux1_descends deaktiviert ist.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2680,8 +2729,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zur Erzeugung von Bildschirmfotos.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2690,8 +2739,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Filmmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2700,8 +2749,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Wechseln der Anzeige der Übersichtskarte.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2710,8 +2759,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Schnellmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2720,8 +2769,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Flugmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2730,8 +2779,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Geistmodus.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2741,8 +2790,8 @@ msgid "" msgstr "" "Taste zum Umschalten der Kameraaktualisierung. Nur für die Entwicklung " "benutzt.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2751,8 +2800,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten der Anzeige der Debug-Informationen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2761,8 +2810,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um das HUD zu verbergen oder wieder anzuzeigen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2771,8 +2820,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um das Chatprotokoll zu verbergen oder wieder anzuzeigen.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2781,8 +2830,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten des Nebels.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2791,8 +2840,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste zum Umschalten der Profiler-Anzeige. Für die Entwicklung benutzt.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2801,8 +2850,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Taste, um die unbegrenzte Sichtweite ein- oder auszuschalten.\n" -"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2850,6 +2899,14 @@ msgstr "" "Netzwerk üblicherweise\n" "aktualisiert werden." +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2952,34 +3009,39 @@ msgid "Map directory" msgstr "Kartenordner" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n" -"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" +"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" +"Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-" +"Flag\n" +"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben " +"sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" -"zu deaktivieren.\n" -"„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen " -"führen könnte.\n" -"„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in Gebieten, " -"in denen das Wasser sich in Pfützen ansammeln würde.\n" -"Dies könnte mit fein abgestimmten Biomen zu Konflikten führen." +"zu deaktivieren." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n" "Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n" @@ -2989,34 +3051,42 @@ msgstr "" "zu deaktivieren." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" "Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-" "Flag\n" -"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben sind," -"\n" +"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben " +"sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für Kartengenerator v7.\n" -"„ridges“ sind die Flüsse.\n" -"Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" +"Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-" +"Flag\n" +"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben " +"sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." @@ -3065,6 +3135,11 @@ msgstr "Kartengenerator-Flags" msgid "Mapgen flat" msgstr "Flacher Kartengenerator" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Tiefe für große Höhlen für den flachen Kartengenerator" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "cave1-Rauschparameter für flachen Kartengenerator" @@ -3113,6 +3188,11 @@ msgstr "Gelände-Rauschparameter für flachen Kartengenerator" msgid "Mapgen fractal" msgstr "Fraktale-Kartengenerator" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "w-Ausschnitt für Fraktale-Kartengenerator" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "cave1-Rauschparameter für Fraktale-Kartengenerator" @@ -3177,6 +3257,11 @@ msgstr "Kartengeneratorname" msgid "Mapgen v5" msgstr "v5-Kartengenerator" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Tiefe für große Höhlen für den flachen Kartengenerator" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "cave1-Höhlen-Rauschparameter für v5-Kartengenerator" @@ -3261,6 +3346,11 @@ msgstr "Baum-Rauschparameter für v6-Kartengenerator" msgid "Mapgen v7" msgstr "v7-Kartengenerator" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Tiefe für große Höhlen für den flachen Kartengenerator" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "cave1-Höhlen-Rauschparameter für v7-Kartengenerator" @@ -3595,6 +3685,11 @@ msgstr "Geistmodustaste" msgid "Node highlighting" msgstr "Blöcke hervorheben" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "NodeTimer interval" +msgstr "Zeit-Sendeintervall" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3731,6 +3826,10 @@ msgstr "" "Verhindert, dass Mods unsichere Funktionen, wie das Ausführen von\n" "Shell-Kommandos, benutzen können." +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3849,6 +3948,23 @@ msgstr "Bildschirmfoto" msgid "Screenshot folder" msgstr "Bildschirmfotoverzeichnis" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Bildschirmfotoverzeichnis" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Bildschirmfoto" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "Sicherheit" @@ -3952,6 +4068,10 @@ msgstr "Form der Übersichtskarte. Aktiviert = rund, Deaktiviert = rechteckig." msgid "Show debug info" msgstr "Debug-Info zeigen" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "Herunterfahrnachricht" @@ -4027,6 +4147,10 @@ msgstr "Stärke von Parallax." msgid "Strict protocol checking" msgstr "Strikte Protokollversionsprüfung" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "Synchrones SQLite" @@ -4124,6 +4248,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "Diese Schrift wird von bestimmten Sprachen benutzt." +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -4163,10 +4291,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Kameraauswahltaste" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "Tone-Mapping" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Tooltip-Verzögerung" @@ -4467,6 +4591,14 @@ msgstr "" "Ob der Client Debug-Informationen zeigen soll (hat die selbe Wirkung\n" "wie das Drücken von F5)." +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "Breiten-Komponente der anfänglichen Fenstergröße." @@ -4503,72 +4635,273 @@ msgstr "cURL-Parallel-Begrenzung" msgid "cURL timeout" msgstr "cURL-Zeitüberschreitung" -#, fuzzy -#~ msgid "\"" -#~ msgstr "”" +#~ msgid "Item textures..." +#~ msgstr "Inventarbilder ..." -#~ msgid "Enable a bit lower water surface, so it doesn't " -#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht " +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n" +#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n" +#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n" +#~ "nicht mit dieser Einstellung funktioniert." -#~ msgid "If disabled " -#~ msgstr "Wenn deaktiviert " +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)." -#~ msgid "If enabled, " -#~ msgstr "Wenn aktiviert, " +#~ msgid "" +#~ "Julia set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." +#~ msgstr "" +#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" +#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n" +#~ "Nodes multipliziert." -#~ msgid "Rendering:" -#~ msgstr "Rendering:" +#~ msgid "" +#~ "Julia set: W value determining the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n" +#~ "Weite liegt grob zwischen -2 und 2." -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Neustart nach Ändern des Treibers erforderlich" +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n" +#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgid "Downloading" -#~ msgstr "Lade herunter" +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n" +#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen" +#~ msgid "" +#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +#~ msgstr "" +#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" +#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n" +#~ "Versätze in Nodes multipliziert." -#~ msgid "is required by:" -#~ msgstr "wird benötigt von:" +#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes." -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguration gespeichert. " +#~ msgid "" +#~ "Mandelbrot set: Iterations of the recursive function.\n" +#~ "Controls scale of finest detail." +#~ msgstr "" +#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n" +#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad." -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Warnung: Konfiguration nicht konsistent. " +#~ msgid "" +#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-" +#~ "Form.\n" +#~ "Die Weite liegt grob zwischen -2 und 2." -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen" +#~ msgid "" +#~ "Map generation attributes specific to Mapgen fractal.\n" +#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." +#~ msgstr "" +#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n" +#~ "Kartenerzeuger sind.\n" +#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n" +#~ "Mandelbrotmenge aus.\n" +#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +#~ "werden von der Standardeinstellung unverändert gelassen.\n" +#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +#~ "zu deaktivieren." -#~ msgid "Show Public" -#~ msgstr "Zeige öffentliche" +#~ msgid "Mapgen fractal mandelbrot iterations" +#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger" -#~ msgid "Show Favorites" -#~ msgstr "Zeige Favoriten" +#~ msgid "Mapgen fractal mandelbrot offset" +#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten." +#~ msgid "Mapgen fractal mandelbrot scale" +#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger" -#~ msgid "Create world" -#~ msgstr "Welt erstellen" +#~ msgid "Mapgen fractal mandelbrot slice w" +#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger" -#~ msgid "Address required." -#~ msgstr "Adresse benötigt." +#~ msgid "" +#~ "Maximum distance above water level for player spawn.\n" +#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" +#~ "Smaller values may result in a suitable spawn point not being found,\n" +#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." +#~ msgstr "" +#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n" +#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n" +#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n" +#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n" +#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n" +#~ "eingegraben ist." -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt" +#~ msgid "" +#~ "Minimum wanted FPS.\n" +#~ "The amount of rendered stuff is dynamically set according to this. and " +#~ "viewing range min and max." +#~ msgstr "" +#~ "Minimal gewünschte Bildwiederholrate.\n" +#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch " +#~ "angepasst; auch\n" +#~ "die minimale und maximale Sichtweite werden angepasst." -#~ msgid "Files to be deleted" -#~ msgstr "Zu löschende Dateien" +#~ msgid "New style water" +#~ msgstr "Wasser im neuen Stil" -#~ msgid "Cannot create world: No games found" -#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden" +#~ msgid "" +#~ "Pre-generate all item visuals used in the inventory.\n" +#~ "This increases startup time, but runs smoother in-game.\n" +#~ "The generated textures can easily exceed your VRAM, causing artifacts in " +#~ "the inventory." +#~ msgstr "" +#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n" +#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel " +#~ "führen.\n" +#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte " +#~ "im Inventar\n" +#~ "verursachen kann." -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt" +#~ msgid "Preload inventory textures" +#~ msgstr "Texturen vorgenerieren" -#~ msgid "Failed to delete all world files" -#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden" +#~ msgid "" +#~ "The allowed adjustment range for the automatic rendering range " +#~ "adjustment.\n" +#~ "Set this to be equal to viewing range minimum to disable the auto-" +#~ "adjustment algorithm." +#~ msgstr "" +#~ "Die erlaubte Anpassungsreichweite für die automatische Render-" +#~ "Reichweitenanpassung.\n" +#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um " +#~ "den automatischen\n" +#~ "Anpassungsalgorithmus zu deaktivieren." + +#~ msgid "Vertical initial window size." +#~ msgstr "Anfängliche Fensterhöhe." + +#~ msgid "Vertical spawn range" +#~ msgstr "Vertikaler Startpunktbereich" + +#~ msgid "Viewing range minimum" +#~ msgstr "Minimale Sichtweite" + +#~ msgid "Wanted FPS" +#~ msgstr "Gewünschte Bildwiederholrate" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Einzelspielerwelt zurücksetzen" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: " + +#~ msgid "Touch free target" +#~ msgstr "Berührungsfreies Ziel" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid " MB/s" +#~ msgstr " MB/s" + +#~ msgid "Game Name" +#~ msgstr "Spielname" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren" + +#~ msgid "GAMES" +#~ msgstr "SPIELE" + +#~ msgid "Mods:" +#~ msgstr "Mods:" + +#~ msgid "new game" +#~ msgstr "neues Spiel" + +#~ msgid "EDIT GAME" +#~ msgstr "SPIEL ÄNDERN" + +#~ msgid "Remove selected mod" +#~ msgstr "Ausgewählte Mod löschen" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Mod hinzufügen" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "START SERVER" +#~ msgstr "SERVER STARTEN" + +#~ msgid "Name" +#~ msgstr "Name" + +#~ msgid "Password" +#~ msgstr "Passwort" + +#~ msgid "SETTINGS" +#~ msgstr "EINSTELLUNGEN" + +#~ msgid "Preload item visuals" +#~ msgstr "Lade Inventarbilder vor" + +#~ msgid "Finite Liquid" +#~ msgstr "Endliches Wasser" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "EINZELSPIELER" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTUREN PAKETE" + +#~ msgid "MODS" +#~ msgstr "MODS" + +#~ msgid "Add mod:" +#~ msgstr "Modifikation hinzufügen:" + +#~ msgid "Local install" +#~ msgstr "Lokale Install." + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n" +#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird. " + +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Warnung: Einige konfigurierte Mods fehlen.\n" +#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert " +#~ "wird. " + +#~ msgid "KEYBINDINGS" +#~ msgstr "TASTEN EINST." + +#~ msgid "Delete map" +#~ msgstr "Karte löschen" #~ msgid "" #~ "Default Controls:\n" @@ -4594,273 +4927,117 @@ msgstr "cURL-Zeitüberschreitung" #~ "- I: Inventar\n" #~ "- T: Chat\n" -#~ msgid "Delete map" -#~ msgstr "Karte löschen" +#~ msgid "Failed to delete all world files" +#~ msgstr "Es konnten nicht alle Welt Dateien gelöscht werden" -#~ msgid "KEYBINDINGS" -#~ msgstr "TASTEN EINST." +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden" + +#~ msgid "Files to be deleted" +#~ msgstr "Zu löschende Dateien" + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Kann Welt nicht löchen: Nichts ausgewählt" + +#~ msgid "Address required." +#~ msgstr "Adresse benötigt." + +#~ msgid "Create world" +#~ msgstr "Welt erstellen" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Lasse die Adresse frei um einen eigenen Server zu starten." + +#~ msgid "Show Favorites" +#~ msgstr "Zeige Favoriten" + +#~ msgid "Show Public" +#~ msgstr "Zeige öffentliche" + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Kann Welt nicht erstellen: Name enthält ungültige Zeichen" + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Warnung: Konfiguration nicht konsistent. " + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguration gespeichert. " + +#~ msgid "is required by:" +#~ msgstr "wird benötigt von:" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen" + +#~ msgid "Downloading" +#~ msgstr "Lade herunter" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Neustart nach Ändern des Treibers erforderlich" + +#~ msgid "Rendering:" +#~ msgstr "Rendering:" + +#~ msgid "If enabled, " +#~ msgstr "Wenn aktiviert, " + +#~ msgid "If disabled " +#~ msgstr "Wenn deaktiviert " + +#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgstr "Senkt ein bisschen den Wasserspiegel, so tut es nicht " + +#, fuzzy +#~ msgid "\"" +#~ msgstr "”" #~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Warnung: Einige konfigurierte Mods fehlen.\n" -#~ "Mod Einstellungen werden gelöscht wenn die Konfiguration gespeichert " -#~ "wird. " - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Warnung: Einige Mods sind noch nicht konfiguriert.\n" -#~ "Sie werden aktiviert wenn die Konfiguration gespeichert wird. " - -#~ msgid "Local install" -#~ msgstr "Lokale Install." - -#~ msgid "Add mod:" -#~ msgstr "Modifikation hinzufügen:" - -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTUREN PAKETE" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "EINZELSPIELER" - -#~ msgid "Finite Liquid" -#~ msgstr "Endliches Wasser" - -#~ msgid "Preload item visuals" -#~ msgstr "Lade Inventarbilder vor" - -#~ msgid "SETTINGS" -#~ msgstr "EINSTELLUNGEN" - -#~ msgid "Password" -#~ msgstr "Passwort" - -#~ msgid "Name" -#~ msgstr "Name" - -#~ msgid "START SERVER" -#~ msgstr "SERVER STARTEN" - -#~ msgid "Favorites:" -#~ msgstr "Favoriten:" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Mod hinzufügen" - -#~ msgid "Remove selected mod" -#~ msgstr "Ausgewählte Mod löschen" - -#~ msgid "EDIT GAME" -#~ msgstr "SPIEL ÄNDERN" - -#~ msgid "new game" -#~ msgstr "neues Spiel" - -#~ msgid "Mods:" -#~ msgstr "Mods:" - -#~ msgid "GAMES" -#~ msgstr "SPIELE" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kann mod \"$1\" nicht in Spiel \"$2\" kopieren" - -#~ msgid "Game Name" -#~ msgstr "Spielname" - -#~ msgid " MB/s" -#~ msgstr " MB/s" - -#~ msgid " KB/s" -#~ msgstr " KB/s" - -#~ msgid "Touch free target" -#~ msgstr "Berührungsfreies Ziel" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Auf Menüelemente angewandter Skalierfaktor: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Einzelspielerwelt zurücksetzen" - -#~ msgid "Wanted FPS" -#~ msgstr "Gewünschte Bildwiederholrate" - -#~ msgid "Viewing range minimum" -#~ msgstr "Minimale Sichtweite" - -#~ msgid "Vertical spawn range" -#~ msgstr "Vertikaler Startpunktbereich" - -#~ msgid "Vertical initial window size." -#~ msgstr "Anfängliche Fensterhöhe." - -#~ msgid "" -#~ "The allowed adjustment range for the automatic rendering range " -#~ "adjustment.\n" -#~ "Set this to be equal to viewing range minimum to disable the auto-" -#~ "adjustment algorithm." -#~ msgstr "" -#~ "Die erlaubte Anpassungsreichweite für die automatische Render-" -#~ "Reichweitenanpassung.\n" -#~ "Setzen Sie den Wert auf den gleichen Wert wie die minimale Sichtweite, um " -#~ "den automatischen\n" -#~ "Anpassungsalgorithmus zu deaktivieren." - -#~ msgid "Preload inventory textures" -#~ msgstr "Texturen vorgenerieren" - -#~ msgid "" -#~ "Pre-generate all item visuals used in the inventory.\n" -#~ "This increases startup time, but runs smoother in-game.\n" -#~ "The generated textures can easily exceed your VRAM, causing artifacts in " -#~ "the inventory." -#~ msgstr "" -#~ "Alle Itembilder im Inventar vor dem Spielstart erzeugen.\n" -#~ "Dies erhöht die Vorbereitungszeit, wird aber zu einem flüssigerem Spiel " -#~ "führen.\n" -#~ "Die erzeugten Texturen können Ihr VRAM leicht überlasten, was Artefakte " -#~ "im Inventar\n" -#~ "verursachen kann." - -#~ msgid "New style water" -#~ msgstr "Wasser im neuen Stil" - -#~ msgid "" -#~ "Minimum wanted FPS.\n" -#~ "The amount of rendered stuff is dynamically set according to this. and " -#~ "viewing range min and max." -#~ msgstr "" -#~ "Minimal gewünschte Bildwiederholrate.\n" -#~ "Die Anzahl der berechneten Dinge wird anhand dieses Werts dynamisch " -#~ "angepasst; auch\n" -#~ "die minimale und maximale Sichtweite werden angepasst." - -#~ msgid "" -#~ "Maximum distance above water level for player spawn.\n" -#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" -#~ "Smaller values may result in a suitable spawn point not being found,\n" -#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." -#~ msgstr "" -#~ "Höchstabstand über dem Meeresspiegel für den Spieler-\n" -#~ "startpunkt. Größere Werte führen zu Startpunkten näher an\n" -#~ "(x = 0, z = 0). Kleinere Werte können dazu führen, dass kein\n" -#~ "brauchbarer Startpunkt gefunden wird, was wiederum zu einem\n" -#~ "Startpunkt bei (0, 0, 0) führt, der möglicherweise im Untergrund\n" -#~ "eingegraben ist." - -#~ msgid "Mapgen fractal mandelbrot slice w" -#~ msgstr "Mandelbrot-w-Ausschnitt für Fraktale-Kartenerzeuger" - -#~ msgid "Mapgen fractal mandelbrot scale" -#~ msgstr "Mandelbrotskalierung für Fraktale-Kartenerzeuger" - -#~ msgid "Mapgen fractal mandelbrot offset" -#~ msgstr "Mandelbrotversatz für Fraktale-Kartenerzeuger" - -#~ msgid "Mapgen fractal mandelbrot iterations" -#~ msgstr "Mandelbrotiterationen für Fraktale-Kartenerzeuger" - -#~ msgid "" -#~ "Map generation attributes specific to Mapgen fractal.\n" -#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +#~ "Map generation attributes specific to Mapgen v7.\n" +#~ "'ridges' are the rivers.\n" #~ "Flags that are not specified in the flag string are not modified from the " #~ "default.\n" #~ "Flags starting with \"no\" are used to explicitly disable them." #~ msgstr "" -#~ "Kartengenerierungsattribute, die speziell für den Fraktale-\n" -#~ "Kartenerzeuger sind.\n" -#~ "„julia“ wählt für die Erzeugung eine Julia-Menge statt einer\n" -#~ "Mandelbrotmenge aus.\n" -#~ "Bitschalter, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" +#~ "Kartengenerierungsattribute speziell für Kartengenerator v7.\n" +#~ "„ridges“ sind die Flüsse.\n" +#~ "Flags, welche in der Bitschalterzeichenkette nicht angegeben sind,\n" #~ "werden von der Standardeinstellung unverändert gelassen.\n" -#~ "Bitschalter, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +#~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" #~ "zu deaktivieren." #~ msgid "" -#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -#~ "Range roughly -2 to 2." +#~ "Map generation attributes specific to Mapgen Valleys.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them.\n" +#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome " +#~ "issues.\n" +#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where " +#~ "water would tend to pool. It may interfere with delicately adjusted " +#~ "biomes." #~ msgstr "" -#~ "Madnelbrotmenge: W-Koordinate des generierten 3D-Ausschnitts der 4D-" -#~ "Form.\n" -#~ "Die Weite liegt grob zwischen -2 und 2." +#~ "Kartengenerierungsattribute speziell für den Täler-Kartengenerator.\n" +#~ "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" +#~ "werden von der Standardeinstellung unverändert gelassen.\n" +#~ "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" +#~ "zu deaktivieren.\n" +#~ "„altitude_chill“ macht höhere Höhen kälter, was zu einigen Biomproblemen " +#~ "führen könnte.\n" +#~ "„humid_rivers“ modifiziert die Luftfeuchtigkeit um Flüssen und in " +#~ "Gebieten, in denen das Wasser sich in Pfützen ansammeln würde.\n" +#~ "Dies könnte mit fein abgestimmten Biomen zu Konflikten führen." -#~ msgid "" -#~ "Mandelbrot set: Iterations of the recursive function.\n" -#~ "Controls scale of finest detail." -#~ msgstr "" -#~ "Mandelbrotmenge: Iterationen der rekursiven Funktion.\n" -#~ "Steuert die Skalierung mit einem sehr hohem Detailgrad." +#~ msgid "No!!!" +#~ msgstr "Nein!!!" -#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -#~ msgstr "Mandelbrotmenge: Approximative (X,Y,Z)-Skalierungen in Nodes." +#~ msgid "Generate Normalmaps" +#~ msgstr "Normalmaps generieren" -#~ msgid "" -#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -#~ msgstr "" -#~ "Mandelbrotmenge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" -#~ "Reichweite liegt grob von -2 bis 2, wird mit m_scale für\n" -#~ "Versätze in Nodes multipliziert." +#~ msgid "Public Serverlist" +#~ msgstr "Öffentliche Serverliste" -#~ msgid "" -#~ "Key for increasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgstr "" -#~ "Taste zur Erhöhung der Sichtweite. Verändert die minimale Sichtweite.\n" -#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" - -#~ msgid "" -#~ "Key for decreasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgstr "" -#~ "Taste zur Reduzierung der Sichtweite. Verändert die minimale Sichtweite.\n" -#~ "Siehe http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" - -#~ msgid "" -#~ "Julia set: W value determining the 4D shape.\n" -#~ "Range roughly -2 to 2." -#~ msgstr "" -#~ "Julia-Menge: W-Wert, der die 4D-Form festlegt.\n" -#~ "Weite liegt grob zwischen -2 und 2." - -#~ msgid "" -#~ "Julia set: (X,Y,Z) offsets from world centre.\n" -#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -#~ msgstr "" -#~ "Julia-Menge: (X,Y,Z)-Versatz vom Mittelpunkt der Welt.\n" -#~ "Reichweite liegt grob von -2 bis 2, wird mit j_scale für Versätze in\n" -#~ "Nodes multipliziert." - -#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." -#~ msgstr "Blöcke bei Auswahl aufleuchten lassen (Deaktiviert die Auswahlbox)." - -#~ msgid "" -#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " -#~ "completely.\n" -#~ "Note that this is not quite optimized and that smooth lighting on the\n" -#~ "water surface doesn't work with this." -#~ msgstr "" -#~ "Eine etwas niedrigere Wasseroberfläche aktivieren, damit der Node\n" -#~ "nicht vollständig „gefüllt“ wird. Beachten Sie, dass dies nicht wirklich\n" -#~ "optimiert wurde, und dass weiches Licht auf der Wasseroberfläche\n" -#~ "nicht mit dieser Einstellung funktioniert." - -#~ msgid "Item textures..." -#~ msgstr "Inventarbilder ..." +#~ msgid "No of course not!" +#~ msgstr "Nein, natürlich nicht!" diff --git a/po/eo/minetest.po b/po/eo/minetest.po index 79e0f568..d1c137f2 100644 --- a/po/eo/minetest.po +++ b/po/eo/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2015-09-13 12:36+0200\n" "Last-Translator: Tim \n" "Language-Team: Esperanto \n" -"Language-Team: Spanish " -"\n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,6 +75,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nosotros soportamos versiones de protocolo entre la versión $1 y $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -180,6 +181,12 @@ msgstr "No tienes sub-juegos instalados." msgid "Are you sure you want to delete \"$1\"?" msgstr "¿Realmente desea borrar \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Borrar" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: Error al borrar \"$1\"" @@ -188,23 +195,10 @@ msgstr "Modmgr: Error al borrar \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: Ruta del mod \"$1\" inválida" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "¡No, claro que no!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Sí" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "¿Eliminar el mundo \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "No" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Aceptar" @@ -421,7 +415,8 @@ msgid "Uninstall selected modpack" msgstr "Desinstalar el paquete seleccionado" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Dirección / puerto:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -440,18 +435,18 @@ msgstr "Modo creativo" msgid "Damage enabled" msgstr "Daño activado" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Borrar" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nombre / contraseña:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Del. Favorite" +msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Lista de servidores públicos" +msgid "Favorite" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nombre / contraseña:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -476,7 +471,7 @@ msgid "Enable Damage" msgstr "Permitir daños" # Los dos puntos son intencionados. -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nombre / contraseña" @@ -546,8 +541,9 @@ msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?" msgid "Bilinear Filter" msgstr "Filtrado bilineal" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Mapeado de relieve" #: builtin/mainmenu/tab_settings.lua @@ -559,18 +555,10 @@ msgstr "Configurar teclas" msgid "Connected Glass" msgstr "Vidrio Encadenado" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Activar Partículas" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Hojas elegantes" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Generar mapas normales" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mipmap" @@ -579,6 +567,10 @@ msgstr "Mipmap" msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Filtro aniso." +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "No" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Sin Filtrado" @@ -588,18 +580,24 @@ msgid "No Mipmap" msgstr "Sin Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "¡¡¡No!!!" +#, fuzzy +msgid "Node Highlighting" +msgstr "Resaltado de los nodos" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Resaltado de los nodos" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Ninguno" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Mapeado de relieve" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Hojas opacas" @@ -612,6 +610,11 @@ msgstr "Agua opaca" msgid "Parallax Occlusion" msgstr "Oclusión de paralaje" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Activar Partículas" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Configuración" @@ -636,6 +639,11 @@ msgstr "Texturizado:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Para habilitar los sombreadores debe utilizar el controlador OpenGL." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mapeado de relieve" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Umbral táctil (px)" @@ -656,6 +664,10 @@ msgstr "Movimiento de Plantas" msgid "Waving Water" msgstr "Oleaje" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Sí" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Configurar mods" @@ -861,10 +873,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Definiciones de nodos..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Continuar" - #: src/game.cpp msgid "Resolving address..." msgstr "Resolviendo dirección..." @@ -885,13 +893,17 @@ msgstr "Volumen del sonido" msgid "You died." msgstr "Has muerto." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "aceptar" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Ingresar " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "aceptar" +msgid "Proceed" +msgstr "Continuar" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1354,8 +1366,8 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"Una semilla de mapa para un mapa nuevo, deja vacío para una semilla al azar." -"\n" +"Una semilla de mapa para un mapa nuevo, deja vacío para una semilla al " +"azar.\n" "Será anulado si se crea un nuevo mundo en el menú principal." #: src/settings_translation_file.cpp @@ -1377,6 +1389,16 @@ msgstr "Limite absoluto de colas emergentes" msgid "Acceleration in air" msgstr "Aceleración en el aire" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Rango de bloque activo" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Rango de bloque activo" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Rango de bloque activo" @@ -1400,8 +1422,8 @@ msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" -"Ajustar la configuración de puntos por pulgada a tu pantalla (único no " -"X11/Android) p.ej. para pantallas 4K." +"Ajustar la configuración de puntos por pulgada a tu pantalla (único no X11/" +"Android) p.ej. para pantallas 4K." #: src/settings_translation_file.cpp msgid "" @@ -1447,8 +1469,8 @@ msgid "" "minetest.net." msgstr "" "Anunciar a esta lista de servidores.\n" -"Si deseas anunciar tu dirección ipv6, usa serverlist_url = " -"v6.servers.minetest.net." +"Si deseas anunciar tu dirección ipv6, usa serverlist_url = v6.servers." +"minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1475,6 +1497,11 @@ msgstr "Oleaje en el agua" msgid "Basic" msgstr "Básico" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Privilegios por defecto" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Filtrado bilineal" @@ -1493,6 +1520,10 @@ msgstr "" msgid "Build inside player" msgstr "Construir dentro de jugador" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Mapeado de relieve" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Suavizado de cámara" @@ -1513,6 +1544,10 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1677,6 +1712,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Mensaje de error" @@ -2064,6 +2103,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Tecla Avanzar" @@ -2130,9 +2173,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2605,6 +2650,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2690,41 +2743,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2774,6 +2836,11 @@ msgstr "Generador de mapas" msgid "Mapgen flat" msgstr "Generador de mapas" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Generador de mapas" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2827,6 +2894,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Generador de mapas" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Generador de mapas" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2898,6 +2970,11 @@ msgstr "Generador de mapas" msgid "Mapgen v5" msgstr "Generador de mapas" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Generador de mapas" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2984,6 +3061,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Generador de mapas" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Generador de mapas" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3276,6 +3358,10 @@ msgstr "" msgid "Node highlighting" msgstr "Resaltado de los nodos" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3398,6 +3484,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3506,6 +3596,23 @@ msgstr "Captura de pantalla" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Captura de pantalla" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Captura de pantalla" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3597,6 +3704,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3662,6 +3773,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3736,6 +3851,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3766,11 +3885,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Mapeado de relieve" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4022,6 +4136,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4056,35 +4178,47 @@ msgstr "" msgid "cURL timeout" msgstr "Tiempo de espera de cURL" -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Desactivar paquete" +#~ msgid "Preload inventory textures" +#~ msgstr "Precarga de las texturas del inventario" -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "Activado" +#~ msgid "Reset singleplayer world" +#~ msgstr "Reiniciar mundo de un jugador" -#~ msgid "Rendering:" -#~ msgstr "Renderizado:" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Factor de escala aplicado a los elementos del menú: " + +#~ msgid "Touch free target" +#~ msgstr "Tocar para interactuar" + +#~ msgid " KB/s" +#~ msgstr " KB/s" + +#~ msgid " MB/s" +#~ msgstr " MB/s" #~ msgid "Restart minetest for driver change to take effect" #~ msgstr "" #~ "Reinicia minetest para que los cambios en el controlador tengan efecto" -#~ msgid " MB/s" -#~ msgstr " MB/s" +#~ msgid "Rendering:" +#~ msgstr "Renderizado:" -#~ msgid " KB/s" -#~ msgstr " KB/s" +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Activado" -#~ msgid "Touch free target" -#~ msgstr "Tocar para interactuar" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Desactivar paquete" -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Factor de escala aplicado a los elementos del menú: " +#~ msgid "No!!!" +#~ msgstr "¡¡¡No!!!" -#~ msgid "Reset singleplayer world" -#~ msgstr "Reiniciar mundo de un jugador" +#~ msgid "Generate Normalmaps" +#~ msgstr "Generar mapas normales" -#~ msgid "Preload inventory textures" -#~ msgstr "Precarga de las texturas del inventario" +#~ msgid "Public Serverlist" +#~ msgstr "Lista de servidores públicos" + +#~ msgid "No of course not!" +#~ msgstr "¡No, claro que no!" diff --git a/po/et/minetest.po b/po/et/minetest.po index e1b0278e..15cfe12a 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-09 13:53+0000\n" "Last-Translator: Jan Harald \n" -"Language-Team: Estonian " -"\n" +"Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Meie toetame protokolli versioone $1 kuni $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -177,6 +178,12 @@ msgstr "Sa ei ole alammänge paigaldanud." msgid "Are you sure you want to delete \"$1\"?" msgstr "" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Kustuta" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "" @@ -185,23 +192,10 @@ msgstr "" msgid "Modmgr: invalid modpath \"$1\"" msgstr "" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Jah" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Kas kustutada maailm \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Ei" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Nõustu" @@ -410,7 +404,8 @@ msgid "Uninstall selected modpack" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Aadress / Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -429,18 +424,20 @@ msgstr "Loov režiim" msgid "Damage enabled" msgstr "Kahjustamine lubatud" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Kustuta" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nimi / Parool:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Lemmikud:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Avalikud serverid" +#, fuzzy +msgid "Favorite" +msgstr "Lemmikud:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nimi / Parool:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -465,7 +462,7 @@ msgstr "Kujunduslik mängumood" msgid "Enable Damage" msgstr "Lülita valu sisse" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nimi/Parool" @@ -538,9 +535,9 @@ msgstr "Üksikmäng" msgid "Bilinear Filter" msgstr "Bi-lineaarsed Filtreerimine" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Bumpmapping" +msgid "Bump Mapping" msgstr "Väga hea kvaliteet" #: builtin/mainmenu/tab_settings.lua @@ -552,20 +549,11 @@ msgstr "Vaheta nuppe" msgid "Connected Glass" msgstr "Liitu" -#: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "Enable Particles" -msgstr "Luba kõik" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Fancy Leaves" msgstr "Läbipaistmatu vesi" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Mipmap" @@ -575,6 +563,10 @@ msgstr "Väga hea kvaliteet" msgid "Mipmap + Aniso. Filter" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Ei" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "No Filter" @@ -586,18 +578,24 @@ msgid "No Mipmap" msgstr "Väga hea kvaliteet" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "" +#, fuzzy +msgid "Node Highlighting" +msgstr "Ilus valgustus" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Ilus valgustus" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Väga hea kvaliteet" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Opaque Leaves" @@ -612,6 +610,11 @@ msgstr "Läbipaistmatu vesi" msgid "Parallax Occlusion" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Luba kõik" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Sätted" @@ -638,6 +641,11 @@ msgstr "" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Aktiveerimiseks varjud, nad vajavad OpenGL draiver." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Väga hea kvaliteet" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "" @@ -662,6 +670,10 @@ msgstr "Uhked puud" msgid "Waving Water" msgstr "Uhked puud" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Jah" + #: builtin/mainmenu/tab_simple_main.lua #, fuzzy msgid "Config mods" @@ -847,10 +859,6 @@ msgstr "" msgid "Node definitions..." msgstr "" -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Jätka" - #: src/game.cpp msgid "Resolving address..." msgstr "" @@ -871,13 +879,17 @@ msgstr "Hääle volüüm" msgid "You died." msgstr "Sa surid." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "" #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "" +msgid "Proceed" +msgstr "Jätka" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1348,6 +1360,14 @@ msgstr "" msgid "Acceleration in air" msgstr "" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "" @@ -1436,6 +1456,10 @@ msgstr "" msgid "Basic" msgstr "" +#: src/settings_translation_file.cpp +msgid "Basic Privileges" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Bilinear filtering" @@ -1454,6 +1478,11 @@ msgstr "" msgid "Build inside player" msgstr "Mitmikmäng" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Väga hea kvaliteet" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1474,6 +1503,10 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1642,6 +1675,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" @@ -2035,6 +2072,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Forward key" @@ -2101,9 +2142,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2578,6 +2621,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2665,41 +2716,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2750,6 +2810,11 @@ msgstr "Põlvkonna kaardid" msgid "Mapgen flat" msgstr "Põlvkonna kaardid" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Põlvkonna kaardid" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2803,6 +2868,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Põlvkonna kaardid" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Põlvkonna kaardid" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2874,6 +2944,11 @@ msgstr "Põlvkonna kaardid" msgid "Mapgen v5" msgstr "Põlvkonna kaardid" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Põlvkonna kaardid" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2960,6 +3035,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Põlvkonna kaardid" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Põlvkonna kaardid" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3253,6 +3333,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3369,6 +3453,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3480,6 +3568,23 @@ msgstr "Mängupilt" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Mängupilt" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Mängupilt" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3574,6 +3679,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3640,6 +3749,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3714,6 +3827,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3744,11 +3861,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Väga hea kvaliteet" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4001,6 +4113,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4036,66 +4156,55 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Lülita kõik välja" +#~ msgid "Downloading" +#~ msgstr "Alla" -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "Sisse lülitatud" - -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Mäng" - -#~ msgid "GAMES" -#~ msgstr "MÄNGUD" - -#~ msgid "new game" -#~ msgstr "uus mängu" - -#~ msgid "EDIT GAME" -#~ msgstr "MUUDA MÄNGU" - -#, fuzzy -#~ msgid "Remove selected mod" -#~ msgstr "Eemalda valitud muutus" - -#, fuzzy -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Lisama muutus" - -#~ msgid "Favorites:" -#~ msgstr "Lemmikud:" - -#~ msgid "Name" -#~ msgstr "Nimi" - -#~ msgid "Password" -#~ msgstr "Parool" - -#~ msgid "SETTINGS" -#~ msgstr "Seaded" - -#~ msgid "Preload item visuals" -#~ msgstr "Lae asjade visuaale" - -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Löppev vedelik" - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n" -#~ "Need lülitatakse sisse kohe pärast sätete salvestamist." +#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut " +#~ "asja" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n" -#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon." +#~ msgid "is required by:" +#~ msgstr "Seda vajavad:" + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguratsioon salvestatud. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Hoiatus: Konfiguratsioon pole kindel." + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" + +#~ msgid "Show Public" +#~ msgstr "Näita avalikke" + +#~ msgid "Show Favorites" +#~ msgstr "Näita lemmikuid" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." + +#~ msgid "Create world" +#~ msgstr "Loo maailm" + +#~ msgid "Address required." +#~ msgstr "IP on vajalkik." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" + +#~ msgid "Files to be deleted" +#~ msgstr "Failid mida kustutada" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus" #~ msgid "" #~ "Default Controls:\n" @@ -4122,53 +4231,64 @@ msgstr "" #~ "- ESC: Menüü\n" #~ "- T: Jututupa\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Kõigi maailma failide kustutamine ebaõnnestus" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" - -#~ msgid "Files to be deleted" -#~ msgstr "Failid mida kustutada" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" - -#~ msgid "Address required." -#~ msgstr "IP on vajalkik." - -#~ msgid "Create world" -#~ msgstr "Loo maailm" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." - -#~ msgid "Show Favorites" -#~ msgstr "Näita lemmikuid" - -#~ msgid "Show Public" -#~ msgstr "Näita avalikke" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Hoiatus: Konfiguratsioon pole kindel." - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguratsioon salvestatud. " - -#~ msgid "is required by:" -#~ msgstr "Seda vajavad:" - -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " #~ msgstr "" -#~ "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut " -#~ "asja" +#~ "Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n" +#~ "Nende sätted kustutatakse kui salvestada konfiguratsioon." + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n" +#~ "Need lülitatakse sisse kohe pärast sätete salvestamist." #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Alla" +#~ msgid "Finite Liquid" +#~ msgstr "Löppev vedelik" + +#~ msgid "Preload item visuals" +#~ msgstr "Lae asjade visuaale" + +#~ msgid "SETTINGS" +#~ msgstr "Seaded" + +#~ msgid "Password" +#~ msgstr "Parool" + +#~ msgid "Name" +#~ msgstr "Nimi" + +#, fuzzy +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Lisama muutus" + +#, fuzzy +#~ msgid "Remove selected mod" +#~ msgstr "Eemalda valitud muutus" + +#~ msgid "EDIT GAME" +#~ msgstr "MUUDA MÄNGU" + +#~ msgid "new game" +#~ msgstr "uus mängu" + +#~ msgid "GAMES" +#~ msgstr "MÄNGUD" + +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Mäng" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Sisse lülitatud" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Lülita kõik välja" + +#~ msgid "Public Serverlist" +#~ msgstr "Avalikud serverid" diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 5a17e192..3304ad2e 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-03-25 17:42+0000\n" "Last-Translator: Jean-Patrick G. \n" -"Language-Team: French " -"\n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,6 +73,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nous supportons seulement les versions du protocole entre $1 et $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -177,6 +178,12 @@ msgstr "Vous n'avez pas de jeux installés." msgid "Are you sure you want to delete \"$1\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"$1\" ?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Supprimer" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Le gestionnaire de mods n'a pas pu supprimer \"$1\"" @@ -185,23 +192,10 @@ msgstr "Le gestionnaire de mods n'a pas pu supprimer \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Gestionnaire de mods : chemin de mod invalide \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Non, bien sûr que non !" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Oui" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Supprimer le monde \"$1\" ?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Non" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Accepter" @@ -418,7 +412,8 @@ msgid "Uninstall selected modpack" msgstr "Désinstaller le pack de mods" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Adresse / Port :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -437,18 +432,20 @@ msgstr "Mode créatif" msgid "Damage enabled" msgstr "Dégâts activés" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Supprimer" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nom / Mot de passe :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Favoris :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Liste de serveurs publics" +#, fuzzy +msgid "Favorite" +msgstr "Favoris :" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nom / Mot de passe :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -472,7 +469,7 @@ msgstr "Mode créatif" msgid "Enable Damage" msgstr "Activer les dégâts" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nom / Mot de passe" @@ -540,8 +537,9 @@ msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?" msgid "Bilinear Filter" msgstr "Filtrage bilinéaire" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Bump mapping" #: builtin/mainmenu/tab_settings.lua @@ -553,18 +551,10 @@ msgstr "Changer les touches" msgid "Connected Glass" msgstr "Verre unifié" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Activer les particules" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Arbres détaillés" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Normal Mapping" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "MIP mapping" @@ -573,6 +563,10 @@ msgstr "MIP mapping" msgid "Mipmap + Aniso. Filter" msgstr "MIP map + anisotropie" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Non" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Aucun filtre" @@ -582,18 +576,24 @@ msgid "No Mipmap" msgstr "Sans MIP map" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Non !" +#, fuzzy +msgid "Node Highlighting" +msgstr "Surbrillance des blocs" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Surbrillance des blocs" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Aucun" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Échantillonnage de normalmaps" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Arbres minimaux" @@ -606,6 +606,11 @@ msgstr "Eau opaque" msgid "Parallax Occlusion" msgstr "Occlusion parallaxe" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Activer les particules" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Réglages" @@ -630,6 +635,11 @@ msgstr "Textures :" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Sensibilité du toucher (px)" @@ -650,6 +660,10 @@ msgstr "Plantes ondulantes" msgid "Waving Water" msgstr "Eau ondulante" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Oui" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Configurer les mods" @@ -849,10 +863,6 @@ msgstr "Mo/s" msgid "Node definitions..." msgstr "Définitions des blocs..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Procéder" - #: src/game.cpp msgid "Resolving address..." msgstr "Résolution de l'adresse..." @@ -873,13 +883,17 @@ msgstr "Volume du son" msgid "You died." msgstr "Vous êtes mort." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "ok" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Entrer " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "ok" +msgid "Proceed" +msgstr "Procéder" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1361,6 +1375,16 @@ msgstr "Limite absolue des files émergentes" msgid "Acceleration in air" msgstr "Accélération en l'air" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Portée des mapblocks actifs" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Portée des mapblocks actifs" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Portée des mapblocks actifs" @@ -1458,6 +1482,11 @@ msgstr "Hauteur du terrain de base" msgid "Basic" msgstr "Principal" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Privilèges par défaut" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Filtrage bilinéaire" @@ -1474,6 +1503,10 @@ msgstr "Bits par pixel (profondeur de couleur) en mode plein-écran." msgid "Build inside player" msgstr "Placement de bloc à la position du joueur" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bump mapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Lissage du mouvement de la caméra" @@ -1494,6 +1527,11 @@ msgstr "Bruit de cave #1" msgid "Cave noise #2" msgstr "Bruit de cave #2" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "Largeur de la fenêtre" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "Les caves et tunnels se forment à l'intersection de deux bruits" @@ -1664,6 +1702,10 @@ msgstr "Contrôle l'élévation/profondeur des dépressions lacustres." msgid "Controls steepness/height of hills." msgstr "Contrôle l'élévation/hauteur des collines." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Message d'interruption du serveur" @@ -2103,6 +2145,11 @@ msgstr "" msgid "Font size" msgstr "Taille de la police" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Format of screenshots." +msgstr "Chemin où les captures d'écran sont sauvegardées." + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Avancer" @@ -2175,9 +2222,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributs spécifiques à Mapgen V6.\n" "Quand les terrains neigeux sont activés, les jungles sont activés et les " @@ -2797,6 +2846,14 @@ msgid "" "updated over network." msgstr "Temps d'intervalle entre la mise à jour des objets sur le réseau." +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2900,41 +2957,16 @@ msgstr "Chemin du monde" #, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"'altitude_chill' makes higher elevations colder, which may cause biome " "issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." -msgstr "" -"Attributs généraux de la génération de terrain.\n" -"Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent leurs " -"valeurs par défaut." - -#: src/settings_translation_file.cpp -#, fuzzy -msgid "" -"Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." -msgstr "" -"Attributs de terrain spécifiques à Mapgen V7.\n" -"'ridges' sont les rivières.\n" -"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " -"défaut.\n" -"Les drapeaux commençant par \"non\" sont désactivés." - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributs spécifiques à Mapgen V6.\n" "Quand les terrains neigeux sont activés, les jungles sont activés et les " @@ -2944,12 +2976,15 @@ msgstr "" "Les drapeaux commençant par \"non\" sont désactivés." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributs de terrain spécifiques à Mapgen V7.\n" "'ridges' sont les rivières.\n" @@ -2957,6 +2992,43 @@ msgstr "" "défaut.\n" "Les drapeaux commençant par \"non\" sont désactivés." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"Attributs spécifiques à Mapgen V6.\n" +"Quand les terrains neigeux sont activés, les jungles sont activés et les " +"drapeaux jungle est ignoré.\n" +"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " +"défaut.\n" +"Les drapeaux commençant par \"non\" sont désactivés." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v7.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"Attributs spécifiques à Mapgen V6.\n" +"Quand les terrains neigeux sont activés, les jungles sont activés et les " +"drapeaux jungle est ignoré.\n" +"Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs par " +"défaut.\n" +"Les drapeaux commençant par \"non\" sont désactivés." + #: src/settings_translation_file.cpp msgid "Map generation limit" msgstr "Limites de génération du terrain" @@ -3003,6 +3075,11 @@ msgstr "Drapeaux de génération de terrain" msgid "Mapgen flat" msgstr "Drapeaux de génération de terrain" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Mapgen Julia : échelles fractales" + #: src/settings_translation_file.cpp #, fuzzy msgid "Mapgen flat cave1 noise parameters" @@ -3060,6 +3137,11 @@ msgstr "Mapgen V6 : paramètres de bruit du terrain de base" msgid "Mapgen fractal" msgstr "Fractales de la génération de terrain" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Mapgen Julia : couche fractale W" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "Mapgen V5 : paramètres de bruit cave1" @@ -3129,6 +3211,11 @@ msgstr "Nom du générateur de carte" msgid "Mapgen v5" msgstr "Mapgen V5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Mapgen Julia : échelles fractales" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "Mapgen V5 : paramètres de bruit cave1" @@ -3213,6 +3300,11 @@ msgstr "Mapgen V6 : paramètres de bruit des arbres" msgid "Mapgen v7" msgstr "Mapgen V7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Mapgen Julia : échelles fractales" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "Mapgen V7 : paramètres de bruit cave1" @@ -3534,6 +3626,11 @@ msgstr "Mode sans collision" msgid "Node highlighting" msgstr "Eclairage des blocs" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "NodeTimer interval" +msgstr "Intervalle d'envoi du temps" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3670,6 +3767,10 @@ msgstr "" "Empêcher les mods d'exécuter des fonctions insécurisées (comme des commandes " "système)." +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3790,6 +3891,23 @@ msgstr "Capture d'écran" msgid "Screenshot folder" msgstr "Dossier des captures d'écran" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Dossier des captures d'écran" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Capture d'écran" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "Sécurité" @@ -3892,6 +4010,10 @@ msgstr "Forme de la mini-carte. Activé = ronde, désactivé = carré." msgid "Show debug info" msgstr "Afficher les infos de débogage" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "Message d'arrêt du serveur" @@ -3964,6 +4086,10 @@ msgstr "Force de l'occlusion parallaxe." msgid "Strict protocol checking" msgstr "Vérification stricte du protocole" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "SQLite synchronisé" @@ -4052,6 +4178,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "Cette police sera utilisée pour certaines langues." +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -4091,11 +4221,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Changer de caméra" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Mip-mapping" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Délais d'apparition des infobulles" @@ -4392,6 +4517,14 @@ msgstr "" "Détermine la visibilité des infos de débogage du client (même effet que " "taper F5)." +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Width component of the initial window size." @@ -4429,107 +4562,237 @@ msgstr "Limite parallèle de cURL" msgid "cURL timeout" msgstr "Délais d'interruption de cURL" -#~ msgid "\"" -#~ msgstr "\"" - -#~ msgid "Enable a bit lower water surface, so it doesn't " -#~ msgstr "" -#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas " -#~ "le bloc complètement.\n" -#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux " -#~ "ne fonctionne pas dessus. " - -#~ msgid "If disabled " -#~ msgstr "Si désactivé " - -#~ msgid "If enabled, " -#~ msgstr "Si activé, " - -#~ msgid "Rendering:" -#~ msgstr "Affichage :" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet" - -#~ msgid "Game Name" -#~ msgstr "Nom du jeu" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "JEUX" - -#~ msgid "Mods:" -#~ msgstr "Mods :" - -#~ msgid "new game" -#~ msgstr "nouveau jeu" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFIER LE JEU" - -#~ msgid "Remove selected mod" -#~ msgstr "Supprimer le mod sélectionné" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Ajouter un mod" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Favoris :" - -#~ msgid "START SERVER" -#~ msgstr "DÉMARRER LE SERVEUR" - -#~ msgid "Name" -#~ msgstr "Nom" - -#~ msgid "Password" -#~ msgstr "Mot de passe" - -#~ msgid "SETTINGS" -#~ msgstr "PARAMÈTRES" - -#~ msgid "Preload item visuals" -#~ msgstr "Précharger les objets" - -#~ msgid "Finite Liquid" -#~ msgstr "Liquides limités" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "PARTIE SOLO" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACKS DE TEXTURES" - -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "Add mod:" -#~ msgstr "Ajouter un mod :" - -#~ msgid "Local install" -#~ msgstr "Installation locale" +#~ msgid "Item textures..." +#~ msgstr "Textures d'items..." #~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." #~ msgstr "" -#~ "Attention : certains mods ne sont pas encore configurés.\n" -#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. " +#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne " +#~ "submerge pas\n" +#~ "entièrement le bloc voisin.\n" +#~ "Cette fonctionnalité est encore expérimentale et la lumière douce " +#~ "n’apparaît pas à la\n" +#~ "surface de l'eau." + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "" +#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de " +#~ "sélection)." #~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ "Julia set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." #~ msgstr "" -#~ "Attention : certains mods configurés sont introuvables.\n" -#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. " +#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n" +#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler " +#~ "en nombre de blocs." -#~ msgid "Delete map" -#~ msgstr "Supprimer la carte" +#~ msgid "" +#~ "Julia set: W value determining the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Série Julia : valeur W déterminant la forme 4D.\n" +#~ "La portée est environ entre -2 et 2." + +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Touche pour réduire la distance de vue. Modifie la distance de vue " +#~ "minimale.\n" +#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue " +#~ "minimale.\n" +#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." +#~ msgstr "" +#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n" +#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler " +#~ "en nombre de blocs." + +#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." +#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs." + +#~ msgid "" +#~ "Mandelbrot set: Iterations of the recursive function.\n" +#~ "Controls scale of finest detail." +#~ msgstr "" +#~ "Série Mandelbrot : itérations de la fonction récursive.\n" +#~ "Contrôle l'échelle du détail le plus subtil." + +#~ msgid "" +#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" +#~ "Range roughly -2 to 2." +#~ msgstr "" +#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n" +#~ "La portée est environ entre -2 et 2." + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen fractal.\n" +#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." +#~ msgstr "" +#~ "Attributs de terrain spécifiques à Mapgen V7.\n" +#~ "'ridges' sont les rivières.\n" +#~ "Les drapeaux qui ne sont spécifiés dans le champ gardent leurs valeurs " +#~ "par défaut.\n" +#~ "Les drapeaux commençant par \"non\" sont désactivés." + +#~ msgid "Mapgen fractal mandelbrot iterations" +#~ msgstr "Mapgen Mandelbrot : itérations fractales" + +#~ msgid "Mapgen fractal mandelbrot offset" +#~ msgstr "Mapgen Mandelbrot : décalages fractals" + +#~ msgid "Mapgen fractal mandelbrot scale" +#~ msgstr "Mapgen Mandelbrot : échelles fractales" + +#~ msgid "Mapgen fractal mandelbrot slice w" +#~ msgstr "Mapgen Mandelbrot : couche fractale W" + +#~ msgid "" +#~ "Maximum distance above water level for player spawn.\n" +#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" +#~ "Smaller values may result in a suitable spawn point not being found,\n" +#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." +#~ msgstr "" +#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n" +#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = " +#~ "0, z = 0).\n" +#~ "Des valeurs plus petites peut résulter à une location de spawn non-" +#~ "trouvée, résultant\n" +#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol." + +#~ msgid "" +#~ "Minimum wanted FPS.\n" +#~ "The amount of rendered stuff is dynamically set according to this. and " +#~ "viewing range min and max." +#~ msgstr "" +#~ "Images par seconde (FPS) minimum.\n" +#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la " +#~ "distance de vue (minimale et maximale)." + +#~ msgid "New style water" +#~ msgstr "Nouveau style de liquide" + +#~ msgid "" +#~ "Pre-generate all item visuals used in the inventory.\n" +#~ "This increases startup time, but runs smoother in-game.\n" +#~ "The generated textures can easily exceed your VRAM, causing artifacts in " +#~ "the inventory." +#~ msgstr "" +#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n" +#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus " +#~ "fluides.\n" +#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des " +#~ "bugs dans votre inventaire." + +#~ msgid "Preload inventory textures" +#~ msgstr "Pré-chargement des textures d'inventaire" + +#~ msgid "" +#~ "The allowed adjustment range for the automatic rendering range " +#~ "adjustment.\n" +#~ "Set this to be equal to viewing range minimum to disable the auto-" +#~ "adjustment algorithm." +#~ msgstr "" +#~ "Distance d'affichage maximum.\n" +#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n" +#~ "l'auto-ajustement dynamique de la distance d'affichage." + +#~ msgid "Vertical initial window size." +#~ msgstr "Largeur initiale de la fenêtre de jeu." + +#~ msgid "Vertical spawn range" +#~ msgstr "Portée verticale du spawn" + +#~ msgid "Viewing range minimum" +#~ msgstr "Distance de vue minimum" + +#~ msgid "Wanted FPS" +#~ msgstr "FPS minimum" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Réinitialiser le monde" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Taille appliquée aux menus : " + +#~ msgid "Downloading" +#~ msgstr "Téléchargement" + +#~ msgid " KB/s" +#~ msgstr " Ko/s" + +#~ msgid " MB/s" +#~ msgstr " Mo/s" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "" +#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet" + +#~ msgid "is required by:" +#~ msgstr "est requis par :" + +#~ msgid "Configuration saved. " +#~ msgstr "Configuration enregistrée. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Attention : configuration incorrecte. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "" +#~ "Impossible de créer le monde : le nom contient des caractères invalides" + +#~ msgid "Show Public" +#~ msgstr "Voir les serveurs publics" + +#~ msgid "Show Favorites" +#~ msgstr "Voir les serveurs favoris" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Laisser l'adresse vide pour lancer un serveur local." + +#~ msgid "Create world" +#~ msgstr "Créer un monde" + +#~ msgid "Address required." +#~ msgstr "Adresse requise." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné" + +#~ msgid "Files to be deleted" +#~ msgstr "Fichiers à supprimer" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Impossible de configurer ce monde : aucune sélection active" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés" #~ msgid "" #~ "Default Controls:\n" @@ -4556,145 +4819,108 @@ msgstr "Délais d'interruption de cURL" #~ "- Échap : ce menu\n" #~ "- T : discuter\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Tous les fichiers du monde n'ont pu être supprimés" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Impossible de configurer ce monde : aucune sélection active" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Impossible de créer le monde : aucun jeu n'est présent" - -#~ msgid "Files to be deleted" -#~ msgstr "Fichiers à supprimer" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Impossible de supprimer le monde : rien n'est sélectionné" - -#~ msgid "Address required." -#~ msgstr "Adresse requise." - -#~ msgid "Create world" -#~ msgstr "Créer un monde" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Laisser l'adresse vide pour lancer un serveur local." - -#~ msgid "Show Favorites" -#~ msgstr "Voir les serveurs favoris" - -#~ msgid "Show Public" -#~ msgstr "Voir les serveurs publics" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "" -#~ "Impossible de créer le monde : le nom contient des caractères invalides" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Attention : configuration incorrecte. " - -#~ msgid "Configuration saved. " -#~ msgstr "Configuration enregistrée. " - -#~ msgid "is required by:" -#~ msgstr "est requis par :" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "" -#~ "Clic gauche : déplacer tous les objets -- Clic droit : déplacer un objet" - -#~ msgid " MB/s" -#~ msgstr " Mo/s" - -#~ msgid " KB/s" -#~ msgstr " Ko/s" - -#~ msgid "Downloading" -#~ msgstr "Téléchargement" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Taille appliquée aux menus : " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Réinitialiser le monde" - -#~ msgid "Wanted FPS" -#~ msgstr "FPS minimum" - -#~ msgid "Viewing range minimum" -#~ msgstr "Distance de vue minimum" - -#~ msgid "Vertical spawn range" -#~ msgstr "Portée verticale du spawn" - -#~ msgid "Vertical initial window size." -#~ msgstr "Largeur initiale de la fenêtre de jeu." +#~ msgid "Delete map" +#~ msgstr "Supprimer la carte" #~ msgid "" -#~ "The allowed adjustment range for the automatic rendering range " -#~ "adjustment.\n" -#~ "Set this to be equal to viewing range minimum to disable the auto-" -#~ "adjustment algorithm." +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " #~ msgstr "" -#~ "Distance d'affichage maximum.\n" -#~ "Définir cette valeur égale à la distance de vue minimum pour désactiver\n" -#~ "l'auto-ajustement dynamique de la distance d'affichage." - -#~ msgid "Preload inventory textures" -#~ msgstr "Pré-chargement des textures d'inventaire" +#~ "Attention : certains mods configurés sont introuvables.\n" +#~ "Leurs réglages seront effacés quand vous enregistrerez la configuration. " #~ msgid "" -#~ "Pre-generate all item visuals used in the inventory.\n" -#~ "This increases startup time, but runs smoother in-game.\n" -#~ "The generated textures can easily exceed your VRAM, causing artifacts in " -#~ "the inventory." +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " #~ msgstr "" -#~ "Pré-générer tous les visuels d'items utilisés dans l'inventaire.\n" -#~ "Cela augmente le temps de démarrage, mais rend les inventaires plus " -#~ "fluides.\n" -#~ "Les textures générées peuvent facilement déborder votre VRAM, causant des " -#~ "bugs dans votre inventaire." +#~ "Attention : certains mods ne sont pas encore configurés.\n" +#~ "Ils seront activés par défaut quand vous enregistrerez la configuration. " -#~ msgid "New style water" -#~ msgstr "Nouveau style de liquide" +#~ msgid "Local install" +#~ msgstr "Installation locale" + +#~ msgid "Add mod:" +#~ msgstr "Ajouter un mod :" + +#~ msgid "MODS" +#~ msgstr "MODS" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACKS DE TEXTURES" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "PARTIE SOLO" + +#~ msgid "Finite Liquid" +#~ msgstr "Liquides limités" + +#~ msgid "Preload item visuals" +#~ msgstr "Précharger les objets" + +#~ msgid "SETTINGS" +#~ msgstr "PARAMÈTRES" + +#~ msgid "Password" +#~ msgstr "Mot de passe" + +#~ msgid "Name" +#~ msgstr "Nom" + +#~ msgid "START SERVER" +#~ msgstr "DÉMARRER LE SERVEUR" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Ajouter un mod" + +#~ msgid "Remove selected mod" +#~ msgstr "Supprimer le mod sélectionné" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFIER LE JEU" + +#~ msgid "new game" +#~ msgstr "nouveau jeu" + +#~ msgid "Mods:" +#~ msgstr "Mods :" + +#~ msgid "GAMES" +#~ msgstr "JEUX" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nom du jeu" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Redémarrez Minetest pour que le changement du pilote prenne effet" + +#~ msgid "Rendering:" +#~ msgstr "Affichage :" + +#~ msgid "If enabled, " +#~ msgstr "Si activé, " + +#~ msgid "If disabled " +#~ msgstr "Si désactivé " + +#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgstr "" +#~ "Rend l'eau légèrement plus basse, de façon à ce qu'elle ne submerge pas " +#~ "le bloc complètement.\n" +#~ "Note : cette fonctionnalité est assez expérimentale et l'éclairage doux " +#~ "ne fonctionne pas dessus. " + +#~ msgid "\"" +#~ msgstr "\"" #~ msgid "" -#~ "Minimum wanted FPS.\n" -#~ "The amount of rendered stuff is dynamically set according to this. and " -#~ "viewing range min and max." -#~ msgstr "" -#~ "Images par seconde (FPS) minimum.\n" -#~ "Le niveau de rendu est dynamiquement adapté selon ce paramètre et la " -#~ "distance de vue (minimale et maximale)." - -#~ msgid "" -#~ "Maximum distance above water level for player spawn.\n" -#~ "Larger values result in spawn points closer to (x = 0, z = 0).\n" -#~ "Smaller values may result in a suitable spawn point not being found,\n" -#~ "resulting in a spawn at (0, 0, 0) possibly buried underground." -#~ msgstr "" -#~ "Distance maximum au-dessus du niveau de l'eau où le joueur apparaît.\n" -#~ "Des valeurs plus grandes aboutissent à des locations plus proches de (x = " -#~ "0, z = 0).\n" -#~ "Des valeurs plus petites peut résulter à une location de spawn non-" -#~ "trouvée, résultant\n" -#~ "à une location située à (0, 0, 0) probablement enterrée sous le sol." - -#~ msgid "Mapgen fractal mandelbrot slice w" -#~ msgstr "Mapgen Mandelbrot : couche fractale W" - -#~ msgid "Mapgen fractal mandelbrot scale" -#~ msgstr "Mapgen Mandelbrot : échelles fractales" - -#~ msgid "Mapgen fractal mandelbrot offset" -#~ msgstr "Mapgen Mandelbrot : décalages fractals" - -#~ msgid "Mapgen fractal mandelbrot iterations" -#~ msgstr "Mapgen Mandelbrot : itérations fractales" - -#~ msgid "" -#~ "Map generation attributes specific to Mapgen fractal.\n" -#~ "'julia' selects a julia set to be generated instead of a mandelbrot set.\n" +#~ "Map generation attributes specific to Mapgen v7.\n" +#~ "'ridges' are the rivers.\n" #~ "Flags that are not specified in the flag string are not modified from the " #~ "default.\n" #~ "Flags starting with \"no\" are used to explicitly disable them." @@ -4705,85 +4931,30 @@ msgstr "Délais d'interruption de cURL" #~ "par défaut.\n" #~ "Les drapeaux commençant par \"non\" sont désactivés." +#, fuzzy #~ msgid "" -#~ "Mandelbrot set: W co-ordinate of the generated 3D slice of the 4D shape.\n" -#~ "Range roughly -2 to 2." +#~ "Map generation attributes specific to Mapgen Valleys.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them.\n" +#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome " +#~ "issues.\n" +#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where " +#~ "water would tend to pool. It may interfere with delicately adjusted " +#~ "biomes." #~ msgstr "" -#~ "Série Mandelbrot : coordonnée W de la couche 3D de la forme 4D.\n" -#~ "La portée est environ entre -2 et 2." +#~ "Attributs généraux de la génération de terrain.\n" +#~ "Les drapeaux qui ne sont spécifiés dans leur champ respectif gardent " +#~ "leurs valeurs par défaut." -#~ msgid "" -#~ "Mandelbrot set: Iterations of the recursive function.\n" -#~ "Controls scale of finest detail." -#~ msgstr "" -#~ "Série Mandelbrot : itérations de la fonction récursive.\n" -#~ "Contrôle l'échelle du détail le plus subtil." +#~ msgid "No!!!" +#~ msgstr "Non !" -#~ msgid "Mandelbrot set: Approximate (X,Y,Z) scales in nodes." -#~ msgstr "Série Mandelbrot : échelles (X,Y,Z) en blocs." +#~ msgid "Generate Normalmaps" +#~ msgstr "Normal Mapping" -#~ msgid "" -#~ "Mandelbrot set: (X,Y,Z) offsets from world centre.\n" -#~ "Range roughly -2 to 2, multiply by m_scale for offsets in nodes." -#~ msgstr "" -#~ "Série Mandelbrot : décalages (X,Y,Z) à partir du centre du monde.\n" -#~ "La portée est environ entre -2 et 2. Multiplier par m_scale pour décaler " -#~ "en nombre de blocs." +#~ msgid "Public Serverlist" +#~ msgstr "Liste de serveurs publics" -#~ msgid "" -#~ "Key for increasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgstr "" -#~ "Touche pour augmenter la distance de vue. Modifie la distance de vue " -#~ "minimale.\n" -#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" - -#~ msgid "" -#~ "Key for decreasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgstr "" -#~ "Touche pour réduire la distance de vue. Modifie la distance de vue " -#~ "minimale.\n" -#~ "Voir http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" - -#~ msgid "" -#~ "Julia set: W value determining the 4D shape.\n" -#~ "Range roughly -2 to 2." -#~ msgstr "" -#~ "Série Julia : valeur W déterminant la forme 4D.\n" -#~ "La portée est environ entre -2 et 2." - -#~ msgid "" -#~ "Julia set: (X,Y,Z) offsets from world centre.\n" -#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -#~ msgstr "" -#~ "Série Julia : décalages (X,Y,Z) à partir du centre du monde.\n" -#~ "La portée est environ entre -2 et 2. Multiplier par j_scale pour décaler " -#~ "en nombre de blocs." - -#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." -#~ msgstr "" -#~ "Active l'éclairage des blocs pointés (et supprime les bordures noires de " -#~ "sélection)." - -#~ msgid "" -#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " -#~ "completely.\n" -#~ "Note that this is not quite optimized and that smooth lighting on the\n" -#~ "water surface doesn't work with this." -#~ msgstr "" -#~ "Rend la surface de l'eau légèrement plus basse, de façon à ce qu'elle ne " -#~ "submerge pas\n" -#~ "entièrement le bloc voisin.\n" -#~ "Cette fonctionnalité est encore expérimentale et la lumière douce " -#~ "n’apparaît pas à la\n" -#~ "surface de l'eau." - -#~ msgid "Item textures..." -#~ msgstr "Textures d'items..." +#~ msgid "No of course not!" +#~ msgstr "Non, bien sûr que non !" diff --git a/po/he/minetest.po b/po/he/minetest.po index bfb7cd7d..f4229208 100644 --- a/po/he/minetest.po +++ b/po/he/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2015-10-26 16:22+0200\n" "Last-Translator: ChaosWormz \n" "Language-Team: Hebrew \n" -"Language-Team: Hungarian " -"\n" +"Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "$1 és $2 közötti protokoll verziókat támogatunk." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -178,6 +179,12 @@ msgstr "Nincsenek aljátékok telepítve." msgid "Are you sure you want to delete \"$1\"?" msgstr "Biztosan törölni akarod: \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Törlés" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: \"$1\" törlése meghiúsult" @@ -186,23 +193,10 @@ msgstr "Modmgr: \"$1\" törlése meghiúsult" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: érvénytelen mod útvonal: \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Persze, hogy nem!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Igen" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "\"$1\" világ törlése?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Nem" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Elfogad" @@ -411,7 +405,8 @@ msgid "Uninstall selected modpack" msgstr "Kiválasztott modpakk törlése" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Cím / Port:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -430,18 +425,20 @@ msgstr "Kreatív mód" msgid "Damage enabled" msgstr "Sérülés engedélyezve" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Törlés" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Név / jelszó:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Kedvencek:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Nyilvános szerverlista" +#, fuzzy +msgid "Favorite" +msgstr "Kedvencek:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Név / jelszó:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -466,7 +463,7 @@ msgstr "Kreatív mód" msgid "Enable Damage" msgstr "Sérülés engedélyezése" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Név/jelszó" @@ -534,9 +531,9 @@ msgstr "Biztosan visszaállítod az egyjátékos világod?" msgid "Bilinear Filter" msgstr "Bilineáris szűrés" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Bumpmapping" +msgid "Bump Mapping" msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua @@ -547,18 +544,10 @@ msgstr "Gombok változtatása" msgid "Connected Glass" msgstr "Csatlakozó üveg" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Részecskék engedélyezése" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Szép levelek" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Normálfelületek generálása" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Mipmap" @@ -569,6 +558,10 @@ msgstr "Mipmap" msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Aniso. Filter" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Nem" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Nincs szűrés" @@ -578,17 +571,22 @@ msgid "No Mipmap" msgstr "Nincs Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Nem!!!" +msgid "Node Highlighting" +msgstr "Blokk kiemelés" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "Blokk kiemelés" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Nincs" +#: builtin/mainmenu/tab_settings.lua +msgid "Normal Mapping" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Átlátszatlan levelek" @@ -602,6 +600,11 @@ msgstr "Átlátszatlan víz" msgid "Parallax Occlusion" msgstr "Parallax Occlusion" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Részecskék engedélyezése" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Beállítások" @@ -626,6 +629,10 @@ msgstr "Textúrázás:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "A shaderek engedélyezéséhez OpenGL driver használata szükséges." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Érintésküszöb (px)" @@ -646,6 +653,10 @@ msgstr "Hullámzó növények" msgid "Waving Water" msgstr "Hullámzó víz" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Igen" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Modok beállítása" @@ -849,10 +860,6 @@ msgstr "MiB/mp" msgid "Node definitions..." msgstr "Csomópont definíciók..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Folytatás" - #: src/game.cpp msgid "Resolving address..." msgstr "Cím feloldása..." @@ -873,13 +880,17 @@ msgstr "Hangerő" msgid "You died." msgstr "Meghaltál." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "Ok" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Belépés " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "Ok" +msgid "Proceed" +msgstr "Folytatás" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1372,6 +1383,16 @@ msgstr "" msgid "Acceleration in air" msgstr "Gyorsulás levegőben" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Aktív blokk kiterjedési terület" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Aktív blokk kiterjedési terület" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Aktív blokk kiterjedési terület" @@ -1441,8 +1462,8 @@ msgid "" "minetest.net." msgstr "" "Kihirdetés a szerverlistára.\n" -"Ha ki akarod hirdetni az ipv6 címedet, használd ezt: serverlist_url = " -"v6.servers.minetest.net." +"Ha ki akarod hirdetni az ipv6 címedet, használd ezt: serverlist_url = v6." +"servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1468,6 +1489,11 @@ msgstr "Alap terep magassága" msgid "Basic" msgstr "Alap" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Alap jogosultságok" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Bilineáris szűrés" @@ -1485,6 +1511,11 @@ msgstr "Bit/pixel (vagyis színmélység) teljes képernyős módban." msgid "Build inside player" msgstr "Építés játékos helyére" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Bumpmapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Kamera simítás" @@ -1505,6 +1536,11 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "Képernyő szélesség" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1674,6 +1710,10 @@ msgstr "A tavak süllyedésének meredekségét/mélységét állítja." msgid "Controls steepness/height of hills." msgstr "A dombok meredekségét/magasságát állítja." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Üzenet összeomláskor" @@ -2088,6 +2128,11 @@ msgstr "Betűtípus árnyék eltolás, ha 0, akkor nem lesz árnyék rajzolva." msgid "Font size" msgstr "Betűtípus mérete" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Format of screenshots." +msgstr "Képernyőmentések mappája." + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Előre gomb" @@ -2155,14 +2200,23 @@ msgid "Generate normalmaps" msgstr "Normálfelületek generálása" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." -msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" @@ -2420,8 +2474,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a látóterület csökkentéséhez.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2440,8 +2494,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Gomb a látóterület növeléséhez.\n" -"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2744,6 +2798,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2833,31 +2895,34 @@ msgstr "Térkép mappája" #, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Térkép generálási jellemzők csak a Valleys térképgenerátor esetében.\n" +"Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with \"no\" are used to explicitly disable them." #: src/settings_translation_file.cpp #, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Térkép generálási jellemzők csak a Flat (lapos) térképgenerátor esetében.\n" "Esetenkénti tavak és dombok generálása a lapos világba.\n" @@ -2869,11 +2934,13 @@ msgstr "" #, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" "When snowbiomes are enabled jungles are enabled and the jungles flag is " @@ -2883,13 +2950,22 @@ msgstr "" "Flags starting with \"no\" are used to explicitly disable them." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" +"When snowbiomes are enabled jungles are enabled and the jungles flag is " +"ignored.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." -msgstr "" #: src/settings_translation_file.cpp msgid "Map generation limit" @@ -2935,6 +3011,11 @@ msgstr "" msgid "Mapgen flat" msgstr "Flat (lapos) térképgenerátor" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2984,6 +3065,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Fractal térképgenerátor" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -3048,6 +3134,11 @@ msgstr "Térkép generátor neve" msgid "Mapgen v5" msgstr "Térkép generátor v5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -3132,6 +3223,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Térkép generátor v7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3439,6 +3535,10 @@ msgstr "Noclip gomb" msgid "Node highlighting" msgstr "Blokk kiemelés" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3565,6 +3665,10 @@ msgstr "" "Annak megelőzése, hogy a modok nem biztonágos dolgokat futtassanak, pl. " "shell parancsok." +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3679,6 +3783,23 @@ msgstr "Képernyőkép" msgid "Screenshot folder" msgstr "Képernyőkép mappa" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Képernyőkép mappa" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Képernyőkép" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "Biztonság" @@ -3783,6 +3904,10 @@ msgstr "" msgid "Show debug info" msgstr "Hibakereső infó mutatása" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "Leállítási üzenet" @@ -3852,6 +3977,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3930,6 +4059,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "Ezt a betűtípust bizonyos nyelvek használják." +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3966,10 +4099,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Kamera mód váltó gomb" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Eszköztipp késleltetés" @@ -4236,6 +4365,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "A hibakereső infó mutatása (ugyanaz a hatás, ha F5-öt nyomunk)." +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "Kezdeti ablak méret szélessége." @@ -4272,124 +4409,44 @@ msgstr "" msgid "cURL timeout" msgstr "" -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Csomag letiltás" +#~ msgid "Item textures..." +#~ msgstr "Elem textúrák..." -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "Engedélyez" - -#~ msgid "Rendering:" -#~ msgstr "Renderelés:" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet" - -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Játék" - -#~ msgid "Favorites:" -#~ msgstr "Kedvencek:" - -#, fuzzy -#~ msgid "Password" -#~ msgstr "Régi jelszó" - -#~ msgid "Preload item visuals" -#~ msgstr "Előretöltött tárgy láthatóság" - -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Végtelen folyadék" - -#~ msgid "Failed to delete all world files" -#~ msgstr "Hiba az összes világ törlése közben" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék" - -#~ msgid "Files to be deleted" -#~ msgstr "A fájl törölve lett" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Nem törölhető a világ: Nincs kiválasztva" - -#~ msgid "Address required." -#~ msgstr "Cím szükséges." - -#~ msgid "Create world" -#~ msgstr "Világ létrehozása" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts." - -#~ msgid "Show Favorites" -#~ msgstr "Kedvencek mutatása" - -#~ msgid "Show Public" -#~ msgstr "Publikus mutatása" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Figyelem: A beállítások nem egyformák. " - -#~ msgid "Configuration saved. " -#~ msgstr "Beállítások mentve. " - -#~ msgid "is required by:" -#~ msgstr "kell neki:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat" - -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Le" - -#, fuzzy -#~ msgid "Touch free target" -#~ msgstr "Touch free target" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "A méretarány alkalmazva a menü elemekre: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Egyjátékos világ visszaállítása" - -#~ msgid "Wanted FPS" -#~ msgstr "Kívánt FPS" - -#~ msgid "Viewing range minimum" -#~ msgstr "Minimum látóterület" - -#~ msgid "Vertical spawn range" -#~ msgstr "Az (újra)éledés függőleges irányú területe" - -#~ msgid "Vertical initial window size." -#~ msgstr "Függőleges kezdeti ablak méret." - -#~ msgid "Preload inventory textures" -#~ msgstr "Eszköztár textúráinak előtöltése" - -#~ msgid "New style water" -#~ msgstr "Új stílusú víz" - -#, fuzzy #~ msgid "" -#~ "Minimum wanted FPS.\n" -#~ "The amount of rendered stuff is dynamically set according to this. and " -#~ "viewing range min and max." +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." #~ msgstr "" -#~ "Minimum kívánt FPS.\n" -#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a " -#~ "látórerület min és max)." +#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg " +#~ "teljesen a blokkot.\n" +#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n" +#~ "így nem működik a víz felszínén." + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "" +#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a " +#~ "kijelölődobozt)." + +#~ msgid "" +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n" +#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n" +#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" #~ msgid "" #~ "Maximum distance above water level for player spawn.\n" @@ -4404,41 +4461,152 @@ msgstr "" #~ "feléledéshez,\n" #~ "(0,0,0) pozícióban történő feléledést, ami valószínűleg a föld alatt lesz." +#, fuzzy #~ msgid "" -#~ "Key for increasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Minimum wanted FPS.\n" +#~ "The amount of rendered stuff is dynamically set according to this. and " +#~ "viewing range min and max." #~ msgstr "" -#~ "A látóterület növelésének gombja. A minimum látótávolságot módosítja.\n" -#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Minimum kívánt FPS.\n" +#~ "A renderelt cuccok mennyisége dinamikusan ez alapján állítódik be (és a " +#~ "látórerület min és max)." +#~ msgid "New style water" +#~ msgstr "Új stílusú víz" + +#~ msgid "Preload inventory textures" +#~ msgstr "Eszköztár textúráinak előtöltése" + +#~ msgid "Vertical initial window size." +#~ msgstr "Függőleges kezdeti ablak méret." + +#~ msgid "Vertical spawn range" +#~ msgstr "Az (újra)éledés függőleges irányú területe" + +#~ msgid "Viewing range minimum" +#~ msgstr "Minimum látóterület" + +#~ msgid "Wanted FPS" +#~ msgstr "Kívánt FPS" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Egyjátékos világ visszaállítása" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "A méretarány alkalmazva a menü elemekre: " + +#, fuzzy +#~ msgid "Touch free target" +#~ msgstr "Touch free target" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Le" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Ball gomb: Tárgyak mozgatása, Jobb gomb: egy tárgyat mozgat" + +#~ msgid "is required by:" +#~ msgstr "kell neki:" + +#~ msgid "Configuration saved. " +#~ msgstr "Beállítások mentve. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Figyelem: A beállítások nem egyformák. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Nem sikerült a világ létrehozása: A névben nem jó karakterek vannak" + +#~ msgid "Show Public" +#~ msgstr "Publikus mutatása" + +#~ msgid "Show Favorites" +#~ msgstr "Kedvencek mutatása" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Hagyd el a nevét, hogy helyi szervert indíts." + +#~ msgid "Create world" +#~ msgstr "Világ létrehozása" + +#~ msgid "Address required." +#~ msgstr "Cím szükséges." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Nem törölhető a világ: Nincs kiválasztva" + +#~ msgid "Files to be deleted" +#~ msgstr "A fájl törölve lett" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Nem sikerült a világot létrehozni: Nem található a játék" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Nem sikerült a világ beállítása: Nincs kiválasztva" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Hiba az összes világ törlése közben" + +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Végtelen folyadék" + +#~ msgid "Preload item visuals" +#~ msgstr "Előretöltött tárgy láthatóság" + +#, fuzzy +#~ msgid "Password" +#~ msgstr "Régi jelszó" + +#, fuzzy +#~ msgid "Game Name" +#~ msgstr "Játék" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "A driver változások életbe lépéséhez indítsd újra a Minetestet" + +#~ msgid "Rendering:" +#~ msgstr "Renderelés:" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "Engedélyez" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Csomag letiltás" + +#, fuzzy #~ msgid "" -#~ "Key for decreasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Map generation attributes specific to Mapgen Valleys.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them.\n" +#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome " +#~ "issues.\n" +#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where " +#~ "water would tend to pool. It may interfere with delicately adjusted " +#~ "biomes." #~ msgstr "" -#~ "A látóterület csökkentésének gombja. A minimum látóterületet módosítja.\n" -#~ "Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Térkép generálási jellemzők csak a Valleys térképgenerátor esetében.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them.\n" +#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome " +#~ "issues.\n" +#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where " +#~ "water would tend to pool. It may interfere with delicately adjusted " +#~ "biomes." -#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." -#~ msgstr "" -#~ "Kijelölés kiemelés (kivilágítás) engedélyezése a blokkoknál (letiltja a " -#~ "kijelölődobozt)." +#~ msgid "No!!!" +#~ msgstr "Nem!!!" -#~ msgid "" -#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " -#~ "completely.\n" -#~ "Note that this is not quite optimized and that smooth lighting on the\n" -#~ "water surface doesn't work with this." -#~ msgstr "" -#~ "Kicsivel alacsonyabb víz felszín engedélyezése, hogy ne töltse meg " -#~ "teljesen a blokkot.\n" -#~ "Megjegyzés: ez nem teljesen optimalizált, és a simított megvilágítás\n" -#~ "így nem működik a víz felszínén." +#~ msgid "Generate Normalmaps" +#~ msgstr "Normálfelületek generálása" -#~ msgid "Item textures..." -#~ msgstr "Elem textúrák..." +#~ msgid "Public Serverlist" +#~ msgstr "Nyilvános szerverlista" + +#~ msgid "No of course not!" +#~ msgstr "Persze, hogy nem!" diff --git a/po/id/minetest.po b/po/id/minetest.po index c9b46348..3505fca5 100644 --- a/po/id/minetest.po +++ b/po/id/minetest.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-12 19:07+0000\n" "Last-Translator: Muhammad Rifqi Priyo Susanto " "\n" -"Language-Team: Indonesian " -"\n" +"Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,6 +73,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Kami mendukung protokol antara versi $1 dan versi $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -180,6 +181,12 @@ msgstr "Anda tidak punya sub-permainan terpasang." msgid "Are you sure you want to delete \"$1\"?" msgstr "Anda yakin ingin menghapus \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Hapus" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Pengelola mod: gagal untuk menghapus \"$1\"" @@ -188,23 +195,10 @@ msgstr "Pengelola mod: gagal untuk menghapus \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Pengelola mod: jalur mod tidak sah \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Tentu tidak!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Ya" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Hapus Dunia \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Tidak" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Setuju" @@ -420,7 +414,8 @@ msgid "Uninstall selected modpack" msgstr "Copot pemasangan paket mod terpilih" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Alamat / Port :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -439,18 +434,18 @@ msgstr "Mode kreatif" msgid "Damage enabled" msgstr "Kerusakan diaktifkan" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Hapus" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nama / Kata sandi :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Del. Favorite" +msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Daftar Server Publik" +msgid "Favorite" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nama / Kata sandi :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -474,7 +469,7 @@ msgstr "Mode Kreatif" msgid "Enable Damage" msgstr "Aktifkan Kerusakan" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nama/Kata sandi" @@ -544,9 +539,9 @@ msgstr "Apakah Anda yakin ingin mengatur ulang dunia Anda?" msgid "Bilinear Filter" msgstr "Bilinear Filter" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Bumpmapping" +msgid "Bump Mapping" msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua @@ -557,18 +552,10 @@ msgstr "Ubah tombol" msgid "Connected Glass" msgstr "Kaca Tersambung" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Aktifkan Partikel" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Daun Megah" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Hasilkan Normalmaps" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Mipmap" @@ -579,6 +566,10 @@ msgstr "Mipmap" msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Aniso. Filter" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Tidak" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Tanpa Filter" @@ -588,18 +579,24 @@ msgid "No Mipmap" msgstr "Tanpa Mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Tidak!!!" +#, fuzzy +msgid "Node Highlighting" +msgstr "Node Highlighting" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Node Highlighting" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Tidak ada" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Tone Mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Daun Opak" @@ -613,6 +610,11 @@ msgstr "Air Buram" msgid "Parallax Occlusion" msgstr "Parallax Occlusion" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Aktifkan Partikel" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Pengaturan" @@ -637,6 +639,10 @@ msgstr "Penteksturan:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Untuk mengaktifkan shaders OpenGL driver harus digunakan." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "Tone Mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Batas sentuhan (px)" @@ -658,6 +664,10 @@ msgstr "Tanaman Berayun" msgid "Waving Water" msgstr "Air Berombak" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Ya" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Konfigurasi mod" @@ -860,10 +870,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Definisi node..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Lanjut" - #: src/game.cpp msgid "Resolving address..." msgstr "Mencari alamat..." @@ -884,13 +890,17 @@ msgstr "Volume Suara" msgid "You died." msgstr "Anda mati." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "oke" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Masuk " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "oke" +msgid "Proceed" +msgstr "Lanjut" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1374,6 +1384,16 @@ msgstr "Batas absolut dari antrian muncul" msgid "Acceleration in air" msgstr "Percepatan di udara" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Batas blok aktif" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Batas blok aktif" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Batas blok aktif" @@ -1447,8 +1467,8 @@ msgid "" "minetest.net." msgstr "" "Mengumumkan kepada daftar server ini.\n" -"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = " -"v6.servers.minetest.net." +"Jika Anda ingin mengumumkan alamat IPv6 Anda, gunakan serverlist_url = v6." +"servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1476,6 +1496,11 @@ msgstr "Air Berombak" msgid "Basic" msgstr "Dasar" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Izin bawaan" + #: src/settings_translation_file.cpp #, fuzzy msgid "Bilinear filtering" @@ -1493,6 +1518,11 @@ msgstr "Bit per piksel (alias kedalaman warna) dalam mode layar penuh." msgid "Build inside player" msgstr "Bangun di dalam pemain" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Bumpmapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Penghalusan kamera" @@ -1513,6 +1543,10 @@ msgstr "Noise #1 gua" msgid "Cave noise #2" msgstr "Noise #2 gua" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "Gua dan terowongan terbentuk di persimpangan antara dua noise" @@ -1699,6 +1733,10 @@ msgstr "Mengatur kecuraman/kedalaman dari lekukan danau." msgid "Controls steepness/height of hills." msgstr "Mengatur kecuraman/ketinggian dari bukit." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Pesan kerusakan" @@ -2118,6 +2156,10 @@ msgstr "" msgid "Font size" msgstr "Ukuran font" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Forward key" @@ -2185,9 +2227,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2295,8 +2339,8 @@ msgid "" "nodes.\n" "This requires the \"noclip\" privilege on the server." msgstr "" -"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node padat." -"\n" +"Jika diaktifkan dengan mode terbang, pemain mampu terbang melalui node " +"padat.\n" "Hal ini memerlukan hak istimewa \"noclip\" pada server." #: src/settings_translation_file.cpp @@ -2443,8 +2487,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk menjatuhkan barang yang sedang dipilih.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp #, fuzzy @@ -2464,8 +2508,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk lompat.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2474,8 +2518,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk bergerak cepat dalam mode cepat.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2484,8 +2528,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk bergerak mundur.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2494,8 +2538,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk bergerak maju.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2504,8 +2548,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk bergerak ke kiri.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2514,8 +2558,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk bergerak ke kanan.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2545,8 +2589,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk membuka inventaris.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2571,8 +2615,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk mengganti kamera antara orang pertama dan ketiga.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2581,8 +2625,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk mengambil tangkapan layar.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2591,8 +2635,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode sinema.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2601,8 +2645,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk mennganti tampilan peta mini.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2611,8 +2655,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode cepat.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2621,8 +2665,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih terbang.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2631,8 +2675,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tombol untuk beralih mode tembus blok.\n" -"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319017" -"35e3da1b0edf72eb3" +"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2722,6 +2766,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2807,41 +2859,50 @@ msgstr "Direktori peta" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2891,6 +2952,11 @@ msgstr "Generator peta" msgid "Mapgen flat" msgstr "Generator peta" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Generator peta" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2944,6 +3010,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Generator peta" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Generator peta" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -3013,6 +3084,11 @@ msgstr "Nama generator peta" msgid "Mapgen v5" msgstr "Generator peta v5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Generator peta v5" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -3097,6 +3173,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Generator peta v7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Generator peta v7" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3402,6 +3483,10 @@ msgstr "Tombol tembus blok" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3522,6 +3607,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3632,6 +3721,23 @@ msgstr "Tangkapan layar" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Tangkapan layar" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Tangkapan layar" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3723,6 +3829,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3789,6 +3899,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3863,6 +3977,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3893,10 +4011,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Tombol beralih mode kamera" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "Tone Mapping" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4147,6 +4261,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4181,41 +4303,53 @@ msgstr "Batas cURL paralel" msgid "cURL timeout" msgstr "Batas waktu cURL" -#~ msgid "\"" -#~ msgstr "\"" - #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Nonaktifkan PM" +#~ msgid "Preload inventory textures" +#~ msgstr "Memuat tekstur..." + +#~ msgid "Reset singleplayer world" +#~ msgstr "Atur ulang dunia pemain tunggal" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Faktor skala yang diatur untuk elemen menu: " + +#~ msgid "Touch free target" +#~ msgstr "Bebas sentuhan" + +#~ msgid "Downloading" +#~ msgstr "Mengunduh" + +#~ msgid " KB/s" +#~ msgstr " KB/detik" + +#~ msgid " MB/s" +#~ msgstr " MB/detik" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih" + +#~ msgid "Rendering:" +#~ msgstr "Rendering:" #, fuzzy #~ msgid "If enabled, " #~ msgstr "diaktifkan" -#~ msgid "Rendering:" -#~ msgstr "Rendering:" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Mulai ulang minetest untuk beralih ke driver yang dipilih" - -#~ msgid " MB/s" -#~ msgstr " MB/detik" - -#~ msgid " KB/s" -#~ msgstr " KB/detik" - -#~ msgid "Downloading" -#~ msgstr "Mengunduh" - -#~ msgid "Touch free target" -#~ msgstr "Bebas sentuhan" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Faktor skala yang diatur untuk elemen menu: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Atur ulang dunia pemain tunggal" - #, fuzzy -#~ msgid "Preload inventory textures" -#~ msgstr "Memuat tekstur..." +#~ msgid "If disabled " +#~ msgstr "Nonaktifkan PM" + +#~ msgid "\"" +#~ msgstr "\"" + +#~ msgid "No!!!" +#~ msgstr "Tidak!!!" + +#~ msgid "Generate Normalmaps" +#~ msgstr "Hasilkan Normalmaps" + +#~ msgid "Public Serverlist" +#~ msgstr "Daftar Server Publik" + +#~ msgid "No of course not!" +#~ msgstr "Tentu tidak!" diff --git a/po/it/minetest.po b/po/it/minetest.po index 8f1353aa..1b737313 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-29 22:02+0000\n" "Last-Translator: Emon Omen \n" -"Language-Team: Italian " -"\n" +"Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,6 +73,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Supportiamo versioni di protocollo comprese tra $1 e $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -154,7 +155,8 @@ msgstr "Generatore mappa" #: builtin/mainmenu/dlg_create_world.lua msgid "No worldname given or no game selected" -msgstr "Non è stato dato nessun nome di mondo o non è stato scelto nessun gioco" +msgstr "" +"Non è stato dato nessun nome di mondo o non è stato scelto nessun gioco" #: builtin/mainmenu/dlg_create_world.lua msgid "Seed" @@ -176,6 +178,12 @@ msgstr "Non avete sottogiochi installati." msgid "Are you sure you want to delete \"$1\"?" msgstr "Siete certi di volere cancellare \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Cancellare" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: cancellazione di \"$1\" fallita" @@ -184,23 +192,10 @@ msgstr "Modmgr: cancellazione di \"$1\" fallita" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: percorso mod. non valido \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "No, certo che no!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Sì" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Cancellare il mondo \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "No" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Accettare" @@ -413,7 +408,8 @@ msgid "Uninstall selected modpack" msgstr "Disinstallare il pacchetto mod. scelto" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Indirizzo / Porta :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -432,18 +428,20 @@ msgstr "Modalità creativa" msgid "Damage enabled" msgstr "Danno abilitato" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Cancellare" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nome / Password :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Preferiti:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Elenco dei server pubblici" +#, fuzzy +msgid "Favorite" +msgstr "Preferiti:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nome / Password :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -467,7 +465,7 @@ msgstr "Modalità creativa" msgid "Enable Damage" msgstr "Abilitare il danno" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nome/Password" @@ -535,8 +533,9 @@ msgstr "Siete certi di volere azzerare il vostro mondo di giocatore singolo?" msgid "Bilinear Filter" msgstr "Filtro bilineare" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Bumpmapping" #: builtin/mainmenu/tab_settings.lua @@ -547,18 +546,10 @@ msgstr "Modificare i tasti" msgid "Connected Glass" msgstr "Vetri uniti" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Abilitare particelle" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Foglie decorative" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Generare normalmap" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mipmap" @@ -567,6 +558,10 @@ msgstr "Mipmap" msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Filtro aniso." +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "No" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Nessun filtro" @@ -576,17 +571,23 @@ msgid "No Mipmap" msgstr "Niente mipmap" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "No!!!" +msgid "Node Highlighting" +msgstr "Evidenz. nodo" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "Evidenz. nodo" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Nessuno" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Campionamento normalmap" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Foglie opache" @@ -599,6 +600,11 @@ msgstr "Acqua opaca" msgid "Parallax Occlusion" msgstr "Occlusione di parallasse" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Abilitare particelle" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Impostazioni" @@ -623,6 +629,10 @@ msgstr "Immagini:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Per abilitare gli shader è necessario usare i driver OpenGL." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "Mappatura toni" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Soglia di tocco (px)" @@ -643,6 +653,10 @@ msgstr "Piante ondeggianti" msgid "Waving Water" msgstr "Acqua ondeggiante" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Sì" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Config. mod." @@ -845,10 +859,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Definizioni del nodo..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Procedere" - #: src/game.cpp msgid "Resolving address..." msgstr "Risoluzione dell'indirizzo..." @@ -869,13 +879,17 @@ msgstr "Volume dell'audio" msgid "You died." msgstr "Siete morti." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "va bene" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Invio " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "va bene" +msgid "Proceed" +msgstr "Procedere" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1335,8 +1349,8 @@ msgstr "" "Attualmente supportati:\n" "- nessuno: nessun output 3D.\n" "- anaglifo: 3D in colori ciano/magenta.\n" -"- intrecciato: supporto per polarizzazione schermo basata su linea " -"pari/dispari.\n" +"- intrecciato: supporto per polarizzazione schermo basata su linea pari/" +"dispari.\n" "- superiore-inferiore: divisione dello schermo in superiore/inferiore.\n" "- fianco-a-fianco: divisione dello schermo fianco a fianco.\n" "- sfoglia-pagina: 3D basato su buffer quadruplo." @@ -1365,6 +1379,16 @@ msgstr "Limite assoluto di code 'emerge'" msgid "Acceleration in air" msgstr "Accelerazione in aria" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Portata del blocco attivo" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Portata del blocco attivo" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Portata del blocco attivo" @@ -1436,8 +1460,8 @@ msgid "" "minetest.net." msgstr "" "Rendere noto a questo elenco di server.\n" -"Se volete rendere noto il vostro indirizzo ipv6, usate serverlist_url = " -"v6.servers.minetest.net." +"Se volete rendere noto il vostro indirizzo ipv6, usate serverlist_url = v6." +"servers.minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1463,6 +1487,11 @@ msgstr "Altezza base del terreno" msgid "Basic" msgstr "Base" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Privilegi predefiniti" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Filtro bilineare" @@ -1479,6 +1508,10 @@ msgstr "Bit per pixel (cioè profondità di colore) in modalità schermo intero. msgid "Build inside player" msgstr "Costruisci nel giocatore" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bumpmapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Camera scorrevole" @@ -1499,6 +1532,11 @@ msgstr "'Rumore' n°1 della caverna" msgid "Cave noise #2" msgstr "'Rumore' n°2 della caverna" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "Larghezza dello schermo" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "Caverne e gallerie si formano all'intersezione dei due 'rumori'" @@ -1616,8 +1654,8 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" -"Elenco separato da virgole di mod. a cui è permesso l'accesso alle API HTTP," -"\n" +"Elenco separato da virgole di mod. a cui è permesso l'accesso alle API " +"HTTP,\n" "che gli permettono di caricare e scaricare dati su/da internet." #: src/settings_translation_file.cpp @@ -1686,6 +1724,10 @@ msgstr "Controlla la ripidità/profondità delle depressioni lacustri." msgid "Controls steepness/height of hills." msgstr "Controlla la ripidità/altezza delle colline." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Messaggio di crollo" @@ -1789,8 +1831,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" -"Stabilisce la massima distanza di trasferimento del giocatore in blocchi (0 =" -" illimitata)." +"Stabilisce la massima distanza di trasferimento del giocatore in blocchi (0 " +"= illimitata)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." @@ -2126,6 +2168,11 @@ msgstr "" msgid "Font size" msgstr "Dimensione del font" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Format of screenshots." +msgstr "Percorso dove salvare le istantanee." + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Tasto avanti" @@ -2146,8 +2193,8 @@ msgstr "" msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" -"Da che distanza i blocchi sono inviati ai client, espressa in blocchi mappa (" -"16 nodi)." +"Da che distanza i blocchi sono inviati ai client, espressa in blocchi mappa " +"(16 nodi)." #: src/settings_translation_file.cpp msgid "" @@ -2193,13 +2240,16 @@ msgid "Generate normalmaps" msgstr "Generare le normalmap" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributi globali di generazione della mappa.\n" "In Generatore mappa v. 6 l'impostazione 'decorazioni' controlla tutte le " @@ -2239,8 +2289,8 @@ msgstr "" "Gestione delle chiamate deplorate alle API Lua:\n" "- eredita: (prova a) mimare il vecchio comportamento (predefinita per i " "rilasci).\n" -"- registra: mima e registra la traccia della chiamata deplorata (" -"predefinita per il debug).\n" +"- registra: mima e registra la traccia della chiamata deplorata " +"(predefinita per il debug).\n" "- errore: abortire all'uso della chiamata deplorata (suggerita per gli " "sviluppatori di mod.)." @@ -2380,7 +2430,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." -msgstr "Se si imposta, i giocatori (ri)compariranno sempre alla posizione data." +msgstr "" +"Se si imposta, i giocatori (ri)compariranno sempre alla posizione data." #: src/settings_translation_file.cpp msgid "Ignore world errors" @@ -2495,8 +2546,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per ridurre il raggio visivo.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2505,8 +2556,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per lasciare a terra l'oggetto attualmente selezionato.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2515,8 +2566,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per aumentare il raggio visivo.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2525,8 +2576,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per saltare.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2535,8 +2586,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per muoversi rapidamente nella modalità veloce.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2545,8 +2596,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per muovere indietro il giocatore.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2555,8 +2606,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per muovere avanti il giocatore.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2565,8 +2616,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per muovere a sinistra il giocatore.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2575,8 +2626,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per muovere a destra il giocatore.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2585,8 +2636,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per aprire la console dei messaggi.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2595,8 +2646,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per aprire la finestra dei messaggi per scrivere comandi.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2605,8 +2656,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per aprire la finestra dei messaggi.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2615,8 +2666,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per aprire l'inventario.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2625,8 +2676,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per stampare le stack di debug. Usato per lo sviluppo.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2639,8 +2690,8 @@ msgstr "" "Tasto per strisciare.\n" "Usato anche per scendere dalle scale e scendere in acqua se aux1_descends è " "disabilitata.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2648,10 +2699,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tasto per passare tra la camera in prima persona a quella in terza persona.." -"\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Tasto per passare tra la camera in prima persona a quella in terza " +"persona..\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2660,8 +2711,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per scattare istantanee.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2670,8 +2721,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la modalità cinematic.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2680,8 +2731,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la visualizzatore della minimappa.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2690,8 +2741,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la modalità veloce.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2700,8 +2751,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare il volo.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2710,8 +2761,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la modalità noclip.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2719,10 +2770,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tasto per attivare l'aggiornamento della camera. Usato solo per lo sviluppo." -"\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Tasto per attivare l'aggiornamento della camera. Usato solo per lo " +"sviluppo.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2731,8 +2782,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la visualizzazione delle info. di debug.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2741,8 +2792,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la visualizzazione dello HUD.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2751,8 +2802,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la visualizzazione della messaggistica.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2761,8 +2812,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare la visualizzazione della nebbia.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2770,10 +2821,10 @@ msgid "" "See http://irrlicht.sourceforge.net/docu/namespaceirr." "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" -"Tasto per attivare la visualizzazione del profilatore. Usato per lo sviluppo." -"\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Tasto per attivare la visualizzazione del profilatore. Usato per lo " +"sviluppo.\n" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2782,8 +2833,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tasto per attivare il raggio visivo illimitato.\n" -"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e23190" -"1735e3da1b0edf72eb3" +"Si veda http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2829,6 +2880,14 @@ msgstr "" "Lunghezza di uno scatto del server e intervallo per cui gli oggetti sono " "aggiornati in generale sulla rete." +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2915,8 +2974,8 @@ msgstr "Script del menu principale" msgid "" "Make fog and sky colors depend on daytime (dawn/sunset) and view direction." msgstr "" -"Far sì che i colori di cielo e nebbia dipendano dall'ora del giorno " -"(alba/tramonto) e direzione visiva." +"Far sì che i colori di cielo e nebbia dipendano dall'ora del giorno (alba/" +"tramonto) e direzione visiva." #: src/settings_translation_file.cpp msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles." @@ -2927,49 +2986,19 @@ msgid "Map directory" msgstr "Cartella della mappa" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"'altitude_chill' makes higher elevations colder, which may cause biome " "issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." -msgstr "" -"Attributi di generazione della mappa specifici per Generatore mappa valli.\n" -"Le impostazioni che non sono specificate nella stringa mantengono i valori " -"predefiniti.\n" -"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " -"esplicitamente.\n" -"\"altitude_chill\" rende più fredde le elevazioni maggiori, il che potrebbe " -"causare problemi ai biomi.\n" -"\"humid_rivers\" modifica l'umidità attorno ai fiumi e nelle aree in cui " -"l'acqua tenderebbe a stagnare. Potrebbe interferire con biomi" - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." -msgstr "" -"Attributi di generazione della mappa specifici per Generatore mappa piatto.\n" -"Al mondo piatto sono aggiunte colline e laghi occasionali.\n" -"Le impostazioni che non sono specificate nella stringa mantengono i valori " -"predefiniti.\n" -"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " -"esplicitamente." - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n" "Quando i biomi di neve sono abilitati l'impostazione jungles è ignorata e le " @@ -2980,15 +3009,57 @@ msgstr "" "esplicitamente." #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Attributi di generazione della mappa specifici per Generatore mappa v. 7.\n" -"'ridges' sono i fiumi.\n" +"Attributi di generazione della mappa specifici per Generatore mappa piatto.\n" +"Al mondo piatto sono aggiunte colline e laghi occasionali.\n" +"Le impostazioni che non sono specificate nella stringa mantengono i valori " +"predefiniti.\n" +"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +"esplicitamente." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n" +"Quando i biomi di neve sono abilitati l'impostazione jungles è ignorata e le " +"giungle sono abilitate.\n" +"Le impostazioni che non sono specificate nella stringa mantengono i valori " +"predefiniti.\n" +"Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +"esplicitamente." + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v7.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n" +"Quando i biomi di neve sono abilitati l'impostazione jungles è ignorata e le " +"giungle sono abilitate.\n" "Le impostazioni che non sono specificate nella stringa mantengono i valori " "predefiniti.\n" "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " @@ -3038,6 +3109,11 @@ msgstr "Impostazioni del generatore mappa" msgid "Mapgen flat" msgstr "Generatore mappa piatto" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Profondità delle caverne grandi del Generatore mappa piatto" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "Gen. mappa piatto, parametri del 1° 'rumore' delle caverne" @@ -3087,6 +3163,11 @@ msgstr "Parametri del 'rumore' del terreno del Generatore mappa piatto" msgid "Mapgen fractal" msgstr "Generatore mappa frattale" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Gen. mappa frattale, fetta w" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "Gen. mappa frattale, parametri del 1° 'rumore' delle caverne" @@ -3152,6 +3233,11 @@ msgstr "Nome del gen. mappa" msgid "Mapgen v5" msgstr "Generatore mappa v. 5." +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Profondità delle caverne grandi del Generatore mappa piatto" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "Gen. mappa v. 5, parametri del 1° 'rumore' delle caverne" @@ -3236,6 +3322,11 @@ msgstr "Gen. mappa v. 6, parametri del 'rumore' degli alberi" msgid "Mapgen v7" msgstr "Gen. mappa v. 7, parametri del 'rumore'" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Profondità delle caverne grandi del Generatore mappa piatto" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "Gen. mappa v. 7, parametri del 1° 'rumore' delle caverne" @@ -3379,7 +3470,8 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Maximum number of players that can connect simultaneously." -msgstr "Numero massimo di giocatori che possono connettersi contemporaneamente." +msgstr "" +"Numero massimo di giocatori che possono connettersi contemporaneamente." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." @@ -3557,6 +3649,11 @@ msgstr "Tasto noclip" msgid "Node highlighting" msgstr "Evidenziamento nodo" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "NodeTimer interval" +msgstr "Intervallo del tempo di invio" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3694,6 +3791,10 @@ msgstr "" "Impedisce che i mod. facciano cose non sicure come eseguire comandi della " "shell." +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3714,8 +3815,8 @@ msgid "" "Values larger than 26 will start to produce sharp cutoffs at cloud area " "corners." msgstr "" -"Raggio dell'area delle nuvole espresso in numero di 64 nodi nuvola quadrati." -"\n" +"Raggio dell'area delle nuvole espresso in numero di 64 nodi nuvola " +"quadrati.\n" "Valori maggiori di 26 cominceranno a produrre interruzioni appuntite agli " "angoli delle aree nuvola." @@ -3814,6 +3915,23 @@ msgstr "Istantanea" msgid "Screenshot folder" msgstr "Cartella delle istantanee" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Cartella delle istantanee" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Istantanea" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "Sicurezza" @@ -3916,6 +4034,10 @@ msgstr "Forma del minimap. Abilitata = rotonda, disabilitata = quadrata." msgid "Show debug info" msgstr "Mostrare le info. di debug" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "Messaggio di spegnimento" @@ -3991,6 +4113,10 @@ msgstr "Intensità di parallasse." msgid "Strict protocol checking" msgstr "Controllo stretto del protocollo" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "SQLite simultaneo" @@ -4055,8 +4181,8 @@ msgid "" "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n" "set to the nearest valid value." msgstr "" -"L'intensità (oscurità) dell'ombreggiatura di occlusione ambientale dei nodi." -"\n" +"L'intensità (oscurità) dell'ombreggiatura di occlusione ambientale dei " +"nodi.\n" "Minore è più scuro, maggiore è più chiaro. L'intervallo di valori validi " "per\n" "questa impostazione è tra 0.25 e 4.0 inclusi. Se il valore è fuori " @@ -4087,6 +4213,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "Questo font sarà usato per certe lingue." +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -4126,10 +4256,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Chiave di impostazione della modalità camera" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "Mappatura toni" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "Ritardo dei suggerimenti" @@ -4174,7 +4300,8 @@ msgstr "Usare un'animazione con le nuvole per lo sfondo del menu principale." #: src/settings_translation_file.cpp msgid "Use anisotropic filtering when viewing at textures from an angle." -msgstr "Usare il filtro anisotropico quando si vedono le immagini da un angolo." +msgstr "" +"Usare il filtro anisotropico quando si vedono le immagini da un angolo." #: src/settings_translation_file.cpp msgid "Use bilinear filtering when scaling textures." @@ -4374,8 +4501,8 @@ msgstr "" "Dove si ferma il generatore mappa.\n" "Si noti prego:\n" "- Limitato a 31.000 (impostazioni superiori non hanno effetto)\n" -"- Il generatore mappa lavora in gruppi di 80x80x80 nodi (5x5x5 nodi mappa)." -"\n" +"- Il generatore mappa lavora in gruppi di 80x80x80 nodi (5x5x5 nodi " +"mappa).\n" "- Quei gruppi hanno una compensazione di -32, -32 nodi dall'origine.\n" "- Solo i gruppi che rientrano nel map_generation_limit vengono generati." @@ -4423,6 +4550,14 @@ msgstr "" "Se mostrare le info. di debug del client (ha lo stesso effetto di premere " "F5)." +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "Componente larghezza della dimensione iniziale della finestra." @@ -4459,86 +4594,132 @@ msgstr "Limite cURL parallelo" msgid "cURL timeout" msgstr "Tempo di scadenza cURL" -#~ msgid "If disabled " -#~ msgstr "Disatt. pacch." - -#~ msgid "If enabled, " -#~ msgstr "attivata" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Riavviare minetest per rendere effettive le modifiche" - -#~ msgid "Game Name" -#~ msgstr "Nome del gioco" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "GIOCHI" - -#~ msgid "Mods:" -#~ msgstr "Moduli:" - -#~ msgid "new game" -#~ msgstr "nuovo gioco" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFICARE IL GIOCO" - -#~ msgid "Remove selected mod" -#~ msgstr "Rimuovere il modulo selezionato" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Aggiungere il modulo" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Preferiti:" - -#~ msgid "START SERVER" -#~ msgstr "AVVIO SERVER" - -#~ msgid "Name" -#~ msgstr "Nome" - -#~ msgid "Password" -#~ msgstr "Password" - -#~ msgid "SETTINGS" -#~ msgstr "IMPOSTAZIONI" - -#~ msgid "Preload item visuals" -#~ msgstr "Precaricare le immagini" - -#~ msgid "Finite Liquid" -#~ msgstr "Liquido limitato" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "GIOC. SING." - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACCH. DI IMM." - -#~ msgid "MODS" -#~ msgstr "MODULI" - -#~ msgid "Add mod:" -#~ msgstr "Aggiungere un modulo:" - -#~ msgid "Local install" -#~ msgstr "Installazione locale" - -#~ msgid "Wanted FPS" -#~ msgstr "FPS desiderati" - -#~ msgid "Viewing range minimum" -#~ msgstr "Distanza minima di visibilità" +#~ msgid "Item textures..." +#~ msgstr "Immagini degli oggetti..." #~ msgid "Preload inventory textures" #~ msgstr "Precaricamento delle textures dell'inventario" -#~ msgid "Item textures..." -#~ msgstr "Immagini degli oggetti..." +#~ msgid "Viewing range minimum" +#~ msgstr "Distanza minima di visibilità" + +#~ msgid "Wanted FPS" +#~ msgstr "FPS desiderati" + +#~ msgid "Local install" +#~ msgstr "Installazione locale" + +#~ msgid "Add mod:" +#~ msgstr "Aggiungere un modulo:" + +#~ msgid "MODS" +#~ msgstr "MODULI" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACCH. DI IMM." + +#~ msgid "SINGLE PLAYER" +#~ msgstr "GIOC. SING." + +#~ msgid "Finite Liquid" +#~ msgstr "Liquido limitato" + +#~ msgid "Preload item visuals" +#~ msgstr "Precaricare le immagini" + +#~ msgid "SETTINGS" +#~ msgstr "IMPOSTAZIONI" + +#~ msgid "Password" +#~ msgstr "Password" + +#~ msgid "Name" +#~ msgstr "Nome" + +#~ msgid "START SERVER" +#~ msgstr "AVVIO SERVER" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Aggiungere il modulo" + +#~ msgid "Remove selected mod" +#~ msgstr "Rimuovere il modulo selezionato" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFICARE IL GIOCO" + +#~ msgid "new game" +#~ msgstr "nuovo gioco" + +#~ msgid "Mods:" +#~ msgstr "Moduli:" + +#~ msgid "GAMES" +#~ msgstr "GIOCHI" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nome del gioco" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Riavviare minetest per rendere effettive le modifiche" + +#~ msgid "If enabled, " +#~ msgstr "attivata" + +#~ msgid "If disabled " +#~ msgstr "Disatt. pacch." + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen v7.\n" +#~ "'ridges' are the rivers.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." +#~ msgstr "" +#~ "Attributi di generazione della mappa specifici per Generatore mappa v. " +#~ "7.\n" +#~ "'ridges' sono i fiumi.\n" +#~ "Le impostazioni che non sono specificate nella stringa mantengono i " +#~ "valori predefiniti.\n" +#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +#~ "esplicitamente." + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen Valleys.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them.\n" +#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome " +#~ "issues.\n" +#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where " +#~ "water would tend to pool. It may interfere with delicately adjusted " +#~ "biomes." +#~ msgstr "" +#~ "Attributi di generazione della mappa specifici per Generatore mappa " +#~ "valli.\n" +#~ "Le impostazioni che non sono specificate nella stringa mantengono i " +#~ "valori predefiniti.\n" +#~ "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " +#~ "esplicitamente.\n" +#~ "\"altitude_chill\" rende più fredde le elevazioni maggiori, il che " +#~ "potrebbe causare problemi ai biomi.\n" +#~ "\"humid_rivers\" modifica l'umidità attorno ai fiumi e nelle aree in cui " +#~ "l'acqua tenderebbe a stagnare. Potrebbe interferire con biomi" + +#~ msgid "No!!!" +#~ msgstr "No!!!" + +#~ msgid "Generate Normalmaps" +#~ msgstr "Generare normalmap" + +#~ msgid "Public Serverlist" +#~ msgstr "Elenco dei server pubblici" + +#~ msgid "No of course not!" +#~ msgstr "No, certo che no!" diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 96c4eee2..0f1489f3 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -2,11 +2,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-30 05:38+0000\n" "Last-Translator: Rui \n" -"Language-Team: Japanese " -"\n" +"Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,6 +67,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "プロトコルバージョンは$1から$2までをサポートしています。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -93,7 +94,9 @@ msgstr "全て有効化" msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." -msgstr "許可されていない文字が使用されているためMod \"$1\"を有効化できませんでした。文字は[a-z0-9_]のみ使用できます。" +msgstr "" +"許可されていない文字が使用されているためMod \"$1\"を有効化できませんでした。" +"文字は[a-z0-9_]のみ使用できます。" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -130,7 +133,8 @@ msgstr "作成" #: builtin/mainmenu/dlg_create_world.lua msgid "Download a subgame, such as minetest_game, from minetest.net" -msgstr "minetest.netから、minetest_gameなどのサブゲームをダウンロードしてください" +msgstr "" +"minetest.netから、minetest_gameなどのサブゲームをダウンロードしてください" #: builtin/mainmenu/dlg_create_world.lua msgid "Download one from minetest.net" @@ -168,6 +172,12 @@ msgstr "サブゲームがインストールされていません。" msgid "Are you sure you want to delete \"$1\"?" msgstr "本当に\"$1\"を削除してよろしいですか？" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "削除" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modマネージャー: \"$1\"の削除に失敗しました" @@ -176,23 +186,10 @@ msgstr "Modマネージャー: \"$1\"の削除に失敗しました" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modマネージャー: Mod\"$1\"の場所が不明です" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "いいえ！" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "はい" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "ワールド\"$1\"を削除しますか？" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "いいえ" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "決定" @@ -238,8 +235,8 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" -"書式: , , (, , ), , , " -"" +"書式: , , (, , ), , " +", " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -311,7 +308,9 @@ msgstr "Modインストール: $1の本来のMod名が不明です" #: builtin/mainmenu/modmgr.lua msgid "Install Mod: unable to find suitable foldername for modpack $1" -msgstr "Modインストール: Modパック$1に適したフォルダ名を見つけることができませんでした" +msgstr "" +"Modインストール: Modパック$1に適したフォルダ名を見つけることができませんでし" +"た" #: builtin/mainmenu/store.lua msgid "Close store" @@ -402,7 +401,8 @@ msgid "Uninstall selected modpack" msgstr "選択したModパックを削除" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "アドレスとポート:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -421,18 +421,18 @@ msgstr "クリエイティブモード" msgid "Damage enabled" msgstr "ダメージ有効" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "削除" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "名前とパスワード:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Del. Favorite" +msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "公開サーバ一覧" +msgid "Favorite" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "名前とパスワード:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -456,7 +456,7 @@ msgstr "クリエイティブモード" msgid "Enable Damage" msgstr "ダメージ有効" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "名前とパスワード" @@ -524,8 +524,9 @@ msgstr "シングルプレイヤーのワールドをリセットしてよろし msgid "Bilinear Filter" msgstr "バイリニアフィルタ" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "バンプマッピング" #: builtin/mainmenu/tab_settings.lua @@ -536,18 +537,10 @@ msgstr "操作変更" msgid "Connected Glass" msgstr "ガラスを繋げる" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "パーティクル有効化" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "綺麗な葉" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "ノーマルマップの生成" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "ミップマップ" @@ -556,6 +549,10 @@ msgstr "ミップマップ" msgid "Mipmap + Aniso. Filter" msgstr "異方性フィルタ" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "いいえ" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "フィルタ無し" @@ -565,17 +562,23 @@ msgid "No Mipmap" msgstr "ミップマップ無し" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "いいえ！！！" +msgid "Node Highlighting" +msgstr "ノードのハイライト" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "ノードのハイライト" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "無し" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "ミップマッピング" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "不透明な葉" @@ -588,6 +591,11 @@ msgstr "不透明な水" msgid "Parallax Occlusion" msgstr "視差遮蔽マッピング" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "パーティクル有効化" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "設定" @@ -612,6 +620,10 @@ msgstr "テクスチャリング:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "シェーダーを有効にするにはOpenGLを使用する必要があります。" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "ミップマッピング" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "タッチのしきい値（ピクセル）" @@ -632,6 +644,10 @@ msgstr "揺れる草花" msgid "Waving Water" msgstr "揺れる水" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "はい" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Mod設定" @@ -834,10 +850,6 @@ msgstr "MB/秒" msgid "Node definitions..." msgstr "ノードを定義中..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "決定" - #: src/game.cpp msgid "Resolving address..." msgstr "アドレスを解決中..." @@ -858,12 +870,16 @@ msgstr "音量" msgid "You died." msgstr "死にました。" +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "決定" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "エンター " #: src/guiFormSpecMenu.cpp -msgid "ok" +msgid "Proceed" msgstr "決定" #: src/guiKeyChangeMenu.cpp @@ -912,7 +928,9 @@ msgstr "キーが重複しています" #: src/guiKeyChangeMenu.cpp msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してください)" +msgstr "" +"操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してく" +"ださい)" #: src/guiKeyChangeMenu.cpp src/keycode.cpp msgid "Left" @@ -1285,8 +1303,10 @@ msgid "" msgstr "" "（X,Y,Z）『スケール』の単位の世界センターからのフラクタルのオフセット。\n" "動きに低い土地の適当な卵区域を使われます（0、0）。\n" -"デフォルトはmandelbrotセットに適しています、それはjuliaセットのために編集される必要があります。\n" -"およそ-2～2変動してください。ノードでオフセットのために『スケール』によって増えてください。" +"デフォルトはmandelbrotセットに適しています、それはjuliaセットのために編集され" +"る必要があります。\n" +"およそ-2～2変動してください。ノードでオフセットのために『スケール』によって増" +"えてください。" #: src/settings_translation_file.cpp msgid "" @@ -1319,7 +1339,8 @@ msgstr "" "サポートしている出力:\n" "- none: 3D出力を行いません。\n" "- anaglyph: 赤/青の色による3Dです。\n" -"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応しています。\n" +"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応していま" +"す。\n" "- topbottom: 画面を上下で分割します。\n" "- sidebyside: 画面を左右で分割します。" @@ -1328,7 +1349,8 @@ msgid "" "A chosen map seed for a new map, leave empty for random.\n" "Will be overridden when creating a new world in the main menu." msgstr "" -"新規マップを作成する際の初期シード値です。空にするとランダムに設定されます。\n" +"新規マップを作成する際の初期シード値です。空にするとランダムに設定されま" +"す。\n" "ワールドを新規作成する際にシード値を入力すると上書きされます。" #: src/settings_translation_file.cpp @@ -1347,6 +1369,16 @@ msgstr "エマージキューの絶対的な制限値" msgid "Acceleration in air" msgstr "空中での加速" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "アクティブなブロックの範囲" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "アクティブなブロックの範囲" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "アクティブなブロックの範囲" @@ -1369,7 +1401,8 @@ msgstr "" msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." -msgstr "4kスクリーンなどのための、画面の解像度の設定です (非X11/Android環境のみ)。" +msgstr "" +"4kスクリーンなどのための、画面の解像度の設定です (非X11/Android環境のみ)。" #: src/settings_translation_file.cpp #, fuzzy @@ -1419,7 +1452,8 @@ msgid "" "minetest.net." msgstr "" "公開サーバの通知先のサーバ一覧です。\n" -"IPv6アドレスを通知したい場合は、serverlist_url = v6.servers.minetest.netを使用してください。" +"IPv6アドレスを通知したい場合は、serverlist_url = v6.servers.minetest.netを使" +"用してください。" #: src/settings_translation_file.cpp #, fuzzy @@ -1447,6 +1481,11 @@ msgstr "水が揺れる高さ" msgid "Basic" msgstr "基本" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "標準権限" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "バイリニアフィルタリング" @@ -1465,6 +1504,10 @@ msgstr "フルスクリーンモードでの1ピクセル(色深度)あたりの msgid "Build inside player" msgstr "プレイヤーの位置に設置" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "バンプマッピング" + #: src/settings_translation_file.cpp #, fuzzy msgid "Camera smoothing" @@ -1490,6 +1533,10 @@ msgstr "洞窟ノイズ#1" msgid "Cave noise #2" msgstr "洞窟ノイズ#2" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Caves and tunnels form at the intersection of the two noises" @@ -1600,8 +1647,9 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" -"流行の最先端の安全対策がオンの（request_insecure_environment（）を通して）ときでも、不安定な機能にアクセスしてもよい信用された" -"モッズのコンマで区切られたリスト。" +"流行の最先端の安全対策がオンの（request_insecure_environment（）を通して）と" +"きでも、不安定な機能にアクセスしてもよい信用されたモッズのコンマで区切られた" +"リスト。" #: src/settings_translation_file.cpp #, fuzzy @@ -1609,8 +1657,9 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" -"HTTP API（彼らがインターネットに出入りするデータをアップロードして、ダウンロードするのを許します）にアクセスしてもよいモッズのコンマseperat" -"edされたリスト。" +"HTTP API（彼らがインターネットに出入りするデータをアップロードして、ダウン" +"ロードするのを許します）にアクセスしてもよいモッズのコンマseperatedされたリス" +"ト。" #: src/settings_translation_file.cpp msgid "Command key" @@ -1684,6 +1733,10 @@ msgstr "湖底の険しさ/深さの設定。" msgid "Controls steepness/height of hills." msgstr "丘の険しさ/高さの設定。" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "クラッシュメッセージ" @@ -1906,7 +1959,9 @@ msgstr "損害を得ていて、死んでいるプレーヤーを使用可能に #: src/settings_translation_file.cpp #, fuzzy msgid "Enable random user input (only used for testing)." -msgstr "入力される（テストのために使われるだけの）ランダムなユーザーに許可を与えてください。" +msgstr "" +"入力される（テストのために使われるだけの）ランダムなユーザーに許可を与えてく" +"ださい。" #: src/settings_translation_file.cpp #, fuzzy @@ -1927,8 +1982,9 @@ msgid "" "expecting." msgstr "" "つながることから古いクライアントを認めないのを可能にしてください。\n" -"新しいサーバーに接続するとき彼らが完敗しないという点で、年上の依頼人は互換性を持ちます、しかし、彼らがあなたが期待しているすべての新機能を支えるというわけ" -"ではないかもしれません。" +"新しいサーバーに接続するとき彼らが完敗しないという点で、年上の依頼人は互換性" +"を持ちます、しかし、彼らがあなたが期待しているすべての新機能を支えるというわ" +"けではないかもしれません。" #: src/settings_translation_file.cpp #, fuzzy @@ -1938,8 +1994,10 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" -"遠隔メディア・サーバー（サーバーで提供されるならば）の使用法をイネーブルしてください。\n" -"サーバーに接続するとき、遠隔サーバーはメディア（例えばテクスチャー）をダウンロードするかなりより高速道を提供します。" +"遠隔メディア・サーバー（サーバーで提供されるならば）の使用法をイネーブルして" +"ください。\n" +"サーバーに接続するとき、遠隔サーバーはメディア（例えばテクスチャー）をダウン" +"ロードするかなりより高速道を提供します。" #: src/settings_translation_file.cpp #, fuzzy @@ -1948,8 +2006,8 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" -"IPv6サーバーを動かすことを可能にして/働かなくしてください。システム構成に従い、IPv6サーバーは、IPv6クライアントに制限されるかもしれません。" -"\n" +"IPv6サーバーを動かすことを可能にして/働かなくしてください。システム構成に従" +"い、IPv6サーバーは、IPv6クライアントに制限されるかもしれません。\n" "bind_addressがセットされるならば、無視されます。" #: src/settings_translation_file.cpp @@ -1965,8 +2023,8 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" -"テクスチャーのためにbumpmappingすることを可能にします。ノル悪地図はテクスチャー・パックで供給される必要があるか、自動発生する必要があります。" -"\n" +"テクスチャーのためにbumpmappingすることを可能にします。ノル悪地図はテクス" +"チャー・パックで供給される必要があるか、自動発生する必要があります。\n" "許可されることを遮光物に要求します。" #: src/settings_translation_file.cpp @@ -2005,7 +2063,9 @@ msgstr "" msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." -msgstr "0より高い数に設定されるとき、実験的なオプションはブロックの間の見える隙間を引き起こすかもしれません。" +msgstr "" +"0より高い数に設定されるとき、実験的なオプションはブロックの間の見える隙間を引" +"き起こすかもしれません。" #: src/settings_translation_file.cpp #, fuzzy @@ -2085,7 +2145,9 @@ msgstr "視野角。" msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "マルチプレーヤー・タブで示されるあなたの大好きなサーバーを含むclient/serverlist/でファイルしてください。" +msgstr "" +"マルチプレーヤー・タブで示されるあなたの大好きなサーバーを含むclient/" +"serverlist/でファイルしてください。" #: src/settings_translation_file.cpp #, fuzzy @@ -2105,8 +2167,10 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" -"フィルタ処理したテクスチャーは、透明なテクスチャーに暗いか明るい端に終わって、RGBの価値と完全に透明な隣人（それをPNGオプティマイザーは通常捨てます）" -"を、時々混ぜ合わせることができます。テクスチャー荷時間にそれをきれいにするために、このフィルタを使用してください。" +"フィルタ処理したテクスチャーは、透明なテクスチャーに暗いか明るい端に終わっ" +"て、RGBの価値と完全に透明な隣人（それをPNGオプティマイザーは通常捨てます）" +"を、時々混ぜ合わせることができます。テクスチャー荷時間にそれをきれいにするた" +"めに、このフィルタを使用してください。" #: src/settings_translation_file.cpp msgid "Filtering" @@ -2163,6 +2227,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "前キー" @@ -2228,9 +2296,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2282,7 +2352,8 @@ msgid "" "How large area of blocks are subject to the active block stuff, stated in " "mapblocks (16 nodes).\n" "In active blocks objects are loaded and ABMs run." -msgstr "Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。" +msgstr "" +"Mapblock (16ノード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。" #: src/settings_translation_file.cpp msgid "" @@ -2701,6 +2772,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2786,41 +2865,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2867,6 +2955,11 @@ msgstr "マップ生成フラグ" msgid "Mapgen flat" msgstr "マップ生成フラグ" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "マップ生成フラグ" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2915,6 +3008,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "マップ生成フラグ" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "マップ生成フラグ" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2979,6 +3077,11 @@ msgstr "マップ生成名" msgid "Mapgen v5" msgstr "ワールドタイプ" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "ワールドタイプ" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -3063,6 +3166,11 @@ msgstr "" msgid "Mapgen v7" msgstr "ワールドタイプ" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "ワールドタイプ" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3354,6 +3462,10 @@ msgstr "" msgid "Node highlighting" msgstr "ノードをハイライト" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3470,6 +3582,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3578,6 +3694,23 @@ msgstr "スクリーンショット" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "スクリーンショット" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "スクリーンショット" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "セキュリティ" @@ -3669,6 +3802,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3733,6 +3870,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3806,6 +3947,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3836,10 +3981,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "ミップマッピング" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4055,18 +4196,23 @@ msgstr "" "どこでマップ生成を停止するかの設定です。\n" "注意:\n" "- 最大で31000です(これ以上に設定しても効果はありません)。\n" -"- マップ生成は80x80x80ノードのグループで動作します (5x5x5マップブロック)。\n" +"- マップ生成は80x80x80ノードのグループで動作します (5x5x5マップブロッ" +"ク)。\n" "- このグループは原点から-32、-32ノードのオフセットがあります。\n" "- グループはmap_generation_limit内で生成されたものに限ります。" #: src/settings_translation_file.cpp msgid "" "Whether freetype fonts are used, requires freetype support to be compiled in." -msgstr "Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドである必要があります。" +msgstr "" +"Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドで" +"ある必要があります。" #: src/settings_translation_file.cpp msgid "Whether node texture animations should be desynchronized per mapblock." -msgstr "ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうかの設定です。" +msgstr "" +"ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうか" +"の設定です。" #: src/settings_translation_file.cpp msgid "" @@ -4095,7 +4241,17 @@ msgstr "可視領域の端に霧を表示するかどうかの設定です。" #: src/settings_translation_file.cpp msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." -msgstr "クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効果)。" +msgstr "" +"クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効" +"果)。" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" #: src/settings_translation_file.cpp msgid "Width component of the initial window size." @@ -4135,33 +4291,45 @@ msgstr "cURLパラレル制限" msgid "cURL timeout" msgstr "cURLタイムアウト" -#~ msgid "If disabled " -#~ msgstr "無効化の場合 " - -#~ msgid "If enabled, " -#~ msgstr "有効化の場合 " - -#~ msgid "Rendering:" -#~ msgstr "レンダリング:" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "ドライバーを変更するためMinetestを再起動します" - -#~ msgid " MB/s" -#~ msgstr " MB/秒" - -#~ msgid " KB/s" -#~ msgstr " KB/秒" - -#~ msgid "Touch free target" -#~ msgstr "タッチ位置を自由にする" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "メニューの大きさとして設定されている数値: " +#, fuzzy +#~ msgid "Preload inventory textures" +#~ msgstr "テクスチャ読み込み中..." #~ msgid "Reset singleplayer world" #~ msgstr "シングルプレイヤーのワールドをリセット" -#, fuzzy -#~ msgid "Preload inventory textures" -#~ msgstr "テクスチャ読み込み中..." +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "メニューの大きさとして設定されている数値: " + +#~ msgid "Touch free target" +#~ msgstr "タッチ位置を自由にする" + +#~ msgid " KB/s" +#~ msgstr " KB/秒" + +#~ msgid " MB/s" +#~ msgstr " MB/秒" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "ドライバーを変更するためMinetestを再起動します" + +#~ msgid "Rendering:" +#~ msgstr "レンダリング:" + +#~ msgid "If enabled, " +#~ msgstr "有効化の場合 " + +#~ msgid "If disabled " +#~ msgstr "無効化の場合 " + +#~ msgid "No!!!" +#~ msgstr "いいえ！！！" + +#~ msgid "Generate Normalmaps" +#~ msgstr "ノーマルマップの生成" + +#~ msgid "Public Serverlist" +#~ msgstr "公開サーバ一覧" + +#~ msgid "No of course not!" +#~ msgstr "いいえ！" diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po index 5bf51cce..664a380f 100644 --- a/po/jbo/minetest.po +++ b/po/jbo/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2015-11-22 06:05+0000\n" "Last-Translator: senpi \n" "Language-Team: Lojban \n" "Language-Team: Korean \n" "Language-Team: LANGUAGE \n" @@ -73,6 +73,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -180,6 +181,12 @@ msgstr "" msgid "Are you sure you want to delete \"$1\"?" msgstr "" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Өчүрүү" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "" @@ -188,24 +195,11 @@ msgstr "" msgid "Modmgr: invalid modpath \"$1\"" msgstr "" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Ооба" - #: builtin/mainmenu/dlg_delete_world.lua #, fuzzy msgid "Delete World \"$1\"?" msgstr "Дүйнөнү өчүрүү" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Жок" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Кабыл алуу" @@ -419,7 +413,7 @@ msgstr "" #: builtin/mainmenu/tab_multiplayer.lua #, fuzzy -msgid "Address / Port :" +msgid "Address / Port" msgstr "Дареги/порту" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -440,20 +434,20 @@ msgstr "Жаратуу режими" msgid "Damage enabled" msgstr "күйгүзүлгөн" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Өчүрүү" - -#: builtin/mainmenu/tab_multiplayer.lua +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy -msgid "Name / Password :" -msgstr "Аты/сырсөзү" +msgid "Del. Favorite" +msgstr "Тандалмалар:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy -msgid "Public Serverlist" -msgstr "Жалпылык серверлердин тизмеси:" +msgid "Favorite" +msgstr "Тандалмалар:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Аты/сырсөзү" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -478,7 +472,7 @@ msgstr "Жаратуу режими" msgid "Enable Damage" msgstr "Убалды күйгүзүү" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Аты/сырсөзү" @@ -551,9 +545,9 @@ msgstr "Бир кишилик" msgid "Bilinear Filter" msgstr "Экисызык чыпкалоосу" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Bumpmapping" +msgid "Bump Mapping" msgstr "Mip-текстуралоо" #: builtin/mainmenu/tab_settings.lua @@ -565,20 +559,11 @@ msgstr "Баскычтарды өзгөртүү" msgid "Connected Glass" msgstr "Туташуу" -#: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "Enable Particles" -msgstr "Баарын күйгүзүү" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Fancy Leaves" msgstr "Күңүрт суу" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Mipmap" @@ -588,6 +573,10 @@ msgstr "Mip-текстуралоо" msgid "Mipmap + Aniso. Filter" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Жок" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "No Filter" @@ -599,18 +588,24 @@ msgid "No Mipmap" msgstr "Mip-текстуралоо" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "" +#, fuzzy +msgid "Node Highlighting" +msgstr "Тегиз жарык" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Тегиз жарык" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Mip-текстуралоо" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Opaque Leaves" @@ -625,6 +620,11 @@ msgstr "Күңүрт суу" msgid "Parallax Occlusion" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Баарын күйгүзүү" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Ырастоолор" @@ -651,6 +651,11 @@ msgstr "" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-текстуралоо" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "" @@ -675,6 +680,10 @@ msgstr "Кооз бактар" msgid "Waving Water" msgstr "Кооз бактар" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Ооба" + #: builtin/mainmenu/tab_simple_main.lua #, fuzzy msgid "Config mods" @@ -874,10 +883,6 @@ msgstr "" msgid "Node definitions..." msgstr "" -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Улантуу" - #: src/game.cpp msgid "Resolving address..." msgstr "Дареги чечилүүдө..." @@ -899,13 +904,17 @@ msgstr "Үн көлөмү" msgid "You died." msgstr "Сиз өлдүңүз." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "" #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "" +msgid "Proceed" +msgstr "Улантуу" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1374,6 +1383,14 @@ msgstr "" msgid "Acceleration in air" msgstr "" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "" @@ -1462,6 +1479,10 @@ msgstr "" msgid "Basic" msgstr "" +#: src/settings_translation_file.cpp +msgid "Basic Privileges" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Bilinear filtering" @@ -1481,6 +1502,11 @@ msgstr "" msgid "Build inside player" msgstr "Көп кишилик" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip-текстуралоо" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1501,6 +1527,10 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1670,6 +1700,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" @@ -2060,6 +2094,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Forward key" @@ -2126,9 +2164,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2603,6 +2643,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2690,41 +2738,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2771,6 +2828,10 @@ msgstr "" msgid "Mapgen flat" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2819,6 +2880,10 @@ msgstr "" msgid "Mapgen fractal" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2883,6 +2948,10 @@ msgstr "" msgid "Mapgen v5" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2967,6 +3036,10 @@ msgstr "" msgid "Mapgen v7" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3260,6 +3333,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3376,6 +3453,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3486,6 +3567,23 @@ msgstr "Тез сүрөт" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Тез сүрөт" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Тез сүрөт" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3580,6 +3678,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3646,6 +3748,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3719,6 +3825,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3749,11 +3859,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Mip-текстуралоо" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4006,6 +4111,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4041,27 +4154,54 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Баарын өчүрүү" +#~ msgid "Preload inventory textures" +#~ msgstr "Жүктөлүүдө..." #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "күйгүзүлгөн" +#~ msgid "Downloading" +#~ msgstr "Ылдый" -#, fuzzy -#~ msgid "Game Name" -#~ msgstr "Оюн" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу" -#~ msgid "Favorites:" -#~ msgstr "Тандалмалар:" +#~ msgid "is required by:" +#~ msgstr "талап кылынганы:" -#, fuzzy -#~ msgid "Password" -#~ msgstr "Эски сырсөз" +#~ msgid "Configuration saved. " +#~ msgstr "Конфигурация сакталды. " -#, fuzzy -#~ msgid "Finite Liquid" -#~ msgstr "Чектүү суюктук" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Эскертүү: Туура эмес конфигурация. " + +#~ msgid "Show Public" +#~ msgstr "Жалпылыкты көрсөтүү" + +#~ msgid "Show Favorites" +#~ msgstr "Тандалмаларды көрсөтүү" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз." + +#~ msgid "Create world" +#~ msgstr "Дүйнөнү жаратуу" + +#~ msgid "Address required." +#~ msgstr "Дареги талап кылынат." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок" + +#~ msgid "Files to be deleted" +#~ msgstr "Өчүрүлө турган файлдар" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок" #~ msgid "" #~ "Default Controls:\n" @@ -4088,52 +4228,26 @@ msgstr "" #~ "- ESC: бул меню\n" #~ "- T: маек\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Бардык дүйнө файлдарын өчүрүү оңунан чыккан жок" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Дүйнөнү ырастоо мүмкүн эмес: Эч нерсе тандалган жок" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Дүйнөнү жаратуу мүмкүн эмес: Оюндар табылган жок" - -#~ msgid "Files to be deleted" -#~ msgstr "Өчүрүлө турган файлдар" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Дүнөнү жаратуу мүмкүн эмес: Эч нерсе тандалган жок" - -#~ msgid "Address required." -#~ msgstr "Дареги талап кылынат." - -#~ msgid "Create world" -#~ msgstr "Дүйнөнү жаратуу" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Жергиликтүү серверди жүргүзүү үчүн даректи бош калтырыңыз." - -#~ msgid "Show Favorites" -#~ msgstr "Тандалмаларды көрсөтүү" - -#~ msgid "Show Public" -#~ msgstr "Жалпылыкты көрсөтүү" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Эскертүү: Туура эмес конфигурация. " - -#~ msgid "Configuration saved. " -#~ msgstr "Конфигурация сакталды. " - -#~ msgid "is required by:" -#~ msgstr "талап кылынганы:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Сол баскычы: Бардык буюмдарды ташуу, Оң баскычы: Бир буюмду ташуу" +#, fuzzy +#~ msgid "Finite Liquid" +#~ msgstr "Чектүү суюктук" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ылдый" +#~ msgid "Password" +#~ msgstr "Эски сырсөз" #, fuzzy -#~ msgid "Preload inventory textures" -#~ msgstr "Жүктөлүүдө..." +#~ msgid "Game Name" +#~ msgstr "Оюн" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "күйгүзүлгөн" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Баарын өчүрүү" + +#, fuzzy +#~ msgid "Public Serverlist" +#~ msgstr "Жалпылык серверлердин тизмеси:" diff --git a/po/lt/minetest.po b/po/lt/minetest.po index 41e640bb..9818d29d 100644 --- a/po/lt/minetest.po +++ b/po/lt/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2015-11-19 05:14+0000\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" "Language-Team: LANGUAGE \n" @@ -95,6 +95,7 @@ msgid "Save" msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -172,12 +173,9 @@ msgid "Are you sure you want to delete \"$1\"?" msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "" - -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" msgstr "" #: builtin/mainmenu/dlg_delete_mod.lua @@ -192,10 +190,6 @@ msgstr "" msgid "Delete World \"$1\"?" msgstr "" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "" - #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" msgstr "" @@ -401,26 +395,25 @@ msgid "Select Mod File:" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" -msgstr "" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" +msgid "Address / Port" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "" - -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" +msgid "Name / Password" msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Connect" msgstr "" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Del. Favorite" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Favorite" +msgstr "" + #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" msgstr "" @@ -467,7 +460,7 @@ msgstr "" msgid "Public" msgstr "" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "" @@ -503,6 +496,14 @@ msgstr "" msgid "Fancy Leaves" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Node Outlining" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "Node Highlighting" +msgstr "" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "" @@ -548,7 +549,11 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" +msgid "Yes" +msgstr "" + +#: builtin/mainmenu/tab_settings.lua +msgid "No" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -556,7 +561,7 @@ msgid "Smooth Lighting" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" +msgid "Particles" msgstr "" #: builtin/mainmenu/tab_settings.lua @@ -571,10 +576,6 @@ msgstr "" msgid "Connected Glass" msgstr "" -#: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" -msgstr "" - #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" msgstr "" @@ -599,12 +600,16 @@ msgstr "" msgid "Touchthreshold (px)" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "Bump Mapping" +msgstr "" + #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +msgid "Tone Mapping" msgstr "" #: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" +msgid "Normal Mapping" msgstr "" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp @@ -719,10 +724,6 @@ msgstr "" msgid "needs_fallback_font" msgstr "" -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "" - #: src/game.cpp msgid "You died." msgstr "" @@ -826,6 +827,10 @@ msgstr "" msgid "MiB/s" msgstr "" +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "" + #: src/game.cpp msgid "" "\n" @@ -833,11 +838,11 @@ msgid "" msgstr "" #: src/guiFormSpecMenu.cpp -msgid "Enter " +msgid "Proceed" msgstr "" #: src/guiFormSpecMenu.cpp -msgid "ok" +msgid "Enter " msgstr "" #: src/guiKeyChangeMenu.cpp @@ -1732,6 +1737,18 @@ msgid "" "Note that the port field in the main menu overrides this setting." msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Saving map received from server" msgstr "" @@ -1740,6 +1757,10 @@ msgstr "" msgid "Save the map received by the client on disk." msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Connect to external media server" msgstr "" @@ -1932,10 +1953,6 @@ msgid "" "Thy only work with the OpenGL video backend." msgstr "" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "" - #: src/settings_translation_file.cpp msgid "Filmic tone mapping" msgstr "" @@ -1944,6 +1961,10 @@ msgstr "" msgid "Enables filmic tone mapping" msgstr "" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Enables bumpmapping for textures. Normalmaps need to be supplied by the " @@ -2498,6 +2519,25 @@ msgstr "" msgid "Path to save screenshots at." msgstr "" +#: src/settings_translation_file.cpp +msgid "Screenshot format" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Screenshot quality" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "DPI" msgstr "" @@ -2765,6 +2805,14 @@ msgid "" "See /privs in game for a full list on your server and mod configuration." msgstr "" +#: src/settings_translation_file.cpp +msgid "Basic Privileges" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Unlimited player transfer distance" msgstr "" @@ -3054,6 +3102,30 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "Ignore world errors" msgstr "" @@ -3142,9 +3214,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3230,6 +3304,14 @@ msgstr "" msgid "Mapgen v5" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen v5 cave width" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen v5 filler depth noise parameters" msgstr "" @@ -3261,11 +3343,13 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3337,10 +3421,16 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Mapgen v7 cave width" msgstr "" #: src/settings_translation_file.cpp @@ -3398,10 +3488,12 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3420,6 +3512,10 @@ msgstr "" msgid "Y of upper limit of large pseudorandom caves." msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen flat cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen flat lake threshold" msgstr "" @@ -3485,6 +3581,10 @@ msgstr "" msgid "Mapgen fractal" msgstr "" +#: src/settings_translation_file.cpp +msgid "Mapgen fractal cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Mapgen fractal fractal" msgstr "" @@ -3631,13 +3731,16 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -3700,6 +3803,10 @@ msgid "" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noises" msgstr "" diff --git a/po/nb/minetest.po b/po/nb/minetest.po index 22c80b8d..7ae1156e 100644 --- a/po/nb/minetest.po +++ b/po/nb/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2015-09-20 17:15+0200\n" "Last-Translator: Christian Haug \n" "Language-Team: Norwegian Bokmål \n" "Language-Team: Dutch \n" -"Language-Team: Polish " -"\n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Wspieramy protokół w wersji od $1 do $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -177,6 +178,12 @@ msgstr "Nie masz zainstalowanych żadnych podgier." msgid "Are you sure you want to delete \"$1\"?" msgstr "Na pewno usunąć \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Usuń" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: nie można usunąć \"$1\"" @@ -185,23 +192,10 @@ msgstr "Modmgr: nie można usunąć \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: nieprawidłowy katalog \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Oczywiście, że nie!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Tak" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Usunąć świat \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Nie" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Zaakceptuj" @@ -412,7 +406,8 @@ msgid "Uninstall selected modpack" msgstr "Usuń zaznaczony modpack" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Adres / Port :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -431,18 +426,20 @@ msgstr "Tryb kreatywny" msgid "Damage enabled" msgstr "Obrażenia włączone" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Usuń" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nazwa gracza / Hasło :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Ulubione:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Lista publicznych serwerów" +#, fuzzy +msgid "Favorite" +msgstr "Ulubione:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nazwa gracza / Hasło :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -466,7 +463,7 @@ msgstr "Tryb kreatywny" msgid "Enable Damage" msgstr "Włącz obrażenia" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nazwa gracza/Hasło" @@ -535,8 +532,9 @@ msgstr "Pojedynczy gracz" msgid "Bilinear Filter" msgstr "Filtrowanie dwuliniowe" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Mapowanie wypukłości" #: builtin/mainmenu/tab_settings.lua @@ -547,18 +545,10 @@ msgstr "Zmień klawisze" msgid "Connected Glass" msgstr "Szkło połączone" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Włącz Efekty Cząsteczkowe" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Ozdobne liście" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Generuj mapy normalnych" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mipmapy" @@ -567,6 +557,10 @@ msgstr "Mipmapy" msgid "Mipmap + Aniso. Filter" msgstr "Mipmapy i Filtr anizotropowe" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Nie" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Filtrowanie wyłączone" @@ -576,18 +570,24 @@ msgid "No Mipmap" msgstr "Mip-Mappowanie wyłączone" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Nie!!" +#, fuzzy +msgid "Node Highlighting" +msgstr "Płynne oświetlenie" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Płynne oświetlenie" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Brak" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Mip-Mappowanie" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Nieprzejrzyste liście" @@ -600,6 +600,11 @@ msgstr "Nieprzejrzysta Woda" msgid "Parallax Occlusion" msgstr "Mapowanie paralaksy" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Włącz Efekty Cząsteczkowe" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Ustawienia" @@ -624,6 +629,11 @@ msgstr "Teksturowanie:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-Mappowanie" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "" @@ -647,6 +657,10 @@ msgstr "Ozdobne drzewa" msgid "Waving Water" msgstr "Ozdobne drzewa" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Tak" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Skonfiguruj mody" @@ -849,10 +863,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Definicje nod..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Kontynuuj" - #: src/game.cpp msgid "Resolving address..." msgstr "Sprawdzanie adresu..." @@ -873,13 +883,17 @@ msgstr "Głośność" msgid "You died." msgstr "Zginąłeś." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "ok" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Enter " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "ok" +msgid "Proceed" +msgstr "Kontynuuj" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1349,6 +1363,14 @@ msgstr "" msgid "Acceleration in air" msgstr "" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "" @@ -1437,6 +1459,10 @@ msgstr "" msgid "Basic" msgstr "" +#: src/settings_translation_file.cpp +msgid "Basic Privileges" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Bilinear filtering" @@ -1456,6 +1482,10 @@ msgstr "" msgid "Build inside player" msgstr "Gra wieloosobowa" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Mapowanie wypukłości" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1476,6 +1506,10 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1645,6 +1679,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" @@ -2038,6 +2076,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Forward key" @@ -2104,9 +2146,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2582,6 +2626,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2669,41 +2721,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2754,6 +2815,11 @@ msgstr "Generator mapy" msgid "Mapgen flat" msgstr "Generator mapy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Generator mapy" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2807,6 +2873,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Generator mapy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Generator mapy" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2878,6 +2949,11 @@ msgstr "Generator mapy" msgid "Mapgen v5" msgstr "Generator mapy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Generator mapy" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2964,6 +3040,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Generator mapy" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Generator mapy" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3257,6 +3338,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3373,6 +3458,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3484,6 +3573,23 @@ msgstr "Snapshot" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Snapshot" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Snapshot" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3583,6 +3689,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3649,6 +3759,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3723,6 +3837,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3753,11 +3871,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Mip-Mappowanie" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4011,6 +4124,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4047,91 +4168,59 @@ msgid "cURL timeout" msgstr "Limit czasu cURL" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Wyłącz wszystkie" +#~ msgid "Preload inventory textures" +#~ msgstr "Ładowanie..." #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "włączone" +#~ msgid "Downloading" +#~ msgstr "Ściągnij" -#~ msgid "Game Name" -#~ msgstr "Nazwa Gry" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się" - -#~ msgid "GAMES" -#~ msgstr "GRY" - -#~ msgid "Mods:" -#~ msgstr "Mody:" - -#~ msgid "new game" -#~ msgstr "nowa gra" - -#~ msgid "EDIT GAME" -#~ msgstr "EDYTUJ GRĘ" - -#~ msgid "Remove selected mod" -#~ msgstr "Usuń zaznaczony mod" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<--Dodaj mod" - -#~ msgid "CLIENT" -#~ msgstr "KLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Ulubione:" - -#~ msgid "START SERVER" -#~ msgstr "URUCHOM SERWER" - -#~ msgid "Name" -#~ msgstr "Nazwa" - -#~ msgid "Password" -#~ msgstr "Hasło" - -#~ msgid "SETTINGS" -#~ msgstr "USTAWIENIA" - -#~ msgid "Preload item visuals" -#~ msgstr "Ładuj obrazy przedmiotów" - -#~ msgid "Finite Liquid" -#~ msgstr "Realistyczne ciecze" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "TRYB JEDNOOSOBOWY" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACZKI TEKSTUR" - -#~ msgid "MODS" -#~ msgstr "MODY" - -#, fuzzy -#~ msgid "Add mod:" -#~ msgstr "<<--Dodaj mod" - -#, fuzzy -#~ msgid "Local install" -#~ msgstr "Instaluj" - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ msgid "Left click: Move all items, Right click: Move single item" #~ msgstr "" -#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n" -#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację. " +#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: " +#~ "przenieś pojedynczy przedmiot" -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n" -#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację. " +#~ msgid "is required by:" +#~ msgstr "wymagane przez:" + +#~ msgid "Configuration saved. " +#~ msgstr "Konfiguracja zapisana. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki" + +#~ msgid "Show Public" +#~ msgstr "Pokaż publiczne" + +#~ msgid "Show Favorites" +#~ msgstr "Pokaż ulubione" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny." + +#~ msgid "Create world" +#~ msgstr "Stwórz świat" + +#~ msgid "Address required." +#~ msgstr "Wymagany adres." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Nie można skasować świata: nic nie zaznaczono" + +#~ msgid "Files to be deleted" +#~ msgstr "Pliki do skasowania" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Nie udało się skasować wszystkich plików świata" #~ msgid "" #~ "Default Controls:\n" @@ -4158,57 +4247,98 @@ msgstr "Limit czasu cURL" #~ "- ESC: to menu\n" #~ "- T: czat\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Nie udało się skasować wszystkich plików świata" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Nie można skonfigurować świata: Nic nie zaznaczono" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry" - -#~ msgid "Files to be deleted" -#~ msgstr "Pliki do skasowania" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Nie można skasować świata: nic nie zaznaczono" - -#~ msgid "Address required." -#~ msgstr "Wymagany adres." - -#~ msgid "Create world" -#~ msgstr "Stwórz świat" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Pozostaw pole adresu puste, by uruchomić serwer lokalny." - -#~ msgid "Show Favorites" -#~ msgstr "Pokaż ulubione" - -#~ msgid "Show Public" -#~ msgstr "Pokaż publiczne" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Nie można stworzyć świata: Nazwa zawiera niedozwolone znaki" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Ostrzeżenie: Plik konfiguracyjny niespójny. " - -#~ msgid "Configuration saved. " -#~ msgstr "Konfiguracja zapisana. " - -#~ msgid "is required by:" -#~ msgstr "wymagane przez:" - -#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " #~ msgstr "" -#~ "Lewy przycisk myszy: przenieś wszystkie przedmioty, Prawy przycisk myszy: " -#~ "przenieś pojedynczy przedmiot" +#~ "Ostrzeżenie: Niektóre z modyfikacji nie zostały znalezione.\n" +#~ "Ich ustawienia zostaną usunięte gdy zapiszesz konfigurację. " + +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Uwaga: Niektóre z modyfikacji nie zostały jeszcze skonfigurowane.\n" +#~ "Zostaną domyślnie włączone gdy zapiszesz konfigurację. " #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Ściągnij" +#~ msgid "Local install" +#~ msgstr "Instaluj" #, fuzzy -#~ msgid "Preload inventory textures" -#~ msgstr "Ładowanie..." +#~ msgid "Add mod:" +#~ msgstr "<<--Dodaj mod" + +#~ msgid "MODS" +#~ msgstr "MODY" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACZKI TEKSTUR" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "TRYB JEDNOOSOBOWY" + +#~ msgid "Finite Liquid" +#~ msgstr "Realistyczne ciecze" + +#~ msgid "Preload item visuals" +#~ msgstr "Ładuj obrazy przedmiotów" + +#~ msgid "SETTINGS" +#~ msgstr "USTAWIENIA" + +#~ msgid "Password" +#~ msgstr "Hasło" + +#~ msgid "Name" +#~ msgstr "Nazwa" + +#~ msgid "START SERVER" +#~ msgstr "URUCHOM SERWER" + +#~ msgid "CLIENT" +#~ msgstr "KLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<--Dodaj mod" + +#~ msgid "Remove selected mod" +#~ msgstr "Usuń zaznaczony mod" + +#~ msgid "EDIT GAME" +#~ msgstr "EDYTUJ GRĘ" + +#~ msgid "new game" +#~ msgstr "nowa gra" + +#~ msgid "Mods:" +#~ msgstr "Mody:" + +#~ msgid "GAMES" +#~ msgstr "GRY" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się" + +#~ msgid "Game Name" +#~ msgstr "Nazwa Gry" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "włączone" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Wyłącz wszystkie" + +#~ msgid "No!!!" +#~ msgstr "Nie!!" + +#~ msgid "Generate Normalmaps" +#~ msgstr "Generuj mapy normalnych" + +#~ msgid "Public Serverlist" +#~ msgstr "Lista publicznych serwerów" + +#~ msgid "No of course not!" +#~ msgstr "Oczywiście, że nie!" diff --git a/po/pt/minetest.po b/po/pt/minetest.po index e73780cd..4bdd22ee 100644 --- a/po/pt/minetest.po +++ b/po/pt/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-01 00:21+0000\n" "Last-Translator: Fernando Reis \n" -"Language-Team: Portuguese " -"\n" +"Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nós suportamos as versões de protocolo entre $1 e $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -179,6 +180,12 @@ msgstr "Você não tem nenhum jogo instalado." msgid "Are you sure you want to delete \"$1\"?" msgstr "Tem a certeza que pertende eliminar \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Eliminar" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Mensagem de Extra: falhou a eliminação de \"$1\"" @@ -187,23 +194,10 @@ msgstr "Mensagem de Extra: falhou a eliminação de \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Mensagem de extra: caminho inválido \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Não, é claro que não!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Sim" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Eliminar Mundo \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Não" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Aceitar" @@ -417,7 +411,8 @@ msgid "Uninstall selected modpack" msgstr "Desinstalar pacote de extras selecionado" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Endereço / Porta :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -436,18 +431,20 @@ msgstr "Modo Criativo" msgid "Damage enabled" msgstr "Dano ativado" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Eliminar" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nome / Senha :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Favoritos:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Lista de Servidores Públicos" +#, fuzzy +msgid "Favorite" +msgstr "Favoritos:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nome / Senha :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -471,7 +468,7 @@ msgstr "Modo Criativo" msgid "Enable Damage" msgstr "Ativar Dano" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nome/Senha" @@ -539,8 +536,9 @@ msgstr "Tem a certeza que deseja reiniciar o seu mundo?" msgid "Bilinear Filter" msgstr "Filtro bi-linear" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Bump mapping" #: builtin/mainmenu/tab_settings.lua @@ -551,18 +549,10 @@ msgstr "Mudar teclas" msgid "Connected Glass" msgstr "Vidro conectado" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Ativar Partículas" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Folhas detalhadas" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Gerar Normalmaps" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mapa MIP" @@ -571,6 +561,10 @@ msgstr "Mapa MIP" msgid "Mipmap + Aniso. Filter" msgstr "Mapa MIP + Filtro Anisotrópico" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Não" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Sem Filtro" @@ -580,17 +574,23 @@ msgid "No Mipmap" msgstr "Sem mapa MIP" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Não!!!" +msgid "Node Highlighting" +msgstr "Destaque dos Cubos" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "Destaque dos Cubos" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Nenhum" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Mapeamento de tons" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Folhas Opacas" @@ -603,6 +603,11 @@ msgstr "Água Opaca" msgid "Parallax Occlusion" msgstr "Oclusão de paralaxe" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Ativar Partículas" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Definições" @@ -627,6 +632,10 @@ msgstr "Texturização:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Para ativar os sombreadores é necessário usar o driver OpenGL." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "Mapeamento de tons" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Nível de sensibilidade ao toque (px)" @@ -647,6 +656,10 @@ msgstr "Plantas ondulantes" msgid "Waving Water" msgstr "Água ondulante" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Sim" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Configurar extras" @@ -850,10 +863,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "Definindo cubos..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Continuar" - #: src/game.cpp msgid "Resolving address..." msgstr "A resolver endereço..." @@ -874,13 +883,17 @@ msgstr "Volume do som" msgid "You died." msgstr "Morreste." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "ok" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Enter " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "ok" +msgid "Proceed" +msgstr "Continuar" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1369,6 +1382,16 @@ msgstr "Limite absoluto da fila de espera emergente" msgid "Acceleration in air" msgstr "Aceleração no ar" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Distância de ativação de blocos" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Distância de ativação de blocos" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Distância de ativação de blocos" @@ -1440,8 +1463,8 @@ msgid "" "minetest.net." msgstr "" "Anunciar a esta lista de servidores.\n" -"Se quiser anunciar o seu endereço IPv6, use serverlist_url = " -"v6.servers.minetest.net." +"Se quiser anunciar o seu endereço IPv6, use serverlist_url = v6.servers." +"minetest.net." #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." @@ -1467,6 +1490,11 @@ msgstr "Altura base do terreno" msgid "Basic" msgstr "Básico" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Privilégios por defeito" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Filtro bi-linear" @@ -1483,6 +1511,10 @@ msgstr "Bits por pixel (profundidade de cor) no modo de ecrã inteiro." msgid "Build inside player" msgstr "Construir com o jogador dentro do cubo" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bump mapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Suavização da camera" @@ -1503,6 +1535,10 @@ msgstr "Ruído para cavernas #1" msgid "Cave noise #2" msgstr "Ruído para cavernas #2" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "Cavernas e túneis formam-se na interseção entre os dois ruídos" @@ -1690,6 +1726,10 @@ msgstr "Controla a inclinação/profundidade dos lagos." msgid "Controls steepness/height of hills." msgstr "Controla a inclinação/altura das colinas." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Mensagem de erro" @@ -1926,8 +1966,8 @@ msgid "" "Ignored if bind_address is set." msgstr "" "Ativar/desativar a execução de um servidor IPv6. Um servidor IPv6 pode \n" -"estar restringido a clientes com IPv6, dependendo da configuração do sistema." -"\n" +"estar restringido a clientes com IPv6, dependendo da configuração do " +"sistema.\n" "Ignorado se bind_address estiver definido." #: src/settings_translation_file.cpp @@ -2106,6 +2146,10 @@ msgstr "" msgid "Font size" msgstr "Tamanho da fonte" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Tecla para avançar" @@ -2176,9 +2220,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2481,8 +2527,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para mover o jogador para a frente.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2491,8 +2537,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para mover o jogador para a esquerda.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2536,8 +2582,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para imprimir pilhas de depuração. Usado para o desenvolvimento.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2576,8 +2622,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar a exibição do mini-mapa.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2614,8 +2660,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para ativar/desativar a exibição de informações de depuração.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2694,6 +2740,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2787,41 +2841,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2868,6 +2931,11 @@ msgstr "Flags do mapgen" msgid "Mapgen flat" msgstr "Gerador de mapa plano" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Limite de lagos no gerador de mapa plano" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2916,6 +2984,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Gerador de mapa fractal" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "W do corte do gerador de mapa fractal" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "Parâmetros de ruído caverna1 no gerador de mapa fractal" @@ -2981,6 +3054,11 @@ msgstr "Nome do gerador de mapa" msgid "Mapgen v5" msgstr "Gerador de mapa V5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Gerador de mapa V5" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -3065,6 +3143,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Gerador de mapa V7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Gerador de mapa V7" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3356,6 +3439,10 @@ msgstr "" msgid "Node highlighting" msgstr "Destacando cubos" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3472,6 +3559,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3587,6 +3678,23 @@ msgstr "Captura de ecrã" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Captura de ecrã" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Captura de ecrã" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3680,6 +3788,10 @@ msgstr "Formato do mini-mapa. Ativado = redondo, desativado = quadrado." msgid "Show debug info" msgstr "Mostrar informação de depuração" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3688,7 +3800,8 @@ msgstr "" msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." -msgstr "Dimensão da parcela a ser gerada por mapgen, em mapblocks (16^3 cubos)." +msgstr "" +"Dimensão da parcela a ser gerada por mapgen, em mapblocks (16^3 cubos)." #: src/settings_translation_file.cpp msgid "Slope and fill work together to modify the heights" @@ -3744,6 +3857,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3817,6 +3934,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3852,10 +3973,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "Mapeamento de tons" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4080,8 +4197,8 @@ msgstr "" "Note:\n" "- Limitado a 31000 (valor superior não tem efeito)\n" "- O gerador funciona em grupos de 80x80x80 cubos (5x5x5 MapBlocks).\n" -"- Esses grupos têm um deslocamento de -32, -32 cubos em relação à origem." -"\n" +"- Esses grupos têm um deslocamento de -32, -32 cubos em relação à " +"origem.\n" "- Apenas grupos dentro do limite definido por map_generation_limit são " "gerados" @@ -4127,6 +4244,14 @@ msgstr "" "Se deve mostrar ao cliente informação de depuração (tem o mesmo efeito que " "premir F5)." +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4162,93 +4287,57 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Desativar Tudo" +#~ msgid "Preload inventory textures" +#~ msgstr "A carregar..." #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "ativo" +#~ msgid "Downloading" +#~ msgstr "Descarregar" -#~ msgid "Game Name" -#~ msgstr "Nome do Jogo" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Botão esq: Mover todos os itens Botão dir: Mover um item" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "" -#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo " -#~ "\"$2\"" +#~ msgid "is required by:" +#~ msgstr "é necessário pelo:" -#~ msgid "GAMES" -#~ msgstr "JOGOS" +#~ msgid "Configuration saved. " +#~ msgstr "Configuração gravada. " -#~ msgid "Mods:" -#~ msgstr "Extras:" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Atenção: Configuração não compatível. " -#~ msgid "new game" -#~ msgstr "novo jogo" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos" -#~ msgid "EDIT GAME" -#~ msgstr "EDITAR JOGO" +#~ msgid "Show Public" +#~ msgstr "Mostrar Públicos" -#~ msgid "Remove selected mod" -#~ msgstr "Remover extra selecionado" +#~ msgid "Show Favorites" +#~ msgstr "Mostrar Favoritos" -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adicionar extra" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Deixe endereço em branco para iniciar servidor local." -#~ msgid "CLIENT" -#~ msgstr "CLIENTE" +#~ msgid "Create world" +#~ msgstr "Criar mundo" -#~ msgid "Favorites:" -#~ msgstr "Favoritos:" +#~ msgid "Address required." +#~ msgstr "Endereço necessário." -#~ msgid "START SERVER" -#~ msgstr "INICIAR SERVIDOR" +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado" -#~ msgid "Name" -#~ msgstr "Nome" +#~ msgid "Files to be deleted" +#~ msgstr "Ficheiros para eliminar" -#~ msgid "Password" -#~ msgstr "Senha" +#~ msgid "Cannot create world: No games found" +#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos" -#~ msgid "SETTINGS" -#~ msgstr "DEFINIÇÕES" +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Não foi possível configurar mundo: Nada seleccionado" -#~ msgid "Preload item visuals" -#~ msgstr "Pré-carregamento dos itens" - -#~ msgid "Finite Liquid" -#~ msgstr "Líquido Finito" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "Um Jogador" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACOTES DE TEXTURAS" - -#~ msgid "MODS" -#~ msgstr "EXTRAS" - -#, fuzzy -#~ msgid "Add mod:" -#~ msgstr "<<-- Adicionar extra" - -#, fuzzy -#~ msgid "Local install" -#~ msgstr "Instalar" - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods ainda não estão configurados.\n" -#~ "Eles vão ser ativados por predefinição quando guardar a configuração. " - -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "Atenção: Alguns mods configurados estão em falta.\n" -#~ "As suas definições vão ser removidas quando gravar a configuração. " +#~ msgid "Failed to delete all world files" +#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos" #~ msgid "" #~ "Default Controls:\n" @@ -4275,55 +4364,100 @@ msgstr "" #~ "- ESC: Este menu\n" #~ "- T: Chat\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Falhou a remoção de todos os ficheiros dos mundos" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods configurados estão em falta.\n" +#~ "As suas definições vão ser removidas quando gravar a configuração. " -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Não foi possível configurar mundo: Nada seleccionado" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Não foi possível criar mundo: Não foram detectados jogos" - -#~ msgid "Files to be deleted" -#~ msgstr "Ficheiros para eliminar" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Não foi possível eliminar mundo: Nada seleccionado" - -#~ msgid "Address required." -#~ msgstr "Endereço necessário." - -#~ msgid "Create world" -#~ msgstr "Criar mundo" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Deixe endereço em branco para iniciar servidor local." - -#~ msgid "Show Favorites" -#~ msgstr "Mostrar Favoritos" - -#~ msgid "Show Public" -#~ msgstr "Mostrar Públicos" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Não foi possível criar mundo: Nome com caracteres inválidos" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Atenção: Configuração não compatível. " - -#~ msgid "Configuration saved. " -#~ msgstr "Configuração gravada. " - -#~ msgid "is required by:" -#~ msgstr "é necessário pelo:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Botão esq: Mover todos os itens Botão dir: Mover um item" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods ainda não estão configurados.\n" +#~ "Eles vão ser ativados por predefinição quando guardar a configuração. " #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Descarregar" +#~ msgid "Local install" +#~ msgstr "Instalar" #, fuzzy -#~ msgid "Preload inventory textures" -#~ msgstr "A carregar..." +#~ msgid "Add mod:" +#~ msgstr "<<-- Adicionar extra" + +#~ msgid "MODS" +#~ msgstr "EXTRAS" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACOTES DE TEXTURAS" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "Um Jogador" + +#~ msgid "Finite Liquid" +#~ msgstr "Líquido Finito" + +#~ msgid "Preload item visuals" +#~ msgstr "Pré-carregamento dos itens" + +#~ msgid "SETTINGS" +#~ msgstr "DEFINIÇÕES" + +#~ msgid "Password" +#~ msgstr "Senha" + +#~ msgid "Name" +#~ msgstr "Nome" + +#~ msgid "START SERVER" +#~ msgstr "INICIAR SERVIDOR" + +#~ msgid "CLIENT" +#~ msgstr "CLIENTE" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adicionar extra" + +#~ msgid "Remove selected mod" +#~ msgstr "Remover extra selecionado" + +#~ msgid "EDIT GAME" +#~ msgstr "EDITAR JOGO" + +#~ msgid "new game" +#~ msgstr "novo jogo" + +#~ msgid "Mods:" +#~ msgstr "Extras:" + +#~ msgid "GAMES" +#~ msgstr "JOGOS" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "" +#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo " +#~ "\"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nome do Jogo" + +#, fuzzy +#~ msgid "If enabled, " +#~ msgstr "ativo" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Desativar Tudo" + +#~ msgid "No!!!" +#~ msgstr "Não!!!" + +#~ msgid "Generate Normalmaps" +#~ msgstr "Gerar Normalmaps" + +#~ msgid "Public Serverlist" +#~ msgstr "Lista de Servidores Públicos" + +#~ msgid "No of course not!" +#~ msgstr "Não, é claro que não!" diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index 9e665acd..3b345226 100644 --- a/po/pt_BR/minetest.po +++ b/po/pt_BR/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-03-31 13:45+0000\n" "Last-Translator: Ian giestas pauli \n" -"Language-Team: Portuguese (Brazil) " -"\n" +"Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Nós suportamos entre as versões $1 e $2 do protocolo." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -180,6 +181,12 @@ msgstr "Você não possui nenhum subgame instalado." msgid "Are you sure you want to delete \"$1\"?" msgstr "Tem certeza que deseja excluir \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Excluir" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: não foi possível excluir \"$1\"" @@ -188,23 +195,10 @@ msgstr "Modmgr: não foi possível excluir \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: caminho inválido do módulo \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Claro que não!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Sim" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Excluir o mundo \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Não" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Aceitar" @@ -419,7 +413,8 @@ msgid "Uninstall selected modpack" msgstr "Desinstalar o pacote de módulos selecionado" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Endereço / Porta :" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -438,18 +433,20 @@ msgstr "Modo criativo" msgid "Damage enabled" msgstr "Habilitar dano" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Excluir" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Nome / Senha :" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Favoritos:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Lista de servidores públicos" +#, fuzzy +msgid "Favorite" +msgstr "Favoritos:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nome / Senha :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -473,7 +470,7 @@ msgstr "Modo criativo" msgid "Enable Damage" msgstr "Habilitar dano" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nome / Senha" @@ -541,8 +538,9 @@ msgstr "Você tem certeza que deseja resetar seu mundo?" msgid "Bilinear Filter" msgstr "Filtragem bi-linear" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Bump mapping" #: builtin/mainmenu/tab_settings.lua @@ -553,18 +551,10 @@ msgstr "Mudar teclas" msgid "Connected Glass" msgstr "Vidro conectado" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Habilitar partículas" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Folhas com transparência" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Gerar Normalmaps" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mipmap (filtro)" @@ -573,6 +563,10 @@ msgstr "Mipmap (filtro)" msgid "Mipmap + Aniso. Filter" msgstr "Mipmap + Filtro Anisotrópico" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Não" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Sem filtros" @@ -582,17 +576,23 @@ msgid "No Mipmap" msgstr "Sem Mipmapping" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Não!!!" +msgid "Node Highlighting" +msgstr "Destaque nos Blocos" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "Destaque nos Blocos" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Nenhum" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Tone mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Folhas Opacas" @@ -605,6 +605,11 @@ msgstr "Água opaca" msgid "Parallax Occlusion" msgstr "Oclusão de paralaxe" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Habilitar partículas" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Configurações" @@ -630,6 +635,10 @@ msgstr "Texturização:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Para habilitar os sombreadores é necessário usar o driver OpenGL." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "Tone mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Nível de sensibilidade ao toque (px)" @@ -650,6 +659,10 @@ msgstr "Plantas balançam" msgid "Waving Water" msgstr "Ondas na água" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Sim" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Configurar Mods" @@ -853,10 +866,6 @@ msgstr "MB/s" msgid "Node definitions..." msgstr "Carregando blocos..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Continuar" - #: src/game.cpp msgid "Resolving address..." msgstr "Resolvendo os endereços..." @@ -877,13 +886,17 @@ msgstr "Volume do som" msgid "You died." msgstr "Você morreu." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "Ok" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Entrar " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "Ok" +msgid "Proceed" +msgstr "Continuar" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1367,6 +1380,16 @@ msgstr "Limite absoluto de emergir filas" msgid "Acceleration in air" msgstr "Aceleração no ar" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Limite para blocos ativos" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Limite para blocos ativos" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Limite para blocos ativos" @@ -1465,6 +1488,11 @@ msgstr "Altura da base do terreno" msgid "Basic" msgstr "Básico" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Privilégios por padrão" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Filtragem bi-linear" @@ -1483,6 +1511,10 @@ msgstr "" msgid "Build inside player" msgstr "Construir com o jogador dentro do bloco" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Bump mapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Suavização da camera" @@ -1503,6 +1535,10 @@ msgstr "Ruído nas cavernas #1" msgid "Cave noise #2" msgstr "Ruído nas cavernas #2" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1691,6 +1727,10 @@ msgstr "Controla o esparsamento/profundidade dos lagos." msgid "Controls steepness/height of hills." msgstr "Controla o esparsamento/altura das colinas." +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Mensagem de travamento" @@ -2125,6 +2165,10 @@ msgstr "Fonte de compensador de sombra, se 0 então sombra não será desenhada. msgid "Font size" msgstr "Tamanho da fonte" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Tecla para frente" @@ -2192,13 +2236,16 @@ msgid "Generate normalmaps" msgstr "Gerar normalmaps" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Atributos de geração de mapa.\n" "No Mapgen v6 a flag 'decorations' controla todas as decorações exceto " @@ -2207,8 +2254,8 @@ msgstr "" "decorações.\n" "Flags que não são especificadas na string da flag não são alteradas por " "padrão.\n" -"Flags começando com \"no\" (não) são usada para explicitamente " -"desabilitá-las." +"Flags começando com \"no\" (não) são usada para explicitamente desabilitá-" +"las." #: src/settings_translation_file.cpp msgid "Graphics" @@ -2494,8 +2541,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para diminuir o alcance de visão.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2514,8 +2561,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "Tecla para aumentar o alcance de visão.\n" -"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e2319" -"01735e3da1b0edf72eb3" +"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2827,6 +2874,14 @@ msgstr "" "Comprimento de um tick de servidor e o intervalo no qual os objetos são " "geralmente atualizados em rede." +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2926,34 +2981,38 @@ msgid "Map directory" msgstr "Diretório do mapa" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Atributos de mapgen específicos para vales (Mapgen Valleys).\n" -"Flags que não estão especificadas na string de flags não são modificados a " -"partir do padrão.\n" -"Flags começando com \"no\" (não) são usadas para desativá-los explicitamente." -"\n" -"\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que pode " -"causar algumas falhas nos biomas.\n" -"\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a água " -"tende a ser represada em poças. Pode interferir em biomas que são sensíveis " -"a mudanças." +"Atributos para o gerador de mapas específico para o Mapgen v6.\n" +"Quando biomas de neve estão habilitados, pântanos ficam habilitados e a flag " +"de pântanos é ignorada.\n" +"Flags que não são especificadas na string da flag não são modificadas por " +"padrão.\n" +"Flags começando com \"no\" (não) são usadas para explicitamente desabilitá-" +"las." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Atributos de mapgen específicos para Mapgen plano.\n" "Alguns lagos e colinas são ocasionalmente adicionados num mundo plano.\n" @@ -2962,35 +3021,43 @@ msgstr "" "Flags começando com \"no\" (não) são usadas para desativá-los explicitamente." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "Atributos para o gerador de mapas específico para o Mapgen v6.\n" "Quando biomas de neve estão habilitados, pântanos ficam habilitados e a flag " "de pântanos é ignorada.\n" "Flags que não são especificadas na string da flag não são modificadas por " "padrão.\n" -"Flags começando com \"no\" (não) são usadas para explicitamente " -"desabilitá-las." +"Flags começando com \"no\" (não) são usadas para explicitamente desabilitá-" +"las." #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Atributos de geração de mapas específicos para o Mapgen v7.\n" -"'ridges' são os rios.\n" -"Flags que não estão especificadas na string da flag não são modificadas por " +"Atributos para o gerador de mapas específico para o Mapgen v6.\n" +"Quando biomas de neve estão habilitados, pântanos ficam habilitados e a flag " +"de pântanos é ignorada.\n" +"Flags que não são especificadas na string da flag não são modificadas por " "padrão.\n" -"Flags começando com \"no\" são usadas para explicitamente desabilitá-las." +"Flags começando com \"no\" (não) são usadas para explicitamente desabilitá-" +"las." #: src/settings_translation_file.cpp msgid "Map generation limit" @@ -3036,6 +3103,11 @@ msgstr "Flags do Mapgen" msgid "Mapgen flat" msgstr "Mapgen plano" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Threshold dos lagos no Mapgen plano" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -3084,6 +3156,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Fractal do Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Componente W da fatia do fractal do Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -3148,6 +3225,11 @@ msgstr "Nome do mapgen" msgid "Mapgen v5" msgstr "Mapgen versão 5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Profundidade de cavernas grandes" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -3232,6 +3314,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Mapgen versão 7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Profundidade de cavernas grandes" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3523,6 +3610,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3639,6 +3730,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3747,6 +3842,23 @@ msgstr "Captura de tela" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Captura de tela" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Captura de tela" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3838,6 +3950,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3902,6 +4018,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3975,6 +4095,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -4005,10 +4129,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "Tone mapping" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4256,6 +4376,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "Largura da janela inicial." @@ -4290,90 +4418,103 @@ msgstr "" msgid "cURL timeout" msgstr "" -#, fuzzy -#~ msgid "If disabled " -#~ msgstr "Desabilitar PMs" +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, " +#~ "portando não preenche todo o espaço disponível para bloco.\n" +#~ "Note que isso não está bem otimizado e que suavização da iluminação na " +#~ "superfície da água não funciona bem com esse recurso." -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "habilitado" - -#~ msgid "Game Name" -#~ msgstr "Nome do jogo" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "JOGOS" - -#~ msgid "Mods:" -#~ msgstr "Módulos:" - -#~ msgid "new game" -#~ msgstr "novo jogo" - -#~ msgid "EDIT GAME" -#~ msgstr "EDITAR JOGO" - -#~ msgid "Remove selected mod" -#~ msgstr "Remover o módulo selecionado" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adicionar módulo" - -#~ msgid "CLIENT" -#~ msgstr "CLIENTE" - -#~ msgid "Favorites:" -#~ msgstr "Favoritos:" - -#~ msgid "START SERVER" -#~ msgstr "SERVIDOR" - -#~ msgid "Name" -#~ msgstr "Nome" - -#~ msgid "Password" -#~ msgstr "Senha" - -#~ msgid "SETTINGS" -#~ msgstr "CONFIGURAÇÕES" - -#~ msgid "Preload item visuals" -#~ msgstr "Precarga de elementos visuais" - -#~ msgid "Finite Liquid" -#~ msgstr "Líquido finito" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "UM JOGADOR" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "TEXTURAS" - -#~ msgid "MODS" -#~ msgstr "MÓDULOS" - -#~ msgid "Add mod:" -#~ msgstr "Adicionar módulo:" - -#~ msgid "Local install" -#~ msgstr "Instalação local" +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "" +#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque " +#~ "selectionbox [Padrão])." #~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ "Julia set: (X,Y,Z) offsets from world centre.\n" +#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." #~ msgstr "" -#~ "Atenção: Alguns mods ainda não foram configurados.\n" -#~ "E eles serão ativados por padrão, quando você salvar a configuração." +#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n" +#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos " +#~ "em nós." #~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" #~ msgstr "" -#~ "Atenção: Alguns mods configurados não foram encontrados.\n" -#~ "Suas definições serão removidas quando você salvar a configuração." +#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo " +#~ "mínimo de visualização.\n" +#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "" +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgstr "" +#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo " +#~ "intervalo de visualização.\n" +#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#~ msgid "Preload inventory textures" +#~ msgstr "pré-carregando texturas de inventário" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Baixar" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item" + +#~ msgid "is required by:" +#~ msgstr "é necessário para:" + +#~ msgid "Configuration saved. " +#~ msgstr "A configuração foi salva. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Atenção: A configuração não está consistente." + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos" + +#~ msgid "Show Public" +#~ msgstr "Exibir públicos" + +#~ msgid "Show Favorites" +#~ msgstr "Exibir favoritos" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Deixe o endereço em branco para iniciar um servidor local." + +#~ msgid "Create world" +#~ msgstr "Criar o mundo" + +#~ msgid "Address required." +#~ msgstr "É necessário um endereço." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado" + +#~ msgid "Files to be deleted" +#~ msgstr "Arquivos a serem excluídos" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Não foi possível excluir todos os arquivos do mundo" #~ msgid "" #~ "Default Controls:\n" @@ -4400,100 +4541,131 @@ msgstr "" #~ "- ESC: este menu\n" #~ "- T: bate-papo\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Não foi possível excluir todos os arquivos do mundo" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods configurados não foram encontrados.\n" +#~ "Suas definições serão removidas quando você salvar a configuração." -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Não foi possível configurar o mundo: Nada foi selecionado" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "Atenção: Alguns mods ainda não foram configurados.\n" +#~ "E eles serão ativados por padrão, quando você salvar a configuração." -#~ msgid "Cannot create world: No games found" -#~ msgstr "Não foi possivel criar o mundo: Não foi encontrado nenhum jogo" +#~ msgid "Local install" +#~ msgstr "Instalação local" -#~ msgid "Files to be deleted" -#~ msgstr "Arquivos a serem excluídos" +#~ msgid "Add mod:" +#~ msgstr "Adicionar módulo:" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Não foi possível excluir o mundo: Nenhum foi selecionado" +#~ msgid "MODS" +#~ msgstr "MÓDULOS" -#~ msgid "Address required." -#~ msgstr "É necessário um endereço." +#~ msgid "TEXTURE PACKS" +#~ msgstr "TEXTURAS" -#~ msgid "Create world" -#~ msgstr "Criar o mundo" +#~ msgid "SINGLE PLAYER" +#~ msgstr "UM JOGADOR" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Deixe o endereço em branco para iniciar um servidor local." +#~ msgid "Finite Liquid" +#~ msgstr "Líquido finito" -#~ msgid "Show Favorites" -#~ msgstr "Exibir favoritos" +#~ msgid "Preload item visuals" +#~ msgstr "Precarga de elementos visuais" -#~ msgid "Show Public" -#~ msgstr "Exibir públicos" +#~ msgid "SETTINGS" +#~ msgstr "CONFIGURAÇÕES" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Não foi possível criar o mundo: O nome contém caracteres inválidos" +#~ msgid "Password" +#~ msgstr "Senha" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Atenção: A configuração não está consistente." +#~ msgid "Name" +#~ msgstr "Nome" -#~ msgid "Configuration saved. " -#~ msgstr "A configuração foi salva. " +#~ msgid "START SERVER" +#~ msgstr "SERVIDOR" -#~ msgid "is required by:" -#~ msgstr "é necessário para:" +#~ msgid "CLIENT" +#~ msgstr "CLIENTE" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "Botão esquerdo: Move todos os itens. Botão direito: Move um item" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adicionar módulo" + +#~ msgid "Remove selected mod" +#~ msgstr "Remover o módulo selecionado" + +#~ msgid "EDIT GAME" +#~ msgstr "EDITAR JOGO" + +#~ msgid "new game" +#~ msgstr "novo jogo" + +#~ msgid "Mods:" +#~ msgstr "Módulos:" + +#~ msgid "GAMES" +#~ msgstr "JOGOS" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Nome do jogo" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "Baixar" +#~ msgid "If enabled, " +#~ msgstr "habilitado" -#~ msgid "Preload inventory textures" -#~ msgstr "pré-carregando texturas de inventário" +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Desabilitar PMs" #~ msgid "" -#~ "Key for increasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Map generation attributes specific to Mapgen v7.\n" +#~ "'ridges' are the rivers.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." #~ msgstr "" -#~ "Tecla para aumentar o intervalo de visualização. Modifica o mínimo " -#~ "intervalo de visualização.\n" -#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Atributos de geração de mapas específicos para o Mapgen v7.\n" +#~ "'ridges' são os rios.\n" +#~ "Flags que não estão especificadas na string da flag não são modificadas " +#~ "por padrão.\n" +#~ "Flags começando com \"no\" são usadas para explicitamente desabilitá-las." #~ msgid "" -#~ "Key for decreasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Map generation attributes specific to Mapgen Valleys.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them.\n" +#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome " +#~ "issues.\n" +#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where " +#~ "water would tend to pool. It may interfere with delicately adjusted " +#~ "biomes." #~ msgstr "" -#~ "Tecla para diminuir o intervalo de visualização. Modifica o intervalo " -#~ "mínimo de visualização.\n" -#~ "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Atributos de mapgen específicos para vales (Mapgen Valleys).\n" +#~ "Flags que não estão especificadas na string de flags não são modificados " +#~ "a partir do padrão.\n" +#~ "Flags começando com \"no\" (não) são usadas para desativá-los " +#~ "explicitamente.\n" +#~ "\"altitude_chill\" torna terrenos de elevada altitude mais frios, o que " +#~ "pode causar algumas falhas nos biomas.\n" +#~ "\"humid_rivers\" modifica a umidade ao redor dos rios e em áreas onde a " +#~ "água tende a ser represada em poças. Pode interferir em biomas que são " +#~ "sensíveis a mudanças." -#~ msgid "" -#~ "Julia set: (X,Y,Z) offsets from world centre.\n" -#~ "Range roughly -2 to 2, multiply by j_scale for offsets in nodes." -#~ msgstr "" -#~ "Julia definido: (X, Y, Z) deslocamentos do centro mundo.\n" -#~ "Variam aproximadamente -2 a 2, multiplique por j_scale para deslocamentos " -#~ "em nós." +#~ msgid "No!!!" +#~ msgstr "Não!!!" -#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." -#~ msgstr "" -#~ "Habilitar destaque de bloco selecionado (desabilita o modo de destaque " -#~ "selectionbox [Padrão])." +#~ msgid "Generate Normalmaps" +#~ msgstr "Gerar Normalmaps" -#~ msgid "" -#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " -#~ "completely.\n" -#~ "Note that this is not quite optimized and that smooth lighting on the\n" -#~ "water surface doesn't work with this." -#~ msgstr "" -#~ "Habilita recurso permitindo que o nível da água seja um pouco menor, " -#~ "portando não preenche todo o espaço disponível para bloco.\n" -#~ "Note que isso não está bem otimizado e que suavização da iluminação na " -#~ "superfície da água não funciona bem com esse recurso." +#~ msgid "Public Serverlist" +#~ msgstr "Lista de servidores públicos" + +#~ msgid "No of course not!" +#~ msgstr "Claro que não!" diff --git a/po/ro/minetest.po b/po/ro/minetest.po index 78777674..ac4bf793 100644 --- a/po/ro/minetest.po +++ b/po/ro/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-03-17 15:28+0000\n" "Last-Translator: Lordmusic Player \n" -"Language-Team: Romanian " -"\n" +"Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,6 +76,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -177,6 +178,12 @@ msgstr "" msgid "Are you sure you want to delete \"$1\"?" msgstr "Ești sigur că vrei să ștergi \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Șterge" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: Eroare la ștergerea \"$1\"" @@ -185,23 +192,10 @@ msgstr "Modmgr: Eroare la ștergerea \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: Pacht de mod invalid \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Nu, sigur că nu!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Da" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Ștergi lumea \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Nu" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Acceptă" @@ -418,7 +412,7 @@ msgstr "Dezinstalaţi Pachetul de moduri selectat" #: builtin/mainmenu/tab_multiplayer.lua #, fuzzy -msgid "Address / Port :" +msgid "Address / Port" msgstr "Adresă/Port" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -439,19 +433,20 @@ msgstr "Modul Creativ" msgid "Damage enabled" msgstr "activat" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Șterge" - -#: builtin/mainmenu/tab_multiplayer.lua +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy -msgid "Name / Password :" -msgstr "Nume/Parolă" +msgid "Del. Favorite" +msgstr "Preferate:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Listă de servere publică" +#, fuzzy +msgid "Favorite" +msgstr "Preferate:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Nume/Parolă" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy @@ -476,7 +471,7 @@ msgstr "Modul Creativ" msgid "Enable Damage" msgstr "Activează Daune" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Nume/Parolă" @@ -549,9 +544,9 @@ msgstr "Singleplayer" msgid "Bilinear Filter" msgstr "Filtrare Biliniară" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Bumpmapping" +msgid "Bump Mapping" msgstr "Mip Mapping" #: builtin/mainmenu/tab_settings.lua @@ -563,20 +558,11 @@ msgstr "Modifică tastele" msgid "Connected Glass" msgstr "Conectează" -#: builtin/mainmenu/tab_settings.lua -#, fuzzy -msgid "Enable Particles" -msgstr "Activează tot" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Fancy Leaves" msgstr "Apă opacă" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "" - #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Mipmap" @@ -586,6 +572,10 @@ msgstr "Mip Mapping" msgid "Mipmap + Aniso. Filter" msgstr "" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Nu" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "No Filter" @@ -597,18 +587,24 @@ msgid "No Mipmap" msgstr "Mip Mapping" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "" +#, fuzzy +msgid "Node Highlighting" +msgstr "Lumină mai bună" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Lumină mai bună" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Mip Mapping" + #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Opaque Leaves" @@ -622,6 +618,11 @@ msgstr "Apă opacă" msgid "Parallax Occlusion" msgstr "" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Activează tot" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Setări" @@ -648,6 +649,11 @@ msgstr "" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Pentru a permite shadere OpenGL trebuie să fie folosite." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip Mapping" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "" @@ -672,6 +678,10 @@ msgstr "Copaci fantezici" msgid "Waving Water" msgstr "Copaci fantezici" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Da" + #: builtin/mainmenu/tab_simple_main.lua #, fuzzy msgid "Config mods" @@ -871,10 +881,6 @@ msgstr "" msgid "Node definitions..." msgstr "Definițiile Blocurilor..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Continuă" - #: src/game.cpp msgid "Resolving address..." msgstr "Se rezolvă adresa..." @@ -896,13 +902,17 @@ msgstr "Volum Sunet" msgid "You died." msgstr "Ai murit." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "" #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "" +msgid "Proceed" +msgstr "Continuă" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1372,6 +1382,14 @@ msgstr "" msgid "Acceleration in air" msgstr "" +#: src/settings_translation_file.cpp +msgid "Active Block Management interval" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Active Block Modifier interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "" @@ -1460,6 +1478,10 @@ msgstr "" msgid "Basic" msgstr "" +#: src/settings_translation_file.cpp +msgid "Basic Privileges" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Bilinear filtering" @@ -1478,6 +1500,11 @@ msgstr "" msgid "Build inside player" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Bumpmapping" +msgstr "Mip Mapping" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "" @@ -1498,6 +1525,10 @@ msgstr "" msgid "Cave noise #2" msgstr "" +#: src/settings_translation_file.cpp +msgid "Cave width" +msgstr "" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1667,6 +1698,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "" @@ -2062,6 +2097,10 @@ msgstr "" msgid "Font size" msgstr "" +#: src/settings_translation_file.cpp +msgid "Format of screenshots." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Forward key" @@ -2128,9 +2167,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2606,6 +2647,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2693,41 +2742,50 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2778,6 +2836,11 @@ msgstr "Mapgen" msgid "Mapgen flat" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2831,6 +2894,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2902,6 +2970,11 @@ msgstr "Mapgen" msgid "Mapgen v5" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2988,6 +3061,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Mapgen" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Mapgen" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3281,6 +3359,10 @@ msgstr "" msgid "Node highlighting" msgstr "" +#: src/settings_translation_file.cpp +msgid "NodeTimer interval" +msgstr "" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3397,6 +3479,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3508,6 +3594,23 @@ msgstr "PrintScreen" msgid "Screenshot folder" msgstr "" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "PrintScreen" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "PrintScreen" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "" @@ -3607,6 +3710,10 @@ msgstr "" msgid "Show debug info" msgstr "" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "" @@ -3673,6 +3780,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3747,6 +3858,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3777,11 +3892,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "" -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Mip Mapping" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "" @@ -4035,6 +4145,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4070,84 +4188,87 @@ msgid "cURL timeout" msgstr "" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "Dezactivează MP" - -#, fuzzy -#~ msgid "If enabled, " -#~ msgstr "activat" - -#~ msgid "Game Name" -#~ msgstr "Numele jocului" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "JOCURI" - -#~ msgid "Mods:" -#~ msgstr "Moduri:" - -#~ msgid "new game" -#~ msgstr "joc nou" - -#~ msgid "EDIT GAME" -#~ msgstr "MODIFICĂ JOCUL" - -#~ msgid "Remove selected mod" -#~ msgstr "Șterge modul selectat" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Adaugă modul" - -#~ msgid "CLIENT" -#~ msgstr "CLIENT" - -#~ msgid "Favorites:" -#~ msgstr "Preferate:" - -#~ msgid "START SERVER" -#~ msgstr "DESCHIDE SERVERUL" - -#~ msgid "Name" -#~ msgstr "Nume" - -#~ msgid "Password" -#~ msgstr "Parolă" - -#~ msgid "SETTINGS" -#~ msgstr "SETĂRI" - -#~ msgid "Preload item visuals" -#~ msgstr "Pre-încarcă imaginile obiectelor" - -#~ msgid "Finite Liquid" -#~ msgstr "Lichid finit" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "SINGLE PLAYER" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "PACHETE DE TEXTURĂ" - -#~ msgid "MODS" -#~ msgstr "MODURI" - -#~ msgid "Add mod:" -#~ msgstr "Adăugaţi mod:" - -#~ msgid "Local install" -#~ msgstr "Instalare locală" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "" -#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect" +#~ msgid "Preload inventory textures" +#~ msgstr "Se încarcă..." #, fuzzy #~ msgid "Downloading" #~ msgstr "Descarcă" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "" +#~ "Click stânga: Mută toate obiectele, Click dreapta: Mută un singur obiect" + +#~ msgid "Local install" +#~ msgstr "Instalare locală" + +#~ msgid "Add mod:" +#~ msgstr "Adăugaţi mod:" + +#~ msgid "MODS" +#~ msgstr "MODURI" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "PACHETE DE TEXTURĂ" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "SINGLE PLAYER" + +#~ msgid "Finite Liquid" +#~ msgstr "Lichid finit" + +#~ msgid "Preload item visuals" +#~ msgstr "Pre-încarcă imaginile obiectelor" + +#~ msgid "SETTINGS" +#~ msgstr "SETĂRI" + +#~ msgid "Password" +#~ msgstr "Parolă" + +#~ msgid "Name" +#~ msgstr "Nume" + +#~ msgid "START SERVER" +#~ msgstr "DESCHIDE SERVERUL" + +#~ msgid "CLIENT" +#~ msgstr "CLIENT" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Adaugă modul" + +#~ msgid "Remove selected mod" +#~ msgstr "Șterge modul selectat" + +#~ msgid "EDIT GAME" +#~ msgstr "MODIFICĂ JOCUL" + +#~ msgid "new game" +#~ msgstr "joc nou" + +#~ msgid "Mods:" +#~ msgstr "Moduri:" + +#~ msgid "GAMES" +#~ msgstr "JOCURI" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Numele jocului" + #, fuzzy -#~ msgid "Preload inventory textures" -#~ msgstr "Se încarcă..." +#~ msgid "If enabled, " +#~ msgstr "activat" + +#, fuzzy +#~ msgid "If disabled " +#~ msgstr "Dezactivează MP" + +#~ msgid "Public Serverlist" +#~ msgstr "Listă de servere publică" + +#~ msgid "No of course not!" +#~ msgstr "Nu, sigur că nu!" diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 9cceb381..d2819391 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -7,17 +7,17 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-04-18 23:08+0000\n" "Last-Translator: Stas Kies \n" -"Language-Team: Russian " -"\n" +"Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.6-dev\n" #: builtin/fstk/ui.lua @@ -74,6 +74,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "Мы поддерживаем версии протоколов между $1 и $2." #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -179,6 +180,12 @@ msgstr "У вас не установлены мини-игры." msgid "Are you sure you want to delete \"$1\"?" msgstr "Уверены, что хотите удалить \"$1\"?" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "Удалить" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Modmgr: невозможно удалить \"$1\"" @@ -187,23 +194,10 @@ msgstr "Modmgr: невозможно удалить \"$1\"" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Modmgr: неправильный путь \"$1\"" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "Нет, конечно нет!" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "Да" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "Удалить мир \"$1\"?" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "Нет" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "Принять" @@ -414,7 +408,8 @@ msgid "Uninstall selected modpack" msgstr "Удалить выбранный мод-пак" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "Адрес / Порт:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -433,18 +428,20 @@ msgstr "Режим творчества" msgid "Damage enabled" msgstr "Разрешить увечья" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "Удалить" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "Имя / Пароль:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "Избранное:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "Список публичных серверов" +#, fuzzy +msgid "Favorite" +msgstr "Избранное:" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "Имя / Пароль:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -468,7 +465,7 @@ msgstr "Режим творчества" msgid "Enable Damage" msgstr "Разрешить увечья" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "Имя / Пароль" @@ -536,8 +533,9 @@ msgstr "Уверены, что хотите сбросить мир одиноч msgid "Bilinear Filter" msgstr "Билинейная фильтрация" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "Бампмаппинг" #: builtin/mainmenu/tab_settings.lua @@ -548,18 +546,10 @@ msgstr "Смена управления" msgid "Connected Glass" msgstr "Стёкла без швов" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "Включить частицы" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "Красивая листва" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "Генерировать карты нормалей" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Мипмаппинг" @@ -568,6 +558,10 @@ msgstr "Мипмаппинг" msgid "Mipmap + Aniso. Filter" msgstr "Мипмаппинг с анизотр. фильтром" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "Нет" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "Без Фильтров" @@ -577,18 +571,24 @@ msgid "No Mipmap" msgstr "Без Мипмаппинга" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "Нет!" +#, fuzzy +msgid "Node Highlighting" +msgstr "Подсветка нод" #: builtin/mainmenu/tab_settings.lua #, fuzzy -msgid "Node Highlighting" +msgid "Node Outlining" msgstr "Подсветка нод" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Ничего" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "Mip-текстурирование (Мип-маппинг)" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "Непрозрачная листва" @@ -601,6 +601,11 @@ msgstr "Непрозрачная вода" msgid "Parallax Occlusion" msgstr "Parallax Occlusion" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "Включить частицы" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "Настройки" @@ -625,6 +630,11 @@ msgstr "Текстурирование:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Для включения шейдеров необходим драйвер OpenGL." +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +#, fuzzy +msgid "Tone Mapping" +msgstr "Mip-текстурирование (Мип-маппинг)" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "Чувствительность (пк)" @@ -645,6 +655,10 @@ msgstr "Покачивание растений" msgid "Waving Water" msgstr "Волны на воде" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "Да" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "Настройка модов" @@ -849,10 +863,6 @@ msgstr "МиБ/с" msgid "Node definitions..." msgstr "Описания нод..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "Продолжить" - #: src/game.cpp msgid "Resolving address..." msgstr "Получение адреса..." @@ -873,13 +883,17 @@ msgstr "Громкость звука" msgid "You died." msgstr "Вы умерли." +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "OK" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "Введите " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "OK" +msgid "Proceed" +msgstr "Продолжить" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1362,6 +1376,16 @@ msgstr "Абсолютный лимит появляющихся запросо msgid "Acceleration in air" msgstr "Ускорение в воздухе" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "Дальность взаимодействия с блоками" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "Дальность взаимодействия с блоками" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "Дальность взаимодействия с блоками" @@ -1432,8 +1456,8 @@ msgid "" "minetest.net." msgstr "" "Объявите списку сервера.\n" -"Если Вы хотите объявить о своем адресе IPv6, используйте serverlist_url = " -"v6.servers.minetest.net." +"Если Вы хотите объявить о своем адресе IPv6, используйте serverlist_url = v6." +"servers.minetest.net." #: src/settings_translation_file.cpp #, fuzzy @@ -1461,6 +1485,11 @@ msgstr "Высота основной местности" msgid "Basic" msgstr "Базовый" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "Стандартные права" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "Билинейная фильтрация" @@ -1477,6 +1506,10 @@ msgstr "Биты на пиксель (глубина цвета) в полноэ msgid "Build inside player" msgstr "Разрешить ставить блоки на месте игрока" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "Бампмаппинг" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "Сглаживание камеры" @@ -1498,6 +1531,11 @@ msgstr "Шум пещеры #1" msgid "Cave noise #2" msgstr "Шум пещеры #2" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "Ширина экрана" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "Пещеры и тоннели формируются на перекрестке этих двух шумов" @@ -1659,6 +1697,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "Сообщение при падении" @@ -2058,6 +2100,11 @@ msgstr "" msgid "Font size" msgstr "Размер шрифта" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Format of screenshots." +msgstr "Путь для сохранения скриншотов." + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "Вперед" @@ -2123,9 +2170,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2690,6 +2739,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2776,41 +2833,50 @@ msgstr "Каталог сохранения карт" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2859,6 +2925,11 @@ msgstr "Флаги генератора карты" msgid "Mapgen flat" msgstr "Флаги генератора карты" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Флаги генератора карты" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2912,6 +2983,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "Флаги генератора карты" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Флаги генератора карты" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2981,6 +3057,11 @@ msgstr "Название генератора карты" msgid "Mapgen v5" msgstr "Генератор карты версии 5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Генератор карты версии 5" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -3065,6 +3146,11 @@ msgstr "" msgid "Mapgen v7" msgstr "Генератор карты версии 7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Генератор карты версии 7" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3371,6 +3457,11 @@ msgstr "Клавиша отключения столкновений" msgid "Node highlighting" msgstr "Подсветка нод" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "NodeTimer interval" +msgstr "Интервал отправки" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3491,6 +3582,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3602,6 +3697,23 @@ msgstr "Cкриншот" msgid "Screenshot folder" msgstr "Каталог со скриншотами" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "Каталог со скриншотами" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "Cкриншот" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Security" @@ -3715,6 +3827,10 @@ msgstr "" msgid "Show debug info" msgstr "Показывать отладочную информацию." +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "Shutdown message" @@ -3794,6 +3910,10 @@ msgstr "" msgid "Strict protocol checking" msgstr "" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "" @@ -3872,6 +3992,10 @@ msgstr "Задержка в секундах между кликами при з msgid "This font will be used for certain languages." msgstr "" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp #, fuzzy msgid "" @@ -3911,11 +4035,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "Клавиша переключения режима камеры." -#: src/settings_translation_file.cpp -#, fuzzy -msgid "Tone Mapping" -msgstr "Mip-текстурирование (Мип-маппинг)" - #: src/settings_translation_file.cpp #, fuzzy msgid "Tooltip delay" @@ -4198,6 +4317,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "Показывать данные отладки (аналогично нажатию F5)." +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "" @@ -4234,98 +4361,110 @@ msgstr "" msgid "cURL timeout" msgstr "cURL тайм-аут" -#~ msgid "\"" -#~ msgstr "\"" - -#~ msgid "If disabled " -#~ msgstr "Если выключено " - -#~ msgid "If enabled, " -#~ msgstr "Если включено " - -#~ msgid "Rendering:" -#~ msgstr "Рендеринг:" - -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "Перезапустите Minetest для принятия изменений" - -#~ msgid "Game Name" -#~ msgstr "Название" - -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\"" - -#~ msgid "GAMES" -#~ msgstr "ИГРЫ" - -#~ msgid "Mods:" -#~ msgstr "Моды:" - -#~ msgid "new game" -#~ msgstr "Создать игру" - -#~ msgid "EDIT GAME" -#~ msgstr "РЕДАКТИРОВАНИЕ" - -#~ msgid "Remove selected mod" -#~ msgstr "Удалить мод" - -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- Добавить мод" - -#~ msgid "CLIENT" -#~ msgstr "КЛИЕНТ" - -#~ msgid "Favorites:" -#~ msgstr "Избранное:" - -#~ msgid "START SERVER" -#~ msgstr "СЕРВЕР" - -#~ msgid "Name" -#~ msgstr "Имя" - -#~ msgid "Password" -#~ msgstr "Пароль" - -#~ msgid "SETTINGS" -#~ msgstr "НАСТРОЙКИ" - -#~ msgid "Preload item visuals" -#~ msgstr "Предзагрузка изображений" - -#~ msgid "Finite Liquid" -#~ msgstr "Конечные жидкости" - -#~ msgid "SINGLE PLAYER" -#~ msgstr "ОДИНОЧНАЯ ИГРА" - -#~ msgid "TEXTURE PACKS" -#~ msgstr "ПАКЕТЫ ТЕКСТУР" - -#~ msgid "MODS" -#~ msgstr "МОДЫ" - -#~ msgid "Add mod:" -#~ msgstr "Добавить мод:" - -#~ msgid "Local install" -#~ msgstr "Локальная установка" +#~ msgid "" +#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " +#~ "completely.\n" +#~ "Note that this is not quite optimized and that smooth lighting on the\n" +#~ "water surface doesn't work with this." +#~ msgstr "" +#~ "Включите немного более низкую поверхность воды, чтобы она\n" +#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n" +#~ "и мягкое освещение на поверхности воды не работает с этим." #~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " +#~ "Key for decreasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" #~ msgstr "" -#~ "Предупреждение: Некоторые моды еще не настроены.\n" -#~ "Их стандартные настройки будут установлены, когда вы сохраните " -#~ "конфигурацию. " +#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность " +#~ "отображения.\n" +#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" #~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " +#~ "Key for increasing the viewing range. Modifies the minimum viewing " +#~ "range.\n" +#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" #~ msgstr "" -#~ "Предупреждение: Некоторые моды не найдены.\n" -#~ "Их настройки будут удалены, когда вы сохраните конфигурацию. " +#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность " +#~ "отображения.\n" +#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." +#~ "html#a54da2a0e231901735e3da1b0edf72eb3" + +#, fuzzy +#~ msgid "New style water" +#~ msgstr "Новый стиль воды" + +#~ msgid "Preload inventory textures" +#~ msgstr "Предзагрузка текстур..." + +#, fuzzy +#~ msgid "Viewing range minimum" +#~ msgstr "Минимальная граница дальности отрисовки." + +#, fuzzy +#~ msgid "Wanted FPS" +#~ msgstr "Ожидаемый FPS" + +#~ msgid "Reset singleplayer world" +#~ msgstr "Сброс одиночной игры" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "Коэффициент масштаба интерфейса: " + +#~ msgid "Touch free target" +#~ msgstr "Свободный выбор цели" + +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "Загрузить" + +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет" + +#~ msgid "is required by:" +#~ msgstr "требуется для:" + +#~ msgid "Configuration saved. " +#~ msgstr "Настройки сохранены. " + +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "Предупреждение: Неверная конфигурация. " + +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы" + +#~ msgid "Show Public" +#~ msgstr "Публичные" + +#~ msgid "Show Favorites" +#~ msgstr "Избранные" + +#~ msgid "Leave address blank to start a local server." +#~ msgstr "Оставьте адрес пустым для запуска локального сервера." + +#~ msgid "Create world" +#~ msgstr "Создать мир" + +#~ msgid "Address required." +#~ msgstr "Нужно ввести адрес." + +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "Невозможно удалить мир: Ничего не выбрано" + +#~ msgid "Files to be deleted" +#~ msgstr "Следующие файлы будут удалены" + +#~ msgid "Cannot create world: No games found" +#~ msgstr "Невозможно создать мир: Ни одной игры не найдено" + +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "Невозможно настроить мир: ничего не выбрано" + +#~ msgid "Failed to delete all world files" +#~ msgstr "Ошибка при удалении файлов мира" #~ msgid "" #~ "Default Controls:\n" @@ -4352,107 +4491,104 @@ msgstr "cURL тайм-аут" #~ "- ESC: это меню\n" #~ "- T: чат\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "Ошибка при удалении файлов мира" - -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "Невозможно настроить мир: ничего не выбрано" - -#~ msgid "Cannot create world: No games found" -#~ msgstr "Невозможно создать мир: Ни одной игры не найдено" - -#~ msgid "Files to be deleted" -#~ msgstr "Следующие файлы будут удалены" - -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "Невозможно удалить мир: Ничего не выбрано" - -#~ msgid "Address required." -#~ msgstr "Нужно ввести адрес." - -#~ msgid "Create world" -#~ msgstr "Создать мир" - -#~ msgid "Leave address blank to start a local server." -#~ msgstr "Оставьте адрес пустым для запуска локального сервера." - -#~ msgid "Show Favorites" -#~ msgstr "Избранные" - -#~ msgid "Show Public" -#~ msgstr "Публичные" - -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "Невозможно создать мир: Имя содержит недопустимые символы" - -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "Предупреждение: Неверная конфигурация. " - -#~ msgid "Configuration saved. " -#~ msgstr "Настройки сохранены. " - -#~ msgid "is required by:" -#~ msgstr "требуется для:" - -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет" - -#, fuzzy -#~ msgid "Downloading" -#~ msgstr "Загрузить" - -#~ msgid "Touch free target" -#~ msgstr "Свободный выбор цели" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "Коэффициент масштаба интерфейса: " - -#~ msgid "Reset singleplayer world" -#~ msgstr "Сброс одиночной игры" - -#, fuzzy -#~ msgid "Wanted FPS" -#~ msgstr "Ожидаемый FPS" - -#, fuzzy -#~ msgid "Viewing range minimum" -#~ msgstr "Минимальная граница дальности отрисовки." - -#~ msgid "Preload inventory textures" -#~ msgstr "Предзагрузка текстур..." - -#, fuzzy -#~ msgid "New style water" -#~ msgstr "Новый стиль воды" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "Предупреждение: Некоторые моды не найдены.\n" +#~ "Их настройки будут удалены, когда вы сохраните конфигурацию. " #~ msgid "" -#~ "Key for increasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " #~ msgstr "" -#~ "Клавиша Увеличения видимого диапазона. Изменяет минимальную дальность " -#~ "отображения.\n" -#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ "Предупреждение: Некоторые моды еще не настроены.\n" +#~ "Их стандартные настройки будут установлены, когда вы сохраните " +#~ "конфигурацию. " -#~ msgid "" -#~ "Key for decreasing the viewing range. Modifies the minimum viewing " -#~ "range.\n" -#~ "See http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" -#~ msgstr "" -#~ "Клавиша уменьшения видимого диапазона. Изменяет минимальную дальность " -#~ "отображения.\n" -#~ "Смотрите http://irrlicht.sourceforge.net/docu/namespaceirr." -#~ "html#a54da2a0e231901735e3da1b0edf72eb3" +#~ msgid "Local install" +#~ msgstr "Локальная установка" -#~ msgid "" -#~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " -#~ "completely.\n" -#~ "Note that this is not quite optimized and that smooth lighting on the\n" -#~ "water surface doesn't work with this." -#~ msgstr "" -#~ "Включите немного более низкую поверхность воды, чтобы она\n" -#~ "не заполняла блок полностью. Учтите, что это не совсем оптимизировано,\n" -#~ "и мягкое освещение на поверхности воды не работает с этим." +#~ msgid "Add mod:" +#~ msgstr "Добавить мод:" + +#~ msgid "MODS" +#~ msgstr "МОДЫ" + +#~ msgid "TEXTURE PACKS" +#~ msgstr "ПАКЕТЫ ТЕКСТУР" + +#~ msgid "SINGLE PLAYER" +#~ msgstr "ОДИНОЧНАЯ ИГРА" + +#~ msgid "Finite Liquid" +#~ msgstr "Конечные жидкости" + +#~ msgid "Preload item visuals" +#~ msgstr "Предзагрузка изображений" + +#~ msgid "SETTINGS" +#~ msgstr "НАСТРОЙКИ" + +#~ msgid "Password" +#~ msgstr "Пароль" + +#~ msgid "Name" +#~ msgstr "Имя" + +#~ msgid "START SERVER" +#~ msgstr "СЕРВЕР" + +#~ msgid "CLIENT" +#~ msgstr "КЛИЕНТ" + +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- Добавить мод" + +#~ msgid "Remove selected mod" +#~ msgstr "Удалить мод" + +#~ msgid "EDIT GAME" +#~ msgstr "РЕДАКТИРОВАНИЕ" + +#~ msgid "new game" +#~ msgstr "Создать игру" + +#~ msgid "Mods:" +#~ msgstr "Моды:" + +#~ msgid "GAMES" +#~ msgstr "ИГРЫ" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\"" + +#~ msgid "Game Name" +#~ msgstr "Название" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "Перезапустите Minetest для принятия изменений" + +#~ msgid "Rendering:" +#~ msgstr "Рендеринг:" + +#~ msgid "If enabled, " +#~ msgstr "Если включено " + +#~ msgid "If disabled " +#~ msgstr "Если выключено " + +#~ msgid "\"" +#~ msgstr "\"" + +#~ msgid "No!!!" +#~ msgstr "Нет!" + +#~ msgid "Generate Normalmaps" +#~ msgstr "Генерировать карты нормалей" + +#~ msgid "Public Serverlist" +#~ msgstr "Список публичных серверов" + +#~ msgid "No of course not!" +#~ msgstr "Нет, конечно нет!" diff --git a/po/tr/minetest.po b/po/tr/minetest.po index ff5557e6..b3c063d2 100644 --- a/po/tr/minetest.po +++ b/po/tr/minetest.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2015-10-27 16:46+0200\n" "Last-Translator: PilzAdam \n" "Language-Team: Turkish \n" "Language-Team: Ukrainian \n" -"Language-Team: Chinese (China) " -"\n" +"Language-Team: Chinese (China) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,6 +71,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "我们支持的协议版本为 $1 至 $2。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -172,6 +173,12 @@ msgstr "你没有安装任何子游戏。" msgid "Are you sure you want to delete \"$1\"?" msgstr "你确认要删除“$1”？" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "删除" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "MOD管理器：无法删除“$1”" @@ -180,23 +187,10 @@ msgstr "MOD管理器：无法删除“$1”" msgid "Modmgr: invalid modpath \"$1\"" msgstr "MOD管理器：MOD“$1“路径非法" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "当然不！" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "是" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "删除世界“$1”？" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "否" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "接受" @@ -242,8 +236,8 @@ msgid "" "Format: , , (, , ), , " ", " msgstr "" -"格式: , , (, , ), , , " -"" +"格式: , , (, , ), , " +", " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -406,7 +400,8 @@ msgid "Uninstall selected modpack" msgstr "删除选中的MOD包" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "地址/端口:" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -425,18 +420,20 @@ msgstr "创造模式" msgid "Damage enabled" msgstr "启用伤害" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "删除" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "用户名/密码:" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Del. Favorite" +msgstr "最爱的服务器：" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "公共服务器列表" +#, fuzzy +msgid "Favorite" +msgstr "最爱的服务器：" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "用户名/密码:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -460,7 +457,7 @@ msgstr "创造模式" msgid "Enable Damage" msgstr "开启伤害风险" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "名字/密码" @@ -528,8 +525,9 @@ msgstr "你确定要重置您的单人世界吗？" msgid "Bilinear Filter" msgstr "双线性过滤" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "凹凸贴图" #: builtin/mainmenu/tab_settings.lua @@ -540,18 +538,10 @@ msgstr "更改键位设置" msgid "Connected Glass" msgstr "连接的玻璃" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "启用粒子" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "华丽的树叶" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "生成一般地图" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mip 贴图" @@ -560,6 +550,10 @@ msgstr "Mip 贴图" msgid "Mipmap + Aniso. Filter" msgstr "Mip 贴图 + Aniso 过滤" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "否" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "无过滤" @@ -569,17 +563,23 @@ msgid "No Mipmap" msgstr "无 Mip 贴图" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "不!!!" +msgid "Node Highlighting" +msgstr "节点高亮" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "节点高亮" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "无" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "一般地图采样" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "不透明的树叶" @@ -592,6 +592,11 @@ msgstr "不透明的水" msgid "Parallax Occlusion" msgstr "视差贴图" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "启用粒子" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "设置" @@ -616,6 +621,10 @@ msgstr "纹理:" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "启用着色器需要使用OpenGL驱动。" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "色调映射" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "触控阈值（像素）" @@ -636,6 +645,10 @@ msgstr "摇摆的植物" msgid "Waving Water" msgstr "流动的水面" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "是" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "配置 MOD" @@ -838,10 +851,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "方块定义..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "继续" - #: src/game.cpp msgid "Resolving address..." msgstr "正在解析地址..." @@ -862,13 +871,17 @@ msgstr "音量" msgid "You died." msgstr "你死了。" +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "确定" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "输入 " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "确定" +msgid "Proceed" +msgstr "继续" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1347,6 +1360,16 @@ msgstr "生产队列绝对限制" msgid "Acceleration in air" msgstr "空中加速" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "活动块范围" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "活动块范围" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "活动块范围" @@ -1438,6 +1461,11 @@ msgstr "基础地形高度" msgid "Basic" msgstr "基础" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "默认权限" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "双线性过滤" @@ -1454,6 +1482,10 @@ msgstr "" msgid "Build inside player" msgstr "建立内部玩家" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "凹凸贴图" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "镜头平滑" @@ -1474,6 +1506,11 @@ msgstr "洞穴噪音 #1" msgid "Cave noise #2" msgstr "洞穴噪音 #2" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "屏幕宽度" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" @@ -1630,6 +1667,10 @@ msgstr "" msgid "Controls steepness/height of hills." msgstr "控制山丘的坡度/高度。" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "崩溃信息" @@ -1961,7 +2002,8 @@ msgstr "视界程度。" msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "client/serverlist/ 中的文件包含会显示在“多人游戏”选项卡中的您收藏的服务器。" +msgstr "" +"client/serverlist/ 中的文件包含会显示在“多人游戏”选项卡中的您收藏的服务器。" #: src/settings_translation_file.cpp msgid "Filler Depth" @@ -2027,6 +2069,11 @@ msgstr "字体阴影偏移，0 表示不绘制阴影。" msgid "Font size" msgstr "字体大小" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Format of screenshots." +msgstr "屏幕截图保存位置。" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "前进键" @@ -2092,9 +2139,11 @@ msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2565,6 +2614,14 @@ msgid "" "updated over network." msgstr "" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2650,41 +2707,50 @@ msgstr "地图目录" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen Valleys.\n" +"'altitude_chill' makes higher elevations colder, which may cause biome " +"issues.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " -"issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp msgid "" "Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" #: src/settings_translation_file.cpp @@ -2731,6 +2797,11 @@ msgstr "地图生成器标志" msgid "Mapgen flat" msgstr "地图生成器平面" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "地图生成器平面阈值" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "" @@ -2779,6 +2850,11 @@ msgstr "" msgid "Mapgen fractal" msgstr "地图生成器分形" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "地图生成器分形片 w" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "" @@ -2843,6 +2919,11 @@ msgstr "地图生成器名称" msgid "Mapgen v5" msgstr "地图生成器 v5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "巨大洞穴深度" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "" @@ -2927,6 +3008,11 @@ msgstr "" msgid "Mapgen v7" msgstr "地图生成器 v7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "巨大洞穴深度" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "" @@ -3223,6 +3309,11 @@ msgstr "无剪辑键" msgid "Node highlighting" msgstr "节点高亮" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "NodeTimer interval" +msgstr "发送间隔时间" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "" @@ -3339,6 +3430,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "" @@ -3447,6 +3542,23 @@ msgstr "截图" msgid "Screenshot folder" msgstr "截图文件夹" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "截图文件夹" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "截图" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "安全" @@ -3538,6 +3650,10 @@ msgstr "" msgid "Show debug info" msgstr "显示调试信息" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "关机消息" @@ -3602,6 +3718,10 @@ msgstr "视差强度。" msgid "Strict protocol checking" msgstr "严格协议检查" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "同步 SQLite" @@ -3675,6 +3795,10 @@ msgstr "" msgid "This font will be used for certain languages." msgstr "用于特定语言的字体。" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3705,10 +3829,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "切换拍照模式键" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "色调映射" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "工具提示延迟" @@ -3960,6 +4080,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "是否显示客户端调试信息（与按 F5 的效果相同）。" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "初始化窗口尺寸之宽度组件。" @@ -3995,92 +4123,73 @@ msgid "cURL timeout" msgstr "cURL 超时" #, fuzzy -#~ msgid "If disabled " -#~ msgstr "禁用MOD包" +#~ msgid "Preload inventory textures" +#~ msgstr "载入中..." #, fuzzy -#~ msgid "If enabled, " -#~ msgstr "启用" +#~ msgid "Reset singleplayer world" +#~ msgstr "重置单人游戏" -#~ msgid "Restart minetest for driver change to take effect" -#~ msgstr "重启minetest让驱动变化生效" +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "菜单元素应用缩放因子" -#~ msgid "Game Name" -#~ msgstr "游戏名" +#~ msgid "Touch free target" +#~ msgstr "自由触摸目标" -#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" -#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”" +#, fuzzy +#~ msgid "Downloading" +#~ msgstr "下载中" -#~ msgid "GAMES" -#~ msgstr "游戏" +#~ msgid " KB/s" +#~ msgstr "千字节/秒" -#~ msgid "Mods:" -#~ msgstr "MODS：" +#~ msgid " MB/s" +#~ msgstr "兆字节/秒" -#~ msgid "new game" -#~ msgstr "新建游戏" +#~ msgid "Left click: Move all items, Right click: Move single item" +#~ msgstr "左键：移动所有物品，右键：移动单个物品" -#~ msgid "EDIT GAME" -#~ msgstr "编辑游戏" +#~ msgid "is required by:" +#~ msgstr "被需要：" -#~ msgid "Remove selected mod" -#~ msgstr "删除选中MOD" +#~ msgid "Configuration saved. " +#~ msgstr "配置已保存。 " -#~ msgid "<<-- Add mod" -#~ msgstr "<<-- 添加MOD" +#~ msgid "Warning: Configuration not consistent. " +#~ msgstr "警告：配置不一致。 " -#~ msgid "CLIENT" -#~ msgstr "客户端" +#~ msgid "Cannot create world: Name contains invalid characters" +#~ msgstr "无法创建世界：名字包含非法字符" -#~ msgid "Favorites:" -#~ msgstr "最爱的服务器：" +#~ msgid "Show Public" +#~ msgstr "显示公共" -#~ msgid "START SERVER" -#~ msgstr "启动服务器" +#~ msgid "Show Favorites" +#~ msgstr "显示最爱" -#~ msgid "Name" -#~ msgstr "名字" +#~ msgid "Leave address blank to start a local server." +#~ msgstr "地址栏留空可启动本地服务器。" -#~ msgid "Password" -#~ msgstr "密码" +#~ msgid "Create world" +#~ msgstr "创造世界" -#~ msgid "SETTINGS" -#~ msgstr "设置" +#~ msgid "Address required." +#~ msgstr "需要地址。" -#~ msgid "Preload item visuals" -#~ msgstr "预先加载物品图像" +#~ msgid "Cannot delete world: Nothing selected" +#~ msgstr "无法删除世界：没有选择世界" -#~ msgid "Finite Liquid" -#~ msgstr "液体有限延伸" +#~ msgid "Files to be deleted" +#~ msgstr "将被删除的文件" -#~ msgid "SINGLE PLAYER" -#~ msgstr "单人游戏" +#~ msgid "Cannot create world: No games found" +#~ msgstr "无法创造世界：未找到游戏模式" -#~ msgid "TEXTURE PACKS" -#~ msgstr "材质包" +#~ msgid "Cannot configure world: Nothing selected" +#~ msgstr "无法配置世界：没有选择世界" -#~ msgid "MODS" -#~ msgstr "MODS" - -#~ msgid "Add mod:" -#~ msgstr "添加MOD：" - -#~ msgid "Local install" -#~ msgstr "本地安装" - -#~ msgid "" -#~ "Warning: Some mods are not configured yet.\n" -#~ "They will be enabled by default when you save the configuration. " -#~ msgstr "" -#~ "警告：一些MOD仍未设定。\n" -#~ "它们会在你保存配置的时候自动启用。 " - -#~ msgid "" -#~ "Warning: Some configured mods are missing.\n" -#~ "Their setting will be removed when you save the configuration. " -#~ msgstr "" -#~ "警告：缺少一些设定了的MOD。\n" -#~ "它们的设置会在你保存配置的时候被移除。 " +#~ msgid "Failed to delete all world files" +#~ msgstr "无法删除所有该世界的文件" #~ msgid "" #~ "Default Controls:\n" @@ -4108,71 +4217,99 @@ msgstr "cURL 超时" #~ "ESC：菜单\n" #~ "T：聊天\n" -#~ msgid "Failed to delete all world files" -#~ msgstr "无法删除所有该世界的文件" +#~ msgid "" +#~ "Warning: Some configured mods are missing.\n" +#~ "Their setting will be removed when you save the configuration. " +#~ msgstr "" +#~ "警告：缺少一些设定了的MOD。\n" +#~ "它们的设置会在你保存配置的时候被移除。 " -#~ msgid "Cannot configure world: Nothing selected" -#~ msgstr "无法配置世界：没有选择世界" +#~ msgid "" +#~ "Warning: Some mods are not configured yet.\n" +#~ "They will be enabled by default when you save the configuration. " +#~ msgstr "" +#~ "警告：一些MOD仍未设定。\n" +#~ "它们会在你保存配置的时候自动启用。 " -#~ msgid "Cannot create world: No games found" -#~ msgstr "无法创造世界：未找到游戏模式" +#~ msgid "Local install" +#~ msgstr "本地安装" -#~ msgid "Files to be deleted" -#~ msgstr "将被删除的文件" +#~ msgid "Add mod:" +#~ msgstr "添加MOD：" -#~ msgid "Cannot delete world: Nothing selected" -#~ msgstr "无法删除世界：没有选择世界" +#~ msgid "MODS" +#~ msgstr "MODS" -#~ msgid "Address required." -#~ msgstr "需要地址。" +#~ msgid "TEXTURE PACKS" +#~ msgstr "材质包" -#~ msgid "Create world" -#~ msgstr "创造世界" +#~ msgid "SINGLE PLAYER" +#~ msgstr "单人游戏" -#~ msgid "Leave address blank to start a local server." -#~ msgstr "地址栏留空可启动本地服务器。" +#~ msgid "Finite Liquid" +#~ msgstr "液体有限延伸" -#~ msgid "Show Favorites" -#~ msgstr "显示最爱" +#~ msgid "Preload item visuals" +#~ msgstr "预先加载物品图像" -#~ msgid "Show Public" -#~ msgstr "显示公共" +#~ msgid "SETTINGS" +#~ msgstr "设置" -#~ msgid "Cannot create world: Name contains invalid characters" -#~ msgstr "无法创建世界：名字包含非法字符" +#~ msgid "Password" +#~ msgstr "密码" -#~ msgid "Warning: Configuration not consistent. " -#~ msgstr "警告：配置不一致。 " +#~ msgid "Name" +#~ msgstr "名字" -#~ msgid "Configuration saved. " -#~ msgstr "配置已保存。 " +#~ msgid "START SERVER" +#~ msgstr "启动服务器" -#~ msgid "is required by:" -#~ msgstr "被需要：" +#~ msgid "CLIENT" +#~ msgstr "客户端" -#~ msgid "Left click: Move all items, Right click: Move single item" -#~ msgstr "左键：移动所有物品，右键：移动单个物品" +#~ msgid "<<-- Add mod" +#~ msgstr "<<-- 添加MOD" -#~ msgid " MB/s" -#~ msgstr "兆字节/秒" +#~ msgid "Remove selected mod" +#~ msgstr "删除选中MOD" -#~ msgid " KB/s" -#~ msgstr "千字节/秒" +#~ msgid "EDIT GAME" +#~ msgstr "编辑游戏" + +#~ msgid "new game" +#~ msgstr "新建游戏" + +#~ msgid "Mods:" +#~ msgstr "MODS：" + +#~ msgid "GAMES" +#~ msgstr "游戏" + +#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" +#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”" + +#~ msgid "Game Name" +#~ msgstr "游戏名" + +#~ msgid "Restart minetest for driver change to take effect" +#~ msgstr "重启minetest让驱动变化生效" #, fuzzy -#~ msgid "Downloading" -#~ msgstr "下载中" - -#~ msgid "Touch free target" -#~ msgstr "自由触摸目标" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "菜单元素应用缩放因子" +#~ msgid "If enabled, " +#~ msgstr "启用" #, fuzzy -#~ msgid "Reset singleplayer world" -#~ msgstr "重置单人游戏" +#~ msgid "If disabled " +#~ msgstr "禁用MOD包" -#, fuzzy -#~ msgid "Preload inventory textures" -#~ msgstr "载入中..." +#~ msgid "No!!!" +#~ msgstr "不!!!" + +#~ msgid "Generate Normalmaps" +#~ msgstr "生成一般地图" + +#~ msgid "Public Serverlist" +#~ msgstr "公共服务器列表" + +#~ msgid "No of course not!" +#~ msgstr "当然不！" diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index c3330792..abe574c9 100644 --- a/po/zh_TW/minetest.po +++ b/po/zh_TW/minetest.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 05:49+0100\n" +"POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-03-05 14:43+0000\n" "Last-Translator: Jeff Huang \n" -"Language-Team: Chinese (Taiwan) " -"\n" +"Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,6 +72,7 @@ msgid "We support protocol versions between version $1 and $2." msgstr "我們支援協定版本 $1 到 $2。" #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua #: builtin/mainmenu/dlg_rename_modpack.lua #: builtin/mainmenu/dlg_settings_advanced.lua src/guiKeyChangeMenu.cpp #: src/keycode.cpp @@ -98,7 +99,9 @@ msgstr "啟用全部" msgid "" "Failed to enable mod \"$1\" as it contains disallowed characters. Only " "chararacters [a-z0-9_] are allowed." -msgstr "啟用 mod 「$1」 失敗，因為其包含了不合法的字元。只有 字元 [a-z0-9_] 才是可用的。" +msgstr "" +"啟用 mod 「$1」 失敗，因為其包含了不合法的字元。只有 字元 [a-z0-9_] 才是可用" +"的。" #: builtin/mainmenu/dlg_config_world.lua msgid "Hide Game" @@ -173,6 +176,12 @@ msgstr "您沒有安裝子遊戲。" msgid "Are you sure you want to delete \"$1\"?" msgstr "您確定您要刪除「$1」嗎？" +#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua +#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#: src/keycode.cpp +msgid "Delete" +msgstr "刪除" + #: builtin/mainmenu/dlg_delete_mod.lua msgid "Modmgr: failed to delete \"$1\"" msgstr "Mod 管理員：刪除「$1」失敗" @@ -181,23 +190,10 @@ msgstr "Mod 管理員：刪除「$1」失敗" msgid "Modmgr: invalid modpath \"$1\"" msgstr "Mod 管理員：無效的 mod 路徑「$1」" -#: builtin/mainmenu/dlg_delete_mod.lua -msgid "No of course not!" -msgstr "不，絕對不是！" - -#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua -#: builtin/mainmenu/tab_settings.lua -msgid "Yes" -msgstr "是" - #: builtin/mainmenu/dlg_delete_world.lua msgid "Delete World \"$1\"?" msgstr "刪除世界「$1」？" -#: builtin/mainmenu/dlg_delete_world.lua -msgid "No" -msgstr "否" - #: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp msgid "Accept" msgstr "接受" @@ -242,7 +238,9 @@ msgstr "格式為 3 個在括號內的以逗號分離的數字。" msgid "" "Format: , , (, , ), , " ", " -msgstr "格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續性>" +msgstr "" +"格式：<偏移>, <尺寸>, (<寬度 X>, <寬度 Y>, <寬度 Z>), <種子>, <八進位>, <持續" +"性>" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -405,7 +403,8 @@ msgid "Uninstall selected modpack" msgstr "解除安裝已選取的 mod 包" #: builtin/mainmenu/tab_multiplayer.lua -msgid "Address / Port :" +#, fuzzy +msgid "Address / Port" msgstr "地址／埠：" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp @@ -424,18 +423,18 @@ msgstr "創造模式" msgid "Damage enabled" msgstr "已啟用傷害" -#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua -#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp -msgid "Delete" -msgstr "刪除" - -#: builtin/mainmenu/tab_multiplayer.lua -msgid "Name / Password :" -msgstr "名稱／密碼：" +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +msgid "Del. Favorite" +msgstr "" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -msgid "Public Serverlist" -msgstr "公共伺服器清單" +msgid "Favorite" +msgstr "" + +#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy +msgid "Name / Password" +msgstr "名稱／密碼：" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -459,7 +458,7 @@ msgstr "創造模式" msgid "Enable Damage" msgstr "啟用傷害" -#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua +#: builtin/mainmenu/tab_server.lua msgid "Name/Password" msgstr "名稱／密碼" @@ -527,8 +526,9 @@ msgstr "您確定要要重置您的單人遊戲世界嗎？" msgid "Bilinear Filter" msgstr "雙線性過濾器" -#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -msgid "Bumpmapping" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Bump Mapping" msgstr "映射貼圖" #: builtin/mainmenu/tab_settings.lua @@ -539,18 +539,10 @@ msgstr "變更按鍵" msgid "Connected Glass" msgstr "連接玻璃" -#: builtin/mainmenu/tab_settings.lua -msgid "Enable Particles" -msgstr "啟用粒子" - #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" msgstr "華麗葉子" -#: builtin/mainmenu/tab_settings.lua -msgid "Generate Normalmaps" -msgstr "生成一般地圖" - #: builtin/mainmenu/tab_settings.lua msgid "Mipmap" msgstr "Mip 貼圖" @@ -559,6 +551,10 @@ msgstr "Mip 貼圖" msgid "Mipmap + Aniso. Filter" msgstr "Mip 貼圖 + Aniso. 過濾器" +#: builtin/mainmenu/tab_settings.lua +msgid "No" +msgstr "否" + #: builtin/mainmenu/tab_settings.lua msgid "No Filter" msgstr "無過濾器" @@ -568,17 +564,23 @@ msgid "No Mipmap" msgstr "無 Mip 貼圖" #: builtin/mainmenu/tab_settings.lua -msgid "No!!!" -msgstr "否！！！" +msgid "Node Highlighting" +msgstr "突顯節點" #: builtin/mainmenu/tab_settings.lua -msgid "Node Highlighting" +#, fuzzy +msgid "Node Outlining" msgstr "突顯節點" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "無" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Normal Mapping" +msgstr "法線貼圖採樣" + #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" msgstr "不透明葉子" @@ -591,6 +593,11 @@ msgstr "不透明水" msgid "Parallax Occlusion" msgstr "視差遮蔽" +#: builtin/mainmenu/tab_settings.lua +#, fuzzy +msgid "Particles" +msgstr "啟用粒子" + #: builtin/mainmenu/tab_settings.lua msgid "Settings" msgstr "設定" @@ -615,6 +622,10 @@ msgstr "紋理：" msgid "To enable shaders the OpenGL driver needs to be used." msgstr "要啟用著色器，必須使用 OpenGL 驅動程式。" +#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp +msgid "Tone Mapping" +msgstr "色調映射" + #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "碰觸限值（像素）" @@ -635,6 +646,10 @@ msgstr "植物擺動" msgid "Waving Water" msgstr "波動的水" +#: builtin/mainmenu/tab_settings.lua +msgid "Yes" +msgstr "是" + #: builtin/mainmenu/tab_simple_main.lua msgid "Config mods" msgstr "設定 mod" @@ -837,10 +852,6 @@ msgstr "MiB/s" msgid "Node definitions..." msgstr "節點定義..." -#: src/game.cpp src/guiFormSpecMenu.cpp -msgid "Proceed" -msgstr "開始" - #: src/game.cpp msgid "Resolving address..." msgstr "正在解析地址……" @@ -861,13 +872,17 @@ msgstr "音量" msgid "You died." msgstr "您已經死亡。" +#: src/game.cpp src/guiFormSpecMenu.cpp +msgid "ok" +msgstr "確定" + #: src/guiFormSpecMenu.cpp msgid "Enter " msgstr "輸入 " #: src/guiFormSpecMenu.cpp -msgid "ok" -msgstr "確定" +msgid "Proceed" +msgstr "開始" #: src/guiKeyChangeMenu.cpp msgid "\"Use\" = climb down" @@ -1350,6 +1365,16 @@ msgstr "發生佇列的絕對限制" msgid "Acceleration in air" msgstr "在空氣中的加速" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Management interval" +msgstr "活動區塊範圍" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Active Block Modifier interval" +msgstr "活動區塊範圍" + #: src/settings_translation_file.cpp msgid "Active block range" msgstr "活動區塊範圍" @@ -1443,6 +1468,11 @@ msgstr "基礎地形高度" msgid "Basic" msgstr "基礎" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Basic Privileges" +msgstr "預設特權" + #: src/settings_translation_file.cpp msgid "Bilinear filtering" msgstr "雙線性過濾器" @@ -1459,6 +1489,10 @@ msgstr "全螢幕模式中的位元／像素（又稱色彩深度）。" msgid "Build inside player" msgstr "在玩家內構建" +#: src/settings_translation_file.cpp +msgid "Bumpmapping" +msgstr "映射貼圖" + #: src/settings_translation_file.cpp msgid "Camera smoothing" msgstr "攝影機平滑" @@ -1479,6 +1513,11 @@ msgstr "洞穴噪音 #1" msgid "Cave noise #2" msgstr "洞穴噪音 #2" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Cave width" +msgstr "螢幕寬度" + #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" msgstr "洞穴與隧道形成兩種噪音的交集" @@ -1662,6 +1701,10 @@ msgstr "控制湖泊窪地的陡度／深度。" msgid "Controls steepness/height of hills." msgstr "控制山丘的陡度／深度。" +#: src/settings_translation_file.cpp +msgid "Controls width of tunnels, a smaller value creates wider tunnels." +msgstr "" + #: src/settings_translation_file.cpp msgid "Crash message" msgstr "當機訊息" @@ -2014,7 +2057,8 @@ msgstr "以度計算的視野。" msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." -msgstr "在 客戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。" +msgstr "" +"在 客戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。" #: src/settings_translation_file.cpp msgid "Filler Depth" @@ -2084,6 +2128,11 @@ msgstr "字型陰影偏移，若為 0 則陰影將不會被繪製。" msgid "Font size" msgstr "字型大小" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Format of screenshots." +msgstr "儲存螢幕截圖的路徑。" + #: src/settings_translation_file.cpp msgid "Forward key" msgstr "前進鍵" @@ -2145,13 +2194,16 @@ msgid "Generate normalmaps" msgstr "生成一般地圖" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" "and junglegrass, in all other mapgens this flag controls all decorations.\n" +"The default flags set in the engine are: caves, light, decorations\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "全域地圖產生屬性。\n" "在 Mapgen v6 中，「decorations」旗標控制所有除了樹木\n" @@ -2307,7 +2359,9 @@ msgid "" "If enabled, you can place blocks at the position (feet + eye level) where " "you stand.\n" "This is helpful when working with nodeboxes in small areas." -msgstr "若啟用，您可以在您站立的位置（腳與眼睛的高度）放置方塊。當在小區域裡與節點盒一同工作時非常有用。" +msgstr "" +"若啟用，您可以在您站立的位置（腳與眼睛的高度）放置方塊。當在小區域裡與節點盒" +"一同工作時非常有用。" #: src/settings_translation_file.cpp msgid "If this is set, players will always (re)spawn at the given position." @@ -2421,8 +2475,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "降低視野範圍的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2431,8 +2485,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "丟棄目前選定物品的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2441,8 +2495,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "增加視野範圍的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2451,8 +2505,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "跳躍的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2461,8 +2515,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "在快速模式中快速移動的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2471,8 +2525,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "將玩家往後方移動的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2481,8 +2535,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "將玩家往前方移動的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2491,8 +2545,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "將玩家往左方移動的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2501,8 +2555,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "將玩家往右方移動的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2511,8 +2565,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "開啟聊天視窗的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2521,8 +2575,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "開啟對話視窗以供輸入指令的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2531,8 +2585,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "開啟對話視窗的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2541,8 +2595,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "開啟物品欄的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2551,8 +2605,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "印出除錯堆疊的按鍵。對開發來說很有用。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2564,8 +2618,8 @@ msgid "" msgstr "" "潛行的按鍵。\n" "若 aux1_ 降低停用時，也會用於向下攀爬與在水中下潛。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2574,8 +2628,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "用來切換第一與第三人稱視角的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2584,8 +2638,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "拍攝螢幕截圖的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2594,8 +2648,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換電影模式的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2604,8 +2658,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換顯示迷你地圖的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2614,8 +2668,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換快速模式的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2624,8 +2678,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換飛行的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2634,8 +2688,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換 noclip 模式的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2644,8 +2698,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換視角更新的按鍵。僅對開發有用。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2654,8 +2708,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換顯示除錯資訊的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2664,8 +2718,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換顯示 HUD 的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2674,8 +2728,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換顯示聊天的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2684,8 +2738,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換顯示霧的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2694,8 +2748,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換顯示輪廓的按鍵。對開發有用。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "" @@ -2704,8 +2758,8 @@ msgid "" "html#a54da2a0e231901735e3da1b0edf72eb3" msgstr "" "切換無限視野的按鍵。\n" -"請見 http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e" -"3da1b0edf72eb3" +"請見 http://irrlicht.sourceforge.net/docu/namespaceirr." +"html#a54da2a0e231901735e3da1b0edf72eb3" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" @@ -2749,6 +2803,14 @@ msgid "" "updated over network." msgstr "伺服器 tick 的長度與相關物件的間隔通常透過網路更新。" +#: src/settings_translation_file.cpp +msgid "Length of time between ABM execution cycles" +msgstr "" + +#: src/settings_translation_file.cpp +msgid "Length of time between NodeTimer execution cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Level of logging to be written to debug.txt:\n" @@ -2845,43 +2907,19 @@ msgid "Map directory" msgstr "地圖目錄" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them.\n" -"\"altitude_chill\" makes higher elevations colder, which may cause biome " +"'altitude_chill' makes higher elevations colder, which may cause biome " "issues.\n" -"\"humid_rivers\" modifies the humidity around rivers and in areas where " -"water would tend to pool. It may interfere with delicately adjusted biomes." -msgstr "" -"專用於 Mapgen 山谷的地圖生成屬性。\n" -"未在旗標字串中指定的旗標將不會自預設值修改。\n" -"以「no」開頭的旗標字串將會用於明確的停用它們。\n" -"「altitude_chill」會讓較高的地方更寒冷，可能會造成生物群落的問題。\n" -"「humid_rivers」會修改在河流附近的濕度，在那些區域附近水將會傾向變為一池。這可能會對微妙調整過的生物群落造成干擾。" - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen flat.\n" -"Occasional lakes and hills added to the flat world.\n" +"'humid_rivers' modifies the humidity around rivers and in areas where water " +"would tend to pool,\n" +"it may interfere with delicately adjusted biomes.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." -msgstr "" -"專用於 Mapgen flat 的地圖生成屬性。\n" -"偶而會在平坦的世界中加入湖泊與山丘。\n" -"未在旗標字串中指定的旗標將不會自預設值修改。\n" -"以「no」開頭的旗標字串將會用於明確的停用它們。" - -#: src/settings_translation_file.cpp -msgid "" -"Map generation attributes specific to Mapgen v6.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" "專用於 Mapgen v6 的地圖生成屬性。\n" "當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n" @@ -2889,15 +2927,51 @@ msgstr "" "以「no」開頭的旗標字串將會用於明確的停用它們。" #: src/settings_translation_file.cpp +#, fuzzy msgid "" -"Map generation attributes specific to Mapgen v7.\n" -"'ridges' are the rivers.\n" +"Map generation attributes specific to Mapgen flat.\n" +"Occasional lakes and hills can be added to the flat world.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." msgstr "" -"專用於 Mapgen v7 的地圖生成屬性。\n" -"「ridges」為河流。\n" +"專用於 Mapgen flat 的地圖生成屬性。\n" +"偶而會在平坦的世界中加入湖泊與山丘。\n" +"未在旗標字串中指定的旗標將不會自預設值修改。\n" +"以「no」開頭的旗標字串將會用於明確的停用它們。" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v6.\n" +"When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " +"flag is ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"專用於 Mapgen v6 的地圖生成屬性。\n" +"當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n" +"未在旗標字串中指定的旗標將不會自預設值修改。\n" +"以「no」開頭的旗標字串將會用於明確的停用它們。" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "" +"Map generation attributes specific to Mapgen v7.\n" +"The 'ridges' flag controls the rivers.\n" +"The default flags set in the engine are: mountains, ridges\n" +"The flags string modifies the engine defaults.\n" +"Flags that are not specified in the flag string are not modified from the " +"default.\n" +"Flags starting with 'no' are used to explicitly disable them." +msgstr "" +"專用於 Mapgen v6 的地圖生成屬性。\n" +"當 snowbiomes 與叢林都啟用時，叢林旗標會被忽略。\n" "未在旗標字串中指定的旗標將不會自預設值修改。\n" "以「no」開頭的旗標字串將會用於明確的停用它們。" @@ -2945,6 +3019,11 @@ msgstr "Mapgen 旗標" msgid "Mapgen flat" msgstr "Mapgen flat" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen flat cave width" +msgstr "Mapgen flat 大型洞穴深度" + #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" msgstr "Mapgen flat 洞穴1 噪音 參數" @@ -2993,6 +3072,11 @@ msgstr "Mapgen flat 地形 噪音 參數" msgid "Mapgen fractal" msgstr "地圖產生器分形" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen fractal cave width" +msgstr "Mapgen fractal slice w" + #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" msgstr "Mapgen fractal 洞穴1 噪音 參數" @@ -3057,6 +3141,11 @@ msgstr "Mapgen 名稱" msgid "Mapgen v5" msgstr "Mapgen v5" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v5 cave width" +msgstr "Mapgen flat 大型洞穴深度" + #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" msgstr "Mapgen v5 洞穴1 噪音 參數" @@ -3141,6 +3230,11 @@ msgstr "Mapgen v6 樹 噪音 參數" msgid "Mapgen v7" msgstr "地圖產生器 v7" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Mapgen v7 cave width" +msgstr "Mapgen flat 大型洞穴深度" + #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" msgstr "Mapgen v7 洞穴1 噪音 參數" @@ -3454,6 +3548,11 @@ msgstr "Noclip 按鍵" msgid "Node highlighting" msgstr "突顯節點" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "NodeTimer interval" +msgstr "時間傳送間隔" + #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." msgstr "噪音參數供生物群落 API 溫度、濕度與生物混合使用。" @@ -3580,6 +3679,10 @@ msgstr "" msgid "Prevent mods from doing insecure things like running shell commands." msgstr "避免 mod 做出不安全的舉動，像是執行 shell 指令等。" +#: src/settings_translation_file.cpp +msgid "Privileges that players with basic_privs can grant" +msgstr "" + #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." msgstr "分析器資料印出間隔。0 = 停用。對開發者有用。" @@ -3695,6 +3798,23 @@ msgstr "螢幕截圖" msgid "Screenshot folder" msgstr "螢幕截圖資料夾" +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot format" +msgstr "螢幕截圖資料夾" + +#: src/settings_translation_file.cpp +#, fuzzy +msgid "Screenshot quality" +msgstr "螢幕截圖" + +#: src/settings_translation_file.cpp +msgid "" +"Screenshot quality. Only used for JPEG format.\n" +"1 means worst quality; 100 means best quality.\n" +"Use 0 for default quality." +msgstr "" + #: src/settings_translation_file.cpp msgid "Security" msgstr "安全" @@ -3796,6 +3916,10 @@ msgstr "迷你地圖的形狀。啟用 = 圓形，停用 = 方形。" msgid "Show debug info" msgstr "顯示除錯資訊" +#: src/settings_translation_file.cpp +msgid "Show entity selection boxes" +msgstr "" + #: src/settings_translation_file.cpp msgid "Shutdown message" msgstr "關閉訊息" @@ -3866,6 +3990,10 @@ msgstr "視差強度。" msgid "Strict protocol checking" msgstr "嚴格協議檢查" +#: src/settings_translation_file.cpp +msgid "Support older servers" +msgstr "" + #: src/settings_translation_file.cpp msgid "Synchronous SQLite" msgstr "同步的 SQLite" @@ -3954,6 +4082,10 @@ msgstr "當按住滑鼠右鍵時，重覆右鍵點選的間隔以秒計。" msgid "This font will be used for certain languages." msgstr "這個字型將會被用於特定的語言。" +#: src/settings_translation_file.cpp +msgid "Time in between active block management cycles" +msgstr "" + #: src/settings_translation_file.cpp msgid "" "Time in seconds for item entity (dropped items) to live.\n" @@ -3988,10 +4120,6 @@ msgstr "" msgid "Toggle camera mode key" msgstr "切換攝影機模式按鍵" -#: src/settings_translation_file.cpp -msgid "Tone Mapping" -msgstr "色調映射" - #: src/settings_translation_file.cpp msgid "Tooltip delay" msgstr "工具提示延遲" @@ -4272,6 +4400,14 @@ msgid "" "Whether to show the client debug info (has the same effect as hitting F5)." msgstr "是否顯示客戶端除錯資訊（與按下 F5 有同樣的效果）。" +#: src/settings_translation_file.cpp +msgid "" +"Whether to support older servers before protocol version 25.\n" +"Enable if you want to connect to 0.4.12 servers and before.\n" +"Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" +"Disabling this option will protect your password better." +msgstr "" + #: src/settings_translation_file.cpp msgid "Width component of the initial window size." msgstr "初始視窗大小的寬度元素。" @@ -4308,33 +4444,6 @@ msgstr "cURL 並行限制" msgid "cURL timeout" msgstr "cURL 逾時" -#~ msgid "\"" -#~ msgstr "\"" - -#~ msgid "Enable a bit lower water surface, so it doesn't " -#~ msgstr "啟用較低的水面，所以它不會 " - -#~ msgid "If disabled " -#~ msgstr "若停用 " - -#~ msgid "If enabled, " -#~ msgstr "若啟用， " - -#~ msgid "Touch free target" -#~ msgstr "碰觸自由目標" - -#~ msgid "Scaling factor applied to menu elements: " -#~ msgstr "套用在選單元素的縮放係數： " - -#~ msgid "Reset singleplayer world" -#~ msgstr "重置單人遊戲世界" - -#~ msgid "Preload inventory textures" -#~ msgstr "預先載入物品欄材質" - -#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." -#~ msgstr "啟用節點選擇突顯（停用選取框）。" - #~ msgid "" #~ "Enable a bit lower water surface, so it doesn't \"fill\" the node " #~ "completely.\n" @@ -4344,3 +4453,72 @@ msgstr "cURL 逾時" #~ "啟用略低的的水面，所以它就不會完全「填滿」節點。\n" #~ "注意，這個功能並未最佳化完成，水面的\n" #~ "柔和光功能無法與此功能一同運作。" + +#~ msgid "Enable selection highlighting for nodes (disables selectionbox)." +#~ msgstr "啟用節點選擇突顯（停用選取框）。" + +#~ msgid "Preload inventory textures" +#~ msgstr "預先載入物品欄材質" + +#~ msgid "Reset singleplayer world" +#~ msgstr "重置單人遊戲世界" + +#~ msgid "Scaling factor applied to menu elements: " +#~ msgstr "套用在選單元素的縮放係數： " + +#~ msgid "Touch free target" +#~ msgstr "碰觸自由目標" + +#~ msgid "If enabled, " +#~ msgstr "若啟用， " + +#~ msgid "If disabled " +#~ msgstr "若停用 " + +#~ msgid "Enable a bit lower water surface, so it doesn't " +#~ msgstr "啟用較低的水面，所以它不會 " + +#~ msgid "\"" +#~ msgstr "\"" + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen v7.\n" +#~ "'ridges' are the rivers.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them." +#~ msgstr "" +#~ "專用於 Mapgen v7 的地圖生成屬性。\n" +#~ "「ridges」為河流。\n" +#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n" +#~ "以「no」開頭的旗標字串將會用於明確的停用它們。" + +#~ msgid "" +#~ "Map generation attributes specific to Mapgen Valleys.\n" +#~ "Flags that are not specified in the flag string are not modified from the " +#~ "default.\n" +#~ "Flags starting with \"no\" are used to explicitly disable them.\n" +#~ "\"altitude_chill\" makes higher elevations colder, which may cause biome " +#~ "issues.\n" +#~ "\"humid_rivers\" modifies the humidity around rivers and in areas where " +#~ "water would tend to pool. It may interfere with delicately adjusted " +#~ "biomes." +#~ msgstr "" +#~ "專用於 Mapgen 山谷的地圖生成屬性。\n" +#~ "未在旗標字串中指定的旗標將不會自預設值修改。\n" +#~ "以「no」開頭的旗標字串將會用於明確的停用它們。\n" +#~ "「altitude_chill」會讓較高的地方更寒冷，可能會造成生物群落的問題。\n" +#~ "「humid_rivers」會修改在河流附近的濕度，在那些區域附近水將會傾向變為一池。" +#~ "這可能會對微妙調整過的生物群落造成干擾。" + +#~ msgid "No!!!" +#~ msgstr "否！！！" + +#~ msgid "Generate Normalmaps" +#~ msgstr "生成一般地圖" + +#~ msgid "Public Serverlist" +#~ msgstr "公共伺服器清單" + +#~ msgid "No of course not!" +#~ msgstr "不，絕對不是！" From a279426d126631e82f49f5b9d1d7bfb2c580396d Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 2 May 2016 21:22:06 +0100 Subject: [PATCH 490/531] Lua_api.txt: Add warnings of l-system lighting bug --- doc/lua_api.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 4b5f969d..e8e74f67 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -2107,7 +2107,9 @@ and `minetest.auth_reload` call the authetification handler. * `max_drop`: maximum height difference to consider droppable * `algorithm`: One of `"A*_noprefetch"` (default), `"A*"`, `"Dijkstra"` * `minetest.spawn_tree (pos, {treedef})` - * spawns L-System tree at given `pos` with definition in `treedef` table + * spawns L-system tree at given `pos` with definition in `treedef` table + * Warning: L-system generation currently creates lighting bugs in the form of mapblock-sized shadows. + Often these bugs appear as subtle shadows in water. * `minetest.transforming_liquid_add(pos)` * add node to liquid update queue * `minetest.get_node_max_level(pos)` @@ -3196,6 +3198,9 @@ Registered entities L-system trees -------------- +**Warning** +L-system generation currently creates lighting bugs in the form of mapblock-sized shadows. +Often these bugs appear as subtle shadows in water. ### Tree definition From bb925479a56e7b961e3520024c20b74245640035 Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Tue, 3 May 2016 03:24:36 +0300 Subject: [PATCH 491/531] Android: Increase player_stepheight for thicker snow nodebox --- src/localplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index dbd8c4a6..507f3198 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -211,7 +211,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, float player_stepheight = touching_ground ? (BS*0.6) : (BS*0.2); #ifdef __ANDROID__ - player_stepheight += (0.5 * BS); + player_stepheight += (0.6 * BS); #endif v3f accel_f = v3f(0,0,0); From d5c3db9c4179e27a80c32ee95d6573ad0ec7137e Mon Sep 17 00:00:00 2001 From: Ekdohibs Date: Thu, 5 May 2016 18:50:02 +0200 Subject: [PATCH 492/531] Make dropdowns show the string that was their argument. This makes it work even if it contains escape sequences, which didn't work before. --- src/guiFormSpecMenu.cpp | 24 ++++++++++++++++++++++-- src/guiFormSpecMenu.h | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 23cff3eb..ca374151 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -240,6 +240,15 @@ GUITable* GUIFormSpecMenu::getTable(const std::string &tablename) return 0; } +std::vector* GUIFormSpecMenu::getDropDownValues(const std::string &name) +{ + for (u32 i = 0; i < m_dropdowns.size(); ++i) { + if (name == m_dropdowns[i].first.fname) + return &m_dropdowns[i].second; + } + return NULL; +} + static std::vector split(const std::string &s, char delim) { std::vector tokens; @@ -894,6 +903,14 @@ void GUIFormSpecMenu::parseDropDown(parserData* data,std::string element) e->setSelected(stoi(str_initial_selection.c_str())-1); m_fields.push_back(spec); + + m_dropdowns.push_back(std::pair >(spec, std::vector())); + std::vector &values = m_dropdowns.back().second; + for (unsigned int i = 0; i < items.size(); i++) { + values.push_back(unescape_string(items[i])); + } + return; } errorstream << "Invalid dropdown element(" << parts.size() << "): '" @@ -2725,8 +2742,11 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode=quit_mode_no) } s32 selected = e->getSelected(); if (selected >= 0) { - fields[name] = - wide_to_utf8(e->getItem(selected)); + std::vector *dropdown_values = + getDropDownValues(s.fname); + if (dropdown_values && selected < (s32)dropdown_values->size()) { + fields[name] = (*dropdown_values)[selected]; + } } } else if (s.ftype == f_TabHeader) { diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 8774d306..27680743 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -357,6 +357,7 @@ public: bool pausesGame() { return doPause; } GUITable* getTable(const std::string &tablename); + std::vector* getDropDownValues(const std::string &name); #ifdef __ANDROID__ bool getAndroidUIInput(); @@ -395,6 +396,7 @@ protected: std::vector > m_checkboxes; std::map m_tooltips; std::vector > m_scrollbars; + std::vector > > m_dropdowns; ItemSpec *m_selected_item; f32 m_timer1; From 4d9dbceb39324ee0aef6520b8193fa093470cc01 Mon Sep 17 00:00:00 2001 From: Ekdohibs Date: Thu, 5 May 2016 19:08:45 +0200 Subject: [PATCH 493/531] Run unescape_enriched *after* unescape_string. Doing it the other way round was a mistake, since it breaks minetest.formspec_escape with escape sequences that contain special characters. --- src/guiFormSpecMenu.cpp | 37 ++++++++++++++++++++----------------- src/guiFormSpecMenu.h | 18 +++++------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index ca374151..2bf06c1d 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -422,7 +422,7 @@ void GUIFormSpecMenu::parseCheckbox(parserData* data,std::string element) if (selected == "true") fselected = true; - std::wstring wlabel = utf8_to_wide(label); + std::wstring wlabel = utf8_to_wide(unescape_string(label)); core::rect rect = core::rect( pos.X, pos.Y + ((imgsize.Y/2) - m_btn_height), @@ -618,7 +618,7 @@ void GUIFormSpecMenu::parseButton(parserData* data,std::string element, if(!data->explicit_size) warningstream<<"invalid use of button without a size[] element"<addItem(unescape_string(unescape_enriched( + e->addItem(unescape_enriched(unescape_string( utf8_to_wide(items[i]))).c_str()); } @@ -945,7 +945,7 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element) core::rect rect = core::rect(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y); - std::wstring wlabel = utf8_to_wide(label); + std::wstring wlabel = utf8_to_wide(unescape_string(label)); FieldSpec spec( name, @@ -1009,12 +1009,12 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data, default_val = m_form_src->resolveText(default_val); - std::wstring wlabel = utf8_to_wide(label); + std::wstring wlabel = utf8_to_wide(unescape_string(label)); FieldSpec spec( name, wlabel, - utf8_to_wide(default_val), + utf8_to_wide(unescape_string(default_val)), 258+m_fields.size() ); @@ -1105,12 +1105,12 @@ void GUIFormSpecMenu::parseTextArea(parserData* data, default_val = m_form_src->resolveText(default_val); - std::wstring wlabel = utf8_to_wide(label); + std::wstring wlabel = utf8_to_wide(unescape_string(label)); FieldSpec spec( name, wlabel, - utf8_to_wide(default_val), + utf8_to_wide(unescape_string(default_val)), 258+m_fields.size() ); @@ -1218,7 +1218,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data,std::string element) // in the integer cases: 0.4 is not exactly // representable in binary floating point. s32 posy = pos.Y + ((float)i) * spacing.Y * 2.0 / 5.0; - std::wstring wlabel = utf8_to_wide(lines[i]); + std::wstring wlabel = utf8_to_wide(unescape_string(lines[i])); core::rect rect = core::rect( pos.X, posy - m_btn_height, pos.X + m_font->getDimension(wlabel.c_str()).Width, @@ -1250,8 +1250,8 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element) ((parts.size() > 2) && (m_formspec_version > FORMSPEC_API_VERSION))) { std::vector v_pos = split(parts[0],','); - std::wstring text = unescape_string( - unescape_enriched(utf8_to_wide(parts[1]))); + std::wstring text = unescape_enriched( + unescape_string(utf8_to_wide(parts[1]))); MY_CHECKPOS("vertlabel",1); @@ -1339,7 +1339,7 @@ void GUIFormSpecMenu::parseImageButton(parserData* data,std::string element, image_name = unescape_string(image_name); pressed_image_name = unescape_string(pressed_image_name); - std::wstring wlabel = utf8_to_wide(label); + std::wstring wlabel = utf8_to_wide(unescape_string(label)); FieldSpec spec( name, @@ -1437,7 +1437,7 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data,std::string element) e->setNotClipped(true); for (unsigned int i = 0; i < buttons.size(); i++) { - e->addTab(unescape_string(unescape_enriched( + e->addTab(unescape_enriched(unescape_string( utf8_to_wide(buttons[i]))).c_str(), -1); } @@ -1473,6 +1473,9 @@ void GUIFormSpecMenu::parseItemImageButton(parserData* data,std::string element) std::string name = parts[3]; std::string label = parts[4]; + label = unescape_string(label); + item_name = unescape_string(item_name); + MY_CHECKPOS("itemimagebutton",0); MY_CHECKGEOM("itemimagebutton",1); @@ -1611,14 +1614,14 @@ void GUIFormSpecMenu::parseTooltip(parserData* data, std::string element) std::vector parts = split(element,';'); if (parts.size() == 2) { std::string name = parts[0]; - m_tooltips[name] = TooltipSpec(parts[1], + m_tooltips[name] = TooltipSpec(unescape_string(parts[1]), m_default_tooltip_bgcolor, m_default_tooltip_color); return; } else if (parts.size() == 4) { std::string name = parts[0]; video::SColor tmp_color1, tmp_color2; if ( parseColorString(parts[2], tmp_color1, false) && parseColorString(parts[3], tmp_color2, false) ) { - m_tooltips[name] = TooltipSpec(parts[1], + m_tooltips[name] = TooltipSpec(unescape_string(parts[1]), tmp_color1, tmp_color2); return; } diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index 27680743..ef230c81 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -192,14 +192,6 @@ class GUIFormSpecMenu : public GUIModalMenu bool scale; }; - /* The responsibility of unescaping the strings has been shifted - * from the formspec parsing methods to the draw methods. - * There still are a few exceptions: - * - Vertical label, because it modifies the string by inserting - * '\n' between each character, - * - Tab header, because it gives the string immediately to - * Irrlicht and we can't unescape it later. - */ struct FieldSpec { FieldSpec() @@ -210,8 +202,8 @@ class GUIFormSpecMenu : public GUIModalMenu fname(name), fid(id) { - flabel = unescape_string(unescape_enriched(label)); - fdefault = unescape_string(unescape_enriched(default_text)); + flabel = unescape_enriched(label); + fdefault = unescape_enriched(default_text); send = false; ftype = f_Unknown; is_exit = false; @@ -247,7 +239,7 @@ class GUIFormSpecMenu : public GUIModalMenu bgcolor(a_bgcolor), color(a_color) { - tooltip = unescape_string(unescape_enriched(utf8_to_wide(a_tooltip))); + tooltip = unescape_enriched(utf8_to_wide(a_tooltip)); } std::wstring tooltip; irr::video::SColor bgcolor; @@ -264,7 +256,7 @@ class GUIFormSpecMenu : public GUIModalMenu rect(a_rect), parent_button(NULL) { - text = unescape_string(unescape_enriched(a_text)); + text = unescape_enriched(a_text); } StaticTextSpec(const std::wstring &a_text, const core::rect &a_rect, @@ -272,7 +264,7 @@ class GUIFormSpecMenu : public GUIModalMenu rect(a_rect), parent_button(a_parent_button) { - text = unescape_string(unescape_enriched(a_text)); + text = unescape_enriched(a_text); } std::wstring text; core::rect rect; From 0f6e4a0913ea3d96a34dd2da15b140a4b54b0983 Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Sun, 10 Apr 2016 03:12:10 +0300 Subject: [PATCH 494/531] Optimize default settings for Android build --- src/defaultsettings.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index d048721e..70aef60e 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -341,7 +341,6 @@ void set_default_settings(Settings *settings) settings->setDefault("screenH", "0"); settings->setDefault("enable_shaders", "false"); settings->setDefault("fullscreen", "true"); - settings->setDefault("enable_particles", "false"); settings->setDefault("video_driver", "ogles1"); settings->setDefault("touchtarget", "true"); settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/"); @@ -350,8 +349,19 @@ void set_default_settings(Settings *settings) settings->setDefault("max_simultaneous_block_sends_per_client", "3"); settings->setDefault("emergequeue_limit_diskonly", "8"); settings->setDefault("emergequeue_limit_generate", "8"); + settings->setDefault("max_block_generate_distance", "2"); + settings->setDefault("enable_3d_clouds", "false"); + settings->setDefault("fps_max", "30"); + settings->setDefault("pause_fps_max", "10"); + settings->setDefault("max_objects_per_block", "20"); + settings->setDefault("sqlite_synchronous", "1"); + settings->setDefault("gui_scaling", "1.1"); + settings->setDefault("server_map_save_interval", "15"); + settings->setDefault("client_mapblock_limit", "500"); + settings->setDefault("active_block_range", "1"); + settings->setDefault("chunksize", "3"); - settings->setDefault("viewing_range", "50"); + settings->setDefault("viewing_range", "25"); settings->setDefault("inventory_image_hack", "false"); //check for device with small screen From 2cdd9b4ab6cfc878dafb88aa8446b12cf2f94278 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Tue, 23 Apr 2013 23:17:33 +0200 Subject: [PATCH 495/531] Chat: Keep scroll position constant in ChatBuffer::deleteOldest() --- src/chat.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/chat.cpp b/src/chat.cpp index ab945444..cebe3122 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -97,6 +97,8 @@ void ChatBuffer::step(f32 dtime) void ChatBuffer::deleteOldest(u32 count) { + bool at_bottom = (m_scroll == getBottomScrollPos()); + u32 del_unformatted = 0; u32 del_formatted = 0; @@ -120,6 +122,11 @@ void ChatBuffer::deleteOldest(u32 count) m_unformatted.erase(m_unformatted.begin(), m_unformatted.begin() + del_unformatted); m_formatted.erase(m_formatted.begin(), m_formatted.begin() + del_formatted); + + if (at_bottom) + m_scroll = getBottomScrollPos(); + else + scrollAbsolute(m_scroll - del_formatted); } void ChatBuffer::deleteByAge(f32 maxAge) From b8aed9dfc2ae5e1c877707c856b061ee76b0e1c4 Mon Sep 17 00:00:00 2001 From: gregorycu Date: Sun, 8 May 2016 19:02:11 +1000 Subject: [PATCH 496/531] Fixes #4098 ce8a9ed didn't quite go far enough, and left this bug in --- src/server.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 0aba2796..a3b686c2 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1846,7 +1846,7 @@ void Server::SendPlayerHP(u16 peer_id) { DSTACK(FUNCTION_NAME); PlayerSAO *playersao = getPlayerSAO(peer_id); - // In some rare case, if the player is disconnected + // In some rare case if the player is disconnected // while Lua call l_punch, for example, this can be NULL if (!playersao) return; @@ -2515,9 +2515,11 @@ void Server::sendDetachedInventories(u16 peer_id) void Server::DiePlayer(u16 peer_id) { DSTACK(FUNCTION_NAME); - PlayerSAO *playersao = getPlayerSAO(peer_id); - assert(playersao); + // In some rare cases this can be NULL -- if the player is disconnected + // when a Lua function modifies l_punch, for example + if (!playersao) + return; infostream << "Server::DiePlayer(): Player " << playersao->getPlayer()->getName() From 1db499dc6df3681b68ce86ab7aea604895bcd2a1 Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 8 May 2016 01:03:56 +0100 Subject: [PATCH 497/531] Defaultsettings/Android: Increase 'max block generate distance' to 3 --- src/defaultsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 70aef60e..1536aed0 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -349,7 +349,7 @@ void set_default_settings(Settings *settings) settings->setDefault("max_simultaneous_block_sends_per_client", "3"); settings->setDefault("emergequeue_limit_diskonly", "8"); settings->setDefault("emergequeue_limit_generate", "8"); - settings->setDefault("max_block_generate_distance", "2"); + settings->setDefault("max_block_generate_distance", "3"); settings->setDefault("enable_3d_clouds", "false"); settings->setDefault("fps_max", "30"); settings->setDefault("pause_fps_max", "10"); From 95446f4b6d16e8b24b3513fcdd028cedebef3f06 Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 24 Mar 2016 17:17:37 +0100 Subject: [PATCH 498/531] Update credits tab --- builtin/mainmenu/tab_credits.lua | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 822f6484..4d2ffd7f 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -25,26 +25,28 @@ local core_developers = { "kahrl ", "sapier", "ShadowNinja ", - "Nathanael Courant (Nore/Ekdohibs) ", - "BlockMen", - "Craig Robbins (Zeno)", + "Nathanaël Courant (Nore/Ekdohibs) ", "Loic Blot (nerzhul/nrz) ", - "Mat Gregory (paramat)", + "Matt Gregory (paramat)", "est31 ", + "Craig Robbins (Zeno)", } local active_contributors = { + "Auke Kok (sofar) ", + "Duane Robertson ", "SmallJoker ", "Andrew Ward (rubenwardy) ", - "Aaron Suen ", + "Jeija ", + "Gregory Currie (gregorycu)", "Sokomine ", - "Břetislav Štec (t0suj4/TBC_x)", "TeTpaAka", "Jean-Patrick G (kilbith) ", - "Diego Martinez (kaeza) ", + "Diego Martínez (kaeza) ", } local previous_core_developers = { + "BlockMen", "Maciej Kasatkin (RealBadAngel) ", "Lisa Milne (darkrose) ", "proller", @@ -54,14 +56,14 @@ local previous_core_developers = { local previous_contributors = { "Vanessa Ezekowitz (VanessaE) ", "Jurgen Doser (doserj) ", - "Gregory Currie (gregorycu)", - "Jeija ", "MirceaKitsune ", "dannydark ", "0gb.us <0gb.us@0gb.us>", "Guiseppe Bilotta (Oblomov) ", "Jonathan Neuschafer ", "Nils Dagsson Moskopp (erlehmann) ", + "Břetislav Štec (t0suj4/TBC_x)", + "Aaron Suen ", "Constantin Wenger (SpeedProg) ", "matttpt ", "JacobF ", @@ -80,6 +82,11 @@ return { "tablecolumns[color;text]" .. "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. "table[3.5,-0.25;8.5,5.8;list_credits;" .. + "#FFFF00," .. "Dedication of the current release" .. ",," .. + "The 0.4.14 release is dedicated to the memory of" .. ",," .. + "Minetest developer Maciej Kasatkin (RealBadAngel)" .. ",," .. + "who died on March 24 2016." .. ",," .. + "Our thoughts are with his family and friends." .. ",,," .. "#FFFF00," .. fgettext("Core Developers") .. ",," .. table.concat(core_developers, ",,") .. ",,," .. "#FFFF00," .. fgettext("Active Contributors") .. ",," .. From 53e9587861fdf8c588f7e51eca522215167250b4 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Tue, 3 May 2016 20:14:01 +0200 Subject: [PATCH 499/531] Add [resize texture modifier Resizes the texture to the given dimensions. --- doc/lua_api.txt | 7 +++++++ src/client/tile.cpp | 26 +++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index e8e74f67..a4592286 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -279,6 +279,13 @@ Example: [combine:16x32:0,0=default_cobble.png:0,16=default_wood.png +#### `[resize:x` +Resizes the texture to the given dimensions. + +Example: + + default_sandstone.png^[resize:16x16 + #### `[brighten` Brightens the texture. diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 72d626da..ec8c95f0 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -1352,7 +1352,6 @@ bool TextureSource::generateImagePart(std::string part_of_name, u32 r1 = stoi(sf.next(",")); u32 g1 = stoi(sf.next(",")); u32 b1 = stoi(sf.next("")); - std::string filename = sf.next(""); core::dimension2d dim = baseimg->getDimension(); @@ -1711,6 +1710,31 @@ bool TextureSource::generateImagePart(std::string part_of_name, } } } + /* + [resize:WxH + Resizes the base image to the given dimensions + */ + else if (str_starts_with(part_of_name, "[resize")) + { + if (baseimg == NULL) { + errorstream << "generateImagePart(): baseimg == NULL " + << "for part_of_name=\""<< part_of_name + << "\", cancelling." << std::endl; + return false; + } + + Strfnd sf(part_of_name); + sf.next(":"); + u32 width = stoi(sf.next("x")); + u32 height = stoi(sf.next("")); + core::dimension2d dim(width, height); + + video::IImage* image = m_device->getVideoDriver()-> + createImage(video::ECF_A8R8G8B8, dim); + baseimg->copyToScaling(image); + baseimg->drop(); + baseimg = image; + } else { errorstream << "generateImagePart(): Invalid " From 3f89bf4d7f241cebc118cccf2ac147ee6454216e Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 9 May 2016 23:44:15 +0100 Subject: [PATCH 500/531] Lua_api.txt: Fix documentation for facedir rotation --- doc/lua_api.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index a4592286..e9ace5c8 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -554,9 +554,9 @@ node definition: ^ The rotation of the node is stored in param2. Furnaces and chests are rotated this way. Can be made by using minetest.dir_to_facedir(). Values range 0 - 23 - facedir modulo 4 = axisdir + facedir / 4 = axis direction: 0 = y+ 1 = z+ 2 = z- 3 = x+ 4 = x- 5 = y- - facedir's two less significant bits are rotation around the axis + facedir modulo 4 = rotation around that axis paramtype2 == "leveled" paramtype2 == "degrotate" ^ The rotation of this node is stored in param2. Plants are rotated this way. From e289c9e648ed2b53ee7738f0a464a5191a517cf1 Mon Sep 17 00:00:00 2001 From: Tobyplowy Date: Thu, 5 May 2016 22:33:12 +0200 Subject: [PATCH 501/531] Translated using Weblate (Dutch) Currently translated at 85.6% (760 of 887 strings) --- po/nl/minetest.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/nl/minetest.po b/po/nl/minetest.po index c41d3e08..22b5329a 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-01-23 04:35+0000\n" +"PO-Revision-Date: 2016-05-05 22:33+0000\n" "Last-Translator: Tobyplowy \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2138,7 +2138,7 @@ msgstr "Fontschaduw afstand. Indien 0, dan wordt geen schaduw getekend." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "Fontgrootte" +msgstr "Lettergrootte" #: src/settings_translation_file.cpp #, fuzzy From d9a9fae51ddd2e25dc0e30b58974afca87b46c13 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 5 May 2016 22:33:07 +0200 Subject: [PATCH 502/531] Translated using Weblate (Dutch) Currently translated at 89.6% (795 of 887 strings) This is a merger of three commits. --- po/nl/minetest.po | 202 ++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 124 deletions(-) diff --git a/po/nl/minetest.po b/po/nl/minetest.po index 22b5329a..53391715 100644 --- a/po/nl/minetest.po +++ b/po/nl/minetest.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-05-05 22:33+0000\n" -"Last-Translator: Tobyplowy \n" +"PO-Revision-Date: 2016-05-07 00:58+0000\n" +"Last-Translator: Auke Kok \n" "Language-Team: Dutch " "\n" "Language: nl\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -29,7 +29,7 @@ msgstr "Er is een fout opgetreden:" #: builtin/fstk/ui.lua msgid "Main menu" -msgstr "Naar hoofdmenu" +msgstr "Hoofdmenu" #: builtin/fstk/ui.lua builtin/mainmenu/store.lua msgid "Ok" @@ -216,7 +216,7 @@ msgstr "(Er is geen beschrijving van deze instelling beschikbaar)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Terug naar instellingen" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -232,21 +232,20 @@ msgstr "Aanpassen" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Enabled" -msgstr "Aangeschakeld" +msgstr "Ingeschakeld" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "" -"Formaat moet zijn: 3 getallen, gescheiden door komma's en tussen vierkante " -"haken (bijvoorbeeld: [4,-34,138])." +"Formaat is 3 getallen, gescheiden door komma's en tussen vierkante haken." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "" "Format: , , (, , ), , " ", " msgstr "" -"Formaat: , , (, , ), " +"Formaat: , , (, , " +"), , , " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -413,9 +412,8 @@ msgid "Uninstall selected modpack" msgstr "Geselecteerde modverzameling deïnstalleren" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "Servernaam of -adres / Poort :" +msgstr "Server adres / Poort" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -434,19 +432,16 @@ msgid "Damage enabled" msgstr "Verwondingen aangeschakeld" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Del. Favorite" -msgstr "Favorieten:" +msgstr "Verwijder Favoriete" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Favorite" -msgstr "Favorieten:" +msgstr "Favorieten" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Name / Password" -msgstr "Naam / Wachtwoord :" +msgstr "Naam / Wachtwoord" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -508,41 +503,37 @@ msgstr "Start spel" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "3D wolken" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Instellingen" +msgstr "Geavanceerde Instellingen" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Antialiasing:" #: builtin/mainmenu/tab_settings.lua msgid "Are you sure to reset your singleplayer world?" msgstr "Weet je zeker dat je je wereld wilt resetten?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" -msgstr "Bi-Lineaire filtering" +msgstr "Bilineaire Filtering" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bump Mapping" msgstr "Bumpmapping" @@ -551,9 +542,8 @@ msgid "Change keys" msgstr "Toetsen aanpassen" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Verbind glas" +msgstr "Verbonden Glas" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" @@ -572,32 +562,28 @@ msgid "No" msgstr "Nee" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Filters" +msgstr "Geen Filter" #: builtin/mainmenu/tab_settings.lua msgid "No Mipmap" msgstr "Geen Mipmap" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "Oplichtende node" +msgstr "Node Oplichten" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Outlining" -msgstr "Oplichtende node" +msgstr "Node omstrepen" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Geen" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Normal Mapping" -msgstr "Mip-Mapping" +msgstr "Normaal Mappen" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" @@ -612,9 +598,8 @@ msgid "Parallax Occlusion" msgstr "Parallax occlusie" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Particles" -msgstr "Alles aanzetten" +msgstr "Effectdeeltjes" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -629,7 +614,6 @@ msgid "Simple Leaves" msgstr "Eenvoudige bladeren" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" msgstr "Vloeiende verlichting" @@ -642,31 +626,26 @@ msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Om schaduwen mogelijk te maken moet OpenGL worden gebruikt." #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mip-Mapping" +msgstr "Toon Mapping" #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" -msgstr "" +msgstr "Toetsgrenswaarde (px)" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Tri-Lineare Filtering" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" msgstr "Bewegende bladeren" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" msgstr "Bewegende planten" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" msgstr "Golvend water" @@ -724,12 +703,11 @@ msgstr "Nodes initialiseren..." #: src/client.cpp msgid "Loading textures..." -msgstr "Bezig met texturen te laaden..." +msgstr "Bezig met texturen te laden..." #: src/client.cpp -#, fuzzy msgid "Rebuilding shaders..." -msgstr "schaduwen herbouwen..." +msgstr "Texturen herbouwen..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -761,7 +739,7 @@ msgstr "Het gespecificeerde wereld-pad bestaat niet: " #: src/fontengine.cpp msgid "needs_fallback_font" -msgstr "no" +msgstr "needs_fallback_font" #: src/game.cpp msgid "" @@ -1395,14 +1373,12 @@ msgid "Acceleration in air" msgstr "Versnelling in lucht" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Management interval" msgstr "Bereik waarbinnen blokken actief zijn" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Modifier interval" -msgstr "Bereik waarbinnen blokken actief zijn" +msgstr "Bereik waarbinnen blok wijzigers actief zijn" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1445,7 +1421,7 @@ msgstr "Geavanceerd" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Hoogte Koudheid" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1453,11 +1429,11 @@ msgstr "Zet 'snel' altijd aan bij 'vliegen'" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" -msgstr "" +msgstr "Ambient occlusion gamma" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Vergroot de valleien" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1478,9 +1454,8 @@ msgstr "" "'v6.servers.minetest.net'." #: src/settings_translation_file.cpp -#, fuzzy msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "Juliaverzameling: (X,Y,Z) schaal, in nodes (bij benadering)." +msgstr "Ingeschatte (X,Y,Z) schaal van fractal in nodes." #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1495,16 +1470,14 @@ msgid "Backward key" msgstr "Achteruit" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Golfhoogte van water" +msgstr "Basishoogte van terrein" #: src/settings_translation_file.cpp msgid "Basic" msgstr "Basis" #: src/settings_translation_file.cpp -#, fuzzy msgid "Basic Privileges" msgstr "Standaardvoorrechten" @@ -1542,20 +1515,19 @@ msgstr "Toets voor cameraverversing aan/uit" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Grot noise patroon #1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Grot noise patroon #2" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cave width" -msgstr "Schermbreedte" +msgstr "Grot breedte" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Grotten en tunnels vormen bij het kruispunt van twee noise patronen" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1601,9 +1573,8 @@ msgid "Cinematic mode key" msgstr "Cinematic modus aan/uit toets" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clean transparent textures" -msgstr "Transparante texturen" +msgstr "Schoonmaken Transparante texturen" #: src/settings_translation_file.cpp msgid "Client and Server" @@ -1713,15 +1684,16 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Controleert steilheid/diepte van meer depressies." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Controleert steilheid/hoogte van heuvels." #: src/settings_translation_file.cpp msgid "Controls width of tunnels, a smaller value creates wider tunnels." msgstr "" +"Controleert breedte van tunnels, een kleinere waarde maakt bredere tunnels." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1833,11 +1805,11 @@ msgstr "Gedrag bij gebruik van verouderde Lua API functies" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Diepte waaronder je grote grotten vind." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Diepte waaronder je hele grote grotten vind." #: src/settings_translation_file.cpp msgid "Descending speed" @@ -1900,9 +1872,8 @@ msgid "Dump the mapgen debug infos." msgstr "Print wereldgenerator debug informatie." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "MV aanzetten" +msgstr "VBO aanzetten" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1961,7 +1932,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Schakelt animatie van inventaris items aan." #: src/settings_translation_file.cpp msgid "" @@ -1977,12 +1948,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." -msgstr "" +msgstr "Schakelt caching van facedir geroteerde meshes." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Schakelt de mini-kaart in." +msgstr "Schakelt Filmisch Toon Mapping in" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -2078,7 +2048,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "" +msgstr "Filler Diepte" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" @@ -2141,9 +2111,8 @@ msgid "Font size" msgstr "Lettergrootte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Format of screenshots." -msgstr "Pad waar screenshots bewaard worden." +msgstr "Formaat van screenshots." #: src/settings_translation_file.cpp msgid "Forward key" @@ -2203,11 +2172,11 @@ msgstr "Gamma" #: src/settings_translation_file.cpp msgid "General" -msgstr "" +msgstr "Generiek" #: src/settings_translation_file.cpp msgid "Generate normalmaps" -msgstr "" +msgstr "Genereer normaalmappen" #: src/settings_translation_file.cpp #, fuzzy @@ -2237,9 +2206,8 @@ msgid "Gravity" msgstr "Zwaartekracht" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Mods" +msgstr "HTTP Modules" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2261,9 +2229,8 @@ msgstr "" "(aanbevolen voor mod ontwikkelaars)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Height component of the initial window size." -msgstr "Horizontale aanvangsgroote van het window." +msgstr "Vertikale aanvangsgroote van het openingsvenster." #: src/settings_translation_file.cpp msgid "Height on which clouds are appearing." @@ -2279,7 +2246,7 @@ msgstr "Home-pagina van de server. Wordt getoond in de serverlijst." #: src/settings_translation_file.cpp msgid "How deep to make rivers" -msgstr "" +msgstr "Hoe diep rivieren te maken" #: src/settings_translation_file.cpp msgid "" @@ -2314,7 +2281,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "How wide to make rivers" -msgstr "" +msgstr "Hoe breed rivieren te maken" #: src/settings_translation_file.cpp msgid "IPv6" @@ -2432,7 +2399,7 @@ msgstr "Interval voor het sturen van de kloktijd naar cliënten." #: src/settings_translation_file.cpp msgid "Inventory items animations" -msgstr "" +msgstr "inventaris items animaties" #: src/settings_translation_file.cpp msgid "Inventory key" @@ -2813,11 +2780,11 @@ msgstr "Taal" #: src/settings_translation_file.cpp msgid "Large cave depth" -msgstr "" +msgstr "Grote grotten diepte" #: src/settings_translation_file.cpp msgid "Lava Features" -msgstr "" +msgstr "Lava Kenmerken" #: src/settings_translation_file.cpp msgid "Leaves style" @@ -2850,11 +2817,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Length of time between ABM execution cycles" -msgstr "" +msgstr "Tijd tussen ABM executie cycli" #: src/settings_translation_file.cpp msgid "Length of time between NodeTimer execution cycles" -msgstr "" +msgstr "Tijd tussen NodeTimer executie cycli" #: src/settings_translation_file.cpp msgid "" @@ -2902,7 +2869,7 @@ msgstr "Vloeibaarheid van vloeistoffen" #: src/settings_translation_file.cpp msgid "Liquid fluidity smoothing" -msgstr "" +msgstr "Vloeistof viscositeit gladmaakfactor" #: src/settings_translation_file.cpp msgid "Liquid loop max" @@ -3045,9 +3012,8 @@ msgid "Mapblock unload timeout" msgstr "Wereldblok vergeet-tijd" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Wereldgenerator" +msgstr "Valleien Wereldgenerator" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -3070,76 +3036,64 @@ msgid "Mapgen flags" msgstr "Wereldgenerator vlaggen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Wereldgenerator vlaggen" +msgstr "Vlakke Wereldgenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave width" -msgstr "Fractal wereldgenerator julia schaal" +msgstr "Vlakke wereldgenerator grot breedte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave1 noise parameters" -msgstr "Fractal wereldgenerator grotten (1) ruisparameters" +msgstr "Vlakke wereldgenerator grotten (1) ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave2 noise parameters" -msgstr "Fractal wereldgenerator grotten (2) ruisparameters" +msgstr "Vlakke wereldgenerator grotten (2) ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat filler depth noise parameters" msgstr "Fractal wereldgenerator vuldiepte ruisparameters" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Fractal wereldgenerator vlaggen" +msgstr "Vlakke wereldgenerator vlaggen" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "Wereldgenerator vlaggen" +msgstr "Vlakke wereldgenerator grondniveau" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" -msgstr "" +msgstr "Vlakke wereldgenerator heuvel steilheid" #: src/settings_translation_file.cpp msgid "Mapgen flat hill threshold" -msgstr "" +msgstr "Vlakke wereldgenerator heuvel grenswaarde" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Fractal wereldgenerator julia iteraties" +msgstr "Vlakke wereldgenerator meer steilheid" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Fractal wereldgenerator julia schaal" +msgstr "Vlakke wereldgenerator meer grenswaarde" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat large cave depth" -msgstr "Fractal wereldgenerator julia schaal" +msgstr "Vlakke wereldgenerator grote grotten diepte" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat terrain noise parameters" -msgstr "Wereldgenerator v6 basisterrein ruisparameters" +msgstr "Vlakke Wereldgenerator basisterrein ruisparameters" #: src/settings_translation_file.cpp msgid "Mapgen fractal" msgstr "Fractal wereldgenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave width" -msgstr "Fractal wereldgenerator julia w-doorsnede" +msgstr "Fractal wereldgenerator grot breedte" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" From ea712b721b3a30f2e29c0cdee9066f38aae53a95 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 6 May 2016 01:16:37 +0200 Subject: [PATCH 503/531] Translated using Weblate (German) Currently translated at 100.0% (887 of 887 strings) This is a merger of three commits. --- po/de/minetest.po | 152 +++++++++++++++++++++++----------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/po/de/minetest.po b/po/de/minetest.po index baa39017..b9db120e 100644 --- a/po/de/minetest.po +++ b/po/de/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-03-30 21:31+0000\n" +"PO-Revision-Date: 2016-05-06 02:25+0000\n" "Last-Translator: Wuzzy \n" -"Language-Team: German \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.6-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -216,7 +216,7 @@ msgstr "(Keine Beschreibung vorhanden)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "< Zurück zur Einstellungsseite" +msgstr "< Einstellungsseite" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" @@ -416,9 +416,8 @@ msgid "Uninstall selected modpack" msgstr "Ausgewähltes Modpack deinstallieren" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "Adresse / Port:" +msgstr "Adresse / Port" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -437,19 +436,16 @@ msgid "Damage enabled" msgstr "Schaden aktiviert" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Del. Favorite" -msgstr "Favoriten:" +msgstr "Favorit löschen" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Favorite" -msgstr "Favoriten:" +msgstr "Favorit" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Name / Password" -msgstr "Name / Passwort:" +msgstr "Name / Passwort" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -542,7 +538,6 @@ msgid "Bilinear Filter" msgstr "Bilinearer Filter" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bump Mapping" msgstr "Bumpmapping" @@ -583,18 +578,16 @@ msgid "Node Highlighting" msgstr "Blöcke hervorheben" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Outlining" -msgstr "Blöcke hervorheben" +msgstr "Blöcke umranden" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Keines" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Normal Mapping" -msgstr "Normalmaps-Sampling" +msgstr "Normalmapping" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" @@ -609,9 +602,8 @@ msgid "Parallax Occlusion" msgstr "Parallax-Occlusion" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Particles" -msgstr "Partikel aktivieren" +msgstr "Partikel" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -1392,14 +1384,12 @@ msgid "Acceleration in air" msgstr "Beschleunigung in der Luft" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Management interval" -msgstr "Reichweite aktiver Kartenblöcke" +msgstr "Active-Block-Management-Intervall" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Modifier interval" -msgstr "Reichweite aktiver Kartenblöcke" +msgstr "Active-Block-Modifier-Intervall" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1496,9 +1486,8 @@ msgid "Basic" msgstr "Grundlegend" #: src/settings_translation_file.cpp -#, fuzzy msgid "Basic Privileges" -msgstr "Standardprivilegien" +msgstr "Grundprivilegien" #: src/settings_translation_file.cpp msgid "Bilinear filtering" @@ -1541,9 +1530,8 @@ msgid "Cave noise #2" msgstr "Höhlenrauschen Nr. 2" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cave width" -msgstr "Bildschirmbreite" +msgstr "Höhlenbreite" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" @@ -1736,6 +1724,7 @@ msgstr "Steuert die Steilheit/Höhe von Hügeln." #: src/settings_translation_file.cpp msgid "Controls width of tunnels, a smaller value creates wider tunnels." msgstr "" +"Legt die Breite von Tunneln fest; ein kleinerer Wert erzeugt breitere Tunnel." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1869,7 +1858,7 @@ msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" -"Die Beschreibung des Servers. Wird neuen Klienten und in der Serverliste " +"Die Beschreibung des Servers. Wird neuen Clients und in der Serverliste " "angezeigt." #: src/settings_translation_file.cpp @@ -2180,9 +2169,8 @@ msgid "Font size" msgstr "Schriftgröße" #: src/settings_translation_file.cpp -#, fuzzy msgid "Format of screenshots." -msgstr "Pfad, in dem Bildschirmfotos abgespeichert werden." +msgstr "Format von Bildschirmfotos." #: src/settings_translation_file.cpp msgid "Forward key" @@ -2251,7 +2239,6 @@ msgid "Generate normalmaps" msgstr "Normalmaps generieren" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2266,6 +2253,9 @@ msgstr "" "Im Kartengenerator v6 wird das „decorations“-Flag alle Dekorationen außer\n" "Bäume und Dschungelgras aktivieren, in allen anderen Kartengeneratoren\n" "wird dieses Flag alle Dekorationen aktivieren.\n" +"Die von der Engine standardmäßig gesetzten Flags lauten:\n" +"„caves, light, decorations“.\n" +"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n" "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" @@ -2295,12 +2285,13 @@ msgid "" "- error: abort on usage of deprecated call (suggested for mod developers)." msgstr "" "Handhabung für veraltete Lua-API-Aufrufe:\n" -"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für " -"Release).\n" -"- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs " -"protokollieren (Standard für Debug).\n" -"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen " -"(empfohlen für Mod-Entwickler)." +"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release).\n" +"- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs " +"protokollieren (Standard für\n" +" Debug).\n" +"- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen (" +"empfohlen für Mod-\n" +" Entwickler)." #: src/settings_translation_file.cpp msgid "Height component of the initial window size." @@ -2901,11 +2892,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Length of time between ABM execution cycles" -msgstr "" +msgstr "Dauer der Zeit zwischen ABM-Ausführungszyklen" #: src/settings_translation_file.cpp msgid "Length of time between NodeTimer execution cycles" -msgstr "" +msgstr "Dauer der Zeit zwischen NodeTimer-Ausführungszyklen" #: src/settings_translation_file.cpp msgid "" @@ -3009,7 +3000,6 @@ msgid "Map directory" msgstr "Kartenordner" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "'altitude_chill' makes higher elevations colder, which may cause biome " @@ -3023,17 +3013,21 @@ msgid "" "default.\n" "Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" -"Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-" -"Flag\n" -"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben " -"sind,\n" +"Kartengenerierungsattribute speziell für den Kartengenerator „Täler“.\n" +"„altitude_chill“ macht höhere Höhen kälter, was ein paar Biomprobleme " +"hervorrufen könnte.\n" +"„humid_rivers“ modifiert die Luftfeuchtigkeit um Flüssen und in Gebieten, wo " +"sich Wasser\n" +"ansammeln würde; es könnte fein abgestimmte Biomen beeinträchtigen.\n" +"Die von der Engine standardmäßig gesetzten Flags lauten:\n" +"„altitude_chill, humid_rivers“.\n" +"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n" +"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills can be added to the flat world.\n" @@ -3045,13 +3039,14 @@ msgid "" msgstr "" "Kartengenerierungsattribute speziell für den flachen Kartengenerator.\n" "Gelegentlich werden Seen und Hügel zur flachen Welt hinzugefügt.\n" +"Die von der Engine standardmäßig gesetzten Flags sind: keine.\n" +"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n" "Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " @@ -3065,14 +3060,16 @@ msgstr "" "Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" "Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-" "Flag\n" -"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben " -"sind,\n" +"wird ignoriert.\n" +"Die von der Engine standardmäßig gesetzten Flags lauten:\n" +"„biomeblend, mudflow“.\n" +"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n" +"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" "The 'ridges' flag controls the rivers.\n" @@ -3082,11 +3079,12 @@ msgid "" "default.\n" "Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Kartengenerierungsattribute speziell für den Kartengenerator v6.\n" -"Falls Schneebiome aktiviert, werden Dschungel aktiviert und das „jungles“-" -"Flag\n" -"wird ignoriert. Flags, welche in der Flags-Zeichenkette nicht angegeben " -"sind,\n" +"Kartengenerierungsattribute speziell für den Kartengenerator v7.\n" +"Das „ridges“-Flag steuert die Flüsse.\n" +"Die von der Engine standardmäßig gesetzten Flags lauten:\n" +"„mountains, ridges“.\n" +"Die Flags-Zeichenkette modifiert den Standardwert der Engine.\n" +"Flags, welche in der Flags-Zeichenkette nicht angegeben sind,\n" "werden von der Standardeinstellung unverändert gelassen.\n" "Flags, welche mit „no“ beginnen, werden benutzt, um sie explizit\n" "zu deaktivieren." @@ -3136,9 +3134,8 @@ msgid "Mapgen flat" msgstr "Flacher Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave width" -msgstr "Tiefe für große Höhlen für den flachen Kartengenerator" +msgstr "Höhlenbreite für den flachen Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -3189,9 +3186,8 @@ msgid "Mapgen fractal" msgstr "Fraktale-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave width" -msgstr "w-Ausschnitt für Fraktale-Kartengenerator" +msgstr "Höhlenbreite für den Fraktale-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -3258,9 +3254,8 @@ msgid "Mapgen v5" msgstr "v5-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5 cave width" -msgstr "Tiefe für große Höhlen für den flachen Kartengenerator" +msgstr "Höhlenbreite für v5-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -3347,9 +3342,8 @@ msgid "Mapgen v7" msgstr "v7-Kartengenerator" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 cave width" -msgstr "Tiefe für große Höhlen für den flachen Kartengenerator" +msgstr "Höhlenbreite für v7-Kartengenerator" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -3686,9 +3680,8 @@ msgid "Node highlighting" msgstr "Blöcke hervorheben" #: src/settings_translation_file.cpp -#, fuzzy msgid "NodeTimer interval" -msgstr "Zeit-Sendeintervall" +msgstr "NodeTimer-Intervall" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -3828,7 +3821,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Privileges that players with basic_privs can grant" -msgstr "" +msgstr "Privilegien, die Spieler mit basic_privs gewähren können" #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." @@ -3949,14 +3942,12 @@ msgid "Screenshot folder" msgstr "Bildschirmfotoverzeichnis" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot format" -msgstr "Bildschirmfotoverzeichnis" +msgstr "Bildschirmfotoformat" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot quality" -msgstr "Bildschirmfoto" +msgstr "Bildschirmfotoqualität" #: src/settings_translation_file.cpp msgid "" @@ -3964,6 +3955,9 @@ msgid "" "1 means worst quality; 100 means best quality.\n" "Use 0 for default quality." msgstr "" +"Bildschirmfotoqualität. Wird nur für das JPEG-Format benutzt.\n" +"1 steht für die schlechteste Qualität, 100 für die beste Qualität.\n" +"Benutzen Sie 0 für die Standardqualität." #: src/settings_translation_file.cpp msgid "Security" @@ -4070,7 +4064,7 @@ msgstr "Debug-Info zeigen" #: src/settings_translation_file.cpp msgid "Show entity selection boxes" -msgstr "" +msgstr "Entitiy-Auswahlboxen zeigen" #: src/settings_translation_file.cpp msgid "Shutdown message" @@ -4149,7 +4143,7 @@ msgstr "Strikte Protokollversionsprüfung" #: src/settings_translation_file.cpp msgid "Support older servers" -msgstr "" +msgstr "Ältere Server unterstützen" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" @@ -4250,7 +4244,7 @@ msgstr "Diese Schrift wird von bestimmten Sprachen benutzt." #: src/settings_translation_file.cpp msgid "Time in between active block management cycles" -msgstr "" +msgstr "Zeit zwischen Active-Block-Management-Zyklen" #: src/settings_translation_file.cpp msgid "" @@ -4544,7 +4538,8 @@ msgstr "" "Kartenblöcke).\n" "- Diese Gruppen haben einen Abstand von [-32, -32] Blöcken vom Ursprung.\n" "- Nur Gruppen, welche innerhalb der von map_generation_limit definierten " -"Grenze liegen, werden erzeugt." +"Grenze liegen,\n" +" werden erzeugt." #: src/settings_translation_file.cpp msgid "" @@ -4563,7 +4558,7 @@ msgid "" "Whether players are shown to clients without any range limit.\n" "Deprecated, use the setting player_transfer_distance instead." msgstr "" -"Ob Spieler an Clients ohne Distanzbegrenzung angezeit werden.\n" +"Ob Spieler an Clients ohne Distanzbegrenzung angezeigt werden.\n" "Veraltet, benutzen Sie stattdessen die Einstellung " "„player_transfer_distance“." @@ -4598,6 +4593,11 @@ msgid "" "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" "Disabling this option will protect your password better." msgstr "" +"Ob ältere Server vor Protokollversion 25 unterstützt werden sollen.\n" +"Aktivieren Sie dies, falls Sie sich mit Servern der Version 0.4.12 und\n" +"davor verbinden möchten. Server ab 0.4.13 werden funktionieren,\n" +"Server der Version 0.4.12-dev könnten funktionieren.\n" +"Die Deaktivierung dieser Einstellung wird Ihr Passwort besser schützen." #: src/settings_translation_file.cpp msgid "Width component of the initial window size." From ecb9378e0f89a2132ef0f8d5c72b3d2791fdbf64 Mon Sep 17 00:00:00 2001 From: Claybiokiller Date: Thu, 5 May 2016 19:09:42 +0200 Subject: [PATCH 504/531] Translated using Weblate (Chinese (China)) Currently translated at 73.9% (656 of 887 strings) --- po/zh_CN/minetest.po | 47 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index d9e38d33..62ebcd21 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-04-24 15:15+0000\n" +"PO-Revision-Date: 2016-05-05 19:09+0000\n" "Last-Translator: Claybiokiller \n" -"Language-Team: Chinese (China) \n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.6-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -1299,6 +1299,10 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"在「比例尺」中分形的 (X,Y,Z) 偏移。\n" +"用于移动适合的低地生成区域靠近 (0, 0)。\n" +"预设值适合曼德尔布罗特集合，若要用于朱利亚集合则必须修改。\n" +"范围大约在 -2 至 2 间。乘以节点的偏移值。" #: src/settings_translation_file.cpp msgid "" @@ -1399,6 +1403,8 @@ msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" +"调整亮度表的伽玛编码。较低的数值会较亮。\n" +"这个设定是给客户端使用的，会被服务器忽略。" #: src/settings_translation_file.cpp msgid "Advanced" @@ -1439,7 +1445,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "大约 (X,Y,Z) 的节点分形规模。" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1476,7 +1482,7 @@ msgstr "绑定地址" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." -msgstr "" +msgstr "全屏模式中的位／像素（又称色彩深度）。" #: src/settings_translation_file.cpp msgid "Build inside player" @@ -1513,7 +1519,7 @@ msgstr "屏幕宽度" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "洞穴与隧道由两种噪音的交集形成" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1545,6 +1551,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"从 9 种公式里选取 18 种分形。\n" +"1 = 4D \"Roundy\" 曼德尔布罗特集.\n" +"2 = 4D \"Roundy\" 朱利亚集.\n" +"3 = 4D \"Squarry\" 曼德尔布罗特集.\n" +"4 = 4D \"Squarry\" 朱利亚集.\n" +"5 = 4D \"Mandy Cousin\" 曼德尔布罗特集.\n" +"6 = 4D \"Mandy Cousin\" 朱利亚集.\n" +"7 = 4D \"Variation\" 曼德尔布罗特集.\n" +"8 = 4D \"Variation\" 朱利亚集.\n" +"9 = 3D \"Mandelbrot/Mandelbar\" 曼德尔布罗特集.\n" +"10 = 3D \"Mandelbrot/Mandelbar\" 朱利亚集.\n" +"11 = 3D \"Christmas Tree\" 曼德尔布罗特集.\n" +"12 = 3D \"Christmas Tree\" 朱利亚集.\n" +"13 = 3D \"Mandelbulb\" 曼德尔布罗特集.\n" +"14 = 3D \"Mandelbulb\" 朱利亚集.\n" +"15 = 3D \"Cosine Mandelbulb\" 曼德尔布罗特集.\n" +"16 = 3D \"Cosine Mandelbulb\" 朱利亚集.\n" +"17 = 4D \"Mandelbulb\" 曼德尔布罗特集.\n" +"18 = 4D \"Mandelbulb\" 朱利亚集." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1599,12 +1624,16 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" +"受信任的 Mod 列表，以逗号分隔，其可存取不安全的\n" +"功能，即便 mod 安全性已启用（经由 request_insecure_environment()）。" #: src/settings_translation_file.cpp msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"以逗号分隔的 mod 清单，让您可以存取 HTTP API，\n" +"其可从互联网上传及下载资料。" #: src/settings_translation_file.cpp msgid "Command key" @@ -1652,12 +1681,16 @@ msgid "" "Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays " "unchanged." msgstr "" +"控制日／夜循环的长度。\n" +"示例：72 = 20分钟，360 = 4分钟，1 = 24小时，0 = 日／夜／一切保持不变。" #: src/settings_translation_file.cpp msgid "" "Controls size of deserts and beaches in Mapgen v6.\n" "When snowbiomes are enabled 'mgv6_freq_desert' is ignored." msgstr "" +"控制在 Mapgen v6 中的沙漠与沙滩大小。\n" +"当 snowbiomes 启用时「mgv6_freq_desert」会被忽略。" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." From 487bd601eb01ad4e9ff7f0bd54a119cafb8d3d24 Mon Sep 17 00:00:00 2001 From: Thomas Wagner Nielsen Date: Thu, 5 May 2016 22:50:35 +0200 Subject: [PATCH 505/531] Translated using Weblate (Danish) Currently translated at 27.6% (245 of 887 strings) This is a merger of two commits. --- po/da/minetest.po | 117 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 86 insertions(+), 31 deletions(-) diff --git a/po/da/minetest.po b/po/da/minetest.po index e3537f15..6337ba14 100644 --- a/po/da/minetest.po +++ b/po/da/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-04-17 08:53+0000\n" +"PO-Revision-Date: 2016-05-06 13:58+0000\n" "Last-Translator: Thomas Wagner Nielsen \n" -"Language-Team: Danish \n" +"Language-Team: Danish " +"\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.6-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -155,12 +155,14 @@ msgid "Mapgen" msgstr "Mapgen" #: builtin/mainmenu/dlg_create_world.lua +#, fuzzy msgid "No worldname given or no game selected" -msgstr "" +msgstr "Intet navn på verden angivet eller intet spil valgt" #: builtin/mainmenu/dlg_create_world.lua +#, fuzzy msgid "Seed" -msgstr "" +msgstr "Kim" #: builtin/mainmenu/dlg_create_world.lua msgid "Warning: The minimal development test is meant for developers." @@ -213,12 +215,14 @@ msgid "(No description of setting given)" msgstr "(Der er ikke nogen beskrivelse af denne indstilling)" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "< Back to Settings page" -msgstr "" +msgstr "< Tilbage til siden Indstillinger" #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "Browse" -msgstr "" +msgstr "Gennemse" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Disabled" @@ -237,10 +241,13 @@ msgid "Format is 3 numbers separated by commas and inside brackets." msgstr "Formatet er 3 tal, adskilt af kommaer, og omgivet af parenteser." #: builtin/mainmenu/dlg_settings_advanced.lua +#, fuzzy msgid "" "Format: , , (, , ), , " ", " msgstr "" +"Format: , , (, , " +"), , , " #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Games" @@ -404,9 +411,8 @@ msgid "Uninstall selected modpack" msgstr "Afinstaller den valgte modpack" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "Adresse/port:" +msgstr "Adresse/port" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -470,12 +476,14 @@ msgid "New" msgstr "Ny" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua +#, fuzzy msgid "No world created or selected!" -msgstr "" +msgstr "Ingen verden skabt eller valgt!" #: builtin/mainmenu/tab_server.lua +#, fuzzy msgid "Port" -msgstr "" +msgstr "Port" #: builtin/mainmenu/tab_server.lua msgid "Public" @@ -498,20 +506,23 @@ msgid "Start Game" msgstr "Start spil / Forbind" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua msgid "3D Clouds" msgstr "3D-skyer" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua msgid "Advanced Settings" @@ -745,8 +756,9 @@ msgid "Player name too long." msgstr "Spillerens navn er for langt." #: src/client/clientlauncher.cpp +#, fuzzy msgid "Provided world path doesn't exist: " -msgstr "" +msgstr "Den angivne sti til verdenen findes ikke: " #: src/fontengine.cpp msgid "needs_fallback_font" @@ -777,14 +789,17 @@ msgid "Continue" msgstr "Fortsæt" #: src/game.cpp +#, fuzzy msgid "Creating client..." -msgstr "" +msgstr "Opretter klient..." #: src/game.cpp +#, fuzzy msgid "Creating server..." -msgstr "" +msgstr "Opretter server..." #: src/game.cpp +#, fuzzy msgid "" "Default Controls:\n" "- WASD: move\n" @@ -798,8 +813,20 @@ msgid "" "- Mouse wheel: select item\n" "- T: chat\n" msgstr "" +"Standard-styring:\n" +"- WASD: Bevæge sig rundt\n" +"- Mellemrumstast: Hoppe/klatre\n" +"- Skift: Snige/gå nedad\n" +"- Q: Smide genstand\n" +"- I: Medbragt\n" +"- Mus: Vende rundt/kigge\n" +"- Mus venstre: Grave/slå\n" +"- Mus højre: Placere/bruge\n" +"- Musehjul: Vælge genstand\n" +"- T: Chat\n" #: src/game.cpp +#, fuzzy msgid "" "Default Controls:\n" "No menu visible:\n" @@ -814,6 +841,18 @@ msgid "" "- touch&drag, tap 2nd finger\n" " --> place single item to slot\n" msgstr "" +"Standard-styring:\n" +"Ingen menu synlig:\n" +"- Enkelt tryk: Aktivér knap\n" +"- Dobbelt tryk: Placér/brug\n" +"- Stryg finger: Kig rundt\n" +"Menu/Medbragt synlig:\n" +"- Dobbelt tryk (uden for):\n" +" --> Luk\n" +"- Rør ved stakken, rør ved felt:\n" +" --> Flyt stakken\n" +"- Rør ved og træk, tryk med 2. finger\n" +" --> Placér enkelt genstand på feltet\n" #: src/game.cpp msgid "Exit to Menu" @@ -828,20 +867,23 @@ msgid "Item definitions..." msgstr "" #: src/game.cpp +#, fuzzy msgid "KiB/s" -msgstr "" +msgstr "KiB/s" #: src/game.cpp msgid "Media..." msgstr "Medier..." #: src/game.cpp +#, fuzzy msgid "MiB/s" -msgstr "" +msgstr "MiB/s" #: src/game.cpp +#, fuzzy msgid "Node definitions..." -msgstr "" +msgstr "Blokdefinitioner..." #: src/game.cpp msgid "Resolving address..." @@ -993,12 +1035,14 @@ msgid "Passwords do not match!" msgstr "Kodeordene er ikke ens!" #: src/guiVolumeChange.cpp +#, fuzzy msgid "Exit" -msgstr "" +msgstr "Afslut" #: src/guiVolumeChange.cpp +#, fuzzy msgid "Sound Volume: " -msgstr "" +msgstr "Lydstyrke: " #: src/keycode.cpp msgid "Apps" @@ -1311,8 +1355,9 @@ msgid "3D clouds" msgstr "3D skyer" #: src/settings_translation_file.cpp +#, fuzzy msgid "3D mode" -msgstr "" +msgstr "3D-tilstand" #: src/settings_translation_file.cpp msgid "" @@ -1333,20 +1378,23 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "A message to be displayed to all clients when the server crashes." -msgstr "" +msgstr "Besked, som skal vises til alle klienter, når serveren går ned." #: src/settings_translation_file.cpp +#, fuzzy msgid "A message to be displayed to all clients when the server shuts down." -msgstr "" +msgstr "Besked, som skal vises til alle klienter, når serveren lukker ned." #: src/settings_translation_file.cpp msgid "Absolute limit of emerge queues" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Acceleration in air" -msgstr "" +msgstr "Acceleration i luft" #: src/settings_translation_file.cpp msgid "Active Block Management interval" @@ -1372,10 +1420,13 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "" "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k " "screens." msgstr "" +"Justér DPI-konfigurationen til din skærm (ikke-X11 / kun Andorid) f.eks. til " +"4k-skærme." #: src/settings_translation_file.cpp msgid "" @@ -1392,16 +1443,18 @@ msgid "Altitude Chill" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Always fly and fast" -msgstr "" +msgstr "Flyv altid og hurtigt" #: src/settings_translation_file.cpp msgid "Ambient occlusion gamma" msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Amplifies the valleys" -msgstr "" +msgstr "Forstærker dalene" #: src/settings_translation_file.cpp #, fuzzy @@ -1424,12 +1477,14 @@ msgid "Approximate (X,Y,Z) scale of fractal in nodes." msgstr "" #: src/settings_translation_file.cpp +#, fuzzy msgid "Ask to reconnect after crash" -msgstr "" +msgstr "Spørg om at forbinde igen, efter den er gået ned." #: src/settings_translation_file.cpp +#, fuzzy msgid "Automaticaly report to the serverlist." -msgstr "" +msgstr "Rapportér automatisk til serverlisten." #: src/settings_translation_file.cpp #, fuzzy From 36c9c92ec141ee14f279768601675adeccb58811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kisbenedek=20M=C3=A1rton?= Date: Sat, 7 May 2016 03:17:37 +0200 Subject: [PATCH 506/531] Translated using Weblate (Hungarian) Currently translated at 75.7% (672 of 887 strings) --- po/hu/minetest.po | 123 ++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 70 deletions(-) diff --git a/po/hu/minetest.po b/po/hu/minetest.po index 6d636e2c..776ce693 100644 --- a/po/hu/minetest.po +++ b/po/hu/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-03-19 13:00+0000\n" +"PO-Revision-Date: 2016-05-07 03:17+0000\n" "Last-Translator: Kisbenedek Márton \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian " +"\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.6-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -405,9 +405,8 @@ msgid "Uninstall selected modpack" msgstr "Kiválasztott modpakk törlése" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "Cím / Port:" +msgstr "Cím / Port" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -426,19 +425,16 @@ msgid "Damage enabled" msgstr "Sérülés engedélyezve" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Del. Favorite" -msgstr "Kedvencek:" +msgstr "Kedvenc törlés" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Favorite" -msgstr "Kedvencek:" +msgstr "Kedvenc" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Name / Password" -msgstr "Név / jelszó:" +msgstr "Név / Jelszó" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -575,9 +571,8 @@ msgid "Node Highlighting" msgstr "Blokk kiemelés" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Outlining" -msgstr "Blokk kiemelés" +msgstr "Node körvonalazás" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" @@ -601,9 +596,8 @@ msgid "Parallax Occlusion" msgstr "Parallax Occlusion" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Particles" -msgstr "Részecskék engedélyezése" +msgstr "Részecskék" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -1340,7 +1334,6 @@ msgid "3D mode" msgstr "3D mód" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1356,8 +1349,9 @@ msgstr "" "- none: nincs 3d kimenet.\n" "- anaglyph: cián/magenta színű 3d.\n" "- interlaced: odd/even line based polarisation screen support.\n" -"- topbottom: split screen top/bottom.\n" -"- sidebyside: split screen side by side." +"- topbottom: osztott képernyő fent/lent.\n" +"- sidebyside: osztott képernyő kétoldalt.\n" +"- pageflip: quadbuffer based 3d." #: src/settings_translation_file.cpp msgid "" @@ -1384,14 +1378,12 @@ msgid "Acceleration in air" msgstr "Gyorsulás levegőben" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Management interval" -msgstr "Aktív blokk kiterjedési terület" +msgstr "Aktív blokk kezelés időköze" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Modifier interval" -msgstr "Aktív blokk kiterjedési terület" +msgstr "Aktív blokk módosító időköze" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1399,7 +1391,7 @@ msgstr "Aktív blokk kiterjedési terület" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Aktív objektum küldés hatótávolsága" #: src/settings_translation_file.cpp msgid "" @@ -1490,7 +1482,6 @@ msgid "Basic" msgstr "Alap" #: src/settings_translation_file.cpp -#, fuzzy msgid "Basic Privileges" msgstr "Alap jogosultságok" @@ -1537,9 +1528,8 @@ msgid "Cave noise #2" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cave width" -msgstr "Képernyő szélesség" +msgstr "Barlang szélesség" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" @@ -1713,6 +1703,8 @@ msgstr "A dombok meredekségét/magasságát állítja." #: src/settings_translation_file.cpp msgid "Controls width of tunnels, a smaller value creates wider tunnels." msgstr "" +"A járatok szélességét határozza meg, alacsonyabb érték szélesebb járatokat " +"hoz létre." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1768,7 +1760,7 @@ msgstr "Hibakereső infó váltás gomb" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Hibakereső napló szint" #: src/settings_translation_file.cpp msgid "Dedicated server step" @@ -2129,9 +2121,8 @@ msgid "Font size" msgstr "Betűtípus mérete" #: src/settings_translation_file.cpp -#, fuzzy msgid "Format of screenshots." -msgstr "Képernyőmentések mappája." +msgstr "Képernyőmentések formátuma." #: src/settings_translation_file.cpp msgid "Forward key" @@ -2200,7 +2191,6 @@ msgid "Generate normalmaps" msgstr "Normálfelületek generálása" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2211,12 +2201,6 @@ msgid "" "default.\n" "Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." #: src/settings_translation_file.cpp msgid "Graphics" @@ -2906,12 +2890,17 @@ msgid "" "default.\n" "Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" +"Térkép generálási jellemzők a Mapgen Valleys esetében.\n" +"Az 'altitude_chill' a magasabb helyeket hűvösebbé teszi, ami biome " +"problémákat okozhat.\n" +"A 'humid_rivers' a folyók környéki páratartalmat módosítja, és ott, ahol " +"medencék alakulnak ki,\n" +"ütközhet a finoman beállított biome-okkal.\n" +"The default flags set in the engine are: altitude_chill, humid_rivers\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" -"Flags starting with \"no\" are used to explicitly disable them." +"Flags starting with 'no' are used to explicitly disable them." #: src/settings_translation_file.cpp #, fuzzy @@ -2926,6 +2915,8 @@ msgid "" msgstr "" "Térkép generálási jellemzők csak a Flat (lapos) térképgenerátor esetében.\n" "Esetenkénti tavak és dombok generálása a lapos világba.\n" +"The default flags set in the engine are: none\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." @@ -2945,12 +2936,13 @@ msgstr "" "Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" "When snowbiomes are enabled jungles are enabled and the jungles flag is " "ignored.\n" +"The default flags set in the engine are: biomeblend, mudflow\n" +"The flags string modifies the engine defaults.\n" "Flags that are not specified in the flag string are not modified from the " "default.\n" "Flags starting with \"no\" are used to explicitly disable them." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" "The 'ridges' flag controls the rivers.\n" @@ -2960,12 +2952,6 @@ msgid "" "default.\n" "Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Térképgenerálási jellemzők csak a v6 térképgenerátor esetében.\n" -"When snowbiomes are enabled jungles are enabled and the jungles flag is " -"ignored.\n" -"Flags that are not specified in the flag string are not modified from the " -"default.\n" -"Flags starting with \"no\" are used to explicitly disable them." #: src/settings_translation_file.cpp msgid "Map generation limit" @@ -3012,9 +2998,8 @@ msgid "Mapgen flat" msgstr "Flat (lapos) térképgenerátor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave width" -msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" +msgstr "Flat (lapos) térképgenerátor barlang szélesség" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -3029,9 +3014,8 @@ msgid "Mapgen flat filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Térkép generátor" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen flat ground level" @@ -3066,9 +3050,8 @@ msgid "Mapgen fractal" msgstr "Fractal térképgenerátor" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave width" -msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" +msgstr "Fractal térképgenerátor barlang szélesség" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -3135,9 +3118,8 @@ msgid "Mapgen v5" msgstr "Térkép generátor v5" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5 cave width" -msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" +msgstr "v5 térképgenerátor barlang szélesség" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -3224,9 +3206,8 @@ msgid "Mapgen v7" msgstr "Térkép generátor v7" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 cave width" -msgstr "Flat (lapos) térképgenerátor nagy barlang mélység" +msgstr "v7 térképgenerátor barlang szélesség" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -3290,7 +3271,7 @@ msgstr "Masszív barlangok innentől." #: src/settings_translation_file.cpp msgid "Max block generate distance" -msgstr "" +msgstr "Max blokk generálási távolság" #: src/settings_translation_file.cpp msgid "Max block send distance" @@ -3369,21 +3350,23 @@ msgstr "Az egy időben csatlakozó játékosok maximális száma." #: src/settings_translation_file.cpp msgid "Maximum number of statically stored objects in a block." -msgstr "" +msgstr "Statikusan tárolt objektumok maximális száma egy térképblokkban." #: src/settings_translation_file.cpp msgid "" "Maximum proportion of current window to be used for hotbar.\n" "Useful if there's something to be displayed right or left of hotbar." msgstr "" +"Az aktuális ablak maximum hányada a hotbar számára.\n" +"Hasznos, ha valamit el kell helyezni a hotbar jobb, vagy bal oldalán." #: src/settings_translation_file.cpp msgid "Maximum simultaneously blocks send per client" -msgstr "" +msgstr "Az egyidejűleg a kliensenként küldött térképblokkok maximális száma" #: src/settings_translation_file.cpp msgid "Maximum simultaneously bocks send total" -msgstr "" +msgstr "Egyidejűleg küldött térképblokkok maximális száma összesen" #: src/settings_translation_file.cpp msgid "Maximum time in ms a file download (e.g. a mod download) may take." @@ -3667,7 +3650,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Privileges that players with basic_privs can grant" -msgstr "" +msgstr "Jogosultságok, amiket a basic_privs adhat a játékosoknak" #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." @@ -3784,14 +3767,12 @@ msgid "Screenshot folder" msgstr "Képernyőkép mappa" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot format" -msgstr "Képernyőkép mappa" +msgstr "Képernyőkép formátum" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot quality" -msgstr "Képernyőkép" +msgstr "Képernyőkép minőség" #: src/settings_translation_file.cpp msgid "" @@ -3799,6 +3780,9 @@ msgid "" "1 means worst quality; 100 means best quality.\n" "Use 0 for default quality." msgstr "" +"Képernyőkép minőség. Csak a JPEG formátumnál használatos.\n" +"1 jelenti a legrosszabb minőséget; 100 jelenti a legjobb minőséget.\n" +"Használd a 0-t az alapértelmezett minőséghez." #: src/settings_translation_file.cpp msgid "Security" @@ -3906,7 +3890,7 @@ msgstr "Hibakereső infó mutatása" #: src/settings_translation_file.cpp msgid "Show entity selection boxes" -msgstr "" +msgstr "Entitások kijelölő dobozának mutatása" #: src/settings_translation_file.cpp msgid "Shutdown message" @@ -3979,7 +3963,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Support older servers" -msgstr "" +msgstr "Régebbi szerverek támogatása" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" @@ -4310,7 +4294,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Where the map generator stops.\n" "Please note:\n" From 4ac92079fb287f4c06b0f6f217117a52eb5bb8ec Mon Sep 17 00:00:00 2001 From: BreadW Date: Sat, 7 May 2016 00:18:04 +0200 Subject: [PATCH 507/531] Translated using Weblate (Japanese) Currently translated at 50.6% (449 of 887 strings) --- po/ja/minetest.po | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 0f1489f3..db6e82cc 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,10 +3,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-04-30 05:38+0000\n" -"Last-Translator: Rui \n" -"Language-Team: Japanese \n" +"PO-Revision-Date: 2016-05-07 00:18+0000\n" +"Last-Translator: BreadW \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -401,9 +401,8 @@ msgid "Uninstall selected modpack" msgstr "選択したModパックを削除" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "アドレスとポート:" +msgstr "アドレスとポート" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -423,16 +422,15 @@ msgstr "ダメージ有効" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Del. Favorite" -msgstr "" +msgstr "お気に入りを削除" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Favorite" -msgstr "" +msgstr "お気に入り" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Name / Password" -msgstr "名前とパスワード:" +msgstr "名前とパスワード" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -525,7 +523,6 @@ msgid "Bilinear Filter" msgstr "バイリニアフィルタ" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bump Mapping" msgstr "バンプマッピング" @@ -566,18 +563,16 @@ msgid "Node Highlighting" msgstr "ノードのハイライト" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Outlining" -msgstr "ノードのハイライト" +msgstr "ノードの輪郭線描画" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "無し" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Normal Mapping" -msgstr "ミップマッピング" +msgstr "法線マッピング" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" @@ -592,7 +587,6 @@ msgid "Parallax Occlusion" msgstr "視差遮蔽マッピング" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Particles" msgstr "パーティクル有効化" From d01a8054b061239acf8f8beddae80f61f6a21fda Mon Sep 17 00:00:00 2001 From: Yvan YR Date: Sat, 7 May 2016 11:19:25 +0200 Subject: [PATCH 508/531] Translated using Weblate (French) Currently translated at 90.7% (805 of 887 strings) --- po/fr/minetest.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 3304ad2e..523c73bb 100644 --- a/po/fr/minetest.po +++ b/po/fr/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-03-25 17:42+0000\n" -"Last-Translator: Jean-Patrick G. \n" -"Language-Team: French \n" +"PO-Revision-Date: 2016-05-07 11:19+0000\n" +"Last-Translator: Yvan YR \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.6-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -435,7 +435,7 @@ msgstr "Dégâts activés" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy msgid "Del. Favorite" -msgstr "Favoris :" +msgstr "Supprimer favoris :" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua #, fuzzy From d23669a8596a5015cc780ea2a420dde6f5fb25fd Mon Sep 17 00:00:00 2001 From: BreadW Date: Sat, 7 May 2016 16:10:10 +0200 Subject: [PATCH 509/531] Translated using Weblate (Japanese) Currently translated at 51.5% (457 of 887 strings) --- po/ja/minetest.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index db6e82cc..c6bc38d7 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-05-07 00:18+0000\n" +"PO-Revision-Date: 2016-05-07 16:10+0000\n" "Last-Translator: BreadW \n" "Language-Team: Japanese " "\n" @@ -2251,7 +2251,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "全画面表示" #: src/settings_translation_file.cpp msgid "Full screen BPP" @@ -3674,11 +3674,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Screen height" -msgstr "" +msgstr "画面高" #: src/settings_translation_file.cpp msgid "Screen width" -msgstr "" +msgstr "画面幅" #: src/settings_translation_file.cpp msgid "Screenshot" @@ -3719,11 +3719,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Selection box color" -msgstr "" +msgstr "ノード選択線の色" #: src/settings_translation_file.cpp msgid "Selection box width" -msgstr "" +msgstr "ノード選択線の幅" #: src/settings_translation_file.cpp msgid "Server / Singleplayer" @@ -4072,7 +4072,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Video driver" -msgstr "" +msgstr "ビデオドライバ" #: src/settings_translation_file.cpp msgid "View bobbing" @@ -4118,11 +4118,11 @@ msgstr "テクスチャを設定中..." #: src/settings_translation_file.cpp msgid "Water level" -msgstr "" +msgstr "水位" #: src/settings_translation_file.cpp msgid "Water surface level of the world." -msgstr "" +msgstr "ワールドの水面の高さです。" #: src/settings_translation_file.cpp msgid "Waving Nodes" From d3304a7dc4e04aacf393c22e65d0007ea3e1819a Mon Sep 17 00:00:00 2001 From: Emon Omen Date: Sat, 7 May 2016 20:15:36 +0200 Subject: [PATCH 510/531] Translated using Weblate (Italian) Currently translated at 100.0% (887 of 887 strings) This is a merger of three commits. --- po/it/minetest.po | 214 +++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 106 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 1b737313..83ff7c1a 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: Minetest 0.4.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-04-29 22:02+0000\n" +"PO-Revision-Date: 2016-05-08 17:01+0000\n" "Last-Translator: Emon Omen \n" -"Language-Team: Italian \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -408,9 +408,8 @@ msgid "Uninstall selected modpack" msgstr "Disinstallare il pacchetto mod. scelto" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "Indirizzo / Porta :" +msgstr "Indirizzo / Porta" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -429,19 +428,16 @@ msgid "Damage enabled" msgstr "Danno abilitato" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Del. Favorite" -msgstr "Preferiti:" +msgstr "Canc. prefer." #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Favorite" msgstr "Preferiti:" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Name / Password" -msgstr "Nome / Password :" +msgstr "Nome / Password" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -534,9 +530,8 @@ msgid "Bilinear Filter" msgstr "Filtro bilineare" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bump Mapping" -msgstr "Bumpmapping" +msgstr "Bump Mapping" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" @@ -575,18 +570,16 @@ msgid "Node Highlighting" msgstr "Evidenz. nodo" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Outlining" -msgstr "Evidenz. nodo" +msgstr "Bordatura nodo" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Nessuno" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Normal Mapping" -msgstr "Campionamento normalmap" +msgstr "Normal Mapping" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" @@ -601,9 +594,8 @@ msgid "Parallax Occlusion" msgstr "Occlusione di parallasse" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Particles" -msgstr "Abilitare particelle" +msgstr "Particelle" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -1380,14 +1372,12 @@ msgid "Acceleration in air" msgstr "Accelerazione in aria" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Management interval" -msgstr "Portata del blocco attivo" +msgstr "Intervallo del gestore di blocco attivo" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Modifier interval" -msgstr "Portata del blocco attivo" +msgstr "Intervallo del modificatore di blocco attivo" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1488,9 +1478,8 @@ msgid "Basic" msgstr "Base" #: src/settings_translation_file.cpp -#, fuzzy msgid "Basic Privileges" -msgstr "Privilegi predefiniti" +msgstr "Privilegi di base" #: src/settings_translation_file.cpp msgid "Bilinear filtering" @@ -1533,9 +1522,8 @@ msgid "Cave noise #2" msgstr "'Rumore' n°2 della caverna" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cave width" -msgstr "Larghezza dello schermo" +msgstr "Larghezza delle caverne" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" @@ -1593,7 +1581,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Chunk size" -msgstr "Dimensione del pezzo" +msgstr "Dimensione del \"pezzo\"" #: src/settings_translation_file.cpp msgid "Cinematic mode" @@ -1644,10 +1632,9 @@ msgid "" "Comma-separated list of trusted mods that are allowed to access insecure\n" "functions even when mod security is on (via request_insecure_environment())." msgstr "" -"Elenco separato da virgole di mod. fidati a cui è permesso l'accesso a " -"funzioni\n" -"non sicure anche quando la sicurezza dei mod è attivata (tramite " -"request_insecure_environment())." +"Lista separata da virgole dei mod affidabili ai quali è permesso accedere a " +"funzioni non sicure anche quando il valore \"mod security\" è impostato su \"" +"on\" (utilizzando request_insecure_environment())." #: src/settings_translation_file.cpp msgid "" @@ -1727,6 +1714,8 @@ msgstr "Controlla la ripidità/altezza delle colline." #: src/settings_translation_file.cpp msgid "Controls width of tunnels, a smaller value creates wider tunnels." msgstr "" +"Controlla la larghezza delle gallerie, un valore più piccolo crea gallerie " +"più larghe." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1770,7 +1759,7 @@ msgstr "Velocità di accovacciamento" #: src/settings_translation_file.cpp msgid "DPI" -msgstr "DPI" +msgstr "Punti per pollice" #: src/settings_translation_file.cpp msgid "Damage" @@ -1802,7 +1791,7 @@ msgid "" "This will be overridden when creating a world from the main menu." msgstr "" "Gioco predefinito quando si crea un nuovo mondo.\n" -"Questo sarà ignorato quando si crea un mondo dal menu principale." +"Questo verrà ignorato quando si crea un mondo dal menu principale." #: src/settings_translation_file.cpp msgid "Default password" @@ -1817,26 +1806,26 @@ msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" -"Tempo di scadenza predefinito per cURL, espresso in millisecondi.\n" -"Ha effetto solo se si è compilato con cURL." +"Scadenza predefinita per cURL, espressa in millisecondi.\n" +"Ha effetto solo se Minetest è stato compilato con cURL." #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" -"Stabilisce il passo di campionamento dell'immagine.\n" -"Un valore elevato fornisce normal map più uniformi." +"Definisce il passo di campionatura dell'immagine.\n" +"Un valore più alto ha come effetto normal map più uniformi." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" -"Stabilisce la massima distanza di trasferimento del giocatore in blocchi (0 " -"= illimitata)." +"Definisce la massima distanza di trasferimento del giocatore espressa in " +"blocchi (0 = illimitata)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "Ritarda la comparsa dei suggerimenti, espressa in millisecondi." +msgstr "Ritardo nella comparsa dei suggerimenti, espresso in millisecondi." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" @@ -1859,8 +1848,8 @@ msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" -"Descrizione del server, da mostrare quando si unisce un giocatore e " -"nell'elenco dei server." +"Descrizione del server, da mostrarsi nell'elenco dei server e quando i " +"giocatori accedono." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" @@ -1891,7 +1880,7 @@ msgstr "Disabilita anti-trucchi" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "Non permettere password vuote" +msgstr "Rifiutare le password vuote" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." @@ -1908,11 +1897,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "Tasto per lasciare a terra l'oggetto" +msgstr "Tasto per il rilascio di un oggetto" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "Scarico delle info. di debug del gen. mappa." +msgstr "Pubblica le informazioni di debug del generatore della mappa." #: src/settings_translation_file.cpp msgid "Enable VBO" @@ -1920,16 +1909,17 @@ msgstr "Abilitare VBO" #: src/settings_translation_file.cpp msgid "Enable mod security" -msgstr "Abilitare la sicurezza dei mod." +msgstr "Abilita la protezione mod." #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "Permette il danneggiamento e la morte dei giocatori." +msgstr "Abilitare il ferimento e la morte dei giocatori." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." msgstr "" -"Permette l'input casuale da parte dell'utente (usato solo per le prove)." +"Abilita input casuale da parte del giocatore (utilizzato solo per " +"esperimenti)." #: src/settings_translation_file.cpp msgid "" @@ -1947,11 +1937,11 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" -"Permette di impedire la connessione dei client vecchi.\n" -"I client vecchi sono compatibili nel senso che non crolleranno alla " -"connessione\n" -"ai nuovi server, ma potrebbero non supportare tutte le nuove caratteristiche " -"che vi aspettate." +"Abilitare per impedire ai client obsoleti di connettersi.\n" +"I client datati sono compatibili nella misura in cui non vanno in crash " +"quando si connettono\n" +"ai server più recenti, ma non supportano tutte le funzioni che ci si " +"aspetterebbe." #: src/settings_translation_file.cpp msgid "" @@ -1960,10 +1950,11 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" -"Abilitare l'uso di un server di media remoti (se fornito dal server).\n" -"I server remoti offrono un modo significativamente più veloce per scaricare " -"i media\n" -"(ad es. le immagini) quando ci si connette al server." +"Abilita l'utilizzo di un server di materiale remoto (se fornito dal server)." +"\n" +"I server remoti offrono un modo significativamente più veloce di " +"scaricamento\n" +"del materiale (ad es. le immagini) quando ci si collega al server." #: src/settings_translation_file.cpp msgid "" @@ -1971,10 +1962,10 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" -"Abilita/disabilita l'esecuzione di un server IPv6. Un server IPv6 potrebbe " -"essere ristretto\n" -"a client IPv6, dipendentemente dalla configurazione del sistema.\n" -"Viene ignorata se si imposta bind_address." +"Abilita/disabilita l'esecuzione di un server IPv6. Un server IPv6 può " +"essere\n" +"limitato ai client IPv6, dipendentemente dalla configurazione del sistema.\n" +"Ignorata se bind_address è impostato." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." @@ -2025,8 +2016,8 @@ msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" -"Opzione sperimentale, potrebbe causare spazi visibili tra i blocchi\n" -"quando impostata su valori maggiori di 0." +"Opzione sperimentale, può determinare la visibilità di spazi tra i blocchi\n" +"quando impostato ad un numero maggiore di 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" @@ -2169,9 +2160,8 @@ msgid "Font size" msgstr "Dimensione del font" #: src/settings_translation_file.cpp -#, fuzzy msgid "Format of screenshots." -msgstr "Percorso dove salvare le istantanee." +msgstr "Formato delle istantanee." #: src/settings_translation_file.cpp msgid "Forward key" @@ -2240,7 +2230,6 @@ msgid "Generate normalmaps" msgstr "Generare le normalmap" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Global map generation attributes.\n" "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n" @@ -2327,7 +2316,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "" "How many blocks are flying in the wire simultaneously for the whole server." -msgstr "Quanti blocchi volano nel cavo simultaneamente per l'intero server." +msgstr "Quanti blocchi vengono inviati simultaneamente per l'intero server." #: src/settings_translation_file.cpp msgid "How many blocks are flying in the wire simultaneously per client." @@ -2838,7 +2827,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Key use for climbing/descending" -msgstr "Tasto 'usare' per arrampicarsi/scendere" +msgstr "Tasto \"Usare\" per arrampicarsi/scendere" #: src/settings_translation_file.cpp msgid "Language" @@ -2882,11 +2871,11 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Length of time between ABM execution cycles" -msgstr "" +msgstr "Intervallo di tempo tra l'esecuzione dei cicli ABM" #: src/settings_translation_file.cpp msgid "Length of time between NodeTimer execution cycles" -msgstr "" +msgstr "Intervallo di tempo tra l'esecuzione dei cicli del Temporizzatore Nodo" #: src/settings_translation_file.cpp msgid "" @@ -2940,7 +2929,7 @@ msgstr "Uniformazione della fluidità del liquido" #: src/settings_translation_file.cpp msgid "Liquid loop max" -msgstr "Max. giri del liquido" +msgstr "Iterazioni massime nel giro di trasformazione del liquido" #: src/settings_translation_file.cpp msgid "Liquid queue purge time" @@ -2948,7 +2937,7 @@ msgstr "Tempo di svuotamento della coda del liquido" #: src/settings_translation_file.cpp msgid "Liquid sink" -msgstr "Discesa del liquido" +msgstr "Velocità di caduta del liquido" #: src/settings_translation_file.cpp msgid "Liquid update interval in seconds." @@ -2986,7 +2975,6 @@ msgid "Map directory" msgstr "Cartella della mappa" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen Valleys.\n" "'altitude_chill' makes higher elevations colder, which may cause biome " @@ -3000,16 +2988,22 @@ msgid "" "default.\n" "Flags starting with 'no' are used to explicitly disable them." msgstr "" -"Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n" -"Quando i biomi di neve sono abilitati l'impostazione jungles è ignorata e le " -"giungle sono abilitate.\n" +"Attributi di generazione della mappa specifici per il Generatore mappa valli." +"\n" +"'altitude_chill' rende più fredde le altitudini più elevate, il che potrebbe " +"causare problemi di bioma.\n" +"'humid_rivers' modifica l'umidità attorno ai fiumi e in aree dove l'acqua " +"tenderebbe a stagnare,\n" +"potrebbe interferire con i biomi finemente regolati.\n" +"Le impostazioni predefinite impostate nel motore sono: altitude_chill, " +"humid_rivers\n" +"La stringa delle impostazioni modifica i valori predefiniti del motore.\n" "Le impostazioni che non sono specificate nella stringa mantengono i valori " "predefiniti.\n" "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " "esplicitamente." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen flat.\n" "Occasional lakes and hills can be added to the flat world.\n" @@ -3020,14 +3014,16 @@ msgid "" "Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributi di generazione della mappa specifici per Generatore mappa piatto.\n" -"Al mondo piatto sono aggiunte colline e laghi occasionali.\n" +"Laghi e colline occasionali possono essere aggiunti al mondo piatto.\n" +"Le impostazioni predefinite impostate nel motore sono: nessuna\n" +"La stringa delle impostazioni modifica le impostazioni predefinite del " +"motore.\n" "Le impostazioni che non sono specificate nella stringa mantengono i valori " "predefiniti.\n" "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " "esplicitamente." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v6.\n" "When snowbiomes are enabled jungles are automatically enabled, the 'jungles' " @@ -3039,15 +3035,17 @@ msgid "" "Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n" -"Quando i biomi di neve sono abilitati l'impostazione jungles è ignorata e le " -"giungle sono abilitate.\n" +"Quando i biomi di neve sono abilitati le giungle sono abilitate " +"automaticamente, l'impostazione 'jungles' è ignorata.\n" +"Le impostazioni predefinite impostate nel motore sono: biomeblend, mudflow\n" +"La stringa delle impostazioni modifica le impostazioni predefinite del " +"motore.\n" "Le impostazioni che non sono specificate nella stringa mantengono i valori " "predefiniti.\n" "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " "esplicitamente." #: src/settings_translation_file.cpp -#, fuzzy msgid "" "Map generation attributes specific to Mapgen v7.\n" "The 'ridges' flag controls the rivers.\n" @@ -3058,8 +3056,10 @@ msgid "" "Flags starting with 'no' are used to explicitly disable them." msgstr "" "Attributi di generazione della mappa specifici per Generatore mappa v. 6.\n" -"Quando i biomi di neve sono abilitati l'impostazione jungles è ignorata e le " -"giungle sono abilitate.\n" +"L'impostazione 'ridges' controlla i fiumi.\n" +"Le impostazioni predefinite impostate nel motore sono: mountains, ridges\n" +"La stringa delle impostazioni modifica le impostazioni predefinite del " +"motore.\n" "Le impostazioni che non sono specificate nella stringa mantengono i valori " "predefiniti.\n" "Le impostazioni che iniziano con \"no\" sono usate per disabilitarle " @@ -3110,9 +3110,8 @@ msgid "Mapgen flat" msgstr "Generatore mappa piatto" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave width" -msgstr "Profondità delle caverne grandi del Generatore mappa piatto" +msgstr "Larghezza delle caverne del Generatore mappa piatto" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -3164,9 +3163,8 @@ msgid "Mapgen fractal" msgstr "Generatore mappa frattale" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave width" -msgstr "Gen. mappa frattale, fetta w" +msgstr "Gen. mappa frattale, larghezza caverne" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -3234,9 +3232,8 @@ msgid "Mapgen v5" msgstr "Generatore mappa v. 5." #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5 cave width" -msgstr "Profondità delle caverne grandi del Generatore mappa piatto" +msgstr "Gen. mappa v. 5, larghezza caverne" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -3323,9 +3320,8 @@ msgid "Mapgen v7" msgstr "Gen. mappa v. 7, parametri del 'rumore'" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 cave width" -msgstr "Profondità delle caverne grandi del Generatore mappa piatto" +msgstr "Gen. mappa v. 7, larghezza delle caverne" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -3373,7 +3369,7 @@ msgstr "Gen. mappa v. 7, param. del 'rumore' di base del terreno" #: src/settings_translation_file.cpp msgid "Mapgen v7 terrain persistation noise parameters" -msgstr "Gen. mappa v. 7, param. del 'rumore' di continuità del terreno" +msgstr "Gen. mappa v. 7, param. del \"rumore\" di continuità del terreno" #: src/settings_translation_file.cpp msgid "Massive cave depth" @@ -3650,9 +3646,8 @@ msgid "Node highlighting" msgstr "Evidenziamento nodo" #: src/settings_translation_file.cpp -#, fuzzy msgid "NodeTimer interval" -msgstr "Intervallo del tempo di invio" +msgstr "Intervallo del Temporizzatore nodo" #: src/settings_translation_file.cpp msgid "Noise parameters for biome API temperature, humidity and biome blend." @@ -3699,7 +3694,7 @@ msgstr "" "Numero di blocchi extra che possono essere caricati da /clearobjects in una " "volta.\n" "Questo è un controbilanciare tra spesa di transazione sqlite e\n" -"consumo di memoria (4096=100MB, come regola generale)." +"consumo di memoria (4096 = 100MB, come regola generale)." #: src/settings_translation_file.cpp msgid "Number of parallax occlusion iterations." @@ -3709,7 +3704,7 @@ msgstr "Numero di iterazioni di occlusione di parallasse." msgid "Overall bias of parallax occlusion effect, usually scale/2." msgstr "" "Deviazione complessiva dell'effetto di occlusione di parallasse, solitamente " -"scala/2." +"scala fratto 2." #: src/settings_translation_file.cpp msgid "Overall scale of parallax occlusion effect." @@ -3793,7 +3788,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Privileges that players with basic_privs can grant" -msgstr "" +msgstr "Privilegi che possono essere assegnati dai giocatori con basic_privs" #: src/settings_translation_file.cpp msgid "Profiler data print interval. 0 = disable. Useful for developers." @@ -3916,14 +3911,12 @@ msgid "Screenshot folder" msgstr "Cartella delle istantanee" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot format" -msgstr "Cartella delle istantanee" +msgstr "Formato delle istantanee" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot quality" -msgstr "Istantanea" +msgstr "Qualità dell'istantanea" #: src/settings_translation_file.cpp msgid "" @@ -3931,6 +3924,9 @@ msgid "" "1 means worst quality; 100 means best quality.\n" "Use 0 for default quality." msgstr "" +"Qialità dell'istantanea. Usata solo per il formato JPEG.\n" +"1 significa qualità peggiore; 100 significa qualità migliore.\n" +"Usate 0 per la qualità predefinita." #: src/settings_translation_file.cpp msgid "Security" @@ -4036,7 +4032,7 @@ msgstr "Mostrare le info. di debug" #: src/settings_translation_file.cpp msgid "Show entity selection boxes" -msgstr "" +msgstr "Mostrare i riquadri di selezione delle entità" #: src/settings_translation_file.cpp msgid "Shutdown message" @@ -4047,7 +4043,7 @@ msgid "" "Size of chunks to be generated at once by mapgen, stated in mapblocks (16 " "nodes)." msgstr "" -"Dimensione dei pezzi da generare immediatamente dal generatore mappa, " +"Dimensione dei \"pezzi\" da generare immediatamente dal generatore mappa, " "espressa in blocchi mappa (16 nodi)." #: src/settings_translation_file.cpp @@ -4115,7 +4111,7 @@ msgstr "Controllo stretto del protocollo" #: src/settings_translation_file.cpp msgid "Support older servers" -msgstr "" +msgstr "Supporto dei server più vecchi" #: src/settings_translation_file.cpp msgid "Synchronous SQLite" @@ -4215,7 +4211,7 @@ msgstr "Questo font sarà usato per certe lingue." #: src/settings_translation_file.cpp msgid "Time in between active block management cycles" -msgstr "" +msgstr "Tempo tra i cicli di gestione del 'blocco'" #: src/settings_translation_file.cpp msgid "" @@ -4557,6 +4553,12 @@ msgid "" "Servers starting with 0.4.13 will work, 0.4.12-dev servers may work.\n" "Disabling this option will protect your password better." msgstr "" +"Se supportare o meno i server più vecchi precedenti al protocollo versione " +"25.\n" +"Abilitatela se volete connettervi a server 0.4.12 e precedenti.\n" +"I server a partire da 0.4.13 funzioneranno, i server 0.4.12-dev potrebbero " +"funzionare.\n" +"Disabilitare questa opzione proteggerà meglio la vostra password." #: src/settings_translation_file.cpp msgid "Width component of the initial window size." From fb1cfb43e2f9697facad88ed4359ed7bbedbcc2c Mon Sep 17 00:00:00 2001 From: senpi Date: Sun, 8 May 2016 17:39:07 +0200 Subject: [PATCH 511/531] Translated using Weblate (Lojban) Currently translated at 10.5% (94 of 887 strings) --- po/jbo/minetest.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po index 664a380f..522433c1 100644 --- a/po/jbo/minetest.po +++ b/po/jbo/minetest.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2015-11-22 06:05+0000\n" +"PO-Revision-Date: 2016-05-08 17:39+0000\n" "Last-Translator: senpi \n" -"Language-Team: Lojban \n" +"Language-Team: Lojban " +"\n" "Language: jbo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -25,7 +25,7 @@ msgstr "" #: builtin/fstk/ui.lua msgid "An error occured:" -msgstr "" +msgstr "lo selsrera cu pu fasnu:" #: builtin/fstk/ui.lua #, fuzzy @@ -51,11 +51,11 @@ msgstr ".i ca'o samymo'i" #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "" +msgstr "le ve judrnporte favatcini na mapti" #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " -msgstr "" +msgstr "le samci'ejudri cu jitro lo du'u ve judrnporte favytcini li $1" #: builtin/mainmenu/common.lua msgid "Server supports protocol versions between $1 and $2. " From f102d36f6242502c62f26d465ef05cbe68072212 Mon Sep 17 00:00:00 2001 From: Fixer Date: Mon, 9 May 2016 16:22:10 +0200 Subject: [PATCH 512/531] Translated using Weblate (Ukrainian) Currently translated at 38.4% (341 of 887 strings) This is a merger of two commits. --- po/uk/minetest.po | 436 +++++++++++++++++----------------------------- 1 file changed, 156 insertions(+), 280 deletions(-) diff --git a/po/uk/minetest.po b/po/uk/minetest.po index e6e213ae..4a2101d7 100644 --- a/po/uk/minetest.po +++ b/po/uk/minetest.po @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-01-25 23:23+0000\n" +"PO-Revision-Date: 2016-05-10 00:06+0000\n" "Last-Translator: Fixer \n" -"Language-Team: Ukrainian \n" +"Language-Team: Ukrainian " +"\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.5-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -87,12 +87,14 @@ msgid "Depends:" msgstr "Залежить від:" #: builtin/mainmenu/dlg_config_world.lua +#, fuzzy msgid "Disable MP" -msgstr "Вимкнути багатокористувацьку гру" +msgstr "Вимкнути МП" #: builtin/mainmenu/dlg_config_world.lua +#, fuzzy msgid "Enable MP" -msgstr "Увімкнути багатокористувацьку гру" +msgstr "Увімкнути МП" #: builtin/mainmenu/dlg_config_world.lua msgid "Enable all" @@ -111,8 +113,9 @@ msgid "Hide Game" msgstr "Приховати гру" #: builtin/mainmenu/dlg_config_world.lua +#, fuzzy msgid "Hide mp content" -msgstr "Приховати контент багатокористувацької гри" +msgstr "Приховати мп контент" #: builtin/mainmenu/dlg_config_world.lua msgid "Mod:" @@ -129,11 +132,11 @@ msgstr "Світ:" #: builtin/mainmenu/dlg_config_world.lua msgid "enabled" -msgstr "Увімкнено" +msgstr "увімкнено" #: builtin/mainmenu/dlg_create_world.lua msgid "A world named \"$1\" already exists" -msgstr "Світ з такою назвою ( \"$1\") вже існує" +msgstr "Світ з такою назвою \"$1\" вже існує" #: builtin/mainmenu/dlg_create_world.lua msgid "Create" @@ -203,7 +206,7 @@ msgstr "Прийняти" #: builtin/mainmenu/dlg_rename_modpack.lua msgid "Rename Modpack:" -msgstr "Перейменувати Збірку модифікацій:" +msgstr "Перейменувати збірку модифікацій:" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "\"$1\" is not a valid flag." @@ -215,16 +218,15 @@ msgstr "(пояснення відсутнє)" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "< Back to Settings page" -msgstr "" +msgstr "< Назад до Налаштувань" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Browse" msgstr "Проглянути" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "Disabled" -msgstr "Вимкнути багатокористувацьку гру" +msgstr "Вимкнено" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Edit" @@ -349,7 +351,7 @@ msgstr "Пошук" #: builtin/mainmenu/store.lua msgid "Shortname:" -msgstr "Коротке ім'я:" +msgstr "Коротка назва:" #: builtin/mainmenu/store.lua msgid "Successfully installed:" @@ -369,7 +371,7 @@ msgstr "Активні учасники" #: builtin/mainmenu/tab_credits.lua msgid "Core Developers" -msgstr "Основні розробники" +msgstr "Основні розробники ядра гри" #: builtin/mainmenu/tab_credits.lua msgid "Credits" @@ -377,11 +379,11 @@ msgstr "Подяка" #: builtin/mainmenu/tab_credits.lua msgid "Previous Contributors" -msgstr "Попередні помічники" +msgstr "Колишні учасники" #: builtin/mainmenu/tab_credits.lua msgid "Previous Core Developers" -msgstr "Попередні основні розробники" +msgstr "Попередні основні розробники ядра" #: builtin/mainmenu/tab_mods.lua msgid "Installed Mods:" @@ -412,9 +414,8 @@ msgid "Uninstall selected modpack" msgstr "Видалити обрану збірку модифікацій" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "Адреса / Порт :" +msgstr "Адреса / Порт" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -426,33 +427,30 @@ msgstr "Під'єднатися" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Creative mode" -msgstr "Творчий режим" +msgstr "Творчість" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua +#, fuzzy msgid "Damage enabled" -msgstr "Ушкодження увімкнено" +msgstr "Поранення" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Del. Favorite" -msgstr "Улюблені:" +msgstr "Видалити мітку" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Favorite" -msgstr "Улюблені:" +msgstr "Улюблені" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Name / Password" -msgstr "Ім'я / Пароль :" +msgstr "Ім'я / Пароль" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" msgstr "Бої увімкнено" #: builtin/mainmenu/tab_server.lua -#, fuzzy msgid "Bind Address" msgstr "Закріпити адресу" @@ -463,12 +461,12 @@ msgstr "Налаштувати" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Creative Mode" -msgstr "Режим Створення" +msgstr "Творчість" #: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_simple_main.lua #: builtin/mainmenu/tab_singleplayer.lua msgid "Enable Damage" -msgstr "Увімкнути травмування" +msgstr "Увімкнути поранення" #: builtin/mainmenu/tab_server.lua msgid "Name/Password" @@ -508,99 +506,89 @@ msgstr "Почати гру" #: builtin/mainmenu/tab_settings.lua msgid "2x" -msgstr "" +msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "Об'ємні хмари" #: builtin/mainmenu/tab_settings.lua msgid "4x" -msgstr "" +msgstr "4x" #: builtin/mainmenu/tab_settings.lua msgid "8x" -msgstr "" +msgstr "8x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Advanced Settings" -msgstr "Налаштування" +msgstr "Додаткові налаштування" #: builtin/mainmenu/tab_settings.lua msgid "Antialiasing:" -msgstr "" +msgstr "Згладжування:" #: builtin/mainmenu/tab_settings.lua +#, fuzzy msgid "Are you sure to reset your singleplayer world?" msgstr "Ви впевнені, що бажаєте скинути свій світ однокористувацької гри?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Білінійна фільтрація" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "Bump Mapping" -msgstr "MIP-текстурування" +msgstr "Бамп-маппінг" #: builtin/mainmenu/tab_settings.lua msgid "Change keys" msgstr "Змінити клавіші" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Підключитися" +msgstr "З'єднане скло" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Fancy Leaves" -msgstr "Непрозоре листя" +msgstr "Гарні листя" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Mipmap" -msgstr "MIP-текстурування" +msgstr "Міпмапи" #: builtin/mainmenu/tab_settings.lua msgid "Mipmap + Aniso. Filter" -msgstr "" +msgstr "Міпмапи і анізотропний фільтр" #: builtin/mainmenu/tab_settings.lua msgid "No" msgstr "Ні" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Filter" -msgstr "Анізотропна фільтрація" +msgstr "Без фільтрування" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "No Mipmap" -msgstr "MIP-текстурування" +msgstr "Без міпмап" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "Рівне освітлення" +msgstr "Підсвічувати блок" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Outlining" -msgstr "Рівне освітлення" +msgstr "Виділяти блок рамкою" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Нічого" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Normal Mapping" -msgstr "MIP-текстурування" +msgstr "Текстурування нормалів" #: builtin/mainmenu/tab_settings.lua msgid "Opaque Leaves" @@ -611,14 +599,12 @@ msgid "Opaque Water" msgstr "Непрозора вода" #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -#, fuzzy msgid "Parallax Occlusion" -msgstr "Parallax Occlusion" +msgstr "Паралаксова оклюзія" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Particles" -msgstr "Увімкнути все" +msgstr "Часточки" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -633,9 +619,8 @@ msgid "Simple Leaves" msgstr "Просте листя" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Smooth Lighting" -msgstr "Рівне освітлення" +msgstr "Згладжене освітлення" #: builtin/mainmenu/tab_settings.lua msgid "Texturing:" @@ -644,36 +629,31 @@ msgstr "Текстурування:" #: builtin/mainmenu/tab_settings.lua msgid "To enable shaders the OpenGL driver needs to be used." msgstr "" -"Для того, щоб увімкнути шейдери, потрібно використовувати двайвер OpenGL." +"Для того, щоб увімкнути шейдери, потрібно використовувати драйвер OpenGL." #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "MIP-текстурування" +msgstr "Тоновий шейдер" #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" msgstr "" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Trilinear Filter" msgstr "Трилінійна фільтрація" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Leaves" -msgstr "Гарне листя" +msgstr "Коливати листя" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Plants" -msgstr "Гарне листя" +msgstr "Коливати квіти" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Waving Water" -msgstr "Гарне листя" +msgstr "Коливати воду" #: builtin/mainmenu/tab_settings.lua msgid "Yes" @@ -684,7 +664,6 @@ msgid "Config mods" msgstr "Налаштувати модифікації" #: builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Main" msgstr "Головне Меню" @@ -734,7 +713,7 @@ msgstr "Завантаження текстур..." #: src/client.cpp msgid "Rebuilding shaders..." -msgstr "Побудова шейдерів..." +msgstr "Перебудова шейдерів..." #: src/client/clientlauncher.cpp msgid "Connection error (timed out?)" @@ -745,6 +724,7 @@ msgid "Could not find or load game \"" msgstr "Неможливо знайти або завантажити гру \"" #: src/client/clientlauncher.cpp +#, fuzzy msgid "Invalid gamespec." msgstr "Помилкова конфігурація гри." @@ -871,7 +851,6 @@ msgid "KiB/s" msgstr "КіБ/сек" #: src/game.cpp -#, fuzzy msgid "Media..." msgstr "Ресурси..." @@ -889,7 +868,7 @@ msgstr "Отримання адреси..." #: src/game.cpp msgid "Respawn" -msgstr "Народитися" +msgstr "Переродитися" #: src/game.cpp msgid "Shutting down..." @@ -970,9 +949,8 @@ msgid "Left" msgstr "Ліворуч" #: src/guiKeyChangeMenu.cpp src/settings_translation_file.cpp -#, fuzzy msgid "Print stacks" -msgstr "Надрукувати купи" +msgstr "Надрукувати стак" #: src/guiKeyChangeMenu.cpp msgid "Range select" @@ -1043,12 +1021,10 @@ msgid "Apps" msgstr "Додатки" #: src/keycode.cpp -#, fuzzy msgid "Attn" msgstr "Увага" #: src/keycode.cpp -#, fuzzy msgid "Back" msgstr "Назад" @@ -1069,7 +1045,6 @@ msgid "Control" msgstr "Ctrl" #: src/keycode.cpp -#, fuzzy msgid "Convert" msgstr "Конвертувати" @@ -1082,23 +1057,20 @@ msgid "Down" msgstr "Вниз" #: src/keycode.cpp -#, fuzzy msgid "End" -msgstr "End" +msgstr "" #: src/keycode.cpp -#, fuzzy msgid "Erase OEF" -msgstr "Erase OEF" +msgstr "" #: src/keycode.cpp msgid "Escape" msgstr "Esc" #: src/keycode.cpp -#, fuzzy msgid "ExSel" -msgstr "ExSel" +msgstr "" #: src/keycode.cpp msgid "Execute" @@ -1113,9 +1085,8 @@ msgid "Help" msgstr "Допомога" #: src/keycode.cpp -#, fuzzy msgid "Home" -msgstr "Home" +msgstr "" #: src/keycode.cpp msgid "Insert" @@ -1170,12 +1141,10 @@ msgid "Mode Change" msgstr "Змінити режим" #: src/keycode.cpp -#, fuzzy msgid "Next" -msgstr "Наступний" +msgstr "" #: src/keycode.cpp -#, fuzzy msgid "Nonconvert" msgstr "Не обернено" @@ -1184,17 +1153,14 @@ msgid "Num Lock" msgstr "Num Lock" #: src/keycode.cpp -#, fuzzy msgid "Numpad *" msgstr "Num *" #: src/keycode.cpp -#, fuzzy msgid "Numpad +" msgstr "Num +" #: src/keycode.cpp -#, fuzzy msgid "Numpad -" msgstr "Num -" @@ -1243,9 +1209,8 @@ msgid "Numpad 9" msgstr "Num 9" #: src/keycode.cpp -#, fuzzy msgid "OEM Clear" -msgstr "Очистити OEM" +msgstr "" #: src/keycode.cpp msgid "PA1" @@ -1273,9 +1238,8 @@ msgid "Prior" msgstr "Page Down" #: src/keycode.cpp -#, fuzzy msgid "Return" -msgstr "Enter" +msgstr "Ввід" #: src/keycode.cpp #, fuzzy @@ -1319,9 +1283,8 @@ msgid "Snapshot" msgstr "Знімок" #: src/keycode.cpp -#, fuzzy msgid "Space" -msgstr "Space" +msgstr "Пробіл" #: src/keycode.cpp msgid "Tab" @@ -1460,7 +1423,6 @@ msgid "Amplifies the valleys" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Anisotropic filtering" msgstr "Анізотропна фільтрація" @@ -1505,40 +1467,37 @@ msgid "Basic Privileges" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bilinear filtering" msgstr "Білінійна фільтрація" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bind address" -msgstr "Отримання адреси..." +msgstr "Закріплення адреси" #: src/settings_translation_file.cpp msgid "Bits per pixel (aka color depth) in fullscreen mode." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Build inside player" -msgstr "Мережева гра" +msgstr "Будувати в межах гравця" #: src/settings_translation_file.cpp -#, fuzzy msgid "Bumpmapping" -msgstr "MIP-текстурування" +msgstr "Бамп-маппінг" #: src/settings_translation_file.cpp msgid "Camera smoothing" -msgstr "" +msgstr "Згладжування руху камери" #: src/settings_translation_file.cpp msgid "Camera smoothing in cinematic mode" -msgstr "" +msgstr "Згладжування руху камери у кінорежимі" #: src/settings_translation_file.cpp +#, fuzzy msgid "Camera update toggle key" -msgstr "" +msgstr "Клавіша для контролю оновлення камери" #: src/settings_translation_file.cpp msgid "Cave noise #1" @@ -1557,14 +1516,12 @@ msgid "Caves and tunnels form at the intersection of the two noises" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat key" -msgstr "Змінити клавіши" +msgstr "Чат" #: src/settings_translation_file.cpp -#, fuzzy msgid "Chat toggle key" -msgstr "Змінити клавіши" +msgstr "Чат" #: src/settings_translation_file.cpp msgid "" @@ -1594,14 +1551,12 @@ msgid "Chunk size" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode" -msgstr "Режим творчості" +msgstr "Кінорежим" #: src/settings_translation_file.cpp -#, fuzzy msgid "Cinematic mode key" -msgstr "Режим творчості" +msgstr "Кінорежим" #: src/settings_translation_file.cpp msgid "Clean transparent textures" @@ -1624,18 +1579,16 @@ msgid "Cloud radius" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds" -msgstr "3D Хмари" +msgstr "Хмари" #: src/settings_translation_file.cpp msgid "Clouds are a client side effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Clouds in menu" -msgstr "Головне меню" +msgstr "Хмари в меню" #: src/settings_translation_file.cpp msgid "Colored fog" @@ -1654,36 +1607,30 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Command key" -msgstr "Комманда" +msgstr "Команда" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect glass" -msgstr "Підключитися" +msgstr "З'єднувати скло" #: src/settings_translation_file.cpp -#, fuzzy msgid "Connect to external media server" -msgstr "Підключення до сервера..." +msgstr "Підключення до зовнішнього медіасервера" #: src/settings_translation_file.cpp msgid "Connects glass if supported by node." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console alpha" -msgstr "Консоль" +msgstr "Консоль (альфа)" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console color" -msgstr "Консоль" +msgstr "Колір консолі" #: src/settings_translation_file.cpp -#, fuzzy msgid "Console key" msgstr "Консоль" @@ -1696,9 +1643,8 @@ msgid "Continuous forward movement (only used for testing)." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Controls" -msgstr "Ctrl" +msgstr "Керування" #: src/settings_translation_file.cpp msgid "" @@ -1766,9 +1712,8 @@ msgid "DPI" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Damage" -msgstr "Увімкнути ушкодження" +msgstr "Поранення" #: src/settings_translation_file.cpp msgid "Debug info toggle key" @@ -1797,13 +1742,12 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Default password" -msgstr "Новий Пароль" +msgstr "Стандартний пароль" #: src/settings_translation_file.cpp msgid "Default privileges" -msgstr "" +msgstr "Стандартні права" #: src/settings_translation_file.cpp msgid "" @@ -1867,9 +1811,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Disable anticheat" -msgstr "Ввімкнути частки" +msgstr "Вимкнути античіт" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" @@ -1880,14 +1823,12 @@ msgid "Domain name of server, to be displayed in the serverlist." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double tap jump for fly" -msgstr "Подвійний \"Стрибок\" щоб полетіти" +msgstr "Подвійний дотик до \"стрибок\" щоб полетіти" #: src/settings_translation_file.cpp -#, fuzzy msgid "Double-tapping the jump key toggles fly mode." -msgstr "Подвійний \"Стрибок\" щоб полетіти" +msgstr "Подвійний дотик \"стрибок\" вмикає режим польоту." #: src/settings_translation_file.cpp msgid "Drop item key" @@ -1898,9 +1839,8 @@ msgid "Dump the mapgen debug infos." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Увімкнути багатокористувацьку гру" +msgstr "Увімкнути VBO" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1961,14 +1901,12 @@ msgid "Enables caching of facedir rotated meshes." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Увімкнути ушкодження" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables minimap." -msgstr "Увімкнути ушкодження" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2069,9 +2007,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Filtering" -msgstr "Анізотропна фільтрація" +msgstr "Фільтрація" #: src/settings_translation_file.cpp msgid "Fixed map seed" @@ -2087,7 +2024,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Туман" #: src/settings_translation_file.cpp msgid "Fog toggle key" @@ -2122,9 +2059,8 @@ msgid "Format of screenshots." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Forward key" -msgstr "Уперед" +msgstr "Вперед" #: src/settings_translation_file.cpp msgid "Freetype fonts" @@ -2148,7 +2084,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Повний екран" #: src/settings_translation_file.cpp msgid "Full screen BPP" @@ -2156,7 +2092,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Повноекранний режим." #: src/settings_translation_file.cpp msgid "GUI scaling" @@ -2180,9 +2116,8 @@ msgid "General" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Generate normalmaps" -msgstr "Генерувати карти нормалей" +msgstr "Генерувати карти нормалів" #: src/settings_translation_file.cpp msgid "" @@ -2198,16 +2133,15 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Graphics" -msgstr "" +msgstr "Графіка" #: src/settings_translation_file.cpp msgid "Gravity" -msgstr "" +msgstr "Гравітація" #: src/settings_translation_file.cpp -#, fuzzy msgid "HTTP Mods" -msgstr "Модифікації" +msgstr "HTTP Модифікації" #: src/settings_translation_file.cpp msgid "HUD toggle key" @@ -2340,9 +2274,8 @@ msgid "Ignore world errors" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "In-Game" -msgstr "Гра" +msgstr "У грі" #: src/settings_translation_file.cpp msgid "In-game chat console background alpha (opaqueness, between 0 and 255)." @@ -2365,7 +2298,6 @@ msgid "Inventory items animations" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Inventory key" msgstr "Інвентар" @@ -2417,7 +2349,6 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Jump key" msgstr "Стрибок" @@ -2636,7 +2567,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Language" -msgstr "" +msgstr "Мова" #: src/settings_translation_file.cpp msgid "Large cave depth" @@ -2659,9 +2590,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Left key" -msgstr "Ліва клавіша Menu" +msgstr "Ліва клавіша" #: src/settings_translation_file.cpp msgid "" @@ -2739,14 +2669,12 @@ msgid "Main menu game manager" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu mod manager" -msgstr "Головне меню" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Main menu script" -msgstr "Головне меню" +msgstr "" #: src/settings_translation_file.cpp msgid "" @@ -2827,9 +2755,8 @@ msgid "Mapblock unload timeout" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen Valleys" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen biome heat noise parameters" @@ -2844,24 +2771,20 @@ msgid "Mapgen biome humidity noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen debug" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flags" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat cave width" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen flat cave1 noise parameters" @@ -2876,14 +2799,12 @@ msgid "Mapgen flat filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat flags" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat ground level" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen flat hill steepness" @@ -2894,14 +2815,12 @@ msgid "Mapgen flat hill threshold" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake steepness" -msgstr "Оклюзія паралакса" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen flat lake threshold" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen flat large cave depth" @@ -2912,14 +2831,12 @@ msgid "Mapgen flat terrain noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal cave width" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal cave1 noise parameters" @@ -2934,14 +2851,12 @@ msgid "Mapgen fractal filler depth noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal fractal" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal iterations" -msgstr "Оклюзія паралакса" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal julia w" @@ -2960,42 +2875,36 @@ msgid "Mapgen fractal julia z" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal offset" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal scale" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen fractal seabed noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen fractal slice w" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen heat blend noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen name" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v5 cave width" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v5 cave1 noise parameters" @@ -3018,9 +2927,8 @@ msgid "Mapgen v5 height noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v6" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v6 apple trees noise parameters" @@ -3079,14 +2987,12 @@ msgid "Mapgen v6 trees noise parameters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mapgen v7 cave width" -msgstr "Генератор карти" +msgstr "" #: src/settings_translation_file.cpp msgid "Mapgen v7 cave1 noise parameters" @@ -3252,7 +3158,6 @@ msgid "Maxmimum objects per block" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Menus" msgstr "Меню" @@ -3289,9 +3194,8 @@ msgid "Minimum texture size for filters" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Mipmapping" -msgstr "MIP-текстурування" +msgstr "Mіп-текстурування" #: src/settings_translation_file.cpp msgid "Mod profiling" @@ -3434,34 +3338,28 @@ msgid "Overall scale of parallax occlusion effect." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion" -msgstr "Оклюзія паралакса" +msgstr "Паралаксова оклюзія" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion Scale" -msgstr "Оклюзія паралакса" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion bias" -msgstr "Оклюзія паралакса" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion iterations" -msgstr "Оклюзія паралакса" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion mode" -msgstr "Оклюзія паралакса" +msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Parallax occlusion strength" -msgstr "Оклюзія паралакса" +msgstr "" #: src/settings_translation_file.cpp msgid "Path to TrueTypeFont or bitmap." @@ -3486,9 +3384,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Player name" -msgstr "Ім'я гравця надто довге." +msgstr "Ім'я гравця" #: src/settings_translation_file.cpp msgid "Player transfer distance" @@ -3540,7 +3437,6 @@ msgid "Random input" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Range select key" msgstr "Вибір діапазону" @@ -3557,9 +3453,8 @@ msgid "Replaces the default main menu with a custom one." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Right key" -msgstr "Права клавіша Menu" +msgstr "Права клавіша" #: src/settings_translation_file.cpp msgid "Rightclick repetition interval" @@ -3615,23 +3510,20 @@ msgid "Screen width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot" -msgstr "Знімок" +msgstr "Знімок екрану" #: src/settings_translation_file.cpp msgid "Screenshot folder" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot format" -msgstr "Знімок" +msgstr "Формат знімку" #: src/settings_translation_file.cpp -#, fuzzy msgid "Screenshot quality" -msgstr "Знімок" +msgstr "Якість знімку" #: src/settings_translation_file.cpp msgid "" @@ -3661,43 +3553,36 @@ msgid "Selection box width" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server / Singleplayer" -msgstr "Почати однокористувацьку гру" +msgstr "Сервер / Гра" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server URL" -msgstr "Сервер" +msgstr "Адреса сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server address" -msgstr "Сервер" +msgstr "Адреса сервера" #: src/settings_translation_file.cpp msgid "Server description" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server name" -msgstr "Сервер" +msgstr "Назва сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Server port" -msgstr "Сервер" +msgstr "Порт сервера" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist URL" -msgstr "Список публічних серверів" +msgstr "Адреса списку публічних серверів" #: src/settings_translation_file.cpp -#, fuzzy msgid "Serverlist file" -msgstr "Список публічних серверів" +msgstr "Файл списку публічних серверів" #: src/settings_translation_file.cpp msgid "" @@ -3757,9 +3642,8 @@ msgid "Slope and fill work together to modify the heights" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Smooth lighting" -msgstr "Рівне освітлення" +msgstr "Згладжене освітлення" #: src/settings_translation_file.cpp msgid "" @@ -3776,7 +3660,6 @@ msgid "Smooths rotation of camera. 0 to disable." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Sneak key" msgstr "Крастися" @@ -3797,9 +3680,8 @@ msgid "Static spawnpoint" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Strength of generated normalmaps." -msgstr "Генерувати карти нормалей" +msgstr "" #: src/settings_translation_file.cpp msgid "Strength of parallax." @@ -3836,9 +3718,8 @@ msgid "" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Texture path" -msgstr "Набори текстур" +msgstr "Шлях до текстури" #: src/settings_translation_file.cpp msgid "The altitude at which temperature drops by 20C" @@ -3926,7 +3807,6 @@ msgid "Tooltip delay" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Trilinear filtering" msgstr "Трилінійна фільтрація" @@ -3970,9 +3850,8 @@ msgid "Use bilinear filtering when scaling textures." msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Use key" -msgstr "Натисніть клавішу" +msgstr "" #: src/settings_translation_file.cpp msgid "Use mip mapping to scale textures. May slightly increase performance." @@ -4045,7 +3924,6 @@ msgid "Viewing range" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Volume" msgstr "Гучність звуку" @@ -4062,9 +3940,8 @@ msgid "Walking speed" msgstr "" #: src/settings_translation_file.cpp -#, fuzzy msgid "Water Features" -msgstr "Текстури предметів..." +msgstr "" #: src/settings_translation_file.cpp msgid "Water level" @@ -4077,12 +3954,11 @@ msgstr "" #: src/settings_translation_file.cpp #, fuzzy msgid "Waving Nodes" -msgstr "Ініціалізація вузлів" +msgstr "Блоки, що коливаються" #: src/settings_translation_file.cpp -#, fuzzy msgid "Waving leaves" -msgstr "Гарне листя" +msgstr "Листя, що коливається" #: src/settings_translation_file.cpp msgid "Waving plants" From 29fc344d25c6431c7be2accf410d0ae2d86b9c57 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 10 May 2016 17:34:28 +0200 Subject: [PATCH 513/531] Translated using Weblate (Spanish) Currently translated at 51.5% (457 of 887 strings) --- po/es/minetest.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 2d372e2a..8694cdd3 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-03-26 12:16+0000\n" -"Last-Translator: Ever Medina \n" -"Language-Team: Spanish \n" +"PO-Revision-Date: 2016-05-10 17:34+0000\n" +"Last-Translator: ShadowNinja \n" +"Language-Team: Spanish " +"\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -259,8 +259,7 @@ msgstr "Mods" #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Optionally the lacunarity can be appended with a leading comma." -msgstr "" -"Opcionalmente, la lagunaridad puede ser agregada con una coma anterior." +msgstr "Opcionalmente, el lacunaridad puede ser anexado con una coma líder." #: builtin/mainmenu/dlg_settings_advanced.lua msgid "Please enter a comma seperated list of flags." From c8705ca2aa1574c4baf9acec56da68ebd8921030 Mon Sep 17 00:00:00 2001 From: Lucas Montenegro Date: Tue, 10 May 2016 17:32:35 +0200 Subject: [PATCH 514/531] Translated using Weblate (Spanish) Currently translated at 51.5% (457 of 887 strings) This is a merger of two commits. --- po/es/minetest.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 8694cdd3..6a0cc8d0 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" "PO-Revision-Date: 2016-05-10 17:34+0000\n" -"Last-Translator: ShadowNinja \n" +"Last-Translator: Lucas Montenegro \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -49,7 +49,7 @@ msgstr "Cargando..." #: builtin/mainmenu/common.lua msgid "Protocol version mismatch. " -msgstr "Desajuste con la versión de protocolo. " +msgstr "Desajuste con la versión del protocolo. " #: builtin/mainmenu/common.lua msgid "Server enforces protocol version $1. " @@ -513,7 +513,7 @@ msgstr "2x" #: builtin/mainmenu/tab_settings.lua #, fuzzy msgid "3D Clouds" -msgstr "Nubes en 3D" +msgstr "Nubes 3D" #: builtin/mainmenu/tab_settings.lua msgid "4x" From 759fbabaea6fbd21497a1dc62a395af6e385518e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= Date: Fri, 6 May 2016 03:34:11 +0200 Subject: [PATCH 515/531] Translated using Weblate (Spanish) Currently translated at 56.8% (504 of 887 strings) This is a merger of two commits. --- po/es/minetest.po | 284 ++++++++++++++++++++++++++++------------------ 1 file changed, 174 insertions(+), 110 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 6a0cc8d0..03df1d59 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 16:13+0200\n" -"PO-Revision-Date: 2016-05-10 17:34+0000\n" -"Last-Translator: Lucas Montenegro \n" +"PO-Revision-Date: 2016-05-10 18:21+0000\n" +"Last-Translator: Diego Martínez \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.6-dev\n" +"X-Generator: Weblate 2.7-dev\n" #: builtin/fstk/ui.lua msgid "An error occured in a Lua script, such as a mod:" @@ -66,7 +66,6 @@ msgstr "" "a Internet." #: builtin/mainmenu/common.lua -#, fuzzy msgid "We only support protocol version $1." msgstr "Solo se soporta la versión de protocolo $1." @@ -216,7 +215,6 @@ msgid "(No description of setting given)" msgstr "(Ninguna descripción de ajuste dada)" #: builtin/mainmenu/dlg_settings_advanced.lua -#, fuzzy msgid "< Back to Settings page" msgstr "< Volver a la página de Configuración" @@ -414,9 +412,8 @@ msgid "Uninstall selected modpack" msgstr "Desinstalar el paquete seleccionado" #: builtin/mainmenu/tab_multiplayer.lua -#, fuzzy msgid "Address / Port" -msgstr "Dirección / puerto:" +msgstr "Dirección / puerto" #: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp msgid "Client" @@ -436,16 +433,15 @@ msgstr "Daño activado" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Del. Favorite" -msgstr "" +msgstr "Borrar Fav." #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "Favorite" -msgstr "" +msgstr "Favorito" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua -#, fuzzy msgid "Name / Password" -msgstr "Nombre / contraseña:" +msgstr "Nombre / contraseña" #: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" @@ -511,7 +507,6 @@ msgid "2x" msgstr "2x" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "3D Clouds" msgstr "Nubes 3D" @@ -536,12 +531,10 @@ msgid "Are you sure to reset your singleplayer world?" msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bilinear Filter" msgstr "Filtrado bilineal" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Bump Mapping" msgstr "Mapeado de relieve" @@ -550,9 +543,8 @@ msgid "Change keys" msgstr "Configurar teclas" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Connected Glass" -msgstr "Vidrio Encadenado" +msgstr "Vidrio Conectado" #: builtin/mainmenu/tab_settings.lua msgid "Fancy Leaves" @@ -579,21 +571,18 @@ msgid "No Mipmap" msgstr "Sin Mipmap" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Highlighting" -msgstr "Resaltado de los nodos" +msgstr "Resaltar nodos" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Node Outlining" -msgstr "Resaltado de los nodos" +msgstr "Marcar nodos" #: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua msgid "None" msgstr "Ninguno" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Normal Mapping" msgstr "Mapeado de relieve" @@ -610,9 +599,8 @@ msgid "Parallax Occlusion" msgstr "Oclusión de paralaje" #: builtin/mainmenu/tab_settings.lua -#, fuzzy msgid "Particles" -msgstr "Activar Partículas" +msgstr "Partículas" #: builtin/mainmenu/tab_settings.lua msgid "Settings" @@ -639,9 +627,8 @@ msgid "To enable shaders the OpenGL driver needs to be used." msgstr "Para habilitar los sombreadores debe utilizar el controlador OpenGL." #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp -#, fuzzy msgid "Tone Mapping" -msgstr "Mapeado de relieve" +msgstr "Mapeado de tonos" #: builtin/mainmenu/tab_settings.lua msgid "Touchthreshold (px)" @@ -1323,6 +1310,12 @@ msgid "" "sets.\n" "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes." msgstr "" +"Compensado (X,Y,Z) del ruido fractal en unidades de 'scale'.\n" +"Usado para mover un área plana adecuada para el inicio a (0, 0).\n" +"El valor predeterminado es adecuado para conjunts de Mandelbrot,\n" +"necesita ser editado para conjuntos de Julia.\n" +"El valor debe ser entre -2 y 2. Multiplicar por 'scale' para compensar en " +"nodos." #: src/settings_translation_file.cpp msgid "" @@ -1341,7 +1334,6 @@ msgid "3D mode" msgstr "Modo 3D" #: src/settings_translation_file.cpp -#, fuzzy msgid "" "3D support.\n" "Currently supported:\n" @@ -1354,11 +1346,11 @@ msgid "" msgstr "" "Soporte 3D.\n" "Soportado Actualmente:\n" -"- Ninguno: No hay salida 3D.\n" -"- Anaglifo: 3D para anteojos de colores cyan y magenta.\n" -"- Entrelazado: Filas pares e impares intercaladas.\n" -"- Superior-inferior: Partir pantalla horizontalmente.\n" -"- Lado a lado: Partir pantalla verticalmente." +"- Ninguno (none): No hay salida 3D.\n" +"- Anaglifo (anaglyph): 3D para anteojos de colores cyan y magenta.\n" +"- Entrelazado (interlaced): Filas pares e impares intercaladas.\n" +"- Superior-inferior (topbottom): Partir pantalla horizontalmente.\n" +"- Lado a lado (sidebyside): Partir pantalla verticalmente." #: src/settings_translation_file.cpp msgid "" @@ -1389,14 +1381,12 @@ msgid "Acceleration in air" msgstr "Aceleración en el aire" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Management interval" -msgstr "Rango de bloque activo" +msgstr "Intervalo de administración de bloques activos" #: src/settings_translation_file.cpp -#, fuzzy msgid "Active Block Modifier interval" -msgstr "Rango de bloque activo" +msgstr "Intervalo de modificador de bloques activos" #: src/settings_translation_file.cpp msgid "Active block range" @@ -1404,7 +1394,7 @@ msgstr "Rango de bloque activo" #: src/settings_translation_file.cpp msgid "Active object send range" -msgstr "" +msgstr "Alcance de objetos activos a enviar" #: src/settings_translation_file.cpp msgid "" @@ -1429,9 +1419,9 @@ msgid "" "Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n" "This setting is for the client only and is ignored by the server." msgstr "" -"Ajustar la codificación de gamma para las tablas de luz. Números bajos son " -"más luminosos.\n" -"Este ajuste es para el cliente sólo y está ignorado por el servidor." +"Ajustar la codificación gamma para las tablas de luz. Los números mas bajos " +"son mas brillantes.\n" +"Este ajuste es solo para el cliente y es ignorado por el servidor." #: src/settings_translation_file.cpp msgid "Advanced" @@ -1439,7 +1429,7 @@ msgstr "Avanzado" #: src/settings_translation_file.cpp msgid "Altitude Chill" -msgstr "" +msgstr "Altura de enfriamiento" #: src/settings_translation_file.cpp msgid "Always fly and fast" @@ -1451,7 +1441,7 @@ msgstr "Gamma de oclusión de ambiente" #: src/settings_translation_file.cpp msgid "Amplifies the valleys" -msgstr "" +msgstr "Amplificar valles" #: src/settings_translation_file.cpp msgid "Anisotropic filtering" @@ -1473,7 +1463,7 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Approximate (X,Y,Z) scale of fractal in nodes." -msgstr "" +msgstr "Escala aproximada (X,Y,Z) en nodos, de los fractales" #: src/settings_translation_file.cpp msgid "Ask to reconnect after crash" @@ -1488,18 +1478,16 @@ msgid "Backward key" msgstr "Tecla retroceso" #: src/settings_translation_file.cpp -#, fuzzy msgid "Base terrain height" -msgstr "Oleaje en el agua" +msgstr "Altura base del terreno" #: src/settings_translation_file.cpp msgid "Basic" msgstr "Básico" #: src/settings_translation_file.cpp -#, fuzzy msgid "Basic Privileges" -msgstr "Privilegios por defecto" +msgstr "Privilegios básicos" #: src/settings_translation_file.cpp msgid "Bilinear filtering" @@ -1537,19 +1525,19 @@ msgstr "Tecla alternativa para la actualización de la cámara" #: src/settings_translation_file.cpp msgid "Cave noise #1" -msgstr "" +msgstr "Ruido de cueva Nº1" #: src/settings_translation_file.cpp msgid "Cave noise #2" -msgstr "" +msgstr "Ruido de cueva Nº2" #: src/settings_translation_file.cpp msgid "Cave width" -msgstr "" +msgstr "Anchura de cueva" #: src/settings_translation_file.cpp msgid "Caves and tunnels form at the intersection of the two noises" -msgstr "" +msgstr "Formar cuevas y túneles en la intersección de dos ruidos" #: src/settings_translation_file.cpp msgid "Chat key" @@ -1581,6 +1569,25 @@ msgid "" "17 = 4D \"Mandelbulb\" mandelbrot set.\n" "18 = 4D \"Mandelbulb\" julia set." msgstr "" +"Elección de 18 fractales desde 9 fórmulas.\n" +"1 = Conjunto de Mandelbrot 4D \"Redondo\".\n" +"2 = Conjunto de Julia 4D \"Redondo\".\n" +"3 = Conjunto de Mandelbrot 4D \"Cuadrado\".\n" +"4 = Conjunto de Julia 4D \"Cuadrado\".\n" +"5 = Conjunto de Mandelbrot 4D \"Mandy Cousin\".\n" +"6 = Conjunto de Julia 4D \"Mandy Cousin\".\n" +"7 = Conjunto de Mandelbrot 4D \"Variado\".\n" +"8 = Conjunto de Julia 4D \"Variado\".\n" +"9 = Conjunto de Mandelbrot 3D \"Mandelbrot/Mandelbar\".\n" +"10 = Conjunto de Julia 3D \"Mandelbrot/Mandelbar\".\n" +"11 = Conjunto de Mandelbrot 3D \"Árbol de Navidad\".\n" +"12 = Conjunto de Julia 3D \"Árbol de Navidad\".\n" +"13 = Conjunto de Mandelbrot 3D \"Mandelbulb\".\n" +"14 = Conjunto de Julia 3D \"Mandelbulb\".\n" +"15 = Conjunto de Mandelbrot 3D \"Mandelbulb Coseno\".\n" +"16 = Conjunto de Julia 3D \"Mandelbulb Coseno\".\n" +"17 = Conjunto de Mandelbrot 4D \"Mandelbulb\".\n" +"18 = Conjunto de Julia 4D \"Mandelbulb\"." #: src/settings_translation_file.cpp msgid "Chunk size" @@ -1644,6 +1651,10 @@ msgid "" "Comma-seperated list of mods that are allowed to access HTTP APIs, which\n" "allow them to upload and download data to/from the internet." msgstr "" +"Lista separada por comas de los mods a los que se les permite usar las\n" +"interfaces de HTTP, las cuales permiten cargar y descargar datos desde/" +"hacia\n" +"la Internet." #: src/settings_translation_file.cpp msgid "Command key" @@ -1705,15 +1716,16 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Controls steepness/depth of lake depressions." -msgstr "" +msgstr "Controla lo escarpado/profundo de las depresiones." #: src/settings_translation_file.cpp msgid "Controls steepness/height of hills." -msgstr "" +msgstr "Controla lo escarpado/alto de las colinas." #: src/settings_translation_file.cpp msgid "Controls width of tunnels, a smaller value creates wider tunnels." msgstr "" +"Controla el ancho de los túneles, un valor menor crea túneles más anchos." #: src/settings_translation_file.cpp msgid "Crash message" @@ -1724,20 +1736,24 @@ msgid "" "Creates unpredictable lava features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crea características de lava impredecibles en cuevas.\n" +"Pueden hacer la minería más difícil. Cero lo deshabilita. (0-10)" #: src/settings_translation_file.cpp msgid "" "Creates unpredictable water features in caves.\n" "These can make mining difficult. Zero disables them. (0-10)" msgstr "" +"Crea características de agua impredecibles en cuevas.\n" +"Pueden hacer la minería más difícil. Cero lo deshabilita. (0-10)" #: src/settings_translation_file.cpp msgid "Crosshair alpha" -msgstr "" +msgstr "Opacidad de punto de mira" #: src/settings_translation_file.cpp msgid "Crosshair alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Alfa del punto de mira (opacidad, entre 0 y 255)." #: src/settings_translation_file.cpp msgid "Crosshair color" @@ -1748,9 +1764,8 @@ msgid "Crosshair color (R,G,B)." msgstr "Color de la cruz (R,G,B)." #: src/settings_translation_file.cpp -#, fuzzy msgid "Crouch speed" -msgstr "Velocidad de agacharse" +msgstr "Velocidad al agacharse" #: src/settings_translation_file.cpp msgid "DPI" @@ -1766,11 +1781,11 @@ msgstr "Tecla alternativa para la información de la depuración" #: src/settings_translation_file.cpp msgid "Debug log level" -msgstr "" +msgstr "Nivel de registro de depuración" #: src/settings_translation_file.cpp msgid "Dedicated server step" -msgstr "" +msgstr "Intervalo de servidor dedicado" #: src/settings_translation_file.cpp msgid "Default acceleration" @@ -1785,6 +1800,8 @@ msgid "" "Default game when creating a new world.\n" "This will be overridden when creating a world from the main menu." msgstr "" +"Juego predeterminado al crear un nuevo mundo.\n" +"Será sobreescrito al crear un mundo desde el menú principal." #: src/settings_translation_file.cpp msgid "Default password" @@ -1799,54 +1816,63 @@ msgid "" "Default timeout for cURL, stated in milliseconds.\n" "Only has an effect if compiled with cURL." msgstr "" +"Tiempo de espera predeterminado para cURL, en milisegundos.\n" +"Sólo tiene efecto si está compilado con cURL." #: src/settings_translation_file.cpp msgid "" "Defines sampling step of texture.\n" "A higher value results in smoother normal maps." msgstr "" +"Define el intervalo de muestreo de las texturas.\n" +"Un valor más alto causa mapas de relieve más suaves." #: src/settings_translation_file.cpp msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)." msgstr "" +"Define la distancia máxima de envío de jugadores, en bloques (0 = sin " +"límite)." #: src/settings_translation_file.cpp msgid "Delay showing tooltips, stated in milliseconds." -msgstr "" +msgstr "Demora para mostrar información sobre herramientas, en milisegundos." #: src/settings_translation_file.cpp msgid "Deprecated Lua API handling" -msgstr "" +msgstr "Manejo de funciones de Lua obsoletas" #: src/settings_translation_file.cpp msgid "Depth below which you'll find large caves." -msgstr "" +msgstr "Profundidad en la cual comienzan las grandes cuevas." #: src/settings_translation_file.cpp msgid "Depth below which you'll find massive caves." -msgstr "" +msgstr "Profundidad en la cual comienzan cuevas enormes." #: src/settings_translation_file.cpp msgid "Descending speed" -msgstr "" +msgstr "Velocidad de descenso" #: src/settings_translation_file.cpp msgid "" "Description of server, to be displayed when players join and in the " "serverlist." msgstr "" +"Descripción del servidor, que se muestra cuando los jugadores se unen, y en\n" +"la lista de servidores." #: src/settings_translation_file.cpp msgid "Desynchronize block animation" -msgstr "" +msgstr "Desincronizar animación de bloques" #: src/settings_translation_file.cpp msgid "Detailed mod profile data. Useful for mod developers." msgstr "" +"Datos detallados de perfilación de mod. Útil para desarrolladores de mods." #: src/settings_translation_file.cpp msgid "Detailed mod profiling" -msgstr "" +msgstr "Perfilador detallado de los mods" #: src/settings_translation_file.cpp msgid "" @@ -1854,6 +1880,9 @@ msgid "" "The 3 numbers in brackets control the scale of the\n" "terrain, the 3 numbers should be identical." msgstr "" +"Determina la forma del terreno.\n" +"Los tres números entre paréntesis controlan la escala\n" +"del terreno, y deben ser iguales." #: src/settings_translation_file.cpp msgid "Disable anticheat" @@ -1861,11 +1890,12 @@ msgstr "Desactivar Anticheat" #: src/settings_translation_file.cpp msgid "Disallow empty passwords" -msgstr "" +msgstr "No permitir contraseñas vacías" #: src/settings_translation_file.cpp msgid "Domain name of server, to be displayed in the serverlist." msgstr "" +"Nombre de dominio del servidor, será mostrado en la lista de servidores." #: src/settings_translation_file.cpp msgid "Double tap jump for fly" @@ -1877,16 +1907,15 @@ msgstr "Pulsar dos veces \"saltar\" alterna el modo vuelo." #: src/settings_translation_file.cpp msgid "Drop item key" -msgstr "" +msgstr "Tecla de \"Soltar objeto\"" #: src/settings_translation_file.cpp msgid "Dump the mapgen debug infos." -msgstr "" +msgstr "Imprimir información de depuración del generador de mapas." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enable VBO" -msgstr "Activar paquete" +msgstr "Activar VBO" #: src/settings_translation_file.cpp msgid "Enable mod security" @@ -1894,17 +1923,19 @@ msgstr "Activar seguridad de mods" #: src/settings_translation_file.cpp msgid "Enable players getting damage and dying." -msgstr "" +msgstr "Habilitar daños y muerte de jugadores." #: src/settings_translation_file.cpp msgid "Enable random user input (only used for testing)." -msgstr "" +msgstr "Habilitar entrada aleatoria (solo usar para pruebas)." #: src/settings_translation_file.cpp msgid "" "Enable smooth lighting with simple ambient occlusion.\n" "Disable for speed or for different looks." msgstr "" +"Habilita iluminación suave con oclusión ambiental simple.\n" +"Deshabilítalo para mayor velocidad o una vista diferente." #: src/settings_translation_file.cpp msgid "" @@ -1914,6 +1945,10 @@ msgid "" "to new servers, but they may not support all new features that you are " "expecting." msgstr "" +"Habilitar para no permitir que clientes antíguos se conecten.\n" +"Los clientes antíguos son compatibles al punto de conectarse a nueos " +"servidores,\n" +"pero pueden no soportar nuevas características." #: src/settings_translation_file.cpp msgid "" @@ -1922,6 +1957,9 @@ msgid "" "textures)\n" "when connecting to the server." msgstr "" +"Habilita el uso de un servidor remoto de medios (si lo provee el servidor).\n" +"Servidores remotos ofrecen una manera significativamente más rápida de\n" +"descargar medios (por ej. texturas) cuando se conecta a un servidor." #: src/settings_translation_file.cpp msgid "" @@ -1929,10 +1967,13 @@ msgid "" "to IPv6 clients, depending on system configuration.\n" "Ignored if bind_address is set." msgstr "" +"Habilita/deshabilita ejecutar un servidor IPv6. Un servidor IPv6 puede ser\n" +"restringido a clientes IPv6, dependiendo de la configuración del sistema.\n" +"Ignorado si 'bind_address' está configurado." #: src/settings_translation_file.cpp msgid "Enables animation of inventory items." -msgstr "" +msgstr "Habilita la animación de objetos en el inventario." #: src/settings_translation_file.cpp msgid "" @@ -1941,15 +1982,18 @@ msgid "" "or need to be auto-generated.\n" "Requires shaders to be enabled." msgstr "" +"Habilita mapeado de relieves para las texturas. El mapeado de normales " +"necesita ser\n" +"suministrados por el paquete de texturas, o será generado automaticamente.\n" +"Requiere habilitar sombreadores." #: src/settings_translation_file.cpp msgid "Enables caching of facedir rotated meshes." -msgstr "" +msgstr "Habilitar cacheado de mallas giradas." #: src/settings_translation_file.cpp -#, fuzzy msgid "Enables filmic tone mapping" -msgstr "Activar mini-mapa." +msgstr "Habilita el mapeado de tonos fílmico" #: src/settings_translation_file.cpp msgid "Enables minimap." @@ -1960,22 +2004,29 @@ msgid "" "Enables on the fly normalmap generation (Emboss effect).\n" "Requires bumpmapping to be enabled." msgstr "" +"Habilita la generación de mapas de normales (efecto realzado) en el momento." +"\n" +"Requiere habilitar mapeado de relieve." #: src/settings_translation_file.cpp msgid "" "Enables parallax occlusion mapping.\n" "Requires shaders to be enabled." msgstr "" +"Habilita mapeado de oclusión de paralaje.\n" +"Requiere habilitar sombreadores." #: src/settings_translation_file.cpp msgid "" "Experimental option, might cause visible spaces between blocks\n" "when set to higher number than 0." msgstr "" +"Opción experimental, puede causar espacios visibles entre los\n" +"bloques si se le da un valor mayor a 0." #: src/settings_translation_file.cpp msgid "FPS in pause menu" -msgstr "" +msgstr "FPS (cuadros/s) en el menú de pausa" #: src/settings_translation_file.cpp msgid "FSAA" @@ -1983,68 +2034,71 @@ msgstr "" #: src/settings_translation_file.cpp msgid "Fall bobbing" -msgstr "" +msgstr "Movimiento de cámara al caer" #: src/settings_translation_file.cpp -#, fuzzy msgid "Fallback font" -msgstr "needs_fallback_font" +msgstr "Fuente de reserva" #: src/settings_translation_file.cpp msgid "Fallback font shadow" -msgstr "" +msgstr "Sombra de fuente de reserva" #: src/settings_translation_file.cpp msgid "Fallback font shadow alpha" -msgstr "" +msgstr "Alfa de sombra de fuente de reserva" #: src/settings_translation_file.cpp msgid "Fallback font size" -msgstr "" +msgstr "Tamaño de fuente de reserva" #: src/settings_translation_file.cpp msgid "Fast key" -msgstr "" +msgstr "Tecla de \"Rápido\"" #: src/settings_translation_file.cpp msgid "Fast mode acceleration" -msgstr "" +msgstr "Aceleración del modo rápido" #: src/settings_translation_file.cpp msgid "Fast mode speed" -msgstr "" +msgstr "Velocidad del modo rápido" #: src/settings_translation_file.cpp msgid "Fast movement" -msgstr "" +msgstr "Movimiento rápido" #: src/settings_translation_file.cpp msgid "" "Fast movement (via use key).\n" "This requires the \"fast\" privilege on the server." msgstr "" +"Movimiento rápido (por medio de tecla de \"Uso\").\n" +"Requiere privilegio \"fast\" (rápido) en el servidor." #: src/settings_translation_file.cpp msgid "Field of view" -msgstr "" +msgstr "Campo visual" #: src/settings_translation_file.cpp msgid "Field of view in degrees." -msgstr "" +msgstr "Campo visual en grados." #: src/settings_translation_file.cpp msgid "" "File in client/serverlist/ that contains your favorite servers displayed in " "the Multiplayer Tab." msgstr "" +"Fichero en client/serverlist/ que contiene sus servidores favoritos que se " +"mostrarán en la página de Multijugador." #: src/settings_translation_file.cpp msgid "Filler Depth" -msgstr "" +msgstr "Profundidad del relleno" #: src/settings_translation_file.cpp msgid "Filmic tone mapping" -msgstr "" +msgstr "Mapa de tonos fílmico" #: src/settings_translation_file.cpp msgid "" @@ -2053,6 +2107,11 @@ msgid "" "light edge to transparent textures. Apply this filter to clean that up\n" "at texture load time." msgstr "" +"Las texturas filtradas pueden mezclar los valores RGB de los vecinos\n" +"completamete tranparentes, los cuales los optimizadores de ficheros\n" +"PNG usualmente descartan, lo que a veces resulta en un borde claro u\n" +"oscuro en las texturas transparentes. Aplica éste filtro para limpiar ésto\n" +"al cargar las texturas." #: src/settings_translation_file.cpp msgid "Filtering" @@ -2060,7 +2119,7 @@ msgstr "Filtrado" #: src/settings_translation_file.cpp msgid "Fixed map seed" -msgstr "" +msgstr "Semilla de mapa fija" #: src/settings_translation_file.cpp msgid "Fly key" @@ -2068,43 +2127,43 @@ msgstr "Tecla vuelo" #: src/settings_translation_file.cpp msgid "Flying" -msgstr "" +msgstr "Volar" #: src/settings_translation_file.cpp msgid "Fog" -msgstr "" +msgstr "Niebla" #: src/settings_translation_file.cpp msgid "Fog toggle key" -msgstr "" +msgstr "Tecla para alternar niebla" #: src/settings_translation_file.cpp msgid "Font path" -msgstr "" +msgstr "Ruta de fuentes" #: src/settings_translation_file.cpp msgid "Font shadow" -msgstr "" +msgstr "Sombra de fuentes" #: src/settings_translation_file.cpp msgid "Font shadow alpha" -msgstr "" +msgstr "Alfa de sombra de fuentes" #: src/settings_translation_file.cpp msgid "Font shadow alpha (opaqueness, between 0 and 255)." -msgstr "" +msgstr "Alfa de sombra de fuentes (opacidad, entre 0 y 255)." #: src/settings_translation_file.cpp msgid "Font shadow offset, if 0 then shadow will not be drawn." -msgstr "" +msgstr "Compensado de sombra de fuente, si es 0 no se dibujará la sombra." #: src/settings_translation_file.cpp msgid "Font size" -msgstr "" +msgstr "Tamaño de fuente" #: src/settings_translation_file.cpp msgid "Format of screenshots." -msgstr "" +msgstr "Formato de capturas de pantalla." #: src/settings_translation_file.cpp msgid "Forward key" @@ -2112,48 +2171,53 @@ msgstr "Tecla Avanzar" #: src/settings_translation_file.cpp msgid "Freetype fonts" -msgstr "" +msgstr "Fuentes Freetype" #: src/settings_translation_file.cpp msgid "" "From how far blocks are generated for clients, stated in mapblocks (16 " "nodes)." msgstr "" +"Desde cuán lejos se generan los bloques para los clientes, especificado\n" +"en bloques de mapa (mapblocks, 16 nodos)." #: src/settings_translation_file.cpp msgid "" "From how far blocks are sent to clients, stated in mapblocks (16 nodes)." msgstr "" +"Desde cuán lejos se envían bloques a los clientes, especificado en\n" +"bloques de mapa (mapblocks, 16 nodos)." #: src/settings_translation_file.cpp msgid "" "From how far clients know about objects, stated in mapblocks (16 nodes)." msgstr "" +"Desde cuán lejos los clientes saben acerca de otros objetos,\n" +"especificado en bloques de mapa (mapblocks, 16 nodos)." #: src/settings_translation_file.cpp msgid "Full screen" -msgstr "" +msgstr "Pantalla completa" #: src/settings_translation_file.cpp msgid "Full screen BPP" -msgstr "" +msgstr "Profundidad de color en pantalla completa" #: src/settings_translation_file.cpp msgid "Fullscreen mode." -msgstr "" +msgstr "Modo de pantalla completa." #: src/settings_translation_file.cpp msgid "GUI scaling" -msgstr "" +msgstr "Escala de IGU" #: src/settings_translation_file.cpp -#, fuzzy msgid "GUI scaling filter" -msgstr "Factor de escala (GUI)" +msgstr "Filtro de escala de IGU" #: src/settings_translation_file.cpp msgid "GUI scaling filter txr2img" -msgstr "" +msgstr "Filtro de escala de IGU \"txr2img\"" #: src/settings_translation_file.cpp msgid "Gamma" From 5d9b6aaa03fb326073b1d70645a5c08f10b7e461 Mon Sep 17 00:00:00 2001 From: Johnny Date: Tue, 10 May 2016 14:28:45 -0700 Subject: [PATCH 516/531] README: Update Fedora dependencies list Edited packages to reflect correct packages --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 86536f6a..9ca9b331 100644 --- a/README.txt +++ b/README.txt @@ -106,7 +106,7 @@ Install dependencies. Here's an example for Debian/Ubuntu: $ sudo apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev For Fedora users: -$ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal* libvorbis* libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-dev bzip2-dev +$ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal* libvorbis* libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-devel bzip2-devel You can install git for easily keeping your copy up to date. If you dont want git, read below on how to get the source without git. From ebe638c32db2fb29886a5ae82c7726afad4c0010 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 10 May 2016 22:06:03 -0400 Subject: [PATCH 517/531] Mapgen V6: Synchronize spflags with defaultsettings This fixes an issue where trees are omitted from Mapgen V6 maps on configurations that explicitly defined the mgv6_spflags setting. --- src/defaultsettings.cpp | 3 +-- src/mapgen_v6.cpp | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 1536aed0..e8b652c1 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -180,7 +180,7 @@ void set_default_settings(Settings *settings) settings->setDefault("enable_particles", "true"); settings->setDefault("enable_mesh_cache", "false"); settings->setDefault("enable_vbo", "true"); - + settings->setDefault("enable_minimap", "true"); settings->setDefault("minimap_shape_round", "true"); settings->setDefault("minimap_double_scan_height", "true"); @@ -319,7 +319,6 @@ void set_default_settings(Settings *settings) settings->setDefault("water_level", "1"); settings->setDefault("chunksize", "5"); settings->setDefault("mg_flags", "dungeons"); - settings->setDefault("mgv6_spflags", "jungles, snowbiomes, trees"); // IPv6 settings->setDefault("enable_ipv6", "true"); diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index e24083cf..c389b2ed 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -140,7 +140,9 @@ MapgenV6::~MapgenV6() MapgenV6Params::MapgenV6Params() { - spflags = MGV6_BIOMEBLEND | MGV6_MUDFLOW; + spflags = MGV6_JUNGLES | MGV6_SNOWBIOMES | MGV6_TREES | + MGV6_BIOMEBLEND | MGV6_MUDFLOW; + freq_desert = 0.45; freq_beach = 0.15; From 58b54cf9a97221a2457b8a5cf3816be4490848a5 Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Wed, 11 May 2016 17:15:41 +1000 Subject: [PATCH 518/531] Add platform name to --version information --- src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 72daaef0..7f11c6b4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -344,7 +344,8 @@ static void print_allowed_options(const OptionList &allowed_options) static void print_version() { - std::cout << PROJECT_NAME_C " " << g_version_hash << std::endl; + std::cout << PROJECT_NAME_C " " << g_version_hash + << "(" << porting::getPlatformName() << ") " << std::endl; #ifndef SERVER std::cout << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl; #endif From 8bb9e467d6d0f284db45431de881690d72e9336f Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Wed, 11 May 2016 23:20:20 +1000 Subject: [PATCH 519/531] Fix typo in the info printed by --version --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 7f11c6b4..1b95a9f1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -345,7 +345,7 @@ static void print_allowed_options(const OptionList &allowed_options) static void print_version() { std::cout << PROJECT_NAME_C " " << g_version_hash - << "(" << porting::getPlatformName() << ") " << std::endl; + << " (" << porting::getPlatformName() << ")" << std::endl; #ifndef SERVER std::cout << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl; #endif From a9b5c2662fca2e38ccafe2bd8be675ef0a98ffdc Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 12 May 2016 00:52:29 +0200 Subject: [PATCH 520/531] Android: update openssl to 1.0.2h --- build/android/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/android/Makefile b/build/android/Makefile index f3a18189..e8614365 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -91,7 +91,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) -OPENSSL_VERSION = 1.0.2g +OPENSSL_VERSION = 1.0.2h OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 From 997002703be14826b73a38bfd0e92e6b0c7c4bfd Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 12 May 2016 02:11:27 +0200 Subject: [PATCH 521/531] Android: download deps using https Its more secure, and some pages even redirect to the https version. --- build/android/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index e8614365..4ac9760f 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -89,7 +89,7 @@ IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/ IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp -IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) +IRRLICHT_URL_SVN = https://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION) OPENSSL_VERSION = 1.0.2h OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION) @@ -97,14 +97,14 @@ OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/ OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp OPENSSL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/openssl_timestamp -OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz +OPENSSL_URL = https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz CURL_VERSION = 7.48.0 CURL_DIR = $(ANDR_ROOT)/deps/curl-$(CURL_VERSION) CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a CURL_TIMESTAMP = $(CURL_DIR)/timestamp CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp -CURL_URL_HTTP = http://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 +CURL_URL_HTTP = https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.bz2 GMP_VERSION = 6.1.0 GMP_DIR = $(ANDR_ROOT)/deps/gmp-$(GMP_VERSION) @@ -124,10 +124,10 @@ ICONV_DIR = $(ANDR_ROOT)/deps/libiconv/ ICONV_LIB = $(ICONV_DIR)/lib/.libs/libiconv.so ICONV_TIMESTAMP = $(ICONV_DIR)timestamp ICONV_TIMESTAMP_INT = $(ANDR_ROOT)/deps/iconv_timestamp -ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz +ICONV_URL_HTTP = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz SQLITE3_FOLDER = sqlite-amalgamation-3120200 -SQLITE3_URL = http://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip +SQLITE3_URL = https://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip ANDROID_SDK = $(shell grep '^sdk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') ANDROID_NDK = $(shell grep '^ndk\.dir' local.properties | sed 's/^.*=[[:space:]]*//') From 9d3d43f3340030db8855ebc394e969f10d00dc30 Mon Sep 17 00:00:00 2001 From: Rui Date: Fri, 13 May 2016 01:38:29 +1000 Subject: [PATCH 522/531] Fix #4111 ("Provided world path doesn't exist" if choosing singleplayer on first run") Bug and whitespace error fixed (Zeno) --- builtin/mainmenu/init.lua | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 6dd345ff..7f0c1e38 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -77,13 +77,28 @@ local function init_globals() if PLATFORM == "Android" then local world_list = core.get_worlds() - local world_index = table.indexof(world_list, "singleplayerworld") + local world_index - if world_index == -1 then + local found_singleplayerworld = false + for i, world in ipairs(world_list) do + if world.name == "singleplayerworld" then + found_singleplayerworld = true + world_index = i + break + end + end + + if not found_singleplayerworld then core.create_world("singleplayerworld", 1) world_list = core.get_worlds() - world_index = table.indexof(world_list, "singleplayerworld") + + for i, world in ipairs(world_list) do + if world.name == "singleplayerworld" then + world_index = i + break + end + end end gamedata.worldindex = world_index From ec15e35ad7effe54d04c0d34ead3bc63d0e311f1 Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 13 May 2016 02:22:31 +0200 Subject: [PATCH 523/531] Mainmenu: don't show change keys dialog on android The change keys dialog can't be left. It doesn't make much sense to show it on Android in the first place, therefore disable it, just like commit aed70cb0b652d6cb2272e7b94cd56671b3df6239 'Disable sound and key binding settings in "pause" menu on android' has disabled it for the esc menu. Fixes #4115. --- builtin/mainmenu/tab_settings.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 2649a8a5..b9f2453a 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -203,9 +203,15 @@ local function formspec(tabview, name, tabdata) "checkbox[8,0;cb_shaders;" .. fgettext("Shaders") .. ";" .. dump(core.setting_getbool("enable_shaders")) .. "]" + if PLATFORM ~= "Android" then + tab_string = tab_string .. + "button[8,4.75;3.75,0.5;btn_change_keys;" + .. fgettext("Change keys") .. "]" + end + tab_string = tab_string .. - "button[8,4.75;3.75,0.5;btn_change_keys;" .. fgettext("Change keys") .. "]" .. - "button[0,4.75;3.75,0.5;btn_advanced_settings;" .. fgettext("Advanced Settings") .. "]" + "button[0,4.75;3.75,0.5;btn_advanced_settings;" + .. fgettext("Advanced Settings") .. "]" if core.setting_get("touchscreen_threshold") ~= nil then From b906ed4e5902785ab6f15012666e344c98fabe14 Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Sat, 14 May 2016 23:35:56 +1000 Subject: [PATCH 524/531] Fix locked hardware buttons on Android Fixes #2122 Fixes #1454 Addendum (est31) According from its docs in android_native_app_glue.h (from the NDK), the onInputEvent should "Return 1 if you have handled the event, 0 for any default dispatching". Before, we always returned 1, meaning we blocked all hardware keys to be given to the OS. This broke the volume keys and has caused #2122 and #1454. Although it bases on lots of guesswork, it can probably safely be said that CGUIEnvironment::postEventFromUser returns true if the event was handled, and false if not. Therefore, set the status variable depending on what postEventFromUser returned. --- .../patches/irrlicht-back_button.patch | 23 ++++++++++--------- .../MtNativeActivity.java | 4 ++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/build/android/patches/irrlicht-back_button.patch b/build/android/patches/irrlicht-back_button.patch index 227749ba..de567adc 100644 --- a/build/android/patches/irrlicht-back_button.patch +++ b/build/android/patches/irrlicht-back_button.patch @@ -1,14 +1,15 @@ ---- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp 2014-06-03 20:56:21.289559503 +0200 -+++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig 2014-06-03 20:57:39.281556749 +0200 -@@ -423,6 +423,7 @@ - } - - device->postEventFromUser(event); -+ status = 1; - } - break; - default: -@@ -479,7 +480,7 @@ +--- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig 2015-08-29 15:43:09.000000000 +0300 ++++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp 2016-05-13 21:36:22.880388505 +0300 +@@ -486,7 +486,7 @@ + event.KeyInput.Char = 0; + } + +- device->postEventFromUser(event); ++ status = device->postEventFromUser(event); + } + break; + default: +@@ -543,7 +543,7 @@ KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT KeyMap[3] = KEY_HOME; // AKEYCODE_HOME diff --git a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java index fc95a837..3173a71f 100644 --- a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java +++ b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java @@ -19,6 +19,10 @@ public class MtNativeActivity extends NativeActivity { public void onDestroy() { super.onDestroy(); } + + @Override + public void onBackPressed() { + } public void copyAssets() { From b25554c8d7260cdac6551c69900b78e24b0b48eb Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 14 May 2016 16:46:46 +0200 Subject: [PATCH 525/531] Fix android build by fixing patch line endings --- build/android/patches/irrlicht-back_button.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/android/patches/irrlicht-back_button.patch b/build/android/patches/irrlicht-back_button.patch index de567adc..e17b8134 100644 --- a/build/android/patches/irrlicht-back_button.patch +++ b/build/android/patches/irrlicht-back_button.patch @@ -1,14 +1,14 @@ --- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig 2015-08-29 15:43:09.000000000 +0300 +++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp 2016-05-13 21:36:22.880388505 +0300 @@ -486,7 +486,7 @@ - event.KeyInput.Char = 0; - } - -- device->postEventFromUser(event); -+ status = device->postEventFromUser(event); - } - break; - default: + event.KeyInput.Char = 0; + } + +- device->postEventFromUser(event); ++ status = device->postEventFromUser(event); + } + break; + default: @@ -543,7 +543,7 @@ KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT From c65e7a9b3edbd1f42e7478acdb02252e3c2237ec Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 14 May 2016 22:12:38 +0200 Subject: [PATCH 526/531] Android: Re-add button to remove singleplayer world Fixes #4120. --- builtin/mainmenu/tab_settings.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index b9f2453a..af8df0cc 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -203,7 +203,11 @@ local function formspec(tabview, name, tabdata) "checkbox[8,0;cb_shaders;" .. fgettext("Shaders") .. ";" .. dump(core.setting_getbool("enable_shaders")) .. "]" - if PLATFORM ~= "Android" then + if PLATFORM == "Android" then + tab_string = tab_string .. + "button[8,4.75;3.75,0.5;btn_reset_singleplayer;" + .. fgettext("Reset singleplayer world") .. "]" + else tab_string = tab_string .. "button[8,4.75;3.75,0.5;btn_change_keys;" .. fgettext("Change keys") .. "]" From 854d9e3745304f5f420805818de99e5e6d1b2596 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 15 May 2016 14:49:15 +0200 Subject: [PATCH 527/531] Bump version to 0.4.14 --- CMakeLists.txt | 4 ++-- build/android/build.gradle | 2 +- doc/lua_api.txt | 2 +- doc/menu_lua_api.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f853f4d..998cdc9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,11 +13,11 @@ set(PROJECT_NAME_CAPITALIZED "Minetest") # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing set(VERSION_MAJOR 0) set(VERSION_MINOR 4) -set(VERSION_PATCH 13) +set(VERSION_PATCH 14) set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") # Change to false for releases -set(DEVELOPMENT_BUILD TRUE) +set(DEVELOPMENT_BUILD FALSE) set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") if(VERSION_EXTRA) diff --git a/build/android/build.gradle b/build/android/build.gradle index 3ce11bec..391e250a 100644 --- a/build/android/build.gradle +++ b/build/android/build.gradle @@ -14,7 +14,7 @@ android { buildToolsVersion "23.0.3" defaultConfig { - versionCode 13 + versionCode 14 versionName "${System.env.VERSION_STR}.${versionCode}" minSdkVersion 9 targetSdkVersion 9 diff --git a/doc/lua_api.txt b/doc/lua_api.txt index e9ace5c8..593e0c43 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1,4 +1,4 @@ -Minetest Lua Modding API Reference 0.4.13 +Minetest Lua Modding API Reference 0.4.14 ========================================= * More information at * Developer Wiki: diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt index c995b4c5..ac8713a3 100644 --- a/doc/menu_lua_api.txt +++ b/doc/menu_lua_api.txt @@ -1,4 +1,4 @@ -Minetest Lua Mainmenu API Reference 0.4.13 +Minetest Lua Mainmenu API Reference 0.4.14 ======================================== Introduction From fb31bd3806c56b467dbaaf4dba26aaff4224fdc6 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 15 May 2016 14:49:15 +0200 Subject: [PATCH 528/531] Continue with 0.4.14-dev --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 998cdc9a..592feb99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(VERSION_PATCH 14) set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") # Change to false for releases -set(DEVELOPMENT_BUILD FALSE) +set(DEVELOPMENT_BUILD TRUE) set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") if(VERSION_EXTRA) From 01a784bd11d833724fdf826d805429d3a6f7b1f5 Mon Sep 17 00:00:00 2001 From: paramat Date: Thu, 12 May 2016 04:39:05 +0100 Subject: [PATCH 529/531] Documentation: Remove incorrect and excessive mapgen flags text --- builtin/settingtypes.txt | 10 ---------- minetest.conf.example | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index ad269d8b..93fb8e95 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -848,8 +848,6 @@ map_generation_limit (Map generation limit) int 31000 0 31000 # Global map generation attributes. # In Mapgen v6 the 'decorations' flag controls all decorations except trees # and junglegrass, in all other mapgens this flag controls all decorations. -# The default flags set in the engine are: caves, light, decorations -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. mg_flags (Mapgen flags) flags caves,dungeons,light,decorations caves,dungeons,light,decorations,nocaves,nodungeons,nolight,nodecorations @@ -910,8 +908,6 @@ mgv5_np_cave2 (Mapgen v5 cave2 noise parameters) noise_params 0, 12, (50, 50, 50 # Map generation attributes specific to Mapgen v6. # When snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored. -# The default flags set in the engine are: biomeblend, mudflow -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. mgv6_spflags (Mapgen v6 flags) flags jungles,biomeblend,mudflow,snowbiomes,trees jungles,biomeblend,mudflow,snowbiomes,flat,trees,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees @@ -937,8 +933,6 @@ mgv6_np_apple_trees (Mapgen v6 apple trees noise parameters) noise_params 0, 1, # Map generation attributes specific to Mapgen v7. # The 'ridges' flag controls the rivers. -# The default flags set in the engine are: mountains, ridges -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountains,noridges @@ -962,8 +956,6 @@ mgv7_np_cave2 (Mapgen v7 cave2 noise parameters) noise_params 0, 12, (100, 100, # Map generation attributes specific to Mapgen flat. # Occasional lakes and hills can be added to the flat world. -# The default flags set in the engine are: none -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. mgflat_spflags (Mapgen flat flags) flags lakes,hills,,nolakes,nohills @@ -1079,8 +1071,6 @@ mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, ( # 'altitude_chill' makes higher elevations colder, which may cause biome issues. # 'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool, # it may interfere with delicately adjusted biomes. -# The default flags set in the engine are: altitude_chill, humid_rivers -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. mg_valleys_spflags (Valleys C Flags) flags altitude_chill,humid_rivers altitude_chill,noaltitude_chill,humid_rivers,nohumid_rivers diff --git a/minetest.conf.example b/minetest.conf.example index 5090a620..a5ca16e5 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1046,8 +1046,6 @@ # Global map generation attributes. # In Mapgen v6 the 'decorations' flag controls all decorations except trees # and junglegrass, in all other mapgens this flag controls all decorations. -# The default flags set in the engine are: caves, light, decorations -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: caves, dungeons, light, decorations, nocaves, nodungeons, nolight, nodecorations @@ -1121,8 +1119,6 @@ # Map generation attributes specific to Mapgen v6. # When snowbiomes are enabled jungles are automatically enabled, the 'jungles' flag is ignored. -# The default flags set in the engine are: biomeblend, mudflow -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, trees, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat, notrees @@ -1173,8 +1169,6 @@ # Map generation attributes specific to Mapgen v7. # The 'ridges' flag controls the rivers. -# The default flags set in the engine are: mountains, ridges -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: mountains, ridges, nomountains, noridges @@ -1221,8 +1215,6 @@ # Map generation attributes specific to Mapgen flat. # Occasional lakes and hills can be added to the flat world. -# The default flags set in the engine are: none -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: lakes, hills, , nolakes, nohills @@ -1367,8 +1359,6 @@ # 'altitude_chill' makes higher elevations colder, which may cause biome issues. # 'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool, # it may interfere with delicately adjusted biomes. -# The default flags set in the engine are: altitude_chill, humid_rivers -# The flags string modifies the engine defaults. # Flags that are not specified in the flag string are not modified from the default. # Flags starting with 'no' are used to explicitly disable them. # type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers From 7a828de1bc658938243c0ddf85b7aab7a1087ccd Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 13 May 2016 00:14:24 +0200 Subject: [PATCH 530/531] Android: enable parallelism for main target too This adds to the changes that commit 98d16e0d9a945f5f48462c05f26ae4bde2db5731 "Android: Tell make about sub-makes to speed up build" did, and enables parallel builds for minetest itself as well. --- build/android/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/android/Makefile b/build/android/Makefile index 4ac9760f..38029699 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -752,7 +752,7 @@ clean_assets : apk: local.properties assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LEVELDB_TARGET) \ $(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ANDR_ROOT)/jni/src/android_version.h \ $(ANDR_ROOT)/jni/src/android_version_githash.h sqlite3_download - @${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} \ + + @${ANDROID_NDK}/ndk-build NDK_MODULE_PATH=${NDK_MODULE_PATH} \ GPROF=${GPROF} APP_ABI=${TARGET_ABI} HAVE_LEVELDB=${HAVE_LEVELDB} \ APP_PLATFORM=${APP_PLATFORM} \ TARGET_LIBDIR=${TARGET_LIBDIR} \ From decbd396df0855f0a356c836cf7c0c5b133964cf Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 16 May 2016 12:42:51 +0200 Subject: [PATCH 531/531] Really fix ncurses lookup on Arch Linux Commit 27ee8d8943080a5dd735c9faa47c726604bafdff forgot to add the paths without ncursesw/ to the find_path() call --- cmake/Modules/FindNcursesw.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/FindNcursesw.cmake b/cmake/Modules/FindNcursesw.cmake index b8c7f78f..e572c704 100644 --- a/cmake/Modules/FindNcursesw.cmake +++ b/cmake/Modules/FindNcursesw.cmake @@ -115,7 +115,7 @@ if(CURSES_USE_NCURSESW) get_filename_component(_cursesParentDir "${_cursesLibDir}" PATH) find_path(CURSES_INCLUDE_PATH - NAMES ncursesw/ncurses.h ncursesw/curses.h + NAMES ncursesw/ncurses.h ncursesw/curses.h ncurses.h curses.h HINTS "${_cursesParentDir}/include" )