mff/homedecor_modpack
1
0
Fork 0
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

Fixes to translation.

Browse Source
This commit is contained in:
Xanthin 2014-03-25 14:16:47 +01:00 committed by kaeza
parent ab4b89d76b
commit e702ef9f13
11 changed files with 100 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
homedecor/crafts.lua
View File

@ -167,7 +167,7 @@ minetest.register_craft( {
-- Items/recipes not requiring smelting of anything new
minetest.register_craft( {
output = "homedecor:glass_table_small_round 15",
output = "homedecor:glass_table_small_round_b 15",
recipe = {
{ "", "default:glass", "" },
{ "default:glass", "default:glass", "default:glass" },
@ -176,7 +176,7 @@ minetest.register_craft( {
})
minetest.register_craft( {
output = "homedecor:glass_table_small_square 4",
output = "homedecor:glass_table_small_square_b 4",
recipe = {
{"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" },
{"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" }
@ -184,7 +184,7 @@ minetest.register_craft( {
})
minetest.register_craft( {
output = "homedecor:glass_table_large 4",
output = "homedecor:glass_table_large_b 4",
recipe = {
{ "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" },
{ "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }
@ -194,7 +194,7 @@ minetest.register_craft( {
--
minetest.register_craft( {
output = "homedecor:wood_table_small_round 15",
output = "homedecor:wood_table_small_round_b 15",
recipe = {
{ "", "group:wood", "" },
{ "group:wood", "group:wood", "group:wood" },
@ -203,7 +203,7 @@ minetest.register_craft( {
})
minetest.register_craft( {
output = "homedecor:wood_table_small_square 4",
output = "homedecor:wood_table_small_square_b 4",
recipe = {
{ "homedecor:wood_table_small_round","homedecor:wood_table_small_round" },
{ "homedecor:wood_table_small_round","homedecor:wood_table_small_round" }
@ -211,7 +211,7 @@ minetest.register_craft( {
})
minetest.register_craft( {
output = "homedecor:wood_table_large 4",
output = "homedecor:wood_table_large_b 4",
recipe = {
{ "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" },
{ "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }
@ -222,19 +222,19 @@ minetest.register_craft( {
minetest.register_craft({
type = "fuel",
recipe = "homedecor:wood_table_small_round",
recipe = "homedecor:wood_table_small_round_b",
burntime = 30,
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:wood_table_small_square",
recipe = "homedecor:wood_table_small_square_b",
burntime = 30,
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:wood_table_large",
recipe = "homedecor:wood_table_large_b",
burntime = 30,
})

6
homedecor/fences.lua
View File

@ -272,7 +272,7 @@ minetest.register_node("homedecor:fence_privacy", {
minetest.register_node("homedecor:fence_privacy_corner", {
drawtype = "nodebox",
description = S("Wooden Privacy Fence"),
description = S("Wooden Privacy Fence Corner"),
tiles = {
"homedecor_fence_privacy_corner_top.png",
"homedecor_fence_privacy_corner_bottom.png",
@ -336,7 +336,7 @@ minetest.register_node("homedecor:fence_barbed_wire", {
minetest.register_node("homedecor:fence_barbed_wire_corner", {
drawtype = "nodebox",
description = S("Barbed Wire Fence"),
description = S("Barbed Wire Fence Corner"),
tiles = {
"homedecor_fence_barbed_wire.png"
},
@ -401,7 +401,7 @@ minetest.register_node("homedecor:fence_chainlink", {
minetest.register_node("homedecor:fence_chainlink_corner", {
drawtype = "nodebox",
description = "Chainlink Fence",
description = S("Chainlink Fence Corner"),
tiles = {
"homedecor_fence_chainlink_corner_top.png",
"homedecor_fence_chainlink_corner_bottom.png",

20
homedecor/furnaces.lua
View File

@ -128,7 +128,7 @@ function homedecor.register_furnace(name, furnacedef)
if listname == "fuel" then
if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then
if inv:is_empty("src") then
meta:set_string("infotext", desc.." is empty")
meta:set_string("infotext", S("%s is empty"):format(desc))
end
return stack:get_count()
else
@ -147,7 +147,7 @@ function homedecor.register_furnace(name, furnacedef)
if to_list == "fuel" then
if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then
if inv:is_empty("src") then
meta:set_string("infotext", desc.." is empty")
meta:set_string("infotext", S("%s is empty"):format(desc))
end
return count
else
@ -198,7 +198,7 @@ function homedecor.register_furnace(name, furnacedef)
if listname == "fuel" then
if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then
if inv:is_empty("src") then
meta:set_string("infotext",desc.." is empty")
meta:set_string("infotext",S("%s is empty"):format(desc))
end
return stack:get_count()
else
@ -217,7 +217,7 @@ function homedecor.register_furnace(name, furnacedef)
if to_list == "fuel" then
if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then
if inv:is_empty("src") then
meta:set_string("infotext",desc.." is empty")
meta:set_string("infotext",S("%s is empty"):format(desc))
end
return count
else
@ -291,7 +291,7 @@ function homedecor.register_furnace(name, furnacedef)
if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
local percent = math.floor(meta:get_float("fuel_time") /
meta:get_float("fuel_totaltime") * 100)
meta:set_string("infotext",desc..((" active: %d%%"):format(percent)))
meta:set_string("infotext",S("%s active: %d%%"):format(desc,percent))
hacky_swap_node(pos,name_active)
meta:set_string("formspec", make_formspec(furnacedef, percent))
return
@ -311,7 +311,7 @@ function homedecor.register_furnace(name, furnacedef)
end
if (not fuel) or (fuel.time <= 0) then
meta:set_string("infotext",desc..": Out of fuel")
meta:set_string("infotext",desc..S(": Out of fuel"))
hacky_swap_node(pos,name)
meta:set_string("formspec", make_formspec(furnacedef, 0))
return
@ -319,7 +319,7 @@ function homedecor.register_furnace(name, furnacedef)
if cooked.item:is_empty() then
if was_active then
meta:set_string("infotext",desc.." is empty")
meta:set_string("infotext",S("%s is empty"):format(desc))
hacky_swap_node(pos,name)
meta:set_string("formspec", make_formspec(furnacedef, 0))
end
@ -327,7 +327,7 @@ function homedecor.register_furnace(name, furnacedef)
end
if not inv:room_for_item("dst", cooked.item) then
meta:set_string("infotext", desc..": output bins are full")
meta:set_string("infotext", desc..S(": output bins are full"))
hacky_swap_node(pos, name)
meta:set_string("formspec", make_formspec(furnacedef, 0))
return
@ -343,7 +343,7 @@ function homedecor.register_furnace(name, furnacedef)
end
homedecor.register_furnace("homedecor:oven", {
description = "Oven",
description = S("Oven"),
tile_format = "homedecor_oven_%s%s.png",
output_slots = 4,
output_width = 2,
@ -351,7 +351,7 @@ homedecor.register_furnace("homedecor:oven", {
})
homedecor.register_furnace("homedecor:microwave_oven", {
description = "Microwave Oven",
description = S("Microwave Oven"),
tiles = {
"homedecor_microwave_top.png", "homedecor_microwave_bottom.png",
"homedecor_microwave_right.png", "homedecor_microwave_left.png",

11
homedecor/furniture.lua
View File

@ -1,7 +1,8 @@
local S = homedecor.gettext
-- Test
minetest.register_node("homedecor:table", {
description = "Table",
description = S("Table"),
tiles = {
"forniture_wood.png",
"forniture_wood.png",
@ -31,7 +32,7 @@ minetest.register_node("homedecor:table", {
})
minetest.register_node("homedecor:chair", {
description = "Chair",
description = S("Chair"),
tiles = {
"forniture_wood.png",
"forniture_wood.png",
@ -72,9 +73,9 @@ local chaircolors = {
for i in ipairs(chaircolors) do
local color = chaircolors[i][1]
local name = chaircolors[i][2]
local name = S(chaircolors[i][2])
minetest.register_node("homedecor:armchair_"..color, {
description = "Armchair ("..name..")",
description = S("Armchair (%s)"):format(name),
tiles = {
"forniture_armchair_top_"..color..".png",
"forniture_armchair_top_"..color..".png",
@ -126,7 +127,7 @@ local repl = { off="low", low="med", med="hi", hi="max", max="off", }
local function reg_lamp(suffix, nxt, desc, tilesuffix, light)
minetest.register_node("homedecor:table_lamp_"..suffix, {
description = desc,
description = S(desc),
drawtype = "nodebox",
tiles = {
"forniture_table_lamp_s"..tilesuffix..".png",

2
homedecor/kitchen_cabinet.lua
View File

@ -53,7 +53,7 @@ minetest.register_node('homedecor:kitchen_cabinet', {
minetest.register_node('homedecor:kitchen_cabinet_half', {
drawtype="nodebox",
description = 'Half-height Kitchen Cabinet (on ceiling)',
description = S('Half-height Kitchen Cabinet (on ceiling)'),
tiles = { 'homedecor_kitchen_cabinet_sides.png',
'homedecor_kitchen_cabinet_bottom.png',
'homedecor_kitchen_cabinet_sides.png',

72
homedecor/locale/template.txt
View File

@ -1,4 +1,3 @@
##########################
# Template language file #
##########################
@ -32,7 +31,7 @@ right =
### door_nodes.lua ###
Not enough vertical space to place a door! =
Not enough space above that spot to place a door! =
### crafts.lua ###
Brass Ingot =
@ -53,21 +52,38 @@ Unprocessed Plastic base =
### fences.lua ###
Barbed Wire Fence =
Barbed Wire Fence Corner =
Barbed Wire Fence Gate =
Brass Fence/railing =
Brass Fence/railing with sign =
Chainlink Fence =
Chainlink Fence Corner =
Chainlink Fence Gate =
Chainlink Fence Gate (open) =
Unpainted Picket Fence =
Unpainted Picket Fence Corner =
Unpainted Picket Fence Gate =
White Picket Fence =
White Picket Fence Corner =
White Picket Fence Gate =
Wooden Privacy Fence =
Wooden Privacy Fence Corner =
Wrought Iron Fence/railing =
Wrought Iron Fence/railing with sign =
want to simply place the wielded item like usual. =
### furniture.lua ###
Table =
Chair =
Black =
Red =
Pink =
Violet =
Blue =
Dark Green =
## 1: Color name
Armchair (%s) =
Table Lamp =
### furniture_medieval.lua ###
Bars =
Binding Bars =
@ -83,10 +99,14 @@ Shower Head =
### init.lua ###
Loaded! =
Air Conditioner =
Asphalt Shingles =
Asphalt Shingles (outer corner) =
Asphalt Shingles (inner corner) =
Black Plastic Flower Pot =
Brass Pole =
Brass Table Legs =
Wrought Iron Table Legs =
red =
green =
blue =
@ -97,11 +117,13 @@ violet =
Curtains (%s) =
Drop-Ceiling Tile =
Glass Skylight =
Glass Skylight Frosted =
Glass Table (Small, Round) =
Glass Table (Small, Square) =
Glass Table Piece (large) =
Green Plastic Flower Pot =
Large Area Rug =
Large Glass Table Piece =
Glass Table Piece (large) =
Large Stereo Speaker =
Legs for Utility Table =
Projection Screen Material =
@ -109,25 +131,29 @@ Small Surround Speaker =
Small Throw Rug =
Stereo Receiver =
Terracotta Flower Pot =
Terracotta Roofing =
Terracotta Shingles =
Terracotta Shingles (outer corner) =
Terracotta Shingles (inner corner) =
Textured Ceiling Paint =
Utility Table =
Utility table mk2 =
Wooden Shutter (Black) =
Wooden Shutter (Dark Grey) =
Wooden Shutter (Forest Green) =
Wooden Shutter (Dark grey) =
Wooden Shutter (Forest green) =
Wooden Shutter (Grey) =
Wooden Shutter (Light Blue) =
Wooden Shutter (Purple) =
Wooden Shutter (Light blue) =
Wooden Shutter (Violet) =
Wooden Shutter (Red) =
Wooden Shutter (Unpainted Mahogany) =
Wooden Shutter (Unpainted Oak) =
Wooden Shutter (Mahogany) =
Wooden Shutter (Unpainted oak) =
Wooden Shutter (White) =
Wooden Shutter (Yellow) =
Wooden Tabletop piece =
Wooden Tabletop (Small, Round) =
Wooden Tabletop (Small, Square) =
Wood Table Piece (large)=
Wood Table (Small, Round) =
Wood Table (Small, Square) =
Wood Shingles =
Wood Shingles (outer corner) =
Wood Shingles (inner corner) =
Wrought Iron Pole =
someone =
## 1: Player name
@ -154,8 +180,13 @@ Yellow Glowlight (thin, on wall) =
%s tried to access a %s belonging to %s at %s =
## 1: Item description
%s (Locked) =
Locked Fridge =
Locked Cabinet =
Locked Nightstand =
Locked Oven =
Locked Oven (active) =
Locked Microwave Oven =
Locked Microwave Oven (active) =
### nightstands.lua ###
Mahogany Nightstand with One Drawer =
@ -171,12 +202,15 @@ Two-drawer Nightstand =
### oven.lua ###
Oven =
## 1: Item name
Microwave Oven =
## 1: Item descrition
Could not insert '%s' =
## 1: Percentage
Oven active: %d%% =
Oven out of fuel =
Oven is empty =
## 1: Item description, 2: Percentage
%s active: %d%% =
## 1: Item description
%s is empty =
: Out of fuel =
: output bins are full =
### refrigerator.lua ###
Refrigerator =

2
homedecor/locked.lua
View File

@ -120,7 +120,7 @@ end
local items = {
{ "refrigerator",
"Cabinet" },
"Fridge" },
{ "kitchen_cabinet",
"Cabinet" },
{ "kitchen_cabinet_half",

4
homedecor/shingles.lua
View File

@ -20,7 +20,7 @@ minetest.register_node("homedecor:skylight", {
})
minetest.register_node("homedecor:skylight_frosted", {
description = S("Glass Skylight"),
description = S("Glass Skylight Frosted"),
drawtype = "raillike",
tiles = { "homedecor_skylight_frosted.png" },
wield_image = "homedecor_skylight_frosted.png",
@ -72,7 +72,7 @@ minetest.register_node("homedecor:shingles_asphalt", {
})
minetest.register_node("homedecor:shingles_terracotta", {
description = S("Terracotta Roofing"),
description = S("Terracotta Shingles"),
drawtype = "raillike",
tiles = { "homedecor_shingles_terracotta.png" },
wield_image = "homedecor_shingles_terracotta.png",

10
homedecor/tables.lua
View File

@ -83,7 +83,7 @@ for i in ipairs(materials) do
})
minetest.register_node('homedecor:'..m..'_table_small_square_t', {
description = S(d.."Glass Table (Small, Square)"),
description = S(d.." Table (Small, Square)"),
drawtype = 'nodebox',
tiles = {
'homedecor_'..m..'_table_small_square_tb.png',
@ -281,7 +281,7 @@ for i in ipairs(materials) do
-- Large square table pieces
minetest.register_node('homedecor:'..m..'_table_large_b', {
description = S(d.."Table Piece (large)"),
description = S(d.." Table Piece (large)"),
drawtype = 'nodebox',
tiles = {
'homedecor_'..m..'_table_large_tb.png',
@ -338,7 +338,7 @@ for i in ipairs(materials) do
})
minetest.register_node('homedecor:'..m..'_table_large_t', {
description = S(d.."Table Piece (large)"),
description = S(d.." Table Piece (large)"),
drawtype = 'nodebox',
tiles = {
'homedecor_'..m..'_table_large_tb.png',
@ -368,7 +368,7 @@ for i in ipairs(materials) do
})
minetest.register_node('homedecor:'..m..'_table_large_s', {
description = S(d.."Table Piece (large)"),
description = S(d.." Table Piece (large)"),
drawtype = 'nodebox',
tiles = {
'homedecor_'..m..'_table_large_edges.png',
@ -456,7 +456,7 @@ minetest.register_node("homedecor:table_legs_brass", {
})
minetest.register_node("homedecor:table_legs_wrought_iron", {
description = S("Brass Table Legs"),
description = S("Wrought Iron Table Legs"),
drawtype = "plantlike",
tiles = {"homedecor_table_legs_wrought_iron.png"},
inventory_image = "homedecor_table_legs_wrought_iron.png",

2
signs_lib/init.lua
View File

@ -407,7 +407,7 @@ signs_lib.update_sign = function(pos, fields)
end
minetest.register_node(":default:sign_wall", {
description = "Sign",
description = S("Sign"),
inventory_image = "default_sign_wall.png",
wield_image = "default_sign_wall.png",
node_placement_prediction = "",

9
signs_lib/locale/template.txt Normal file
View File

@ -0,0 +1,9 @@
#Template
Reading cached character database. =
Font seems to have changed. Rebuilding cache. =
Could not find font line height in cached DB. Trying brute force. =
Sign =
%s wrote "%s" to sign at %s =
Registered %s and %s =
signs loaded =