diff --git a/technic/init.lua b/technic/init.lua index 8c23d6691..b043314ec 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -12,9 +12,6 @@ local modpath = minetest.get_modpath("technic") technic.modpath = modpath --- Translation support -local S = minetest.get_translator("technic") - -- Read configuration file dofile(modpath.."/config.lua") @@ -43,6 +40,6 @@ dofile(modpath.."/tools/init.lua") dofile(modpath.."/legacy.lua") if minetest.settings:get_bool("log_mods") then - print(S("[Technic] Loaded in @1 seconds", string.format("%f", os.clock() - load_start))) + print("[Technic] Loaded in %f seconds":format(os.clock() - load_start)) end diff --git a/technic/locale/technic.de.tr b/technic/locale/technic.de.tr index 4b05b8e31..370bc6a93 100644 --- a/technic/locale/technic.de.tr +++ b/technic/locale/technic.de.tr @@ -4,9 +4,6 @@ # Deutsche Uebersetzung des Technic Mods # by Xanthin -## Misc -[Technic] Loaded in @1 seconds=[Technic] ist in @1 Sekunden geladen - ## Items Silicon Wafer=Siliziumscheibe Doped Silicon Wafer=Dotierte Siliziumscheibe @@ -80,7 +77,6 @@ HV= @1 Nuclear Reactor Core= Enables or disables technic's switching station ABM= @1 Already Present= -[TECHNIC] Warning: redundant switching station found near @1= Machines: timeout check= Machines: re-enable check= You are not allowed to edit this!= @@ -92,9 +88,6 @@ Machines: run injector= Tools: tree tap= @1 is unpowered= @1 is powered (@2% of maximum power)= -@1 tried to place @2 at protected position @3= -@1 tried to take @2 at protected position @3 with a @4= -@1 tried to place @2 at protected position @3 with a @4= ## Machine names Power Monitor= @@ -150,7 +143,6 @@ Enable Digiline= Digiline Remote Channel Save= Start= -A reactor melted down at @1= Start successful= Error= Restart= @@ -253,4 +245,3 @@ Compressing= Extracting= Separating= Freezing= -[Technic] ignored registration of garbage recipe!= diff --git a/technic/locale/technic.es.tr b/technic/locale/technic.es.tr index 1395c6827..cdd69352c 100644 --- a/technic/locale/technic.es.tr +++ b/technic/locale/technic.es.tr @@ -4,9 +4,6 @@ # Traduccion al Español del Mod Technic # Autor: Diego Martínez -## Misc -[Technic] Loaded in @1 seconds=[Technic] Cargado en @1 segundos - ## Items Silicon Wafer=Oblea de Silicio Doped Silicon Wafer=Oblea de Silicio Dopada @@ -80,7 +77,6 @@ HV= @1 Nuclear Reactor Core= Enables or disables technic's switching station ABM= @1 Already Present= -[TECHNIC] Warning: redundant switching station found near @1= Machines: timeout check= Machines: re-enable check= You are not allowed to edit this!= @@ -92,9 +88,6 @@ Machines: run injector= Tools: tree tap= @1 is unpowered= @1 is powered (@2% of maximum power)= -@1 tried to place @2 at protected position @3= -@1 tried to take @2 at protected position @3 with a @4= -@1 tried to place @2 at protected position @3 with a @4= ## Machine names Power Monitor= @@ -148,7 +141,6 @@ Enable Digiline= Digiline Remote Channel Save= Start= -A reactor melted down at @1= Start successful= Error= Restart= @@ -251,4 +243,3 @@ Compressing= Extracting= Separating= Freezing= -[Technic] ignored registration of garbage recipe!= diff --git a/technic/locale/technic.fr.tr b/technic/locale/technic.fr.tr index 17005a946..c1755fc23 100644 --- a/technic/locale/technic.fr.tr +++ b/technic/locale/technic.fr.tr @@ -4,9 +4,6 @@ # Template for translations of Technic -## Misc -[Technic] Loaded in @1 seconds=[Technic] Chargement en @1 secondes - ## Items Silicon Wafer=Tranche de silicium Doped Silicon Wafer=Tranche de silicium doppé @@ -79,7 +76,6 @@ HV=haute tension @1 Nuclear Reactor Core=Cœur de réacteur nucléaire @1 Enables or disables technic's switching station ABM=Active ou desactive la station de commutation de technic @1 Already Present=@1 déja présent -[TECHNIC] Warning: redundant switching station found near @1=[TECHNIC] Avertissement : station de commutation redondante près de @1 Machines: timeout check=Machines : vérification de timeout Machines: re-enable check=Machines : réactivation des vérifications You are not allowed to edit this!=Vous n’êtes pas autorisé à modifier cela ! @@ -91,9 +87,6 @@ Machines: run injector= fonctionnement de l’injecteur Tools: tree tap=Outils : Robinet à sève @1 is unpowered=@1 est hors tension @1 is powered (@2% of maximum power)=@1 est alimenté (@2 % de la puissance maximale) -@1 tried to place @2 at protected position @3=@1 a essayé de placer @2 à la position protégée @3 -@1 tried to take @2 at protected position @3 with a @4=@1 a essayé de prendre @2 à la position protégée @3 avec un @4 -@1 tried to place @2 at protected position @3 with a @4=@1 a essayé de placer @2 à la position protégée @3 avec un @4 ## Machine names @@ -149,7 +142,6 @@ Enable Digiline=Activer Digiline Digiline Remote Channel=Cannal Digiline distant Save=Sauvegarder Start=Démarrer -A reactor melted down at @1=Un réacteur a fusionné à @1 Start successuful=Démarré avec succès Error=Erreur Restart=Redémarrer @@ -253,4 +245,3 @@ Compressing=Compression Extracting=Extraction Separating=Séparation Freezing=Congélation -[Technic] ignored registration of garbage recipe!=[Technic] enregistrement d’une recette incohérente ignoré ! diff --git a/technic/locale/technic.it.tr b/technic/locale/technic.it.tr index ea966be3d..e5aa88513 100644 --- a/technic/locale/technic.it.tr +++ b/technic/locale/technic.it.tr @@ -1,9 +1,6 @@ # textdomain: technic -## Misc -[Technic] Loaded in @1 seconds=[Technic] caricato in @1 secondi - ## Items Silicon Wafer=Wafer di silicone Doped Silicon Wafer=Wafer di silicone dopato @@ -75,7 +72,6 @@ HV= @1 Nuclear Reactor Core= Enables or disables technic's switching station ABM= @1 Already Present= -[TECHNIC] Warning: redundant switching station found near @1= Machines: timeout check= Machines: re-enable check= You are not allowed to edit this!= @@ -87,9 +83,6 @@ Machines: run injector= Tools: tree tap= @1 is unpowered= @1 is powered (@2% of maximum power)= -@1 tried to place @2 at protected position @3= -@1 tried to take @2 at protected position @3 with a @4= -@1 tried to place @2 at protected position @3 with a @4= ## Machine names Power Monitor= @@ -143,7 +136,6 @@ Enable Digiline= Digiline Remote Channel Save= Start= -A reactor melted down at @1= Start successful= Error= Restart= @@ -246,4 +238,3 @@ Compressing=Compressione Extracting=Estrazione Separating= Freezing= -[Technic] ignored registration of garbage recipe!= diff --git a/technic/locale/technic.pl.tr b/technic/locale/technic.pl.tr index 7b31e2165..a7fb66013 100644 --- a/technic/locale/technic.pl.tr +++ b/technic/locale/technic.pl.tr @@ -4,9 +4,6 @@ # Polskie tłumaczenie Technic mod # by mat9117 -## Misc -[Technic] Loaded in @1 seconds=[Technic] Wczytany w @1 sekund - ## Items Silicon Wafer=Płytka krzemowa Doped Silicon Wafer=Domieszkowana płytka krzemowa @@ -79,7 +76,6 @@ HV= @1 Nuclear Reactor Core= Enables or disables technic's switching station ABM= @1 Already Present= -[TECHNIC] Warning: redundant switching station found near @1= Machines: timeout check= Machines: re-enable check= You are not allowed to edit this!= @@ -91,9 +87,6 @@ Machines: run injector= Tools: tree tap= @1 is unpowered= @1 is powered (@2% of maximum power)= -@1 tried to place @2 at protected position @3= -@1 tried to take @2 at protected position @3 with a @4= -@1 tried to place @2 at protected position @3 with a @4= ## Machine names @1 Alloy Furnace=@1 Piec stopowy @@ -147,7 +140,6 @@ Enable Digiline= Digiline Remote Channel Save= Start= -A reactor melted down at @1= Start successful= Error= Restart= @@ -251,4 +243,3 @@ Compressing=Kompresowanie Extracting=Ekstrakcja Separating=Oddzielanie Freezing= -[Technic] ignored registration of garbage recipe!= diff --git a/technic/locale/technic.pt_BR.tr b/technic/locale/technic.pt_BR.tr index de35342a4..6f0f03c09 100644 --- a/technic/locale/technic.pt_BR.tr +++ b/technic/locale/technic.pt_BR.tr @@ -4,9 +4,6 @@ # Tradução portuguesa brasileira para technic # By Sires -## Misc -[Technic] Loaded in @1 seconds = [Technic] Carregado em @1 segundos - ## Items Silicon Wafer=Pastilha de Silício Doped Silicon Wafer=Pastilha de Silício Dopada @@ -79,7 +76,6 @@ HV= @1 Nuclear Reactor Core= Enables or disables technic's switching station ABM= @1 Already Present= -[TECHNIC] Warning: redundant switching station found near @1= Machines: timeout check= Machines: re-enable check= You are not allowed to edit this!= @@ -91,9 +87,6 @@ Machines: run injector= Tools: tree tap= @1 is unpowered= @1 is powered (@2% of maximum power)= -@1 tried to place @2 at protected position @3= -@1 tried to take @2 at protected position @3 with a @4= -@1 tried to place @2 at protected position @3 with a @4= ## Machine names Power Monitor= @@ -149,7 +142,6 @@ Enable Digiline= Digiline Remote Channel Save= Start= -A reactor melted down at @1= Start successful= Error= Restart= @@ -245,4 +237,3 @@ Compressing=Comprimindo Extracting=Extraindo Separating=Separando Freezing= -[Technic] ignored registration of garbage recipe!= diff --git a/technic/locale/template.txt b/technic/locale/template.txt index eb491d3b9..1905b413d 100644 --- a/technic/locale/template.txt +++ b/technic/locale/template.txt @@ -4,9 +4,6 @@ # Template for translations of Technic -## Misc -[Technic] Loaded in @1 seconds= - ## Items Silicon Wafer= Doped Silicon Wafer= @@ -79,7 +76,6 @@ HV= @1 Nuclear Reactor Core= Enables or disables technic's switching station ABM= @1 Already Present= -[TECHNIC] Warning: redundant switching station found near @1= Machines: timeout check= Machines: re-enable check= You are not allowed to edit this!= @@ -91,9 +87,6 @@ Machines: run injector= Tools: tree tap= @1 is unpowered= @1 is powered (@2% of maximum power)= -@1 tried to place @2 at protected position @3= -@1 tried to take @2 at protected position @3 with a @4= -@1 tried to place @2 at protected position @3 with a @4= ## Machine names @@ -149,7 +142,6 @@ Enable Digiline= Digiline Remote Channel Save= Start= -A reactor melted down at @1= Start successful= Error= Restart= @@ -254,4 +246,3 @@ Compressing= Extracting= Separating= Freezing= -[Technic] ignored registration of garbage recipe!= diff --git a/technic/machines/HV/nuclear_reactor.lua b/technic/machines/HV/nuclear_reactor.lua index 2a0e71859..a66ec1432 100644 --- a/technic/machines/HV/nuclear_reactor.lua +++ b/technic/machines/HV/nuclear_reactor.lua @@ -211,7 +211,7 @@ end local function melt_down_reactor(pos) - minetest.log("action", S("A reactor melted down at @1", minetest.pos_to_string(pos))) + minetest.log("action", "A reactor melted down at "..minetest.pos_to_string(pos)) minetest.set_node(pos, {name = "technic:corium_source"}) end diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index 58dba258a..c0ad24819 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -298,9 +298,7 @@ for zp = 0, 1 do local pos = pointed_thing.above if minetest.is_protected(pos, placer:get_player_name()) then - minetest.log("action", S("@1 tried to place @2 at protected position @3", placer:get_player_name(), - itemstack:get_name(), - minetest.pos_to_string(pos))) + minetest.log("action", placer:get_player_name().." tried to place "..itemstack:get_name().." at protected position "..minetest.pos_to_string(pos)) minetest.record_protection_violation(pos, placer:get_player_name()) return itemstack end @@ -326,9 +324,7 @@ for zp = 0, 1 do on_rightclick = function(pos, node, placer, itemstack, pointed_thing) if is_supported_node(itemstack:get_name()) then if minetest.is_protected(pos, placer:get_player_name()) then - minetest.log("action", S("@1 tried to place @2 at protected position @3", placer:get_player_name(), - itemstack:get_name(), - minetest.pos_to_string(pos))) + minetest.log("action", placer:get_player_name().." tried to place "..itemstack:get_name().." at protected position "..minetest.pos_to_string(pos)) minetest.record_protection_violation(pos, placer:get_player_name()) return itemstack end diff --git a/technic/machines/register/recipes.lua b/technic/machines/register/recipes.lua index 33ad2005c..18e612038 100644 --- a/technic/machines/register/recipes.lua +++ b/technic/machines/register/recipes.lua @@ -45,7 +45,7 @@ local function register_recipe(typename, data) local recipe = {time = data.time, input = {}, output = data.output} local index = get_recipe_index(data.input) if not index then - print(S("[Technic] ignored registration of garbage recipe!")) + print("[Technic] ignored registration of garbage recipe!") return end for _, stack in ipairs(data.input) do @@ -84,7 +84,7 @@ function technic.get_recipe(typename, items) end local index = get_recipe_index(items) if not index then - print(S("[Technic] ignored registration of garbage recipe!")) + print("[Technic] ignored registration of garbage recipe!") return end local recipe = technic.recipes[typename].recipes[index] diff --git a/technic/machines/switching_station.lua b/technic/machines/switching_station.lua index 56b74b0af..5ad6c716a 100644 --- a/technic/machines/switching_station.lua +++ b/technic/machines/switching_station.lua @@ -275,7 +275,7 @@ minetest.register_abm({ if not technic.redundant_warn[poshash] then technic.redundant_warn[poshash] = true - print(S("[TECHNIC] Warning: redundant switching station found near @1", minetest.pos_to_string(pos))) + print("[TECHNIC] Warning: redundant switching station found near "..minetest.pos_to_string(pos)) end return end diff --git a/technic/tools/cans.lua b/technic/tools/cans.lua index e413aad7c..88a78ac81 100644 --- a/technic/tools/cans.lua +++ b/technic/tools/cans.lua @@ -36,11 +36,7 @@ function technic.register_can(d) local charge = get_can_level(itemstack) if charge == data.can_capacity then return end if minetest.is_protected(pointed_thing.under, user:get_player_name()) then - minetest.log("action", S("@1 tried to take @2 at protected position @3 with a @4", - user:get_player_name(), - node.name, - minetest.pos_to_string(pointed_thing.under), - data.can_name)) + minetest.log("action", user:get_player_name().." tried to take "..node.name.." at protected position "..minetest.pos_to_string(pointed_thing.under).." with a "..data.can_name) return end minetest.remove_node(pointed_thing.under) @@ -64,11 +60,7 @@ function technic.register_can(d) local charge = get_can_level(itemstack) if charge == 0 then return end if minetest.is_protected(pos, user:get_player_name()) then - minetest.log("action", S("@1 tried to place @2 at protected position @3 with a @4", - user:get_player_name(), - data.liquid_source_name, - minetest.pos_to_string(pos), - data.can_name)) + minetest.log("action", user:get_player_name().." tried to place "..data.liquid_source_name.." at protected position "..minetest.pos_to_string(pos).." with a "..data.can_name) return end minetest.set_node(pos, {name=data.liquid_source_name}) diff --git a/technic_chests/common.lua b/technic_chests/common.lua index 06b0a85c1..a0fdbabe8 100644 --- a/technic_chests/common.lua +++ b/technic_chests/common.lua @@ -50,14 +50,14 @@ function technic.chests.inv_take(pos, listname, index, stack, player) end function technic.chests.on_inv_move(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", S("@1 moves stuff in chest at @2", player:get_player_name(), minetest.pos_to_string(pos))) + minetest.log("action", player:get_player_name().." moves stuff in chest at "..minetest.pos_to_string(pos)) end function technic.chests.on_inv_put(pos, listname, index, stack, player) - minetest.log("action", S("@1 moves @2 to chest at @3", player:get_player_name(), stack:get_name(), minetest.pos_to_string(pos))) + minetest.log("action", player:get_player_name().." moves "..stack:get_name().." to chest at "..minetest.pos_to_string(pos)) end function technic.chests.on_inv_take(pos, listname, index, stack, player) - minetest.log("action", S("@1 takes @2 from chest at @3", player:get_player_name(), stack:get_name(), minetest.pos_to_string(pos))) + minetest.log("action", player:get_player_name().." takes "..stack:get_name().." from chest at "..minetest.pos_to_string(pos)) end diff --git a/technic_chests/locale/technic_chests.fr.tr b/technic_chests/locale/technic_chests.fr.tr index 4d22e7a5a..0a6cee137 100644 --- a/technic_chests/locale/technic_chests.fr.tr +++ b/technic_chests/locale/technic_chests.fr.tr @@ -40,9 +40,5 @@ Auto-sort is @1=Tri automatique @1 Off=désactivé On=activé -@1 moves stuff in chest at @2=@1 déplace des affaires dans le coffre à @2 -@1 moves @2 to chest at @3=@1 déplace @2 vers le coffre à @3 -@1 takes @2 from chest at @3=@1 prend @2 du coffre à @3 -[technic_chests] WARNING: variable or method '@1' not present in dummy pipeworks table - assuming it is a method…=[technic_chests] AVERTISSEMENT : la variable ou la méthode '@1' n’est pas présente dans la table factice - en considérant que c’est une méthode… Allow splitting incoming stacks from tubes=Séparer les piles venant des tuyaux diff --git a/technic_chests/locale/template.txt b/technic_chests/locale/template.txt index 2a54f278f..a83f76135 100644 --- a/technic_chests/locale/template.txt +++ b/technic_chests/locale/template.txt @@ -40,8 +40,4 @@ Auto-sort is @1= Off= On= -@1 moves stuff in chest at @2= -@1 moves @2 to chest at @3= -@1 takes @2 from chest at @3= -[technic_chests] WARNING: variable or method '@1' not present in dummy pipeworks table - assuming it is a method…= Allow splitting incoming stacks from tubes= diff --git a/technic_chests/register.lua b/technic_chests/register.lua index 1c59527ee..efec3a25c 100644 --- a/technic_chests/register.lua +++ b/technic_chests/register.lua @@ -19,7 +19,7 @@ if not minetest.get_modpath("pipeworks") then local dummy = function() end pipeworks_meta.__index = function(table, key) - print(S("[technic_chests] WARNING: variable or method '@1' not present in dummy pipeworks table - assuming it is a method…", key)) + print("[technic_chests] WARNING: variable or method '"..key.."' not present in dummy pipeworks table - assuming it is a method…") pipeworks[key] = dummy return dummy end diff --git a/wrench/init.lua b/wrench/init.lua index 608fc59ab..71475efb8 100644 --- a/wrench/init.lua +++ b/wrench/init.lua @@ -41,9 +41,8 @@ local function restore(pos, placer, itemstack) data = minetest.deserialize(data) if not data then minetest.remove_node(pos) - minetest.log("error", S("@1 wanted to place @2 at @3, but it had no data.", placer:get_player_name(), - name, minetest.pos_to_string(pos))) - minetest.log("verbose", S("itemstack: @1", itemstack:to_string())) + minetest.log("error", placer:get_player_name().." wanted to place "..name.." at "..minetest.pos_to_string(pos)..", but it had no data.") + minetest.log("verbose", "itemstack: "..itemstack:to_string()) return true end minetest.set_node(pos, {name = data.name, param2 = node.param2}) @@ -122,9 +121,7 @@ minetest.register_tool("wrench:wrench", { if def.owned and not minetest.check_player_privs(placer, "protection_bypass") then local owner = meta:get_string("owner") if owner and owner ~= player_name then - minetest.log("action", S("@1 tried to pick up an owned node belonging to @2 at @3", - player_name, owner, - minetest.pos_to_string(pos))) + minetest.log("action", player_name.." tried to pick up an owned node belonging to "..owner.." at "..minetest.pos_to_string(pos)) return end end diff --git a/wrench/locale/technic_wrench.fr.tr b/wrench/locale/technic_wrench.fr.tr index adf4f9341..3a6f59f0f 100644 --- a/wrench/locale/technic_wrench.fr.tr +++ b/wrench/locale/technic_wrench.fr.tr @@ -5,7 +5,3 @@ Wrench=Clé @1 with items=@1 avec des objets -@1 wanted to place @2 at @3, but it had no data.=@1 a voulu placer @2 à la positon @3, mais il n’y avait pas de données. -itemstack: @1=pile d’articles : @1 -@1 tried to pick up an owned node belonging to @2 at @3=@1 a essayé de prendre un bloc protégé appartenant à @2 à la position @3 - diff --git a/wrench/locale/template.txt b/wrench/locale/template.txt index b6b50d8e9..c832e2357 100644 --- a/wrench/locale/template.txt +++ b/wrench/locale/template.txt @@ -5,6 +5,3 @@ Wrench = @1 with items = -@1 wanted to place @2 at @3, but it had no data.= -itemstack: @1= -@1 tried to pick up an owned node belonging to @2 at @3