Merge branch 'master' of https://github.com/webdesigner97/streets

6 files changed, 52 insertions, 48 deletions

diff --git a/roadsigns/signs.lua b/roadsigns/signs.lua
index d7878fd..3b8beb4 100644
--- a/roadsigns/signs.lua
+++ b/roadsigns/signs.lua
@@ -1,5 +1,5 @@
 minetest.register_node(":streets:sign_blank",{
-	description = S("Emtpy sign"),
+	description = S("Empty sign"),
 	tiles = {"streets_sign_back.png"},
 	inventory_image = "streets_sign_back.png",
 	wield_image = "streets_sign_back.png",
@@ -27,7 +27,7 @@ minetest.register_node(":streets:sign_blank",{
 	after_place_node = function(pos)
 		local meta = minetest.get_meta(pos)
 		
-		meta:set_string("infotext", "Empty Sign")
+		meta:set_string("infotext", S("Empty Sign"))
 	end
 })
 minetest.register_node(":streets:sign_lava",{
@@ -59,7 +59,7 @@ minetest.register_node(":streets:sign_lava",{
 	after_place_node = function(pos)
 		local meta = minetest.get_meta(pos)
 		
-		meta:set_string("infotext", "Warning: Careful of lava")
+		meta:set_string("infotext", S("Warning: Careful of lava"))
 	end
 })
 	
@@ -92,7 +92,7 @@ minetest.register_node(":streets:sign_water",{
 	after_place_node = function(pos)
 		local meta = minetest.get_meta(pos)
 		
-		meta:set_string("infotext", "Warning: Water Nearby")
+		meta:set_string("infotext", S("Warning: Water nearby"))
 	end
 })
 
@@ -125,6 +125,6 @@ minetest.register_node(":streets:sign_construction",{
 	after_place_node = function(pos)
 		local meta = minetest.get_meta(pos)
 		
-		meta:set_string("infotext", "Warning: Construction area, possible deep excavations")
+		meta:set_string("infotext", S("Warning: Construction area, possible deep excavations"))
 	end
 })
diff --git a/roadsigns/workshop.lua b/roadsigns/workshop.lua
index 75cbf5a..08b94f2 100644
--- a/roadsigns/workshop.lua
+++ b/roadsigns/workshop.lua
@@ -4,32 +4,32 @@
 local forms = {
 	inactive = {
 		"size[12,10]",
-		"label[3.5,0;Sign workshop - Create signs for your roads!]",
-		"label[0,0.5;Available signs:]",
+		"label[3.5,0;"..S("Sign workshop - Create signs for your roads!").."]",
+		"label[0,0.5;"..S("Available signs:").."]",
 		"list[context;streets:signworkshop_list;0,1;5,4]",
-		"label[9,0.5;Needed stuff:]",
+		"label[9,0.5;"..S("Needed stuff:").."]",
 		"list[context;streets:signworkshop_recipe;8,1;4,1]",
-		"label[9,2;Put it here:]",
+		"label[9,2;"..S("Put it here:").."]",
 		"list[context;streets:signworkshop_input;8,3;4,1]",
-		"button[8,4;2,1;streets:signworkshop_send;Start!]",
-		"label[5.8,0.5;Selected:]",
+		"button[8,4;2,1;streets:signworkshop_send;"..S("Start!").."]",
+		"label[5.8,0.5;"..S("Selected:").."]",
 		"list[context;streets:signworkshop_select;6,1;1,1]",
-		"label[5.8,2.5;Output:]",
+		"label[5.8,2.5;"..S("Output:").."]",
 		"list[context;streets:signworkshop_output;6,3;1,1]",
 		"list[current_player;main;2,6;8,4]",
 	},
 	active = {
 		"size[12,10]",
-		"label[3.5,0;Sign workshop - Create signs for your roads!]",
-		"label[0,0.5;Available signs:]",
+		"label[3.5,0;"..S("Sign workshop - Create signs for your roads!").."]",
+		"label[0,0.5;"..S("Available signs:").."]",
 		"list[context;streets:signworkshop_list;0,1;5,4]",
-		"label[9,0.5;Needed stuff:]",
+		"label[9,0.5;"..S("Needed stuff:").."]",
 		"list[context;streets:signworkshop_recipe;8,1;4,1]",
-		"label[9,2;Put it here:]",
+		"label[9,2;"..S("Put it here:").."]",
 		"list[context;streets:signworkshop_input;8,3;4,1]",
-		"label[5.8,0.5;Selected:]",
+		"label[5.8,0.5;"..S("Selected:").."]",
 		"list[context;streets:signworkshop_select;6,1;1,1]",
-		"label[5.8,2.5;Output:]",
+		"label[5.8,2.5;"..S("Output:").."]",
 		"list[context;streets:signworkshop_output;6,3;1,1]",
 		"list[current_player;main;2,6;8,4]"
 		-- 
@@ -55,7 +55,7 @@ minetest.register_node(":streets:signworkshop",{
 		inv:add_item("streets:signworkshop_list","streets:sign_water")
 		inv:add_item("streets:signworkshop_list","streets:sign_construction")
 		-- Meta
-		meta:set_string("infotext","Sign workshop idle")
+		meta:set_string("infotext",S("Sign workshop idle"))
 		meta:set_string("idle","y")
 	end,
 	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
@@ -119,14 +119,14 @@ minetest.register_node(":streets:signworkshop",{
 			if has[3] == nil then has[3] = { name = "" } end
 			if has[4] == nil then has[4] = { name = "" } end
 			if need[1].name == has[1].name and need[2].name == has[2].name and need[3].name == has[3].name and need[4].name == has[4].name then
-				meta:set_string("infotext","Sign workshop working")
+				meta:set_string("infotext",S("Sign workshop working"))
 				meta:set_string("idle","n")
-				meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;Please wait " .. def.time .. " seconds...]")
+				meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;"..S("Please wait %s seconds..."):format(def.time).."]")
 				-- Clear input
 				inv:set_list("streets:signworkshop_input",{"","","",""})
 				minetest.after(def.time,function()
 					-- Reset infotext and meta
-					meta:set_string("infotext","Sign workshop idle")
+					meta:set_string("infotext",S("Sign workshop idle"))
 					meta:set_string("idle","y")
 					meta:set_string("formspec",table.concat(forms.inactive))
 					-- Fill output
@@ -144,4 +144,4 @@ minetest.register_craft({
 		{"default:steel_ingot","default:diamond","default:steel_ingot"},
 		{"default:cobble","default:cobble","default:cobble"}
 	}
-})
\ No newline at end of file
+})
diff --git a/streetsconcrete/init.lua b/streetsconcrete/init.lua
index 92820e3..f4d0205 100644
--- a/streetsconcrete/init.lua
+++ b/streetsconcrete/init.lua
@@ -28,7 +28,7 @@ if streets.extendedBy.technic == true then
 		}
 	})
 	minetest.register_node(":streets:concrete_wall_flat",{
-		description = S("Conrete wall"),
+		description = S("Concrete wall"),
 		tiles = {"technic_concrete_block.png"},
 		groups = {cracky=2},
 		drawtype = "nodebox",
@@ -52,7 +52,7 @@ if streets.extendedBy.technic == true then
 elseif streets.extendedBy.prefab then
 	minetest.register_alias("streets:concrete","prefab:concrete")
 	minetest.register_node(":streets:concrete_wall",{
-		description = S("Conrete wall"),
+		description = S("Concrete wall"),
 		tiles = {"prefab_concrete.png"},
 		groups = {cracky=2},
 		drawtype = "nodebox",
@@ -75,7 +75,7 @@ elseif streets.extendedBy.prefab then
 		}
 	})
 	minetest.register_node(":streets:concrete_wall_flat",{
-		description = S("Conrete wall"),
+		description = S("Concrete wall"),
 		tiles = {"prefab_concrete.png"},
 		groups = {cracky=2},
 		drawtype = "nodebox",
@@ -104,7 +104,7 @@ else
 		groups = {cracky=2}
 	})
 	minetest.register_node(":streets:concrete_wall",{
-		description = S("Conrete wall"),
+		description = S("Concrete wall"),
 		tiles = {"streets_concrete.png"},
 		groups = {cracky=2},
 		drawtype = "nodebox",
@@ -127,7 +127,7 @@ else
 		}
 	})
 	minetest.register_node(":streets:concrete_wall_flat",{
-		description = S("Conrete wall"),
+		description = S("Concrete wall"),
 		tiles = {"streets_concrete.png"},
 		groups = {cracky=2},
 		drawtype = "nodebox",
@@ -153,4 +153,4 @@ else
 		output = "streets:concrete",
 		recipe = {"default:stone"}
 	})
-end
\ No newline at end of file
+end
diff --git a/streetsmod/init.lua b/streetsmod/init.lua
index 1887e7e..86b7e19 100644
--- a/streetsmod/init.lua
+++ b/streetsmod/init.lua
@@ -31,7 +31,7 @@
 	streets.forms = {}
 	
 -- Check for mods which change this mod's beahaviour
-	print("Streets: Checking installed mods...")
+	print("Streets: " .. S("Checking installed mods..."))
 	if minetest.get_modpath("wool")	 then
 		streets.extendedBy.wool = true
 	else
@@ -97,4 +97,4 @@
 	
 -- Done	
 	print("Streets: " .. S("Setup completed, have fun with StreetsMod") .. " " .. streets.version .. "!")
-	streets.load.fin = os.clock()
\ No newline at end of file
+	streets.load.fin = os.clock()
diff --git a/streetsmod/locale/de.txt b/streetsmod/locale/de.txt
index 21fd9c4..b4aca9b 100644
--- a/streetsmod/locale/de.txt
+++ b/streetsmod/locale/de.txt
@@ -1,7 +1,7 @@
 # Translation file GERMAN
-Setup completed, have fun with StreetsMod=Setup abgeschlossen, viel Spaß mit StreetsMod
+Setup completed, have fun with StreetsMod=Setup abgeschlossen, viel Spass mit StreetsMod
 Creating variables and tables...=Erstelle Variablen und Tabellen...
-Checking installed mods...=Ueberpruefe installierte Mods
+Checking installed mods...=Ueberpruefe installierte Mods...
 Check version of your installed StreetsMod and find information=Ueberpruefe die installierte StreetsMod Version und weitere Infos
 Asphalt=Asphalt
 Asphalt stair=Asphalt Treppe
@@ -10,7 +10,7 @@ Construction fence=Bauzaun
 Delineator=Leitpfosten
 Emergency Phone=Notrufsaeule
 Asphalt with sideline=Asphalt mit Seitenlinie
-Asphalt with solid line=Asphalt with durchgezogener Linie
+Asphalt with solid line=Asphalt mit durchgezogener Linie
 Asphalt with dashed line=Asphalt mit unterbrochener Linie
 Asphalt with sideline (edge)=Asphalt mit Seitenlinie (Ecke)
 Asphalt with parking label=Asphalt mit Parkplatzsymbol
@@ -25,23 +25,25 @@ Warning sign (Construction area)=Gefahrenschild Baustelle
 Warning: Careful of lava=Achtung: Lava
 Warning: Water nearby=Achtung: Wasser
 Warning: Construction area, possible deep excavations=Achtung Baustelle, eventuell tiefe Graeben
-Sign workshop - Create signs for your roads=Schilderworkshop - Baue Schilder fuer deine Strassen
-Available signs=Verfuegbare Schilder
-Needed stuff=Benoetigt
-Put it here=Rohstoffe
-Selected=Ausgewaehlt
-Output=Ausgabe
+Sign workshop - Create signs for your roads!=Schilderworkshop - Baue Schilder fuer deine Strassen!
+Available signs:=Verfuegbare Schilder
+Needed stuff:=Benoetigt
+Put it here:=Rohstoffe
+Selected:=Ausgewaehlt
+Output:=Ausgabe
 Sign workshop=Schilderworkshop
 Sign workshop idle=Schilderworkshop bereit
 Sign workshop working=Schilderworkshop arbeitet
+Please wait %s seconds... = Bitte warte %s Sekunden...
 Solid line (yellow)=Durchgezogene Linie (gelb)
 Dashed line (yellow)=Unterbrochene Linie (gelb)
 Cross (yellow)=Kreuz (gelb)
 Outer edge (yellow)=Ecklinie (gelb)
 Parking (yellow)=Parkplatzsymbol (gelb)
 Arrow (yellow)=Pfeil (gelb)
+Sideline (yellow)=Seitenlinie (gelb)
 Steel support=Stahlrahmen
 Street lamp=Strassenlampe
 Concrete wall=Betonwand
 Concrete=Beton
-Trafficlight=Ampel
\ No newline at end of file
+Trafficlight=Ampel
diff --git a/streetsmod/locale/template.txt.txt b/streetsmod/locale/template.txt.txt
index d03801c..095f8fd 100644
--- a/streetsmod/locale/template.txt.txt
+++ b/streetsmod/locale/template.txt.txt
@@ -25,23 +25,25 @@ Warning sign (Construction area)=
 Warning: Careful of lava=
 Warning: Water nearby=
 Warning: Construction area, possible deep excavations=
-Sign workshop - Create signs for your roads=
-Available signs=
-Needed stuff=
-Put it here=
-Selected=
-Output=
+Sign workshop - Create signs for your roads!=
+Available signs:=
+Needed stuff:=
+Put it here:=
+Selected:=
+Output:=
 Sign workshop=
 Sign workshop idle=
 Sign workshop working=
+Please wait %s seconds... =
 Solid line (yellow)=
 Dashed line (yellow)=
 Cross (yellow)=
 Outer edge (yellow)=
 Parking (yellow)=
 Arrow (yellow)=
+Sideline (yellow)=
 Steel support=
 Street lamp=
 Concrete wall=
 Concrete=
-Trafficlight=
\ No newline at end of file
+Trafficlight=