From efba9e06482b0373797436547e2dc35445e3fd43 Mon Sep 17 00:00:00 2001 From: Louis Royer <4259825-lroyer@users.noreply.gitlab.com> Date: Tue, 4 Aug 2020 23:05:02 +0200 Subject: [PATCH] MT5 translation for homedecor_kitchen - Add screwdriver in optional_depends - Fix luacheck warnings --- homedecor_kitchen/depends.txt | 8 ------- homedecor_kitchen/init.lua | 19 +++++++-------- .../locale/homedecor_kitchen.de.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.es.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.fr.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.it.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.ms.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.pt.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.pt_BR.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.ru.tr | 24 +++++++++++++++++++ .../locale/homedecor_kitchen.zh_CN.tr | 24 +++++++++++++++++++ homedecor_kitchen/locale/template.txt | 24 +++++++++++++++++++ homedecor_kitchen/mod.conf | 4 ++++ 13 files changed, 253 insertions(+), 18 deletions(-) delete mode 100644 homedecor_kitchen/depends.txt create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.de.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.es.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.fr.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.it.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.ms.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.pt.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.pt_BR.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.ru.tr create mode 100644 homedecor_kitchen/locale/homedecor_kitchen.zh_CN.tr create mode 100644 homedecor_kitchen/locale/template.txt create mode 100644 homedecor_kitchen/mod.conf diff --git a/homedecor_kitchen/depends.txt b/homedecor_kitchen/depends.txt deleted file mode 100644 index d122ec02..00000000 --- a/homedecor_kitchen/depends.txt +++ /dev/null @@ -1,8 +0,0 @@ -homedecor_common -default -basic_materials -dye -moreblocks? -building_blocks? -technic? -bucket? diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index 905fecc8..7197b8a6 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -1,8 +1,6 @@ -- This file supplies Kitchen stuff like refrigerators, sinks, etc. -local S = homedecor.gettext - -local function N_(x) return x end +local S = minetest.get_translator("homedecor_kitchen") -- steel-textured fridge homedecor.register("refrigerator_steel", { @@ -20,7 +18,7 @@ homedecor.register("refrigerator_steel", { size=50, lockable=true, }, - on_rotate = screwdriver.rotate_simple + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, }) -- white, enameled fridge @@ -39,7 +37,7 @@ homedecor.register("refrigerator_white", { size=50, lockable=true, }, - on_rotate = screwdriver.rotate_simple + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, }) minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white") @@ -120,11 +118,11 @@ homedecor.register("dishwasher", { groups = { snappy = 3 }, }) -local materials = { N_("granite"), N_("marble"), N_("steel"), N_("wood") } +local materials = { ["granite"] = S("granite"), ["marble"] = S("marble"), ["steel"] = S("steel"), ["wood"] = S("wood") } -for _, m in ipairs(materials) do +for m, m_loc in pairs(materials) do homedecor.register("dishwasher_"..m, { - description = S("Dishwasher (@1)", S(m)), + description = S("Dishwasher (@1)", m_loc), tiles = { "homedecor_kitchen_cabinet_top_"..m..".png", "homedecor_dishwasher_bottom.png", @@ -139,7 +137,8 @@ homedecor.register("dishwasher_"..m, { end local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" -local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" +local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)" + .."^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" local function N_(x) return x end @@ -255,7 +254,7 @@ homedecor.register("kitchen_faucet", { groups = {snappy=3}, selection_box = kf_cbox, walkable = false, - on_rotate = screwdriver.disallow, + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) if below and diff --git a/homedecor_kitchen/locale/homedecor_kitchen.de.tr b/homedecor_kitchen/locale/homedecor_kitchen.de.tr new file mode 100644 index 00000000..d8f3a518 --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.de.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=Kupferpfannen +Dishwasher=Spülmachine +Dishwasher (@1)=Spülmaschine (@1) +Half-height Kitchen Cabinet (on ceiling)=Halbhoher Küchenschrank (oben) +Kitchen Cabinet=Küchenschrank +Kitchen Cabinet (@1 top)=Küchenschrank (@1platte) +Kitchen Cabinet with sink=Küchenschrank mit Spüle +Kitchen Faucet=Küchenwasserhahn +Microwave Oven=Mikrowelle +Oven=Backofen +Oven (stainless steel)=Backofen (Edelstahl) +Paper towels=Küchenpapier +Refrigerator=Kühlschrank +Refrigerator (stainless steel)=Kühlschrank (Edelstahl) +Under-sink cabinet=Waschbeckenunterschrank +granite=Granit +marble=Marmor +steel=Stahl +wood=Holz diff --git a/homedecor_kitchen/locale/homedecor_kitchen.es.tr b/homedecor_kitchen/locale/homedecor_kitchen.es.tr new file mode 100644 index 00000000..47848e9c --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.es.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=Sartenes de cobre +Dishwasher=Lavavajillas +Dishwasher (@1)=Lavavajillas (@1) +Half-height Kitchen Cabinet (on ceiling)=Gabinete de cocina de media altura (en techo) +Kitchen Cabinet=Gabinete de cocina +Kitchen Cabinet (@1 top)=Gabinete de cocina (mesada de @1) +Kitchen Cabinet with sink=Gabinete de cocina con lavabo +Kitchen Faucet=Grifo de cocina +Microwave Oven=Horno microondas +Oven=Horno +Oven (stainless steel)=Horno (acero inoxidable) +Paper towels=Toallas de papel +Refrigerator=Refrigerador +Refrigerator (stainless steel)=Refrigerador (acero inoxidable) +Under-sink cabinet=Gabinete bajo lavabo +granite=granito +marble=mármol +steel=acero +wood=madera diff --git a/homedecor_kitchen/locale/homedecor_kitchen.fr.tr b/homedecor_kitchen/locale/homedecor_kitchen.fr.tr new file mode 100644 index 00000000..914cb948 --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.fr.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=Poêles en cuivre +Dishwasher=Lave-vaisselle +Dishwasher (@1)=Lave-vaisselle (@1) +Half-height Kitchen Cabinet (on ceiling)=Meuble de cuisine réduit en hauteur (sur le plafond) +Kitchen Cabinet=Meuble de cuisine +Kitchen Cabinet (@1 top)=Meuble de cuisine (haut @1) +Kitchen Cabinet with sink=Meuble de cuisine avec lavabo +Kitchen Faucet=Robinet de cuisine +Microwave Oven=Four Micro-ondes +Oven=Four +Oven (stainless steel)=Four (acier inox) +Paper towels=Essuie-tout +Refrigerator=Réfrigérateur +Refrigerator (stainless steel)=Réfrigérateur (acier inox) +Under-sink cabinet=Meuble sous évier +granite=granit +marble=marbre +steel=acier +wood=bois diff --git a/homedecor_kitchen/locale/homedecor_kitchen.it.tr b/homedecor_kitchen/locale/homedecor_kitchen.it.tr new file mode 100644 index 00000000..ed609110 --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.it.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans= +Dishwasher= +Dishwasher (@1)= +Half-height Kitchen Cabinet (on ceiling)=Armadietto della cucina di altezza dimezzata (sul soffitto) +Kitchen Cabinet=Armadietto della cucina +Kitchen Cabinet (@1 top)=Armadietto della cucina +Kitchen Cabinet with sink=Armadietto della cucina con il lavandino +Kitchen Faucet=Armadietto della cucina +Microwave Oven=Forno a microonde +Oven=Forno +Oven (stainless steel)= +Paper towels= +Refrigerator=Frigorifero +Refrigerator (stainless steel)=Frigorifero +Under-sink cabinet=Armadietto sotto il lavandino +granite= +marble= +steel= +wood= diff --git a/homedecor_kitchen/locale/homedecor_kitchen.ms.tr b/homedecor_kitchen/locale/homedecor_kitchen.ms.tr new file mode 100644 index 00000000..3515d1ae --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.ms.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=Kuali Leper Tembaga +Dishwasher=Mesin Basuh Pinggan Mangkuk +Dishwasher (@1)=Mesin Basuh Pinggan Mangkuk (@1) +Half-height Kitchen Cabinet (on ceiling)=Kabinet Dapur Separuh (dekat siling) +Kitchen Cabinet=Kabinet Dapur +Kitchen Cabinet (@1 top)=Kabinet Dapur (Beralaskan @1) +Kitchen Cabinet with sink=Kabinet Dapur dengan Sinki +Kitchen Faucet=Kepala Paip Dapur +Microwave Oven=Ketuhar Gelombang Mikro +Oven=Ketuhar +Oven (stainless steel)=Ketuhar (Keluli Tahan Karat) +Paper towels=Tuala Dapur Pakai Buang +Refrigerator=Peti Sejuk +Refrigerator (stainless steel)=Peti Sejuk (Keluli Tahan Karat) +Under-sink cabinet=Kabinet Bawah Sinki +granite=Granit +marble=Marmar +steel=Keluli +wood=Kayu diff --git a/homedecor_kitchen/locale/homedecor_kitchen.pt.tr b/homedecor_kitchen/locale/homedecor_kitchen.pt.tr new file mode 100644 index 00000000..97cc1c0c --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.pt.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=Panelas de cobre +Dishwasher=Lava Louças +Dishwasher (@1)=Lava Louças (@1) +Half-height Kitchen Cabinet (on ceiling)=Armário Superior de Cozinha (no teto) +Kitchen Cabinet=Armário de Cozinha +Kitchen Cabinet (@1 top)=Armário de Cozinha (tampo de @1) +Kitchen Cabinet with sink=Armário de Cozinha com Pia +Kitchen Faucet=Armário de Cozinha +Microwave Oven=Forno Microondas +Oven=Forno +Oven (stainless steel)=Forno (aço inoxidável) +Paper towels=Papel toalha +Refrigerator=Refrigerador +Refrigerator (stainless steel)=Refrigerador (aço inoxidável) +Under-sink cabinet=Armário sob a Pia +granite=granito +marble=mármore +steel=aço +wood=madeira diff --git a/homedecor_kitchen/locale/homedecor_kitchen.pt_BR.tr b/homedecor_kitchen/locale/homedecor_kitchen.pt_BR.tr new file mode 100644 index 00000000..97cc1c0c --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.pt_BR.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=Panelas de cobre +Dishwasher=Lava Louças +Dishwasher (@1)=Lava Louças (@1) +Half-height Kitchen Cabinet (on ceiling)=Armário Superior de Cozinha (no teto) +Kitchen Cabinet=Armário de Cozinha +Kitchen Cabinet (@1 top)=Armário de Cozinha (tampo de @1) +Kitchen Cabinet with sink=Armário de Cozinha com Pia +Kitchen Faucet=Armário de Cozinha +Microwave Oven=Forno Microondas +Oven=Forno +Oven (stainless steel)=Forno (aço inoxidável) +Paper towels=Papel toalha +Refrigerator=Refrigerador +Refrigerator (stainless steel)=Refrigerador (aço inoxidável) +Under-sink cabinet=Armário sob a Pia +granite=granito +marble=mármore +steel=aço +wood=madeira diff --git a/homedecor_kitchen/locale/homedecor_kitchen.ru.tr b/homedecor_kitchen/locale/homedecor_kitchen.ru.tr new file mode 100644 index 00000000..4ce5e33b --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.ru.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=Медные кастрюли +Dishwasher=Посудомоечная машина +Dishwasher (@1)=Посудомоечная машина (@1) +Half-height Kitchen Cabinet (on ceiling)=Полуразмерный кухонный шкаф (потолочный) +Kitchen Cabinet=Кухонный шкаф +Kitchen Cabinet (@1 top)=Кухонный шкаф (@1 верх) +Kitchen Cabinet with sink=Кухонный шкаф с раковиной +Kitchen Faucet=Кухонный смеситель +Microwave Oven=Микроволновая печь +Oven=Духовка +Oven (stainless steel)=Духовка (нержавеющая сталь) +Paper towels=Бумажные полотенца +Refrigerator=Холодильник +Refrigerator (stainless steel)=Холодильник (нержавеющая сталь) +Under-sink cabinet=Шкаф для раковины +granite=гранит +marble=мрамор +steel=сталь +wood=дерево diff --git a/homedecor_kitchen/locale/homedecor_kitchen.zh_CN.tr b/homedecor_kitchen/locale/homedecor_kitchen.zh_CN.tr new file mode 100644 index 00000000..5bcadd41 --- /dev/null +++ b/homedecor_kitchen/locale/homedecor_kitchen.zh_CN.tr @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans=铜锅 +Dishwasher=洗碗机 +Dishwasher (@1)=洗碗机(@1) +Half-height Kitchen Cabinet (on ceiling)=半高厨柜(悬挂式) +Kitchen Cabinet=厨柜 +Kitchen Cabinet (@1 top)=厨柜(@1顶) +Kitchen Cabinet with sink=带水槽的橱柜 +Kitchen Faucet=厨房水龙头 +Microwave Oven=微波炉 +Oven=烤箱 +Oven (stainless steel)=烤箱(不锈钢) +Paper towels=纸巾 +Refrigerator=冰箱 +Refrigerator (stainless steel)=冰箱(不锈钢) +Under-sink cabinet=水槽柜下 +granite=花岗岩 +marble=大理石 +steel=钢 +wood=木材 diff --git a/homedecor_kitchen/locale/template.txt b/homedecor_kitchen/locale/template.txt new file mode 100644 index 00000000..f3832b76 --- /dev/null +++ b/homedecor_kitchen/locale/template.txt @@ -0,0 +1,24 @@ +# textdomain: homedecor_kitchen + + +### init.lua ### + +Copper pans= +Dishwasher= +Dishwasher (@1)= +Half-height Kitchen Cabinet (on ceiling)= +Kitchen Cabinet= +Kitchen Cabinet (@1 top)= +Kitchen Cabinet with sink= +Kitchen Faucet= +Microwave Oven= +Oven= +Oven (stainless steel)= +Paper towels= +Refrigerator= +Refrigerator (stainless steel)= +Under-sink cabinet= +granite= +marble= +steel= +wood= diff --git a/homedecor_kitchen/mod.conf b/homedecor_kitchen/mod.conf new file mode 100644 index 00000000..22f97b2f --- /dev/null +++ b/homedecor_kitchen/mod.conf @@ -0,0 +1,4 @@ +name = homedecor_kitchen +description = Homedecor mod: kitchen +depends = homedecor_common, default, basic_materials, dye +optional_depends = moreblocks, building_blocks, technic, bucket, screwdriver