Compare commits

..

No commits in common. "1a2e15fa75ac7d93054936c1d7d2eaed7224a901" and "1ba3ff8d5d3908fce27132aeff4bf26d6da8b9b9" have entirely different histories.

5 changed files with 11 additions and 34 deletions

View File

@ -14,16 +14,10 @@ Items=Aĵoj
There is already a bag=Jam estas sako
This is not a bag=Tio ne estas sako
@1 (@2% full)=@1 (@2% plena)
Small Backpack=Malgranda sako
Medium Backpack=Mezgrana sako
Large Backpack=Granda sako
Teleported to: @1=Teleportita al: @1
Waypoints limit reached (@1)=Tro da vojmarkoj (Limo: @1)
You already have set a waypoint at this position=Jam estas vojmarko ĉi tie
Welcome back home!=Bonvenon hejmen!
'home' privilege missing=Mankas la rajto «home»
Your Minetest client needs updating (www.minetest.net)=Via Minetest-kliento bezonas ĝisdatigon (www.minetest.net)
No home set=Neniu hejmo agordita
Any dye=Ajna tinkturo
Any coal=Ajna karbo
Any sand=Ajna sablo
@ -88,6 +82,7 @@ No=Ne
Home=Hejmo
Style=Stilo
Sorting=Ordigado
No home set=Neniu hejmo agordita
Set home=Agordi hejmon
Hide tabs=Kaŝi langetojn
HUD description=Fasada priskribo
@ -111,7 +106,7 @@ Replaced by @1 on smelting=Anstataŭiĝas per @1 forĝite
Replaced by @1 on burning=Anstataŭiĝas per @1 bruliĝinte
Replaced by @1 on crafting=Anstataŭiĝas per @1 konstruinte
Repairable by step of @1=Riparebla per @1
@1 of chance to drop=@1-ŝance lasos
@1 of chance to drop=@1
Only drop if using one of these tools: @1=Sole faligu uzante ion inter le jenaj:
Only drop if using this tool: @1=Sole faligu uzanto ĉi tion:
Shapeless=Senforma
@ -138,6 +133,3 @@ Collect items to reveal more recipes=Kolektu portaĵojn, por malkovri pli da rec
Click to hide=Klaku por kaŝi
Click to expand=Klaku por malkaŝi
Bookmarks=Markitaj
Unlocked=Malkovritaj
New recipe unlocked!=Malkovris novan recepton!
@1 new recipes unlocked!=Malkovris @1 da receptoj!

View File

@ -14,16 +14,10 @@ Items=
There is already a bag=
This is not a bag=
@1 (@2% full)=
Small Backpack=
Medium Backpack=
Large Backpack=
Teleported to: @1=
Waypoints limit reached (@1)=
You already have set a waypoint at this position=
Welcome back home!=
'home' privilege missing=
Your Minetest client needs updating (www.minetest.net)=
No home set=
Any dye=
Any coal=
Any sand=
@ -88,6 +82,7 @@ No=
Home=
Style=
Sorting=
No home set=
Set home=
Hide tabs=
HUD description=
@ -138,6 +133,3 @@ Collect items to reveal more recipes=
Click to hide=
Click to expand=
Bookmarks=
Unlocked=
New recipe unlocked!=
@1 new recipes unlocked!=

View File

@ -156,15 +156,11 @@ local bag_recipes = {
},
}
-- For detection by update_translations script.
-- S('Small Backpack')
-- S('Medium Backpack')
-- S('Large Backpack')
for size, item in pairs(bag_recipes) do
local bagname = fmt("i4:bag_%s", size)
core.register_craftitem(bagname, {
description = S(fmt("%s Backpack", size:gsub("^%l", string.upper))),
description = fmt("%s Backpack", size:gsub("^%l", string.upper)),
inventory_image = fmt("i3_bag_%s.png", size),
groups = {bag = item.size},
stack_max = 1,

View File

@ -138,7 +138,7 @@ local function inv_fields(player, data, fields)
if #data.waypoints >= max_waypoints then
play_sound(name, "i3_cannot", 0.8)
return msg(name, S("Waypoints limit reached (@1)", max_waypoints))
return msg(name, fmt("Waypoints limit reached (%u)", max_waypoints))
end
local pos = player:get_pos()
@ -392,13 +392,13 @@ local function home_footer_fields(player, data, fields)
-- Use minetest_games sethome API, if available.
if sethome then
if not sethome.go(name) then
msg(name, S("No home set"))
msg(name, "No home set")
else
msg(name, S("Welcome back home!"))
end
-- Otherwise, use i4s home.
elseif not data.home then
msg(name, S("No home set"))
msg(name, "No home set")
elseif name then
safe_teleport(player, str_to_pos(data.home))
msg(name, S("Welcome back home!"))
@ -424,7 +424,7 @@ end
local function settings_footer_fields(player, data, fields)
local name = player:get_player_name()
if fields.set_home and not check_privs(name, {home = true}) then
return msg(name, S("'home' privilege missing"))
return msg(name, "'home' privilege missing")
elseif fields.set_home then
if sethome then
sethome.set(name, player:get_pos())

View File

@ -2,14 +2,14 @@ local set_fs = i4.set_fs
local hud_notif = i4.hud_notif
local POLL_FREQ = 0.25
IMPORT("reg_items", "reg_nodes", "fmt", "S", "table_merge", "array_diff")
IMPORT("reg_items", "reg_nodes", "fmt", "table_merge", "array_diff")
IMPORT("is_group", "extract_groups", "item_has_groups", "apply_recipe_filters", "sort_by_category")
i4.remove_minitab"nodes"
i4.remove_minitab"items"
i4.new_minitab("unlocked", {
description = S("Unlocked"),
description = "Unlocked",
sorter = function(item, data)
return data.items_progress[item]
@ -142,10 +142,7 @@ local function poll_new_items(player, data, join)
data.discovered = data.known_recipes - oldknown
if data.discovered > 0 then
local msg = S("New recipe unlocked!")
if data.discovered > 1 then
msg = S("@1 new recipes unlocked!", data.discovered)
end
local msg = fmt("%u new recipe%s unlocked!", data.discovered, data.discovered > 1 and "s" or "")
local last_discovered = diff[1]
local img = reg_items[last_discovered].inventory_image