From 2be459a49a47a247d3ea947f715007b23dafdde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20P=C3=A9rez-Cerezo?= Date: Wed, 28 Dec 2016 22:23:07 +0100 Subject: Changed print() to minetest.log() to avoid annoying players in 0.4.15 --- income.lua | 4 ++-- init.lua | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/income.lua b/income.lua index 5aa6fbc..2bb42bc 100644 --- a/income.lua +++ b/income.lua @@ -11,7 +11,7 @@ minetest.register_globalstep(function(dtime) players_income[name] = 0 end players_income[name] = 1 - print("[Currency] basic income for "..name.."") + minetest.log("info", "[Currency] basic income for "..name.."") end end end) @@ -27,7 +27,7 @@ earn_income = function(player) local inv = player:get_inventory() inv:add_item("main", {name="currency:minegeld_5", count=count}) players_income[name] = 0 - print("[Currency] added basic income for "..name.." to inventory") + minetest.log("info", "[Currency] added basic income for "..name.." to inventory") end end diff --git a/init.lua b/init.lua index 0c94994..744fcad 100644 --- a/init.lua +++ b/init.lua @@ -1,20 +1,20 @@ -print(" Currency mod loading... ") +minetest.log("info", " Currency mod loading... ") local modpath = minetest.get_modpath("currency") dofile(modpath.."/craftitems.lua") -print("[Currency] Craft_items Loaded!") +minetest.log("info", "[Currency] Craft_items Loaded!") dofile(modpath.."/shop.lua") -print("[Currency] Shop Loaded!") +minetest.log("info", "[Currency] Shop Loaded!") dofile(modpath.."/barter.lua") -print("[Currency] Barter Loaded!") +minetest.log("info", "[Currency] Barter Loaded!") dofile(modpath.."/safe.lua") -print("[Currency] Safe Loaded!") +minetest.log("info", "[Currency] Safe Loaded!") dofile(modpath.."/crafting.lua") -print("[Currency] Crafting Loaded!") +minetest.log("info", "[Currency] Crafting Loaded!") if minetest.setting_getbool("creative_mode") then - print("[Currency] Creative mode in use, skipping basic income.") + minetest.log("info", "[Currency] Creative mode in use, skipping basic income.") else dofile(modpath.."/income.lua") - print("[Currency] Income Loaded!") + minetest.log("info", "[Currency] Income Loaded!") end -- cgit v1.2.3 From 4c11d3ce2edd0bc0fd45795069ec45e038229360 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sat, 11 Feb 2017 21:24:30 -0700 Subject: add support for intllib and loot mods --- barter.lua | 28 +++++---- craftitems.lua | 12 ++-- depends.txt | 4 +- income.lua | 8 ++- init.lua | 20 +++--- intllib.lua | 45 +++++++++++++ locale/template.pot | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++ loot.lua | 30 +++++++++ safe.lua | 38 +++++------ shop.lua | 38 ++++++----- 10 files changed, 334 insertions(+), 66 deletions(-) create mode 100644 intllib.lua create mode 100644 locale/template.pot create mode 100644 loot.lua diff --git a/barter.lua b/barter.lua index dad2e4a..1fb4f1b 100644 --- a/barter.lua +++ b/barter.lua @@ -1,5 +1,9 @@ barter = {} +-- internationalization boilerplate +local MP = minetest.get_modpath(minetest.get_current_modname()) +local S, NS = dofile(MP.."/intllib.lua") + barter.chest = {} barter.chest.formspec = { main = "size[8,9]".. @@ -7,20 +11,20 @@ barter.chest.formspec = { "list[current_name;pl2;5,0;3,4;]".. "list[current_player;main;0,5;8,4;]", pl1 = { - start = "button[3,1;1,1;pl1_start;Start]", + start = "button[3,1;1,1;pl1_start;" .. S("Start") .. "]", player = function(name) return "label[3,0;"..name.."]" end, - accept1 = "button[3,1;1,1;pl1_accept1;Confirm]".. - "button[3,2;1,1;pl1_cancel;Cancel]", - accept2 = "button[3,1;1,1;pl1_accept2;Exchange]".. - "button[3,2;1,1;pl1_cancel;Cancel]", + accept1 = "button[3,1;1,1;pl1_accept1;" .. S("Confirm") .. "]".. + "button[3,2;1,1;pl1_cancel;" .. S("Cancel") .. "]", + accept2 = "button[3,1;1,1;pl1_accept2;" .. S("Exchange") .. "]".. + "button[3,2;1,1;pl1_cancel;" .. S("Cancel") .. "]", }, pl2 = { - start = "button[4,1;1,1;pl2_start;Start]", + start = "button[4,1;1,1;pl2_start;" .. S("Start") .. "]", player = function(name) return "label[4,0;"..name.."]" end, - accept1 = "button[4,1;1,1;pl2_accept1;Confirm]".. - "button[4,2;1,1;pl2_cancel;Cancel]", - accept2 = "button[4,1;1,1;pl2_accept2;Exchange]".. - "button[4,2;1,1;pl2_cancel;Cancel]", + accept1 = "button[4,1;1,1;pl2_accept1;" .. S("Confirm") .. "]".. + "button[4,2;1,1;pl2_cancel;" .. S("Cancel") .. "]", + accept2 = "button[4,1;1,1;pl2_accept2;" .. S("Exchange") .. "]".. + "button[4,2;1,1;pl2_cancel;" .. S("Cancel") .. "]", }, } @@ -90,7 +94,7 @@ end minetest.register_node("currency:barter", { drawtype = "nodebox", - description = "Barter Table", + description = S("Barter Table"), paramtype = "light", paramtype2 = "facedir", tiles = {"barter_top.png", @@ -111,7 +115,7 @@ minetest.register_node("currency:barter", { sounds = default.node_sound_wood_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Barter Table") + meta:set_string("infotext", S("Barter Table")) meta:set_string("pl1","") meta:set_string("pl2","") barter.chest.update_formspec(meta) diff --git a/craftitems.lua b/craftitems.lua index 47ad953..a8d7570 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -1,26 +1,30 @@ +-- internationalization boilerplate +local MP = minetest.get_modpath(minetest.get_current_modname()) +local S, NS = dofile(MP.."/intllib.lua") + minetest.register_craftitem("currency:minegeld", { - description = "1 MineGeld Note", + description = S("1 MineGeld Note"), inventory_image = "minegeld.png", stack_max = 30000, groups = {minegeld = 1} }) minetest.register_craftitem("currency:minegeld_5", { - description = "5 MineGeld Note", + description = S("5 MineGeld Note"), inventory_image = "minegeld_5.png", stack_max = 30000, groups = {minegeld = 1} }) minetest.register_craftitem("currency:minegeld_10", { - description = "10 MineGeld Note", + description = S("10 MineGeld Note"), inventory_image = "minegeld_10.png", stack_max = 30000, groups = {minegeld = 1} }) minetest.register_craftitem("currency:minegeld_bundle", { - description = "Bundle of random Minegeld notes", + description = S("Bundle of random Minegeld notes"), inventory_image = "minegeld_bundle.png", stack_max = 30000, }) diff --git a/depends.txt b/depends.txt index 331d858..b474c2d 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,3 @@ -default \ No newline at end of file +default +intllib? +loot? \ No newline at end of file diff --git a/income.lua b/income.lua index 2bb42bc..e2146d0 100644 --- a/income.lua +++ b/income.lua @@ -1,5 +1,9 @@ players_income = {} +-- internationalization boilerplate +local MP = minetest.get_modpath(minetest.get_current_modname()) +local S, NS = dofile(MP.."/intllib.lua") + local timer = 0 minetest.register_globalstep(function(dtime) timer = timer + dtime; @@ -11,7 +15,7 @@ minetest.register_globalstep(function(dtime) players_income[name] = 0 end players_income[name] = 1 - minetest.log("info", "[Currency] basic income for "..name.."") + minetest.log("info", S("[Currency] basic income for @1", name)) end end end) @@ -27,7 +31,7 @@ earn_income = function(player) local inv = player:get_inventory() inv:add_item("main", {name="currency:minegeld_5", count=count}) players_income[name] = 0 - minetest.log("info", "[Currency] added basic income for "..name.." to inventory") + minetest.log("info", S("[Currency] added basic income for @1 to inventory", name)) end end diff --git a/init.lua b/init.lua index 744fcad..7060138 100644 --- a/init.lua +++ b/init.lua @@ -1,20 +1,24 @@ -minetest.log("info", " Currency mod loading... ") local modpath = minetest.get_modpath("currency") +-- internationalization boilerplate +local S, NS = dofile(modpath.."/intllib.lua") + +minetest.log("info", S("Currency mod loading...")) + dofile(modpath.."/craftitems.lua") -minetest.log("info", "[Currency] Craft_items Loaded!") +minetest.log("info", S("[Currency] Craft_items Loaded!")) dofile(modpath.."/shop.lua") -minetest.log("info", "[Currency] Shop Loaded!") +minetest.log("info", S("[Currency] Shop Loaded!")) dofile(modpath.."/barter.lua") -minetest.log("info", "[Currency] Barter Loaded!") +minetest.log("info", S("[Currency] Barter Loaded!")) dofile(modpath.."/safe.lua") -minetest.log("info", "[Currency] Safe Loaded!") +minetest.log("info", S("[Currency] Safe Loaded!")) dofile(modpath.."/crafting.lua") -minetest.log("info", "[Currency] Crafting Loaded!") +minetest.log("info", S("[Currency] Crafting Loaded!")) if minetest.setting_getbool("creative_mode") then - minetest.log("info", "[Currency] Creative mode in use, skipping basic income.") + minetest.log("info", S("[Currency] Creative mode in use, skipping basic income.")) else dofile(modpath.."/income.lua") - minetest.log("info", "[Currency] Income Loaded!") + minetest.log("info", S("[Currency] Income Loaded!")) end diff --git a/intllib.lua b/intllib.lua new file mode 100644 index 0000000..6669d72 --- /dev/null +++ b/intllib.lua @@ -0,0 +1,45 @@ + +-- Fallback functions for when `intllib` is not installed. +-- Code released under Unlicense . + +-- Get the latest version of this file at: +-- https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua + +local function format(str, ...) + local args = { ... } + local function repl(escape, open, num, close) + if escape == "" then + local replacement = tostring(args[tonumber(num)]) + if open == "" then + replacement = replacement..close + end + return replacement + else + return "@"..open..num..close + end + end + return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl)) +end + +local gettext, ngettext +if minetest.get_modpath("intllib") then + if intllib.make_gettext_pair then + -- New method using gettext. + gettext, ngettext = intllib.make_gettext_pair() + else + -- Old method using text files. + gettext = intllib.Getter() + end +end + +-- Fill in missing functions. + +gettext = gettext or function(msgid, ...) + return format(msgid, ...) +end + +ngettext = ngettext or function(msgid, msgid_plural, n, ...) + return format(n==1 and msgid or msgid_plural, ...) +end + +return gettext, ngettext diff --git a/locale/template.pot b/locale/template.pot new file mode 100644 index 0000000..aaae543 --- /dev/null +++ b/locale/template.pot @@ -0,0 +1,177 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-11 21:23-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: barter.lua:14 barter.lua:22 +msgid "Start" +msgstr "" + +#: barter.lua:16 barter.lua:24 +msgid "Confirm" +msgstr "" + +#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +msgid "Cancel" +msgstr "" + +#: barter.lua:18 barter.lua:26 shop.lua:20 +msgid "Exchange" +msgstr "" + +#: barter.lua:97 barter.lua:118 +msgid "Barter Table" +msgstr "" + +#: craftitems.lua:6 +msgid "1 MineGeld Note" +msgstr "" + +#: craftitems.lua:13 +msgid "5 MineGeld Note" +msgstr "" + +#: craftitems.lua:20 +msgid "10 MineGeld Note" +msgstr "" + +#: craftitems.lua:27 +msgid "Bundle of random Minegeld notes" +msgstr "" + +#: income.lua:18 +msgid "[Currency] basic income for @1" +msgstr "" + +#: income.lua:34 +msgid "[Currency] added basic income for @1 to inventory" +msgstr "" + +#: init.lua:6 +msgid "Currency mod loading..." +msgstr "" + +#: init.lua:9 +msgid "[Currency] Craft_items Loaded!" +msgstr "" + +#: init.lua:11 +msgid "[Currency] Shop Loaded!" +msgstr "" + +#: init.lua:13 +msgid "[Currency] Barter Loaded!" +msgstr "" + +#: init.lua:15 +msgid "[Currency] Safe Loaded!" +msgstr "" + +#: init.lua:17 +msgid "[Currency] Crafting Loaded!" +msgstr "" + +#: init.lua:20 +msgid "[Currency] Creative mode in use, skipping basic income." +msgstr "" + +#: init.lua:23 +msgid "[Currency] Income Loaded!" +msgstr "" + +#: safe.lua:29 +msgid "Safe" +msgstr "" + +#: safe.lua:44 +msgid "Safe (owned by @1)" +msgstr "" + +#: safe.lua:61 safe.lua:70 safe.lua:79 +msgid "@1 tried to access a safe belonging to @2 at @3" +msgstr "" + +#: safe.lua:86 +msgid "@1 moves stuff in safe at @2" +msgstr "" + +#: safe.lua:89 +msgid "@1 moves stuff to safe at @2" +msgstr "" + +#: safe.lua:92 +msgid "@1 takes stuff from safe at @2" +msgstr "" + +#: shop.lua:11 +msgid "Customer gives (pay here!)" +msgstr "" + +#: shop.lua:13 +msgid "Customer gets:" +msgstr "" + +#: shop.lua:15 +msgid "Owner wants:" +msgstr "" + +#: shop.lua:17 +msgid "Owner gives:" +msgstr "" + +#: shop.lua:26 +msgid "Customers gave:" +msgstr "" + +#: shop.lua:28 +msgid "Your stock:" +msgstr "" + +#: shop.lua:30 +msgid "You want:" +msgstr "" + +#: shop.lua:32 +msgid "In exchange, you give:" +msgstr "" + +#: shop.lua:34 +msgid "Owner, Use (E)+Place (right mouse button) for customer interface" +msgstr "" + +#: shop.lua:88 +msgid "Shop" +msgstr "" + +#: shop.lua:102 +msgid "Exchange shop (owned by @1)" +msgstr "" + +#: shop.lua:151 +msgid "This is your own shop, you can't exchange to yourself!" +msgstr "" + +#: shop.lua:188 +msgid "Exchanged!" +msgstr "" + +#: shop.lua:191 +msgid "Exchange can not be done, contact the shop owner." +msgstr "" + +#: shop.lua:193 +msgid "Exchange can not be done, check if you put all items!" +msgstr "" diff --git a/loot.lua b/loot.lua new file mode 100644 index 0000000..c66fbb5 --- /dev/null +++ b/loot.lua @@ -0,0 +1,30 @@ +if not minetest.get_modpath("loot") then + return +end + +loot.register_loot({ + weights = { generic = 50 }, + payload = { + stack = ItemStack("currency:minegeld"), + min_size = 1, + max_size = 50, + }, +}) + +loot.register_loot({ + weights = { generic = 50 }, + payload = { + stack = ItemStack("currency:minegeld_5"), + min_size = 1, + max_size = 10, + }, +}) + +loot.register_loot({ + weights = { generic = 50 }, + payload = { + stack = ItemStack("currency:minegeld_10"), + min_size = 1, + max_size = 5, + }, +}) \ No newline at end of file diff --git a/safe.lua b/safe.lua index 794e23a..1c53184 100644 --- a/safe.lua +++ b/safe.lua @@ -1,3 +1,7 @@ +-- internationalization boilerplate +local MP = minetest.get_modpath(minetest.get_current_modname()) +local S, NS = dofile(MP.."/intllib.lua") + function default.get_safe_formspec(pos) local spos = pos.x .. "," .. pos.y .. "," ..pos.z local formspec = @@ -22,12 +26,12 @@ local function has_safe_privilege(meta, player) end minetest.register_node("currency:safe", { - description = "Safe", + description = S("Safe"), inventory_image = "safe_front.png", paramtype = "light", paramtype2 = "facedir", tiles = {"safe_side.png", - "safe_side.png", + "safe_side.png", "safe_side.png", "safe_side.png", "safe_side.png", @@ -37,8 +41,7 @@ minetest.register_node("currency:safe", { after_place_node = function(pos, placer) local meta = minetest.get_meta(pos) meta:set_string("owner", placer:get_player_name() or "") - meta:set_string("infotext", "Safe (owned by ".. - meta:get_string("owner")..")") + meta:set_string("infotext", S("Safe (owned by @1)", meta:get_string("owner"))) end, on_construct = function(pos) local meta = minetest.get_meta(pos) @@ -55,10 +58,8 @@ minetest.register_node("currency:safe", { allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) local meta = minetest.get_meta(pos) if not has_safe_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a safe belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) + minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3", + player:get_player_name(), meta:get_string("owner"), minetest.pos_to_string(pos))) return 0 end return count @@ -66,10 +67,8 @@ minetest.register_node("currency:safe", { allow_metadata_inventory_put = function(pos, listname, index, stack, player) local meta = minetest.get_meta(pos) if not has_safe_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a safe belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) + minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3", + player:get_player_name(), meta:get_string("owner"), minetest.pos_to_string(pos))) return 0 end return stack:get_count() @@ -77,25 +76,20 @@ minetest.register_node("currency:safe", { allow_metadata_inventory_take = function(pos, listname, index, stack, player) local meta = minetest.get_meta(pos) if not has_safe_privilege(meta, player) then - minetest.log("action", player:get_player_name().. - " tried to access a safe belonging to ".. - meta:get_string("owner").." at ".. - minetest.pos_to_string(pos)) + minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3", + player:get_player_name(), meta:get_string("owner"), minetest.pos_to_string(pos))) return 0 end return stack:get_count() end, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in safe at "..minetest.pos_to_string(pos)) + minetest.log("action", S("@1 moves stuff in safe at @2", player:get_player_name(), minetest.pos_to_string(pos))) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to safe at "..minetest.pos_to_string(pos)) + minetest.log("action", S("@1 moves stuff to safe at @2", player:get_player_name(), minetest.pos_to_string(pos))) end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from safe at "..minetest.pos_to_string(pos)) + minetest.log("action", S("@1 takes stuff from safe at @2", player:get_player_name(), minetest.pos_to_string(pos))) end, on_rightclick = function(pos, node, clicker) local meta = minetest.get_meta(pos) diff --git a/shop.lua b/shop.lua index 08bfac7..07209e8 100644 --- a/shop.lua +++ b/shop.lua @@ -1,33 +1,37 @@ +-- internationalization boilerplate +local MP = minetest.get_modpath(minetest.get_current_modname()) +local S, NS = dofile(MP.."/intllib.lua") + default.shop = {} default.shop.current_shop = {} default.shop.formspec = { customer = function(pos) local list_name = "nodemeta:"..pos.x..','..pos.y..','..pos.z local formspec = "size[8,9.5]".. - "label[0,0;Customer gives (pay here !)]".. + "label[0,0;" .. S("Customer gives (pay here!)") .. "]".. "list[current_player;customer_gives;0,0.5;3,2;]".. - "label[0,2.5;Customer gets]".. + "label[0,2.5;" .. S("Customer gets:") .. "]".. "list[current_player;customer_gets;0,3;3,2;]".. - "label[5,0;Owner wants]".. + "label[5,0;" .. S("Owner wants:") .. "]".. "list["..list_name..";owner_wants;5,0.5;3,2;]".. - "label[5,2.5;Owner gives]".. + "label[5,2.5;" .. S("Owner gives:") .. "]".. "list["..list_name..";owner_gives;5,3;3,2;]".. "list[current_player;main;0,5.5;8,4;]".. - "button[3,2;2,1;exchange;Exchange]" + "button[3,2;2,1;exchange;" .. S("Exchange") .. "]" return formspec end, owner = function(pos) local list_name = "nodemeta:"..pos.x..','..pos.y..','..pos.z local formspec = "size[8,9.5]".. - "label[0,0;Customers gave:]".. + "label[0,0;" .. S("Customers gave:") .. "]".. "list["..list_name..";customers_gave;0,0.5;3,2;]".. - "label[0,2.5;Your stock:]".. + "label[0,2.5;" .. S("Your stock:") .. "]".. "list["..list_name..";stock;0,3;3,2;]".. - "label[5,0;You want:]".. + "label[5,0;" .. S("You want:") .. "]".. "list["..list_name..";owner_wants;5,0.5;3,2;]".. - "label[5,2.5;In exchange, you give:]".. + "label[5,2.5;" .. S("In exchange, you give:") .. "]".. "list["..list_name..";owner_gives;5,3;3,2;]".. - "label[0,5;Owner, Use(E)+Place(RMB) for customer interface]".. + "label[0,5;" .. S("Owner, Use (E)+Place (right mouse button) for customer interface") .. "]".. "list[current_player;main;0,5.5;8,4;]" return formspec end, @@ -81,10 +85,10 @@ default.shop.exchange = function(meta) end minetest.register_node("currency:shop", { - description = "Shop", + description = S("Shop"), paramtype2 = "facedir", tiles = {"shop_top.png", - "shop_top.png", + "shop_top.png", "shop_side.png", "shop_side.png", "shop_side.png", @@ -95,7 +99,7 @@ minetest.register_node("currency:shop", { after_place_node = function(pos, placer, itemstack) local owner = placer:get_player_name() local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Exchange shop (owned by "..owner..")") + meta:set_string("infotext", S("Exchange shop (owned by @1)", owner)) meta:set_string("owner",owner) --[[meta:set_string("pl1","") meta:set_string("pl2","")]] @@ -144,7 +148,7 @@ minetest.register_on_player_receive_fields(function(sender, formname, fields) local pos = default.shop.current_shop[name] local meta = minetest.get_meta(pos) if meta:get_string("owner") == name then - minetest.chat_send_player(name,"This is your own shop, you can't exchange to yourself !") + minetest.chat_send_player(name,S("This is your own shop, you can't exchange to yourself!")) else local minv = meta:get_inventory() local pinv = sender:get_inventory() @@ -181,12 +185,12 @@ minetest.register_on_player_receive_fields(function(sender, formname, fields) minv:remove_item("stock",item) pinv:add_item("customer_gets",item) end - minetest.chat_send_player(name,"Exchanged!") + minetest.chat_send_player(name,S("Exchanged!")) else if owners_fault then - minetest.chat_send_player(name,"Exchange can not be done, contact the shop owner.") + minetest.chat_send_player(name,S("Exchange can not be done, contact the shop owner.")) else - minetest.chat_send_player(name,"Exchange can not be done, check if you put all items !") + minetest.chat_send_player(name,S("Exchange can not be done, check if you put all items!")) end end end -- cgit v1.2.3 From ad08ce72cee09c3f8229a370b54b69ba850d36e2 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sun, 19 Feb 2017 19:39:24 -0700 Subject: I don't know what "a lot" of minegeld is --- loot.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loot.lua b/loot.lua index c66fbb5..40783a0 100644 --- a/loot.lua +++ b/loot.lua @@ -7,7 +7,7 @@ loot.register_loot({ payload = { stack = ItemStack("currency:minegeld"), min_size = 1, - max_size = 50, + max_size = 500, }, }) @@ -16,7 +16,7 @@ loot.register_loot({ payload = { stack = ItemStack("currency:minegeld_5"), min_size = 1, - max_size = 10, + max_size = 100, }, }) @@ -25,6 +25,6 @@ loot.register_loot({ payload = { stack = ItemStack("currency:minegeld_10"), min_size = 1, - max_size = 5, + max_size = 50, }, }) \ No newline at end of file -- cgit v1.2.3 From f6c00b5e20ee7471f1b07e5f759310264129aa6e Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sun, 19 Feb 2017 19:45:39 -0700 Subject: Settling on a max value of about 2-5 diamonds' worth of minegeld --- loot.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loot.lua b/loot.lua index 40783a0..e687724 100644 --- a/loot.lua +++ b/loot.lua @@ -7,7 +7,7 @@ loot.register_loot({ payload = { stack = ItemStack("currency:minegeld"), min_size = 1, - max_size = 500, + max_size = 250, }, }) @@ -16,7 +16,7 @@ loot.register_loot({ payload = { stack = ItemStack("currency:minegeld_5"), min_size = 1, - max_size = 100, + max_size = 50, }, }) @@ -25,6 +25,6 @@ loot.register_loot({ payload = { stack = ItemStack("currency:minegeld_10"), min_size = 1, - max_size = 50, + max_size = 10, }, }) \ No newline at end of file -- cgit v1.2.3 From 215a33ee9afa9726e7af5b96f03d642807014c60 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Mon, 20 Feb 2017 14:01:45 -0700 Subject: requested localization changes --- income.lua | 4 ++-- init.lua | 14 +++++++------- locale/template.pot | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/income.lua b/income.lua index e2146d0..cbbd5d8 100644 --- a/income.lua +++ b/income.lua @@ -15,7 +15,7 @@ minetest.register_globalstep(function(dtime) players_income[name] = 0 end players_income[name] = 1 - minetest.log("info", S("[Currency] basic income for @1", name)) + minetest.log("info", "[Currency] "..S("basic income for @1", name)) end end end) @@ -31,7 +31,7 @@ earn_income = function(player) local inv = player:get_inventory() inv:add_item("main", {name="currency:minegeld_5", count=count}) players_income[name] = 0 - minetest.log("info", S("[Currency] added basic income for @1 to inventory", name)) + minetest.log("info", "[Currency] "..S("added basic income for @1 to inventory", name)) end end diff --git a/init.lua b/init.lua index 7060138..fa85bd2 100644 --- a/init.lua +++ b/init.lua @@ -6,19 +6,19 @@ local S, NS = dofile(modpath.."/intllib.lua") minetest.log("info", S("Currency mod loading...")) dofile(modpath.."/craftitems.lua") -minetest.log("info", S("[Currency] Craft_items Loaded!")) +minetest.log("info", "[Currency] "..S("Craft_items Loaded!")) dofile(modpath.."/shop.lua") -minetest.log("info", S("[Currency] Shop Loaded!")) +minetest.log("info", "[Currency] "..S("Shop Loaded!")) dofile(modpath.."/barter.lua") -minetest.log("info", S("[Currency] Barter Loaded!")) +minetest.log("info", "[Currency] "..S("Barter Loaded!")) dofile(modpath.."/safe.lua") -minetest.log("info", S("[Currency] Safe Loaded!")) +minetest.log("info", "[Currency] "..S("Safe Loaded!")) dofile(modpath.."/crafting.lua") -minetest.log("info", S("[Currency] Crafting Loaded!")) +minetest.log("info", "[Currency] "..S("Crafting Loaded!")) if minetest.setting_getbool("creative_mode") then - minetest.log("info", S("[Currency] Creative mode in use, skipping basic income.")) + minetest.log("info", "[Currency] "..S("Creative mode in use, skipping basic income.")) else dofile(modpath.."/income.lua") - minetest.log("info", S("[Currency] Income Loaded!")) + minetest.log("info", "[Currency] "..S("Income Loaded!")) end diff --git a/locale/template.pot b/locale/template.pot index aaae543..f528214 100644 --- a/locale/template.pot +++ b/locale/template.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-11 21:23-0700\n" +"POT-Creation-Date: 2017-02-20 13:58-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,11 +53,11 @@ msgid "Bundle of random Minegeld notes" msgstr "" #: income.lua:18 -msgid "[Currency] basic income for @1" +msgid "basic income for @1" msgstr "" #: income.lua:34 -msgid "[Currency] added basic income for @1 to inventory" +msgid "added basic income for @1 to inventory" msgstr "" #: init.lua:6 @@ -65,31 +65,31 @@ msgid "Currency mod loading..." msgstr "" #: init.lua:9 -msgid "[Currency] Craft_items Loaded!" +msgid "Craft_items Loaded!" msgstr "" #: init.lua:11 -msgid "[Currency] Shop Loaded!" +msgid "Shop Loaded!" msgstr "" #: init.lua:13 -msgid "[Currency] Barter Loaded!" +msgid "Barter Loaded!" msgstr "" #: init.lua:15 -msgid "[Currency] Safe Loaded!" +msgid "Safe Loaded!" msgstr "" #: init.lua:17 -msgid "[Currency] Crafting Loaded!" +msgid "Crafting Loaded!" msgstr "" #: init.lua:20 -msgid "[Currency] Creative mode in use, skipping basic income." +msgid "Creative mode in use, skipping basic income." msgstr "" #: init.lua:23 -msgid "[Currency] Income Loaded!" +msgid "Income Loaded!" msgstr "" #: safe.lua:29 -- cgit v1.2.3 From 70e998e04019e3f9a2f2aace05ca826b1afbca46 Mon Sep 17 00:00:00 2001 From: Carter Kolwey Date: Wed, 22 Mar 2017 19:39:44 -0500 Subject: Add pipeworks support to shop Tubes place items into "Your Stock", and filters (must be owned by the shop owner) take from "Customers Gave" --- depends.txt | 3 ++- shop.lua | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/depends.txt b/depends.txt index 331d858..d3f04d8 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +pipeworks? diff --git a/shop.lua b/shop.lua index 08bfac7..36765a3 100644 --- a/shop.lua +++ b/shop.lua @@ -90,7 +90,7 @@ minetest.register_node("currency:shop", { "shop_side.png", "shop_front.png"}, inventory_image = "shop_front.png", - groups = {choppy=2,oddly_breakable_by_hand=2}, + groups = {choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1}, sounds = default.node_sound_wood_defaults(), after_place_node = function(pos, placer, itemstack) local owner = placer:get_player_name() @@ -104,7 +104,23 @@ minetest.register_node("currency:shop", { inv:set_size("stock", 3*2) inv:set_size("owner_wants", 3*2) inv:set_size("owner_gives", 3*2) + if minetest.get_modpath("pipeworks") then pipeworks.after_place(pos) end end, + after_dig_node = (pipeworks and pipeworks.after_dig), + tube = { + insert_object = function(pos, node, stack, direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:add_item("stock",stack) + end, + can_insert = function(pos,node,stack,direction) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return inv:room_for_item("stock", stack) + end, + input_inventory = "customers_gave", + connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1, top = 1} + }, on_rightclick = function(pos, node, clicker, itemstack) clicker:get_inventory():set_size("customer_gives", 3*2) clicker:get_inventory():set_size("customer_gets", 3*2) -- cgit v1.2.3 From 85a74f32ac56859f0dfe0962bf8cc2d323334733 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Mon, 15 May 2017 16:07:08 -0700 Subject: Test for global 'pipeworks' before calling --- shop.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shop.lua b/shop.lua index 36765a3..a11bdbc 100644 --- a/shop.lua +++ b/shop.lua @@ -33,6 +33,8 @@ default.shop.formspec = { end, } +local have_pipeworks = minetest.global_exists("pipeworks") + default.shop.check_privilege = function(listname,playername,meta) --[[if listname == "pl1" then if playername ~= meta:get_string("pl1") then @@ -104,9 +106,9 @@ minetest.register_node("currency:shop", { inv:set_size("stock", 3*2) inv:set_size("owner_wants", 3*2) inv:set_size("owner_gives", 3*2) - if minetest.get_modpath("pipeworks") then pipeworks.after_place(pos) end + if have_pipeworks then pipeworks.after_place(pos) end end, - after_dig_node = (pipeworks and pipeworks.after_dig), + after_dig_node = (have_pipeworks and pipeworks and pipeworks.after_dig), tube = { insert_object = function(pos, node, stack, direction) local meta = minetest.get_meta(pos) -- cgit v1.2.3 From 9e9b1bec4229ab9feff94be231de5113ff0131cd Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Fri, 12 May 2017 18:54:11 -0700 Subject: Replace deprecated 'setting_getbool' with 'settings:get_bool' --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index fa85bd2..6dbf3a9 100644 --- a/init.lua +++ b/init.lua @@ -16,7 +16,7 @@ minetest.log("info", "[Currency] "..S("Safe Loaded!")) dofile(modpath.."/crafting.lua") minetest.log("info", "[Currency] "..S("Crafting Loaded!")) -if minetest.setting_getbool("creative_mode") then +if minetest.settings:get_bool("creative_mode") then minetest.log("info", "[Currency] "..S("Creative mode in use, skipping basic income.")) else dofile(modpath.."/income.lua") -- cgit v1.2.3 From 5b534807aa091ee98296740ff85a70400fc6d211 Mon Sep 17 00:00:00 2001 From: inpos Date: Fri, 11 Aug 2017 17:12:12 +0300 Subject: Russian locale --- locale/ru.po | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 locale/ru.po diff --git a/locale/ru.po b/locale/ru.po new file mode 100644 index 0000000..951e75f --- /dev/null +++ b/locale/ru.po @@ -0,0 +1,179 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-20 13:58-0700\n" +"PO-Revision-Date: 2017-08-11 17:09+0300\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru\n" + +#: barter.lua:14 barter.lua:22 +msgid "Start" +msgstr "Старт" + +#: barter.lua:16 barter.lua:24 +msgid "Confirm" +msgstr "Подтверждение" + +#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +msgid "Cancel" +msgstr "Отмена" + +#: barter.lua:18 barter.lua:26 shop.lua:20 +msgid "Exchange" +msgstr "Обмен" + +#: barter.lua:97 barter.lua:118 +msgid "Barter Table" +msgstr "Таблица бартера" + +#: craftitems.lua:6 +msgid "1 MineGeld Note" +msgstr "Банкнота в 1 MineGeld" + +#: craftitems.lua:13 +msgid "5 MineGeld Note" +msgstr "Банкнота в 5 MineGeld" + +#: craftitems.lua:20 +msgid "10 MineGeld Note" +msgstr "Банкнота в 10 MineGeld" + +#: craftitems.lua:27 +msgid "Bundle of random Minegeld notes" +msgstr "Пачка случайных банкнот Minegeld" + +#: income.lua:18 +msgid "basic income for @1" +msgstr "базовая прибыль для @1" + +#: income.lua:34 +msgid "added basic income for @1 to inventory" +msgstr "базовая прибыль для @1 добавлена в инвентарь" + +#: init.lua:6 +msgid "Currency mod loading..." +msgstr "Загружается мод Currency..." + +#: init.lua:9 +msgid "Craft_items Loaded!" +msgstr "Предметы для сборки загружены!" + +#: init.lua:11 +msgid "Shop Loaded!" +msgstr "Магазин загружен!" + +#: init.lua:13 +msgid "Barter Loaded!" +msgstr "Бартер загружен!" + +#: init.lua:15 +msgid "Safe Loaded!" +msgstr "Сейф загружен!" + +#: init.lua:17 +msgid "Crafting Loaded!" +msgstr "Механизм сборки загружен!" + +#: init.lua:20 +msgid "Creative mode in use, skipping basic income." +msgstr "Используется режим творчества, пропускаем базовую прибыль." + +#: init.lua:23 +msgid "Income Loaded!" +msgstr "Прибыль загружена!" + +#: safe.lua:29 +msgid "Safe" +msgstr "Сейф" + +#: safe.lua:44 +msgid "Safe (owned by @1)" +msgstr "Сейф (принадлежит @1)" + +#: safe.lua:61 safe.lua:70 safe.lua:79 +msgid "@1 tried to access a safe belonging to @2 at @3" +msgstr "@1 попробовал открыть сейф, принадлежащий @2 в @3" + +#: safe.lua:86 +msgid "@1 moves stuff in safe at @2" +msgstr "@1 перемещает вещи в сейфе в @2" + +#: safe.lua:89 +msgid "@1 moves stuff to safe at @2" +msgstr "@1 кладёт вещи в сейф в @2" + +#: safe.lua:92 +msgid "@1 takes stuff from safe at @2" +msgstr "@1 забирает вещи из сейфа в @2" + +#: shop.lua:11 +msgid "Customer gives (pay here!)" +msgstr "Покупатель отдаёт (здесь оплата!)" + +#: shop.lua:13 +msgid "Customer gets:" +msgstr "Покупатель получает:" + +#: shop.lua:15 +msgid "Owner wants:" +msgstr "Владелец хочет:" + +#: shop.lua:17 +msgid "Owner gives:" +msgstr "Владелец отдаёт:" + +#: shop.lua:26 +msgid "Customers gave:" +msgstr "Покупатель отдал:" + +#: shop.lua:28 +msgid "Your stock:" +msgstr "Ваш запас:" + +#: shop.lua:30 +msgid "You want:" +msgstr "Вы хотите:" + +#: shop.lua:32 +msgid "In exchange, you give:" +msgstr "Взамен вы даёте:" + +#: shop.lua:34 +msgid "Owner, Use (E)+Place (right mouse button) for customer interface" +msgstr "Владелец, используйте (E)+Разместить (правая кнопка мыши) для открытия интерфейса покупателя" + +#: shop.lua:88 +msgid "Shop" +msgstr "Магазин" + +#: shop.lua:102 +msgid "Exchange shop (owned by @1)" +msgstr "Пункт обмена (принадлежит @1)" + +#: shop.lua:151 +msgid "This is your own shop, you can't exchange to yourself!" +msgstr "Это ваш собственный магазин, вы не можете обмениваться с самим собой!" + +#: shop.lua:188 +msgid "Exchanged!" +msgstr "Обмен произведён!" + +#: shop.lua:191 +msgid "Exchange can not be done, contact the shop owner." +msgstr "Обмен невозможен, свяжитесь с владельцем магазина." + +#: shop.lua:193 +msgid "Exchange can not be done, check if you put all items!" +msgstr "Обмен невозможен, проверьте, что вы положили все предметы!" -- cgit v1.2.3 From 68ab4ba95c3586636563e2ce0ff6099f43f5a472 Mon Sep 17 00:00:00 2001 From: inpos Date: Mon, 14 Aug 2017 11:19:11 +0300 Subject: Russian locale. Fix plural forms --- locale/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/ru.po b/locale/ru.po index 951e75f..15f54d9 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-02-20 13:58-0700\n" -"PO-Revision-Date: 2017-08-11 17:09+0300\n" +"PO-Revision-Date: 2017-08-11 19:03+0300\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.3\n" "Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "Language: ru\n" #: barter.lua:14 barter.lua:22 -- cgit v1.2.3 From 69b6b44a6a670dca2f05f8616dfb4d91546bae8f Mon Sep 17 00:00:00 2001 From: David OLIVIER Date: Thu, 28 Sep 2017 06:04:22 -0400 Subject: add listring support to safe --- safe.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/safe.lua b/safe.lua index 1c53184..b5c3c38 100644 --- a/safe.lua +++ b/safe.lua @@ -7,7 +7,9 @@ function default.get_safe_formspec(pos) local formspec = "size[8,9]".. "list[nodemeta:".. spos .. ";main;1,1;6,2;]".. - "list[current_player;main;0,5;8,4;]" + "list[current_player;main;0,5;8,4;]".. + "listring[nodemeta:".. spos .. ";main]".. + "listring[current_player;main]" return formspec end -- cgit v1.2.3 From 2f17ee7099113f2a9629ac54316cdf755311f7e5 Mon Sep 17 00:00:00 2001 From: "Muhammad Nur Hidayat Yasuyoshi (MNH48.com)" Date: Tue, 17 Oct 2017 02:13:32 +0800 Subject: Add Malay translation (#13) --- locale/ms.po | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 locale/ms.po diff --git a/locale/ms.po b/locale/ms.po new file mode 100644 index 0000000..54354d3 --- /dev/null +++ b/locale/ms.po @@ -0,0 +1,179 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-20 13:58-0700\n" +"PO-Revision-Date: 2017-10-17 02:03+0800\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.4\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: ms\n" + +#: barter.lua:14 barter.lua:22 +msgid "Start" +msgstr "Mula" + +#: barter.lua:16 barter.lua:24 +msgid "Confirm" +msgstr "Sah" + +#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +msgid "Cancel" +msgstr "Batal" + +#: barter.lua:18 barter.lua:26 shop.lua:20 +msgid "Exchange" +msgstr "Tukar" + +#: barter.lua:97 barter.lua:118 +msgid "Barter Table" +msgstr "Meja Barter" + +#: craftitems.lua:6 +msgid "1 MineGeld Note" +msgstr "Wang 1 MineGeld" + +#: craftitems.lua:13 +msgid "5 MineGeld Note" +msgstr "Wang 5 MineGeld" + +#: craftitems.lua:20 +msgid "10 MineGeld Note" +msgstr "Wang 10 MineGeld" + +#: craftitems.lua:27 +msgid "Bundle of random Minegeld notes" +msgstr "Seberkas wang Minegeld rawak" + +#: income.lua:18 +msgid "basic income for @1" +msgstr "pendapatan asas untuk @1" + +#: income.lua:34 +msgid "added basic income for @1 to inventory" +msgstr "pendapatan asas untuk @1 ditambah masuk ke dalam inventori" + +#: init.lua:6 +msgid "Currency mod loading..." +msgstr "Memuatkan mods Currency..." + +#: init.lua:9 +msgid "Craft_items Loaded!" +msgstr "Item pertukangan dimuatkan!" + +#: init.lua:11 +msgid "Shop Loaded!" +msgstr "Kedai dimuatkan!" + +#: init.lua:13 +msgid "Barter Loaded!" +msgstr "Meja barter dimuatkan!" + +#: init.lua:15 +msgid "Safe Loaded!" +msgstr "Peti besi dimuatkan!" + +#: init.lua:17 +msgid "Crafting Loaded!" +msgstr "Pertukangan dimuatkan!" + +#: init.lua:20 +msgid "Creative mode in use, skipping basic income." +msgstr "Dalam mod kreatif, pendapatan asas diabaikan." + +#: init.lua:23 +msgid "Income Loaded!" +msgstr "Pendapatan dimuatkan!" + +#: safe.lua:29 +msgid "Safe" +msgstr "Peti besi" + +#: safe.lua:44 +msgid "Safe (owned by @1)" +msgstr "Peti besi (pemilik: @1)" + +#: safe.lua:61 safe.lua:70 safe.lua:79 +msgid "@1 tried to access a safe belonging to @2 at @3" +msgstr "@1 cuba untuk mengakses peti besi milik @2 di @3" + +#: safe.lua:86 +msgid "@1 moves stuff in safe at @2" +msgstr "@1 pindahkan barang dalam peti besi di @2" + +#: safe.lua:89 +msgid "@1 moves stuff to safe at @2" +msgstr "@1 masukkan barang dalam peti besi di @2" + +#: safe.lua:92 +msgid "@1 takes stuff from safe at @2" +msgstr "@1 keluarkan barang dari peti besi di @2" + +#: shop.lua:11 +msgid "Customer gives (pay here!)" +msgstr "Pelanggan beri (bayar sini!)" + +#: shop.lua:13 +msgid "Customer gets:" +msgstr "Pelanggan dapat:" + +#: shop.lua:15 +msgid "Owner wants:" +msgstr "Penjual inginkan:" + +#: shop.lua:17 +msgid "Owner gives:" +msgstr "Penjual berikan:" + +#: shop.lua:26 +msgid "Customers gave:" +msgstr "Pelanggan berikan:" + +#: shop.lua:28 +msgid "Your stock:" +msgstr "Stok anda:" + +#: shop.lua:30 +msgid "You want:" +msgstr "Anda mahukan:" + +#: shop.lua:32 +msgid "In exchange, you give:" +msgstr "Anda berikan:" + +#: shop.lua:34 +msgid "Owner, Use (E)+Place (right mouse button) for customer interface" +msgstr "Penjual, Gunakan (E) + Letak (butang tetikus kanan) untuk antaramuka pelanggan" + +#: shop.lua:88 +msgid "Shop" +msgstr "Kedai" + +#: shop.lua:102 +msgid "Exchange shop (owned by @1)" +msgstr "Kedai (pemilik: @1)" + +#: shop.lua:151 +msgid "This is your own shop, you can't exchange to yourself!" +msgstr "Ini kedai anda, anda tidak boleh menjual kepada diri sendiri!" + +#: shop.lua:188 +msgid "Exchanged!" +msgstr "Jual!" + +#: shop.lua:191 +msgid "Exchange can not be done, contact the shop owner." +msgstr "Tak boleh jual, hubungi penjual." + +#: shop.lua:193 +msgid "Exchange can not be done, check if you put all items!" +msgstr "Tak boleh jual, pastikan anda ada apa yang penjual mahukan!" -- cgit v1.2.3 From 09f4bb6dae92b0790c9bd558b323c7eef72b82ad Mon Sep 17 00:00:00 2001 From: Jat15 Date: Sat, 12 May 2018 15:58:19 +0200 Subject: Add French Translate By Papou30 (#14) * Add French Translate By Papou30 * Improve translation (Onyx58 and me) --- locale/fr.po | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 locale/fr.po diff --git a/locale/fr.po b/locale/fr.po new file mode 100644 index 0000000..7fe2876 --- /dev/null +++ b/locale/fr.po @@ -0,0 +1,179 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-28 13:49+0200\n" +"PO-Revision-Date: 2018-05-12 14:55+0200\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.7\n" +"Last-Translator: Papou30\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Language: fr\n" + +#: barter.lua:14 barter.lua:22 +msgid "Start" +msgstr "Début" + +#: barter.lua:16 barter.lua:24 +msgid "Confirm" +msgstr "Confirmer" + +#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +msgid "Cancel" +msgstr "Annuler" + +#: barter.lua:18 barter.lua:26 shop.lua:20 +msgid "Exchange" +msgstr "Échange" + +#: barter.lua:97 barter.lua:118 +msgid "Barter Table" +msgstr "Table de troc" + +#: craftitems.lua:6 +msgid "1 MineGeld Note" +msgstr "1 MineGeld" + +#: craftitems.lua:13 +msgid "5 MineGeld Note" +msgstr "5 MineGeld" + +#: craftitems.lua:20 +msgid "10 MineGeld Note" +msgstr "10 MineGeld" + +#: craftitems.lua:27 +msgid "Bundle of random Minegeld notes" +msgstr "Liasse de Minegeld aléatoire" + +#: income.lua:18 +msgid "basic income for @1" +msgstr "revenu de base pour @1" + +#: income.lua:34 +msgid "added basic income for @1 to inventory" +msgstr "revenu de base ajouté pour @1 à l'inventaire" + +#: init.lua:6 +msgid "Currency mod loading..." +msgstr "Chargement du mod Currency..." + +#: init.lua:9 +msgid "Craft_items Loaded!" +msgstr "Fabrication d'objets (Craft_items) chargé!" + +#: init.lua:11 +msgid "Shop Loaded!" +msgstr "Boutique (Shop) chargée!" + +#: init.lua:13 +msgid "Barter Loaded!" +msgstr "Troc (Barter) chargé!" + +#: init.lua:15 +msgid "Safe Loaded!" +msgstr "Coffre-fort (Safe) chargé!" + +#: init.lua:17 +msgid "Crafting Loaded!" +msgstr "Artisanat (Crafting) chargé!" + +#: init.lua:20 +msgid "Creative mode in use, skipping basic income." +msgstr "Mod créatif en cours d'utilisation, ignoré le revenu de base." + +#: init.lua:23 +msgid "Income Loaded!" +msgstr "Revenu de base (Income) chargé!" + +#: safe.lua:29 +msgid "Safe" +msgstr "Coffre-fort" + +#: safe.lua:44 +msgid "Safe (owned by @1)" +msgstr "Coffre-fort (appartenant à @1)" + +#: safe.lua:61 safe.lua:70 safe.lua:79 +msgid "@1 tried to access a safe belonging to @2 at @3" +msgstr "@1 a tenté d'accéder à un coffre-fort appartenant à @2 à @3" + +#: safe.lua:86 +msgid "@1 moves stuff in safe at @2" +msgstr "@1 déplace le matériel dans coffre-fort à @2" + +#: safe.lua:89 +msgid "@1 moves stuff to safe at @2" +msgstr "@1 déplace le matériel vers coffre-fort à @2" + +#: safe.lua:92 +msgid "@1 takes stuff from safe at @2" +msgstr "@1 prend le matériel dans le coffre-fort à @2" + +#: shop.lua:11 +msgid "Customer gives (pay here!)" +msgstr "Client donne (payer ici!)" + +#: shop.lua:13 +msgid "Customer gets:" +msgstr "Client obtient:" + +#: shop.lua:15 +msgid "Owner wants:" +msgstr "Le propriétaire veut:" + +#: shop.lua:17 +msgid "Owner gives:" +msgstr "Propriétaire donne:" + +#: shop.lua:26 +msgid "Customers gave:" +msgstr "Le client a donné:" + +#: shop.lua:28 +msgid "Your stock:" +msgstr "Votre stock:" + +#: shop.lua:30 +msgid "You want:" +msgstr "Vous voulez:" + +#: shop.lua:32 +msgid "In exchange, you give:" +msgstr "En échange, vous donnez:" + +#: shop.lua:34 +msgid "Owner, Use (E)+Place (right mouse button) for customer interface" +msgstr "Propriétaire, utilisez (E) + place (bouton droit de la souris) pour l'interface client" + +#: shop.lua:88 +msgid "Shop" +msgstr "Boutique" + +#: shop.lua:102 +msgid "Exchange shop (owned by @1)" +msgstr "Boutique d'échange (détenue par @1)" + +#: shop.lua:151 +msgid "This is your own shop, you can't exchange to yourself!" +msgstr "C'est ta propre boutique, tu ne peux pas échanger avec toi-même!" + +#: shop.lua:188 +msgid "Exchanged!" +msgstr "Échangé!" + +#: shop.lua:191 +msgid "Exchange can not be done, contact the shop owner." +msgstr "L'échange ne peut être fait, contactez le propriétaire du magasin." + +#: shop.lua:193 +msgid "Exchange can not be done, check if you put all items!" +msgstr "L'echange ne peut pas etre fait, verifiez si vous mettez tous les articles!" -- cgit v1.2.3 From 5472c543dbfcb83e51175eb8f6a10f33d9ab905f Mon Sep 17 00:00:00 2001 From: "A.C.M" Date: Thu, 24 May 2018 22:38:34 +0200 Subject: German Translation added. --- locale/de.po | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 locale/de.po diff --git a/locale/de.po b/locale/de.po new file mode 100644 index 0000000..ba2e853 --- /dev/null +++ b/locale/de.po @@ -0,0 +1,183 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-05-24 22:01+0200\n" +"PO-Revision-Date: 2018-05-24 22:48+0200\n" +"Last-Translator: A.C.M. \n" +"Language-Team: \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.7\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: barter.lua +msgid "Start" +msgstr "Start" + +#: barter.lua +msgid "Confirm" +msgstr "Bestätigen" + +#: barter.lua +msgid "Cancel" +msgstr "Abbruch" + +#: barter.lua shop.lua +msgid "Exchange" +msgstr "Tausch" + +#: barter.lua +msgid "Barter Table" +msgstr "Tausch Tisch" + +#: craftitems.lua +msgid "1 MineGeld Note" +msgstr "1 Minegeld Banknote" + +#: craftitems.lua +msgid "5 MineGeld Note" +msgstr "5 Minegeld Banknote" + +#: craftitems.lua +msgid "10 MineGeld Note" +msgstr "10 Minegeld Banknote" + +#: craftitems.lua +msgid "50 MineGeld Note" +msgstr "50 Minegeld Banknote" + +#: craftitems.lua +msgid "Bundle of random Minegeld notes" +msgstr "Bündel von verschiedenen Minegeld Banknoten" + +#: income.lua +msgid "basic income for @1" +msgstr "Grundeinkommen für @1" + +#: income.lua +msgid "added basic income for @1 to inventory" +msgstr "Grundeinkommen für @1 ins Inventar gelegt" + +#: init.lua +msgid "Currency mod loading..." +msgstr "Currency mod lädt..." + +#: init.lua +msgid "Craft_items Loaded!" +msgstr "Craft_items geladen!" + +#: init.lua +msgid "Shop Loaded!" +msgstr "Geschäft geladen!" + +#: init.lua +msgid "Barter Loaded!" +msgstr "Tauschtisch geladen!" + +#: init.lua +msgid "Safe Loaded!" +msgstr "Safe geladen!" + +#: init.lua +msgid "Crafting Loaded!" +msgstr "Crafting geladen!" + +#: init.lua +msgid "Creative mode in use, skipping basic income." +msgstr "Kreativmodus eingeschalten, überspringe Grundeinkommen." + +#: init.lua +msgid "Income Loaded!" +msgstr "Income geladen!" + +#: safe.lua +msgid "Safe" +msgstr "Safe" + +#: safe.lua +msgid "Safe (owned by @1)" +msgstr "Safe (gehört @1)" + +#: safe.lua +msgid "@1 tried to access a safe belonging to @2 at @3" +msgstr "@1 versuchte den Zugriff auf Safe von @2 bei @3" + +#: safe.lua +msgid "@1 moves stuff in safe at @2" +msgstr "@1 verschiebt Gegenstände in den Safe bei @2" + +#: safe.lua +msgid "@1 moves stuff to safe at @2" +msgstr "@1 verschiebt Gegenstände nach Safe bei @2" + +#: safe.lua +msgid "@1 takes stuff from safe at @2" +msgstr "@1 nimmt Gegenstände aus Safe bei @2" + +#: shop.lua +msgid "Customer gives (pay here!)" +msgstr "Kunde gibt (bezahl hier!)" + +#: shop.lua +msgid "Customer gets:" +msgstr "Kunde bekommt:" + +#: shop.lua +msgid "Owner wants:" +msgstr "Inhaber will:" + +#: shop.lua +msgid "Owner gives:" +msgstr "Inhaber gibt:" + +#: shop.lua +msgid "Customers gave:" +msgstr "Kunde gab:" + +#: shop.lua +msgid "Your stock:" +msgstr "Dein Lager:" + +#: shop.lua +msgid "You want:" +msgstr "Du willst:" + +#: shop.lua +msgid "In exchange, you give:" +msgstr "Im Tausch, du gibst:" + +#: shop.lua +msgid "Owner, Use (E)+Place (right mouse button) for customer interface" +msgstr "Inhaber, Benutze (E)+Platziere (rechte Maustaste) für Kunde ..." + +#: shop.lua +msgid "Shop" +msgstr "Geschäft" + +#: shop.lua +msgid "Exchange shop (owned by @1)" +msgstr "Tauschgeschäft (gehört @1)" + +#: shop.lua +msgid "This is your own shop, you can't exchange to yourself!" +msgstr "Das ist dein eigenes Geschäft, du kannst nicht mit dir selbst tauschen!" + +#: shop.lua +msgid "Exchanged!" +msgstr "Getauscht!" + +#: shop.lua +msgid "Exchange can not be done, contact the shop owner." +msgstr "Tausch kann nicht abgeschlossen werden, benachrichtige den Geschäftsinhaber." + +#: shop.lua +msgid "Exchange can not be done, check if you put all items!" +msgstr "Tausch kann nicht abgeschlossen werden, prüfe nochmal alles was du hinein gelegt hast!" -- cgit v1.2.3 From bb3fd1a928c730c9a99a341ec4aa9969f99c0195 Mon Sep 17 00:00:00 2001 From: "A.C.M" Date: Thu, 24 May 2018 23:08:23 +0200 Subject: 50-minegeld Note added. --- crafting.lua | 12 ++++++ craftitems.lua | 7 ++++ locale/fr.po | 98 +++++++++++++++++++++++++---------------------- locale/ms.po | 95 ++++++++++++++++++++++++--------------------- locale/ru.po | 98 +++++++++++++++++++++++++---------------------- locale/template.pot | 87 +++++++++++++++++++++-------------------- textures/minegeld_50.png | Bin 0 -> 1014 bytes 7 files changed, 222 insertions(+), 175 deletions(-) create mode 100644 textures/minegeld_50.png diff --git a/crafting.lua b/crafting.lua index d80b74c..ab1374c 100644 --- a/crafting.lua +++ b/crafting.lua @@ -47,6 +47,18 @@ minetest.register_craft({ recipe = {"currency:minegeld_5"}, }) +minetest.register_craft({ + type = "shapeless", + output = "currency:minegeld_10 5", + recipe = {"currency:minegeld_50"}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "currency:minegeld_50", + recipe = {"currency:minegeld_10", "currency:minegeld_10", "currency:minegeld_10", "currency:minegeld_10", "currency:minegeld_10"}, +}) + minetest.register_craft({ type = "shapeless", output = "currency:minegeld_bundle", diff --git a/craftitems.lua b/craftitems.lua index a8d7570..521195f 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -23,6 +23,13 @@ minetest.register_craftitem("currency:minegeld_10", { groups = {minegeld = 1} }) +minetest.register_craftitem("currency:minegeld_50", { + description = S("50 MineGeld Note"), + inventory_image = "minegeld_50.png", + stack_max = 30000, + groups = {minegeld = 1} +}) + minetest.register_craftitem("currency:minegeld_bundle", { description = S("Bundle of random Minegeld notes"), inventory_image = "minegeld_bundle.png", diff --git a/locale/fr.po b/locale/fr.po index 7fe2876..cdc803b 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -7,173 +7,181 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-28 13:49+0200\n" +"POT-Creation-Date: 2018-05-24 23:06+0200\n" "PO-Revision-Date: 2018-05-12 14:55+0200\n" +"Last-Translator: Papou30\n" "Language-Team: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.7\n" -"Last-Translator: Papou30\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: fr\n" -#: barter.lua:14 barter.lua:22 +#: barter.lua msgid "Start" msgstr "Début" -#: barter.lua:16 barter.lua:24 +#: barter.lua msgid "Confirm" msgstr "Confirmer" -#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +#: barter.lua msgid "Cancel" msgstr "Annuler" -#: barter.lua:18 barter.lua:26 shop.lua:20 +#: barter.lua shop.lua msgid "Exchange" msgstr "Échange" -#: barter.lua:97 barter.lua:118 +#: barter.lua msgid "Barter Table" msgstr "Table de troc" -#: craftitems.lua:6 +#: craftitems.lua msgid "1 MineGeld Note" msgstr "1 MineGeld" -#: craftitems.lua:13 +#: craftitems.lua msgid "5 MineGeld Note" msgstr "5 MineGeld" -#: craftitems.lua:20 +#: craftitems.lua msgid "10 MineGeld Note" msgstr "10 MineGeld" -#: craftitems.lua:27 +#: craftitems.lua +#, fuzzy +msgid "50 MineGeld Note" +msgstr "5 MineGeld" + +#: craftitems.lua msgid "Bundle of random Minegeld notes" msgstr "Liasse de Minegeld aléatoire" -#: income.lua:18 +#: income.lua msgid "basic income for @1" msgstr "revenu de base pour @1" -#: income.lua:34 +#: income.lua msgid "added basic income for @1 to inventory" msgstr "revenu de base ajouté pour @1 à l'inventaire" -#: init.lua:6 +#: init.lua msgid "Currency mod loading..." msgstr "Chargement du mod Currency..." -#: init.lua:9 +#: init.lua msgid "Craft_items Loaded!" msgstr "Fabrication d'objets (Craft_items) chargé!" -#: init.lua:11 +#: init.lua msgid "Shop Loaded!" msgstr "Boutique (Shop) chargée!" -#: init.lua:13 +#: init.lua msgid "Barter Loaded!" msgstr "Troc (Barter) chargé!" -#: init.lua:15 +#: init.lua msgid "Safe Loaded!" msgstr "Coffre-fort (Safe) chargé!" -#: init.lua:17 +#: init.lua msgid "Crafting Loaded!" msgstr "Artisanat (Crafting) chargé!" -#: init.lua:20 +#: init.lua msgid "Creative mode in use, skipping basic income." msgstr "Mod créatif en cours d'utilisation, ignoré le revenu de base." -#: init.lua:23 +#: init.lua msgid "Income Loaded!" msgstr "Revenu de base (Income) chargé!" -#: safe.lua:29 +#: safe.lua msgid "Safe" msgstr "Coffre-fort" -#: safe.lua:44 +#: safe.lua msgid "Safe (owned by @1)" msgstr "Coffre-fort (appartenant à @1)" -#: safe.lua:61 safe.lua:70 safe.lua:79 +#: safe.lua msgid "@1 tried to access a safe belonging to @2 at @3" msgstr "@1 a tenté d'accéder à un coffre-fort appartenant à @2 à @3" -#: safe.lua:86 +#: safe.lua msgid "@1 moves stuff in safe at @2" msgstr "@1 déplace le matériel dans coffre-fort à @2" -#: safe.lua:89 +#: safe.lua msgid "@1 moves stuff to safe at @2" msgstr "@1 déplace le matériel vers coffre-fort à @2" -#: safe.lua:92 +#: safe.lua msgid "@1 takes stuff from safe at @2" msgstr "@1 prend le matériel dans le coffre-fort à @2" -#: shop.lua:11 +#: shop.lua msgid "Customer gives (pay here!)" msgstr "Client donne (payer ici!)" -#: shop.lua:13 +#: shop.lua msgid "Customer gets:" msgstr "Client obtient:" -#: shop.lua:15 +#: shop.lua msgid "Owner wants:" msgstr "Le propriétaire veut:" -#: shop.lua:17 +#: shop.lua msgid "Owner gives:" msgstr "Propriétaire donne:" -#: shop.lua:26 +#: shop.lua msgid "Customers gave:" msgstr "Le client a donné:" -#: shop.lua:28 +#: shop.lua msgid "Your stock:" msgstr "Votre stock:" -#: shop.lua:30 +#: shop.lua msgid "You want:" msgstr "Vous voulez:" -#: shop.lua:32 +#: shop.lua msgid "In exchange, you give:" msgstr "En échange, vous donnez:" -#: shop.lua:34 +#: shop.lua msgid "Owner, Use (E)+Place (right mouse button) for customer interface" -msgstr "Propriétaire, utilisez (E) + place (bouton droit de la souris) pour l'interface client" +msgstr "" +"Propriétaire, utilisez (E) + place (bouton droit de la souris) pour " +"l'interface client" -#: shop.lua:88 +#: shop.lua msgid "Shop" msgstr "Boutique" -#: shop.lua:102 +#: shop.lua msgid "Exchange shop (owned by @1)" msgstr "Boutique d'échange (détenue par @1)" -#: shop.lua:151 +#: shop.lua msgid "This is your own shop, you can't exchange to yourself!" msgstr "C'est ta propre boutique, tu ne peux pas échanger avec toi-même!" -#: shop.lua:188 +#: shop.lua msgid "Exchanged!" msgstr "Échangé!" -#: shop.lua:191 +#: shop.lua msgid "Exchange can not be done, contact the shop owner." msgstr "L'échange ne peut être fait, contactez le propriétaire du magasin." -#: shop.lua:193 +#: shop.lua msgid "Exchange can not be done, check if you put all items!" -msgstr "L'echange ne peut pas etre fait, verifiez si vous mettez tous les articles!" +msgstr "" +"L'echange ne peut pas etre fait, verifiez si vous mettez tous les articles!" diff --git a/locale/ms.po b/locale/ms.po index 54354d3..f6a3f5b 100644 --- a/locale/ms.po +++ b/locale/ms.po @@ -7,173 +7,180 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 13:58-0700\n" +"POT-Creation-Date: 2018-05-24 23:06+0200\n" "PO-Revision-Date: 2017-10-17 02:03+0800\n" +"Last-Translator: \n" "Language-Team: \n" +"Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.4\n" -"Last-Translator: \n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: ms\n" -#: barter.lua:14 barter.lua:22 +#: barter.lua msgid "Start" msgstr "Mula" -#: barter.lua:16 barter.lua:24 +#: barter.lua msgid "Confirm" msgstr "Sah" -#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +#: barter.lua msgid "Cancel" msgstr "Batal" -#: barter.lua:18 barter.lua:26 shop.lua:20 +#: barter.lua shop.lua msgid "Exchange" msgstr "Tukar" -#: barter.lua:97 barter.lua:118 +#: barter.lua msgid "Barter Table" msgstr "Meja Barter" -#: craftitems.lua:6 +#: craftitems.lua msgid "1 MineGeld Note" msgstr "Wang 1 MineGeld" -#: craftitems.lua:13 +#: craftitems.lua msgid "5 MineGeld Note" msgstr "Wang 5 MineGeld" -#: craftitems.lua:20 +#: craftitems.lua msgid "10 MineGeld Note" msgstr "Wang 10 MineGeld" -#: craftitems.lua:27 +#: craftitems.lua +#, fuzzy +msgid "50 MineGeld Note" +msgstr "Wang 5 MineGeld" + +#: craftitems.lua msgid "Bundle of random Minegeld notes" msgstr "Seberkas wang Minegeld rawak" -#: income.lua:18 +#: income.lua msgid "basic income for @1" msgstr "pendapatan asas untuk @1" -#: income.lua:34 +#: income.lua msgid "added basic income for @1 to inventory" msgstr "pendapatan asas untuk @1 ditambah masuk ke dalam inventori" -#: init.lua:6 +#: init.lua msgid "Currency mod loading..." msgstr "Memuatkan mods Currency..." -#: init.lua:9 +#: init.lua msgid "Craft_items Loaded!" msgstr "Item pertukangan dimuatkan!" -#: init.lua:11 +#: init.lua msgid "Shop Loaded!" msgstr "Kedai dimuatkan!" -#: init.lua:13 +#: init.lua msgid "Barter Loaded!" msgstr "Meja barter dimuatkan!" -#: init.lua:15 +#: init.lua msgid "Safe Loaded!" msgstr "Peti besi dimuatkan!" -#: init.lua:17 +#: init.lua msgid "Crafting Loaded!" msgstr "Pertukangan dimuatkan!" -#: init.lua:20 +#: init.lua msgid "Creative mode in use, skipping basic income." msgstr "Dalam mod kreatif, pendapatan asas diabaikan." -#: init.lua:23 +#: init.lua msgid "Income Loaded!" msgstr "Pendapatan dimuatkan!" -#: safe.lua:29 +#: safe.lua msgid "Safe" msgstr "Peti besi" -#: safe.lua:44 +#: safe.lua msgid "Safe (owned by @1)" msgstr "Peti besi (pemilik: @1)" -#: safe.lua:61 safe.lua:70 safe.lua:79 +#: safe.lua msgid "@1 tried to access a safe belonging to @2 at @3" msgstr "@1 cuba untuk mengakses peti besi milik @2 di @3" -#: safe.lua:86 +#: safe.lua msgid "@1 moves stuff in safe at @2" msgstr "@1 pindahkan barang dalam peti besi di @2" -#: safe.lua:89 +#: safe.lua msgid "@1 moves stuff to safe at @2" msgstr "@1 masukkan barang dalam peti besi di @2" -#: safe.lua:92 +#: safe.lua msgid "@1 takes stuff from safe at @2" msgstr "@1 keluarkan barang dari peti besi di @2" -#: shop.lua:11 +#: shop.lua msgid "Customer gives (pay here!)" msgstr "Pelanggan beri (bayar sini!)" -#: shop.lua:13 +#: shop.lua msgid "Customer gets:" msgstr "Pelanggan dapat:" -#: shop.lua:15 +#: shop.lua msgid "Owner wants:" msgstr "Penjual inginkan:" -#: shop.lua:17 +#: shop.lua msgid "Owner gives:" msgstr "Penjual berikan:" -#: shop.lua:26 +#: shop.lua msgid "Customers gave:" msgstr "Pelanggan berikan:" -#: shop.lua:28 +#: shop.lua msgid "Your stock:" msgstr "Stok anda:" -#: shop.lua:30 +#: shop.lua msgid "You want:" msgstr "Anda mahukan:" -#: shop.lua:32 +#: shop.lua msgid "In exchange, you give:" msgstr "Anda berikan:" -#: shop.lua:34 +#: shop.lua msgid "Owner, Use (E)+Place (right mouse button) for customer interface" -msgstr "Penjual, Gunakan (E) + Letak (butang tetikus kanan) untuk antaramuka pelanggan" +msgstr "" +"Penjual, Gunakan (E) + Letak (butang tetikus kanan) untuk antaramuka " +"pelanggan" -#: shop.lua:88 +#: shop.lua msgid "Shop" msgstr "Kedai" -#: shop.lua:102 +#: shop.lua msgid "Exchange shop (owned by @1)" msgstr "Kedai (pemilik: @1)" -#: shop.lua:151 +#: shop.lua msgid "This is your own shop, you can't exchange to yourself!" msgstr "Ini kedai anda, anda tidak boleh menjual kepada diri sendiri!" -#: shop.lua:188 +#: shop.lua msgid "Exchanged!" msgstr "Jual!" -#: shop.lua:191 +#: shop.lua msgid "Exchange can not be done, contact the shop owner." msgstr "Tak boleh jual, hubungi penjual." -#: shop.lua:193 +#: shop.lua msgid "Exchange can not be done, check if you put all items!" msgstr "Tak boleh jual, pastikan anda ada apa yang penjual mahukan!" diff --git a/locale/ru.po b/locale/ru.po index 15f54d9..8084d68 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -7,173 +7,181 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 13:58-0700\n" +"POT-Creation-Date: 2018-05-24 23:06+0200\n" "PO-Revision-Date: 2017-08-11 19:03+0300\n" +"Last-Translator: \n" "Language-Team: \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.3\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"Language: ru\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: barter.lua:14 barter.lua:22 +#: barter.lua msgid "Start" msgstr "Старт" -#: barter.lua:16 barter.lua:24 +#: barter.lua msgid "Confirm" msgstr "Подтверждение" -#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +#: barter.lua msgid "Cancel" msgstr "Отмена" -#: barter.lua:18 barter.lua:26 shop.lua:20 +#: barter.lua shop.lua msgid "Exchange" msgstr "Обмен" -#: barter.lua:97 barter.lua:118 +#: barter.lua msgid "Barter Table" msgstr "Таблица бартера" -#: craftitems.lua:6 +#: craftitems.lua msgid "1 MineGeld Note" msgstr "Банкнота в 1 MineGeld" -#: craftitems.lua:13 +#: craftitems.lua msgid "5 MineGeld Note" msgstr "Банкнота в 5 MineGeld" -#: craftitems.lua:20 +#: craftitems.lua msgid "10 MineGeld Note" msgstr "Банкнота в 10 MineGeld" -#: craftitems.lua:27 +#: craftitems.lua +#, fuzzy +msgid "50 MineGeld Note" +msgstr "Банкнота в 5 MineGeld" + +#: craftitems.lua msgid "Bundle of random Minegeld notes" msgstr "Пачка случайных банкнот Minegeld" -#: income.lua:18 +#: income.lua msgid "basic income for @1" msgstr "базовая прибыль для @1" -#: income.lua:34 +#: income.lua msgid "added basic income for @1 to inventory" msgstr "базовая прибыль для @1 добавлена в инвентарь" -#: init.lua:6 +#: init.lua msgid "Currency mod loading..." msgstr "Загружается мод Currency..." -#: init.lua:9 +#: init.lua msgid "Craft_items Loaded!" msgstr "Предметы для сборки загружены!" -#: init.lua:11 +#: init.lua msgid "Shop Loaded!" msgstr "Магазин загружен!" -#: init.lua:13 +#: init.lua msgid "Barter Loaded!" msgstr "Бартер загружен!" -#: init.lua:15 +#: init.lua msgid "Safe Loaded!" msgstr "Сейф загружен!" -#: init.lua:17 +#: init.lua msgid "Crafting Loaded!" msgstr "Механизм сборки загружен!" -#: init.lua:20 +#: init.lua msgid "Creative mode in use, skipping basic income." msgstr "Используется режим творчества, пропускаем базовую прибыль." -#: init.lua:23 +#: init.lua msgid "Income Loaded!" msgstr "Прибыль загружена!" -#: safe.lua:29 +#: safe.lua msgid "Safe" msgstr "Сейф" -#: safe.lua:44 +#: safe.lua msgid "Safe (owned by @1)" msgstr "Сейф (принадлежит @1)" -#: safe.lua:61 safe.lua:70 safe.lua:79 +#: safe.lua msgid "@1 tried to access a safe belonging to @2 at @3" msgstr "@1 попробовал открыть сейф, принадлежащий @2 в @3" -#: safe.lua:86 +#: safe.lua msgid "@1 moves stuff in safe at @2" msgstr "@1 перемещает вещи в сейфе в @2" -#: safe.lua:89 +#: safe.lua msgid "@1 moves stuff to safe at @2" msgstr "@1 кладёт вещи в сейф в @2" -#: safe.lua:92 +#: safe.lua msgid "@1 takes stuff from safe at @2" msgstr "@1 забирает вещи из сейфа в @2" -#: shop.lua:11 +#: shop.lua msgid "Customer gives (pay here!)" msgstr "Покупатель отдаёт (здесь оплата!)" -#: shop.lua:13 +#: shop.lua msgid "Customer gets:" msgstr "Покупатель получает:" -#: shop.lua:15 +#: shop.lua msgid "Owner wants:" msgstr "Владелец хочет:" -#: shop.lua:17 +#: shop.lua msgid "Owner gives:" msgstr "Владелец отдаёт:" -#: shop.lua:26 +#: shop.lua msgid "Customers gave:" msgstr "Покупатель отдал:" -#: shop.lua:28 +#: shop.lua msgid "Your stock:" msgstr "Ваш запас:" -#: shop.lua:30 +#: shop.lua msgid "You want:" msgstr "Вы хотите:" -#: shop.lua:32 +#: shop.lua msgid "In exchange, you give:" msgstr "Взамен вы даёте:" -#: shop.lua:34 +#: shop.lua msgid "Owner, Use (E)+Place (right mouse button) for customer interface" -msgstr "Владелец, используйте (E)+Разместить (правая кнопка мыши) для открытия интерфейса покупателя" +msgstr "" +"Владелец, используйте (E)+Разместить (правая кнопка мыши) для открытия " +"интерфейса покупателя" -#: shop.lua:88 +#: shop.lua msgid "Shop" msgstr "Магазин" -#: shop.lua:102 +#: shop.lua msgid "Exchange shop (owned by @1)" msgstr "Пункт обмена (принадлежит @1)" -#: shop.lua:151 +#: shop.lua msgid "This is your own shop, you can't exchange to yourself!" msgstr "Это ваш собственный магазин, вы не можете обмениваться с самим собой!" -#: shop.lua:188 +#: shop.lua msgid "Exchanged!" msgstr "Обмен произведён!" -#: shop.lua:191 +#: shop.lua msgid "Exchange can not be done, contact the shop owner." msgstr "Обмен невозможен, свяжитесь с владельцем магазина." -#: shop.lua:193 +#: shop.lua msgid "Exchange can not be done, check if you put all items!" msgstr "Обмен невозможен, проверьте, что вы положили все предметы!" diff --git a/locale/template.pot b/locale/template.pot index f528214..396dde0 100644 --- a/locale/template.pot +++ b/locale/template.pot @@ -8,170 +8,175 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-20 13:58-0700\n" +"POT-Creation-Date: 2018-05-24 23:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: barter.lua:14 barter.lua:22 +#: barter.lua msgid "Start" msgstr "" -#: barter.lua:16 barter.lua:24 +#: barter.lua msgid "Confirm" msgstr "" -#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27 +#: barter.lua msgid "Cancel" msgstr "" -#: barter.lua:18 barter.lua:26 shop.lua:20 +#: barter.lua shop.lua msgid "Exchange" msgstr "" -#: barter.lua:97 barter.lua:118 +#: barter.lua msgid "Barter Table" msgstr "" -#: craftitems.lua:6 +#: craftitems.lua msgid "1 MineGeld Note" msgstr "" -#: craftitems.lua:13 +#: craftitems.lua msgid "5 MineGeld Note" msgstr "" -#: craftitems.lua:20 +#: craftitems.lua msgid "10 MineGeld Note" msgstr "" -#: craftitems.lua:27 +#: craftitems.lua +msgid "50 MineGeld Note" +msgstr "" + +#: craftitems.lua msgid "Bundle of random Minegeld notes" msgstr "" -#: income.lua:18 +#: income.lua msgid "basic income for @1" msgstr "" -#: income.lua:34 +#: income.lua msgid "added basic income for @1 to inventory" msgstr "" -#: init.lua:6 +#: init.lua msgid "Currency mod loading..." msgstr "" -#: init.lua:9 +#: init.lua msgid "Craft_items Loaded!" msgstr "" -#: init.lua:11 +#: init.lua msgid "Shop Loaded!" msgstr "" -#: init.lua:13 +#: init.lua msgid "Barter Loaded!" msgstr "" -#: init.lua:15 +#: init.lua msgid "Safe Loaded!" msgstr "" -#: init.lua:17 +#: init.lua msgid "Crafting Loaded!" msgstr "" -#: init.lua:20 +#: init.lua msgid "Creative mode in use, skipping basic income." msgstr "" -#: init.lua:23 +#: init.lua msgid "Income Loaded!" msgstr "" -#: safe.lua:29 +#: safe.lua msgid "Safe" msgstr "" -#: safe.lua:44 +#: safe.lua msgid "Safe (owned by @1)" msgstr "" -#: safe.lua:61 safe.lua:70 safe.lua:79 +#: safe.lua msgid "@1 tried to access a safe belonging to @2 at @3" msgstr "" -#: safe.lua:86 +#: safe.lua msgid "@1 moves stuff in safe at @2" msgstr "" -#: safe.lua:89 +#: safe.lua msgid "@1 moves stuff to safe at @2" msgstr "" -#: safe.lua:92 +#: safe.lua msgid "@1 takes stuff from safe at @2" msgstr "" -#: shop.lua:11 +#: shop.lua msgid "Customer gives (pay here!)" msgstr "" -#: shop.lua:13 +#: shop.lua msgid "Customer gets:" msgstr "" -#: shop.lua:15 +#: shop.lua msgid "Owner wants:" msgstr "" -#: shop.lua:17 +#: shop.lua msgid "Owner gives:" msgstr "" -#: shop.lua:26 +#: shop.lua msgid "Customers gave:" msgstr "" -#: shop.lua:28 +#: shop.lua msgid "Your stock:" msgstr "" -#: shop.lua:30 +#: shop.lua msgid "You want:" msgstr "" -#: shop.lua:32 +#: shop.lua msgid "In exchange, you give:" msgstr "" -#: shop.lua:34 +#: shop.lua msgid "Owner, Use (E)+Place (right mouse button) for customer interface" msgstr "" -#: shop.lua:88 +#: shop.lua msgid "Shop" msgstr "" -#: shop.lua:102 +#: shop.lua msgid "Exchange shop (owned by @1)" msgstr "" -#: shop.lua:151 +#: shop.lua msgid "This is your own shop, you can't exchange to yourself!" msgstr "" -#: shop.lua:188 +#: shop.lua msgid "Exchanged!" msgstr "" -#: shop.lua:191 +#: shop.lua msgid "Exchange can not be done, contact the shop owner." msgstr "" -#: shop.lua:193 +#: shop.lua msgid "Exchange can not be done, check if you put all items!" msgstr "" diff --git a/textures/minegeld_50.png b/textures/minegeld_50.png new file mode 100644 index 0000000..8371bc0 Binary files /dev/null and b/textures/minegeld_50.png differ -- cgit v1.2.3