forked from mtcontrib/homedecor_modpack
		
	Some I18N cleanup.
This commit is contained in:
		@@ -1,6 +1,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					local S = homedecor.gettext
 | 
				
			||||||
 | 
					
 | 
				
			||||||
minetest.register_node("homedecor:toilet", {
 | 
					minetest.register_node("homedecor:toilet", {
 | 
				
			||||||
    description = "Toilet",
 | 
					    description = S("Toilet"),
 | 
				
			||||||
    tiles = { 
 | 
					    tiles = { 
 | 
				
			||||||
        "forniture_marble.png", "forniture_marble.png", 
 | 
					        "forniture_marble.png", "forniture_marble.png", 
 | 
				
			||||||
        "forniture_marble_s1.png", "forniture_marble_s1.png", 
 | 
					        "forniture_marble_s1.png", "forniture_marble_s1.png", 
 | 
				
			||||||
@@ -69,7 +71,7 @@ minetest.register_node("homedecor:toilet_open", {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--Sink
 | 
					--Sink
 | 
				
			||||||
minetest.register_node("homedecor:sink", {
 | 
					minetest.register_node("homedecor:sink", {
 | 
				
			||||||
    description = "Sink",
 | 
					    description = S("Sink"),
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_marble_top_sink.png", "forniture_marble.png",
 | 
					        "forniture_marble_top_sink.png", "forniture_marble.png",
 | 
				
			||||||
        "forniture_marble_sb1.png", "forniture_marble_sb1.png",
 | 
					        "forniture_marble_sb1.png", "forniture_marble_sb1.png",
 | 
				
			||||||
@@ -103,7 +105,7 @@ minetest.register_node("homedecor:sink", {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--Taps
 | 
					--Taps
 | 
				
			||||||
minetest.register_node("homedecor:taps", {
 | 
					minetest.register_node("homedecor:taps", {
 | 
				
			||||||
    description = "Taps",
 | 
					    description = S("Taps"),
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_metal.png", "forniture_metal.png",
 | 
					        "forniture_metal.png", "forniture_metal.png",
 | 
				
			||||||
        "forniture_metal_s1.png", "forniture_metal_s1.png",
 | 
					        "forniture_metal_s1.png", "forniture_metal_s1.png",
 | 
				
			||||||
@@ -138,7 +140,7 @@ minetest.register_node("homedecor:taps", {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--Shower Tray
 | 
					--Shower Tray
 | 
				
			||||||
minetest.register_node("homedecor:shower_tray", {
 | 
					minetest.register_node("homedecor:shower_tray", {
 | 
				
			||||||
    description = "Shower Tray",
 | 
					    description = S("Shower Tray"),
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_marble_base_ducha_top.png",
 | 
					        "forniture_marble_base_ducha_top.png",
 | 
				
			||||||
        "forniture_marble_base_ducha_top.png",
 | 
					        "forniture_marble_base_ducha_top.png",
 | 
				
			||||||
@@ -172,7 +174,7 @@ minetest.register_node("homedecor:shower_tray", {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--Shower Head
 | 
					--Shower Head
 | 
				
			||||||
minetest.register_node("homedecor:shower_head", {
 | 
					minetest.register_node("homedecor:shower_head", {
 | 
				
			||||||
    description = "Shower Head",
 | 
					    description = S("Shower Head"),
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_metal.png",
 | 
					        "forniture_metal.png",
 | 
				
			||||||
        "forniture_metal.png",
 | 
					        "forniture_metal.png",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					local S = homedecor.gettext
 | 
				
			||||||
 | 
					
 | 
				
			||||||
minetest.register_node("homedecor:bars", {
 | 
					minetest.register_node("homedecor:bars", {
 | 
				
			||||||
    description = "Bars",
 | 
					    description = S("Bars"),
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_black_metal.png",
 | 
					        "forniture_black_metal.png",
 | 
				
			||||||
        "forniture_black_metal.png",
 | 
					        "forniture_black_metal.png",
 | 
				
			||||||
@@ -32,7 +34,7 @@ minetest.register_node("homedecor:bars", {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--L Binding Bars
 | 
					--L Binding Bars
 | 
				
			||||||
minetest.register_node("homedecor:L_binding_bars", {
 | 
					minetest.register_node("homedecor:L_binding_bars", {
 | 
				
			||||||
    description = "Binding Bars",
 | 
					    description = S("Binding Bars"),
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_black_metal.png",
 | 
					        "forniture_black_metal.png",
 | 
				
			||||||
        "forniture_black_metal.png",
 | 
					        "forniture_black_metal.png",
 | 
				
			||||||
@@ -61,7 +63,7 @@ minetest.register_node("homedecor:L_binding_bars", {
 | 
				
			|||||||
})
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
minetest.register_node("homedecor:chains", {
 | 
					minetest.register_node("homedecor:chains", {
 | 
				
			||||||
    description = "Chains",
 | 
					    description = S("Chains"),
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_black_metal.png",
 | 
					        "forniture_black_metal.png",
 | 
				
			||||||
        "forniture_black_metal.png",
 | 
					        "forniture_black_metal.png",
 | 
				
			||||||
@@ -136,7 +138,7 @@ minetest.register_node("homedecor:chains", {
 | 
				
			|||||||
})  
 | 
					})  
 | 
				
			||||||
 | 
					
 | 
				
			||||||
minetest.register_node("homedecor:torch_wall", {
 | 
					minetest.register_node("homedecor:torch_wall", {
 | 
				
			||||||
    description = "Torch Wall",
 | 
					    description = S("Wall Torch"),
 | 
				
			||||||
    drawtype = "nodebox",
 | 
					    drawtype = "nodebox",
 | 
				
			||||||
    tiles = {
 | 
					    tiles = {
 | 
				
			||||||
        "forniture_torch_wall_s.png",
 | 
					        "forniture_torch_wall_s.png",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -62,6 +62,19 @@ Wrought Iron Fence/railing = Cerca/Barandilla de Hierro Forjado
 | 
				
			|||||||
Wrought Iron Fence/railing with sign = Cerca/Barandilla de Hierro Forjado con Letrero
 | 
					Wrought Iron Fence/railing with sign = Cerca/Barandilla de Hierro Forjado con Letrero
 | 
				
			||||||
want to simply place the wielded item like usual. = solo se desea colocar el objeto empuñado normalmente.
 | 
					want to simply place the wielded item like usual. = solo se desea colocar el objeto empuñado normalmente.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### furniture_medieval.lua ###
 | 
				
			||||||
 | 
					Bars = Barras
 | 
				
			||||||
 | 
					Binding Bars = Barras de Unión
 | 
				
			||||||
 | 
					Chains = Cadenas
 | 
				
			||||||
 | 
					Wall Torch = Antorcha de Pared
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### furniture_bathroom.lua ###
 | 
				
			||||||
 | 
					Toilet = Inodoro
 | 
				
			||||||
 | 
					Sink = Lavabo
 | 
				
			||||||
 | 
					Taps = Grifo
 | 
				
			||||||
 | 
					Shower Tray = Piso de Ducha
 | 
				
			||||||
 | 
					Shower Head = Ducha
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### init.lua ###
 | 
					### init.lua ###
 | 
				
			||||||
Loaded! = ¡Cargado!
 | 
					Loaded! = ¡Cargado!
 | 
				
			||||||
Asphalt Shingles = Tejas de Asfalto
 | 
					Asphalt Shingles = Tejas de Asfalto
 | 
				
			||||||
@@ -173,8 +186,9 @@ Not enough vertical space to place a refrigerator! = ¡No hay suficiente espacio
 | 
				
			|||||||
Small CRT Television = Pequeña Televisión CRT
 | 
					Small CRT Television = Pequeña Televisión CRT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### signs_lib.lua ###
 | 
					### signs_lib.lua ###
 | 
				
			||||||
E: character map file not found = E: archivo de mapa de caracteres no encontrado
 | 
					 | 
				
			||||||
## 1: Full String, 2: pos in string, 3: current char at pos
 | 
					 | 
				
			||||||
W: unknown symbol in '%s' at %d (probably %s) = A: símbolo desconocido en '%s' posición %d (probablemente %s)
 | 
					 | 
				
			||||||
%s wrote "%s" to sign at %s = %s ha escrito "%s" en el letrero en %s
 | 
					%s wrote "%s" to sign at %s = %s ha escrito "%s" en el letrero en %s
 | 
				
			||||||
 | 
					Reading cached character database. = Leyendo base de datos de catacteres.
 | 
				
			||||||
 | 
					Font seems to have changed. Rebuilding cache. = La fuente parece haber cambiado. Reconstruyendo información guardada.
 | 
				
			||||||
 | 
					Could not find font line height in cached DB. Trying brute force. = No se pudo encontrar la altura de línea en la base de datos. Intentando con fuerza bruta.
 | 
				
			||||||
 | 
					Registered %s and %s = Registrados %s y %s
 | 
				
			||||||
signs loaded = letreros cargados
 | 
					signs loaded = letreros cargados
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,6 +68,19 @@ Wrought Iron Fence/railing =
 | 
				
			|||||||
Wrought Iron Fence/railing with sign =
 | 
					Wrought Iron Fence/railing with sign =
 | 
				
			||||||
want to simply place the wielded item like usual. =
 | 
					want to simply place the wielded item like usual. =
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### furniture_medieval.lua ###
 | 
				
			||||||
 | 
					Bars =
 | 
				
			||||||
 | 
					Binding Bars =
 | 
				
			||||||
 | 
					Chains =
 | 
				
			||||||
 | 
					Wall Torch =
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### furniture_bathroom.lua ###
 | 
				
			||||||
 | 
					Toilet =
 | 
				
			||||||
 | 
					Sink =
 | 
				
			||||||
 | 
					Taps =
 | 
				
			||||||
 | 
					Shower Tray =
 | 
				
			||||||
 | 
					Shower Head =
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### init.lua ###
 | 
					### init.lua ###
 | 
				
			||||||
Loaded! =
 | 
					Loaded! =
 | 
				
			||||||
Asphalt Shingles =
 | 
					Asphalt Shingles =
 | 
				
			||||||
@@ -177,8 +190,9 @@ Not enough vertical space to place a refrigerator! =
 | 
				
			|||||||
Small CRT Television =
 | 
					Small CRT Television =
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### signs_lib.lua ###
 | 
					### signs_lib.lua ###
 | 
				
			||||||
E: character map file not found =
 | 
					 | 
				
			||||||
## 1: Full String, 2: pos in string, 3: current char at pos
 | 
					 | 
				
			||||||
W: unknown symbol in '%s' at %d (probably %s) =
 | 
					 | 
				
			||||||
%s wrote "%s" to sign at %s =
 | 
					%s wrote "%s" to sign at %s =
 | 
				
			||||||
 | 
					Reading cached character database. =
 | 
				
			||||||
 | 
					Font seems to have changed. Rebuilding cache. =
 | 
				
			||||||
 | 
					Could not find font line height in cached DB. Trying brute force. =
 | 
				
			||||||
 | 
					Registered %s and %s =
 | 
				
			||||||
signs loaded =
 | 
					signs loaded =
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -103,7 +103,7 @@ local function build_char_db()
 | 
				
			|||||||
	local cdbf = io.open(CHARDB_FILE, "rt")
 | 
						local cdbf = io.open(CHARDB_FILE, "rt")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if cdbf then
 | 
						if cdbf then
 | 
				
			||||||
		minetest.log("info", "[homedecor] Reading cached character database.")
 | 
							minetest.log("info", "[homedecor] "..S("Reading cached character database."))
 | 
				
			||||||
		for line in cdbf:lines() do
 | 
							for line in cdbf:lines() do
 | 
				
			||||||
			local ch, w = line:match("(0x[0-9A-Fa-f]+)%s+([0-9][0-9]*)")
 | 
								local ch, w = line:match("(0x[0-9A-Fa-f]+)%s+([0-9][0-9]*)")
 | 
				
			||||||
			if ch and w then
 | 
								if ch and w then
 | 
				
			||||||
@@ -125,18 +125,15 @@ local function build_char_db()
 | 
				
			|||||||
			-- Check some random characters to see if the file on disk differs
 | 
								-- Check some random characters to see if the file on disk differs
 | 
				
			||||||
			-- from the cached one. If so, then ditch cached data and rebuild
 | 
								-- from the cached one. If so, then ditch cached data and rebuild
 | 
				
			||||||
			-- (font probably was changed).
 | 
								-- (font probably was changed).
 | 
				
			||||||
			print("*** DEBUG: Randomly checking cache.")
 | 
					 | 
				
			||||||
			if not check_random_chars() then
 | 
								if not check_random_chars() then
 | 
				
			||||||
				LINE_HEIGHT = nil
 | 
									LINE_HEIGHT = nil
 | 
				
			||||||
				minetest.log("info", "[homedecor]"
 | 
									minetest.log("info", "[homedecor] "
 | 
				
			||||||
					.." Font seems to have changed."
 | 
										..S("Font seems to have changed. Rebuilding cache.")
 | 
				
			||||||
					.." Rebuilding cache."
 | 
					 | 
				
			||||||
				)
 | 
									)
 | 
				
			||||||
			end
 | 
								end
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
			minetest.log("warning", "[homedecor]"
 | 
								minetest.log("warning", "[homedecor] "
 | 
				
			||||||
				.." Could not find font line height in cached DB."
 | 
									..S("Could not find font line height in cached DB. Trying brute force.")
 | 
				
			||||||
				.." Trying brute force."
 | 
					 | 
				
			||||||
			)
 | 
								)
 | 
				
			||||||
		end
 | 
							end
 | 
				
			||||||
	end
 | 
						end
 | 
				
			||||||
@@ -641,7 +638,7 @@ function homedecor.register_fence_with_sign(fencename, fencewithsignname)
 | 
				
			|||||||
    def_sign.drop = "default:sign_wall"
 | 
					    def_sign.drop = "default:sign_wall"
 | 
				
			||||||
	minetest.register_node(":"..fencename, def)
 | 
						minetest.register_node(":"..fencename, def)
 | 
				
			||||||
	minetest.register_node(":"..fencewithsignname, def_sign)
 | 
						minetest.register_node(":"..fencewithsignname, def_sign)
 | 
				
			||||||
	print("Registered "..fencename.." and "..fencewithsignname)
 | 
						print(S("Registered %s and %s"):format(fencename, fencewithsignname))
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
build_char_db()
 | 
					build_char_db()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user