Change from intllib to minetest translations and update Spanish

concrete/depends.txt

@@ -1,4 +1,3 @@
 default
 basic_materials
-intllib?
 moreblocks?

concrete/init.lua

@@ -4,8 +4,7 @@
 local technic = rawget(_G, "technic") or {}
 technic.concrete_posts = {}
 
--- Boilerplate to support localized strings if intllib mod is installed.
-local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
+local S = minetest.get_translator("technic_concrete")
 
 for i = 0, 31 do
 	minetest.register_alias("technic:concrete_post"..i,
@@ -63,7 +62,7 @@ minetest.register_node(":technic:blast_resistant_concrete", {
 
 if minetest.get_modpath("moreblocks") then
 	stairsplus:register_all("technic","blast_resistant_concrete","technic:blast_resistant_concrete",{
-		description = "Blast-resistant Concrete",
+		description = S("Blast-resistant Concrete"),
 		tiles = {"technic_blast_resistant_concrete_block.png",},
 		groups = {cracky=1, level=3, concrete=1},
 		sounds = default.node_sound_stone_defaults(),

concrete/locale/technic_concrete.de.tr

@@ -0,0 +1,11 @@
+# textdomain: technic_concrete
+# German Translation for technic_concrete
+# Deutsche Übersetzung von technic_concrete
+# by Xanthin
+
+Rebar=Bewehrungsstab
+Concrete Block=Betonblock
+Blast-resistant Concrete Block=Explosionsbestaendiger Betonblock
+Concrete Post Platform=Betonpfostenplattform
+Concrete Post=Betonpfosten
+

concrete/locale/technic_concrete.es.tr

@@ -0,0 +1,8 @@
+# textdomain: technic_concrete
+# traducido por Carlos Barraza
+
+Blast-resistant Concrete=Concreto Resistente a Exposiones
+Blast-resistant Concrete Block=Bloque de Concreto Resistente a Explosiones
+Concrete Post Platform=Plataforma de Concreto
+Concrete Post=Postes de Concreto
+

concrete/locale/technic_concrete.fr.tr

@@ -0,0 +1,8 @@
+# textdomain: technic_concrete
+# technic_concrete translation template
+
+Rebar=Armature
+Concrete Block=Bloc de béton
+Blast-resistant Concrete Block=Bloc de béton anti explosions
+Concrete Post Platform=Plateforme en béton
+Concrete Post=Pilier en béton

concrete/locale/technic_concrete.pl.tr

@@ -0,0 +1,11 @@
+# textdomain: technic_concrete
+# Polish Translation for technic_concrete
+# Polskie tłumaczenie technic_concrete
+# by mat9117
+
+Rebar=Pręt zbrojeniowy
+Concrete Block=Blok betonu
+Blast-resistant Concrete Block=Przeciwwybuchowy blok betonu
+Concrete Post Platform=Betonowa platforma
+Concrete Post=Betonowy słup
+

concrete/locale/technic_concrete.pt_BR.tr

@@ -0,0 +1,11 @@
+# textdomain: technic_concrete
+# Braziliam portuguese translation for technic_concrete
+# Tradução portuguesa brasileira para technic_concrete
+# By Sires
+
+Rebar=Vergalhão
+Concrete Block=Bloco de Concreto
+Blast-resistant Concrete Block=Bloco de Concreto resistente-a-explosões
+Concrete Post Platform=Plataforma para Poste de Concreto
+Concrete Post=Poste de Concreto
+

concrete/locale/technic_concrete.template.tr

@@ -0,0 +1,7 @@
+# textdomain: technic_concrete
+
+Blast-resistant Concrete=
+Blast-resistant Concrete Block=
+Concrete Post Platform=
+Concrete Post=
+

concrete/locale/technic_concrete.tr.tr

@@ -0,0 +1,8 @@
+# textdomain: technic_concrete
+# turkish translation by mahmutelmas06
+
+Rebar=Beton demiri
+Concrete Block=Beton blok
+Blast-resistant Concrete Block=Patlamaya dayanıklı beton blok
+Concrete Post Platform=Beton direk platformu
+Concrete Post=Beton direk

concrete/mod.conf

@@ -1,3 +1,3 @@
 name = concrete
 depends = default
-optional_depends = basic_materials, intllib, moreblocks
+optional_depends = basic_materials, moreblocks

extranodes/depends.txt

@@ -3,7 +3,6 @@ technic_worldgen
 basic_materials
 concrete
 unifieddyes?
-intllib?
 moreblocks?
 steel?
 streetsmod?

extranodes/init.lua

@@ -1,7 +1,6 @@
 -- Minetest 0.4.6 mod: extranodes
 -- namespace: technic
--- Boilerplate to support localized strings if intllib mod is installed.
-local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
+local S = minetest.get_translator("technic_extranodes")
 
 if minetest.get_modpath("moreblocks") then
 

extranodes/locale/de.txt → extranodes/locale/technic_extranodes.de.tr

@@ -1,9 +1,10 @@
+# textdomain: technic_extranodes
 # German Translation for technic_extranodes
 # Deutsche Übersetzung von technic_extranodes
 # by Xanthin
 
-Marble = Marmor
-Marble Bricks = Marmorziegel
-Granite = Granit
-Concrete = Beton
+Marble=Marmor
+Marble Bricks=Marmorziegel
+Granite=Granit
+Concrete=Beton
 

extranodes/locale/technic_extranodes.es.tr

@@ -0,0 +1,13 @@
+# textdomain: technic_extranodes
+# technic_extranodes traducido por Carlos Barraza
+
+Marble=Mármol
+Marble Bricks=Ladrillos de Mármol
+Granite=Granito
+Concrete=Concreto
+Zinc Block=Bloque de Zinc
+Cast Iron Block=Bloque de Hierro Fundido
+Carbon Steel Block=Bloque de Acero al Carbono
+Stainless Steel Block=Bloque de Acero Inoxidable
+Insulator/cable clip=Aislador/Clip de Cable
+Steel strut with insulator/cable clip=Punta de Acero con Aislante/Clip de Cable

extranodes/locale/technic_extranodes.fr.tr

@@ -0,0 +1,8 @@
+# textdomain: technic_extranodes
+# technic_extranodes translation template
+
+Marble=Marbre
+Marble Bricks=Briques en marbre
+Granite=Granite
+Concrete=Béton
+

extranodes/locale/technic_extranodes.pl.tr

@@ -0,0 +1,10 @@
+# textdomain: technic_extranodes
+# Polish Translation for technic_extranodes
+# Polskie tłumaczenie technic_extranodes
+# by mat9117
+
+Marble=Marmur
+Marble Bricks=Marmurowe cegły
+Granite=Granit
+Concrete=Beton
+

extranodes/locale/pt_BR.txt → extranodes/locale/technic_extranodes.pt_BR.tr

@@ -1,9 +1,10 @@
+# textdomain: technic_extranodes
 # Braziliam portuguese translation for technic_extranodes
 # Tradução portuguesa brasileira para technic_extranodes
 # By Sires
 
-Marble = Mármore
-Marble Bricks = Tijolos de Mármore
-Granite = Granito
-Concrete = Concreto
+Marble=Mármore
+Marble Bricks=Tijolos de Mármore
+Granite=Granito
+Concrete=Concreto
 

extranodes/locale/technic_extranodes.template.tr

@@ -0,0 +1,12 @@
+# textdomain: technic_extranodes
+
+Marble=
+Marble Bricks=
+Granite=
+Concrete=
+Zinc Block=
+Cast Iron Block=
+Carbon Steel Block=
+Stainless Steel Block=
+Insulator/cable clip=
+Steel strut with insulator/cable clip=

extranodes/locale/technic_extranodes.tr.tr

@@ -0,0 +1,7 @@
+# textdomain: technic_extranodes
+# turkish translation by mahmutelmas06
+
+Marble=Mermer
+Marble Bricks=Mermer tuğla
+Granite=Granit
+Concrete=Beton

extranodes/mod.conf

@@ -1,3 +1,3 @@
 name = extranodes
 depends = default, technic_worldgen, basic_materials, concrete
-optional_depends = unifieddyes, intllib, moreblocks, steel, streetsmod
+optional_depends = unifieddyes, moreblocks, steel, streetsmod

manual.md

@@ -1053,6 +1053,8 @@ sound, such as attenuation, panning, or HRTF.  The impression of the
 sound being located in the Minetest world is also compromised by the
 subjective nature of track choice: the specific music that is played to
 a player depends on what media the player has installed.
+Install the music in the folder /technic/technic/sounds/ with the name technic_trackN.ogg
+replacing N with the number from 1 to 9
 
 ### CNC machine ###
 

technic/config.lua

@@ -5,14 +5,14 @@ local conf_table = technic.config:to_table()
 local defaults = {
 	enable_mining_drill = "true",
 	enable_mining_laser = "true",
-	enable_flashlight = "false",
-	enable_wind_mill = "false",
-	enable_frames = "false",
+	enable_flashlight = "true",
+	enable_wind_mill = "true",
+	enable_frames = "true",
 	enable_corium_griefing = "true",
 	enable_radiation_protection = "true",
 	enable_entity_radiation_damage = "true",
 	enable_longterm_radiation_damage = "true",
-	enable_nuclear_reactor_digiline_selfdestruct = "false",
+	enable_nuclear_reactor_digiline_selfdestruct = "true",
 }
 
 for k, v in pairs(defaults) do

technic/depends.txt

@@ -8,7 +8,6 @@ mesecons?
 mesecons_mvps?
 digilines?
 digiline_remote?
-intllib?
 unified_inventory?
 vector_extras?
 dye?

technic/helpers.lua

@@ -50,7 +50,7 @@ assert(technic.pretty_num(123456789) == "123.5 M")
 
 -- used to display power values
 function technic.EU_string(num)
-	return technic.pretty_num(num) .. "EU"
+	return technic.pretty_num(num) .. technic.getter("EU")
 end
 
 

technic/init.lua

@@ -12,12 +12,7 @@ local modpath = minetest.get_modpath("technic")
 technic.modpath = modpath
 
 
--- Boilerplate to support intllib
-if rawget(_G, "intllib") then
-	technic.getter = intllib.Getter()
-else
-	technic.getter = function(s,a,...)if a==nil then return s end a={a,...}return s:gsub("(@?)@(%(?)(%d+)(%)?)",function(e,o,n,c)if e==""then return a[tonumber(n)]..(o==""and c or"")else return"@"..o..n..c end end) end
-end
+technic.getter = minetest.get_translator("technic")
 local S = technic.getter
 
 -- Read configuration file
@@ -48,6 +43,6 @@ dofile(modpath.."/tools/init.lua")
 dofile(modpath.."/legacy.lua")
 
 if minetest.settings:get_bool("log_mods") then
-	print(S("[Technic] Loaded in %f seconds"):format(os.clock() - load_start))
+	print(S("[Technic] Loaded in @1 seconds", os.clock() - load_start))
 end
 

technic/items.lua

@@ -141,7 +141,7 @@ for p = 0, 35 do
 	local block = "technic:uranium"..psuffix.."_block"
 	local ov = p == 7 and minetest.override_item or nil;
 	(ov or minetest.register_craftitem)(ingot, {
-		description = string.format(S("%.1f%%-Fissile Uranium Ingot"), p/10),
+		description = S("@1%-Fissile Uranium Ingot", string.format("%.1f", p/10)),
 		inventory_image = "technic_uranium_ingot.png",
 		groups = {uranium_ingot=1, not_in_creative_inventory=nici},
 	});
@@ -178,7 +178,7 @@ for p = 0, 35 do
 	-- a 3.5%-fissile uranium block.
 	local radioactivity = math.floor(math.sqrt((1+5.55*p/35) * 18 / (1+5.55*7/35)) + 0.5);
 	(ov or minetest.register_node)(block, {
-		description = string.format(S("%.1f%%-Fissile Uranium Block"), p/10),
+		description = S("@1%-Fissile Uranium Block", string.format("%.1f", p/10)),
 		tiles = {"technic_uranium_block.png"},
 		is_ground_content = true,
 		groups = {uranium_block=1, not_in_creative_inventory=nici,