From 1675a93fec9536f211f26e209e9dc1db179b5298 Mon Sep 17 00:00:00 2001 From: Louis Royer <4259825-lroyer@users.noreply.gitlab.com> Date: Tue, 4 Aug 2020 22:08:09 +0200 Subject: [PATCH] MT5 translation for homedecor_exterior - add screwdriver in optional_depends - fixes luacheck warnings - french translation --- homedecor_exterior/depends.txt | 8 ----- homedecor_exterior/init.lua | 35 +++++++++---------- .../locale/homedecor_exterior.de.tr | 25 +++++++++++++ .../locale/homedecor_exterior.es.tr | 25 +++++++++++++ .../locale/homedecor_exterior.fr.tr | 25 +++++++++++++ .../locale/homedecor_exterior.it.tr | 25 +++++++++++++ .../locale/homedecor_exterior.ms.tr | 25 +++++++++++++ .../locale/homedecor_exterior.pt.tr | 25 +++++++++++++ .../locale/homedecor_exterior.pt_BR.tr | 25 +++++++++++++ .../locale/homedecor_exterior.ru.tr | 25 +++++++++++++ .../locale/homedecor_exterior.zh_CN.tr | 25 +++++++++++++ homedecor_exterior/locale/template.txt | 25 +++++++++++++ homedecor_exterior/mod.conf | 4 +++ 13 files changed, 271 insertions(+), 26 deletions(-) delete mode 100644 homedecor_exterior/depends.txt create mode 100644 homedecor_exterior/locale/homedecor_exterior.de.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.es.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.fr.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.it.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.ms.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.pt.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.pt_BR.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.ru.tr create mode 100644 homedecor_exterior/locale/homedecor_exterior.zh_CN.tr create mode 100644 homedecor_exterior/locale/template.txt create mode 100644 homedecor_exterior/mod.conf diff --git a/homedecor_exterior/depends.txt b/homedecor_exterior/depends.txt deleted file mode 100644 index 3f99280a..00000000 --- a/homedecor_exterior/depends.txt +++ /dev/null @@ -1,8 +0,0 @@ -homedecor_common -default -dye -creative -basic_materials -moreblocks? -building_blocks? -bucket? diff --git a/homedecor_exterior/init.lua b/homedecor_exterior/init.lua index 961565a2..3e4b1697 100644 --- a/homedecor_exterior/init.lua +++ b/homedecor_exterior/init.lua @@ -1,7 +1,5 @@ - -local S = homedecor.gettext - -local function N_(x) return x end +local S = minetest.get_translator("homedecor_exterior") +homedecor_exterior = {} local bbq_cbox = { type = "fixed", @@ -48,7 +46,7 @@ homedecor.register("doghouse", { groups = {snappy=3}, expand = { top="placeholder" }, sounds = default.node_sound_wood_defaults(), - on_rotate = screwdriver.rotate_simple + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, }) minetest.register_alias("homedecor:doghouse_roof", "air") @@ -126,7 +124,7 @@ homedecor.register("swing", { groups = { snappy=3, oddly_breakable_by_hand=3 }, sounds = default.node_sound_wood_defaults(), walkable = false, - on_rotate = screwdriver.disallow, + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, node_box = { type = "fixed", fixed = { @@ -156,7 +154,7 @@ homedecor.register("swing", { if not testreg or not testreg.buildable_to then if i < 1 then - minetest.chat_send_player(placer_name, "No room under there to hang a swing.") + minetest.chat_send_player(placer_name, S("No room under there to hang a swing.")) return itemstack else break @@ -176,7 +174,8 @@ homedecor.register("swing", { itemstack:take_item() end else - minetest.chat_send_player(placer_name, "You have to point at the bottom side of an overhanging object to place a swing.") + minetest.chat_send_player(placer_name, + S("You have to point at the bottom side of an overhanging object to place a swing.")) end return itemstack end, @@ -225,7 +224,7 @@ homedecor.register("well", { collision_box = homedecor.nodebox.slab_y(2), expand = { top="placeholder" }, sounds = default.node_sound_stone_defaults(), - on_rotate = screwdriver.rotate_simple + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, }) if minetest.get_modpath("bucket") then @@ -239,7 +238,7 @@ if minetest.get_modpath("bucket") then itemstack:take_item() inv:add_item("main", "bucket:bucket_water 1") else - minetest.chat_send_player(user:get_player_name(), "No room in your inventory to add a filled bucket!") + minetest.chat_send_player(user:get_player_name(), S("No room in your inventory to add a filled bucket!")) end return itemstack else if original_bucket_on_use then @@ -250,17 +249,17 @@ if minetest.get_modpath("bucket") then }) end -homedecor.shrub_colors = { - N_("green"), - N_("red"), - N_("yellow"), +homedecor_exterior.shrub_colors = { + ["green"] = S("green"), + ["red"] = S("red"), + ["yellow"] = S("yellow"), } local shrub_cbox = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } -for _, color in ipairs(homedecor.shrub_colors) do +for color, color_loc in pairs(homedecor_exterior.shrub_colors) do minetest.register_node(":homedecor:shrubbery_large_"..color, { - description = S("Shrubbery (large, @1)", S(color)), + description = S("Shrubbery (large, @1)", color_loc), drawtype = "mesh", mesh = "homedecor_cube.obj", tiles = {"homedecor_shrubbery_"..color..".png"}, @@ -271,7 +270,7 @@ for _, color in ipairs(homedecor.shrub_colors) do }) minetest.register_node(":homedecor:shrubbery_"..color, { - description = S("Shrubbery (@1)", S(color)), + description = S("Shrubbery (@1)", color_loc), drawtype = "mesh", mesh = "homedecor_shrubbery.obj", tiles = { @@ -426,7 +425,7 @@ minetest.register_craft({ } }) -for _, color in ipairs(homedecor.shrub_colors) do +for color, _ in pairs(homedecor_exterior.shrub_colors) do minetest.register_craft({ type = "shapeless", diff --git a/homedecor_exterior/locale/homedecor_exterior.de.tr b/homedecor_exterior/locale/homedecor_exterior.de.tr new file mode 100644 index 00000000..cbb71155 --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.de.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=Grill +Doghouse=Hundehütte +Garden Lattice (@1)=Gartenzaun (@1) +Garden stone path=Gartensteinpfad +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)=Gebüsch (@1) +Shrubbery (large, @1)=Gebüsch (@1) +Tree's swing=Baumschaukel +Water well=Wasserbrunnen + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=grün +red=rot +white wood=weißes Holz +white wood, with vegetation=weißes Holz mit Vegetation +wood=Holz +wood, with vegetation=Holz mit Vegetation +yellow=gelb diff --git a/homedecor_exterior/locale/homedecor_exterior.es.tr b/homedecor_exterior/locale/homedecor_exterior.es.tr new file mode 100644 index 00000000..cb49597d --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.es.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=Barbacoa +Doghouse=Casa de perros +Garden Lattice (@1)=Enrejado de jardín (@1) +Garden stone path=Camino de piedra de jardín +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)=Arbustos (@1) +Shrubbery (large, @1)=Arbustos (@1) +Tree's swing=Columpio +Water well=Pozo de agua + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=verde +red=roja +white wood=madera blanca +white wood, with vegetation=madera blanca, con vegetación +wood=madera +wood, with vegetation=madera, con vegetación +yellow=amarilla diff --git a/homedecor_exterior/locale/homedecor_exterior.fr.tr b/homedecor_exterior/locale/homedecor_exterior.fr.tr new file mode 100644 index 00000000..c4d3ce0a --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.fr.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=Barbecue +Doghouse=Niche +Garden Lattice (@1)=Treillage (@1) +Garden stone path=Chemin de pierres +No room in your inventory to add a filled bucket!=Il n’y a pas de place dans votre inventaire pour y ajouter un seau plein! +No room under there to hang a swing.=Il n’y a pas la place en dessous pour y accrocher une balançoire. +Shrubbery (@1)=Arbustes (@1) +Shrubbery (large, @1)=Arbustes (@1) +Tree's swing=Balançoire +Water well=Puits + +You have to point at the bottom side of an overhanging object to place a swing.=Vous devez viser le dessous d’un objet en hauteur pour placer la balançoire. + +green=vert +red=rouge +white wood=bois blanc +white wood, with vegetation=bois blanc, avec végétation +wood=bois +wood, with vegetation=bois, avec végétation +yellow=jaune diff --git a/homedecor_exterior/locale/homedecor_exterior.it.tr b/homedecor_exterior/locale/homedecor_exterior.it.tr new file mode 100644 index 00000000..8c1cbed3 --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.it.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue= +Doghouse= +Garden Lattice (@1)= +Garden stone path= +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)= +Shrubbery (large, @1)= +Tree's swing= +Water well= + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=verde +red=rosso +white wood=bianco +white wood, with vegetation= +wood= +wood, with vegetation= +yellow= diff --git a/homedecor_exterior/locale/homedecor_exterior.ms.tr b/homedecor_exterior/locale/homedecor_exterior.ms.tr new file mode 100644 index 00000000..b7acdb8c --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.ms.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=Barbeku +Doghouse=Rumah Anjing +Garden Lattice (@1)=Kekisi Taman (@1) +Garden stone path=Laluan Berbatu Taman +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)=Rumpun Pokok Renek (@1) +Shrubbery (large, @1)=Rumpun Pokok Renek (Besar, @1) +Tree's swing=Buaian Pokok +Water well=Perigi Air + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=Hijau +red=Merah +white wood=Kayu Putih +white wood, with vegetation=Kayu Putih, dengan Tumbuhan +wood=Kayu +wood, with vegetation=Kayu, dengan Tumbuhan +yellow=Kuning diff --git a/homedecor_exterior/locale/homedecor_exterior.pt.tr b/homedecor_exterior/locale/homedecor_exterior.pt.tr new file mode 100644 index 00000000..1284c857 --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.pt.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=Churrasqueira +Doghouse=Casa de Cachorro +Garden Lattice (@1)=Treliça de Jardim (@1) +Garden stone path=Caminho de pedra de jardim +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)=Matagal (@1) +Shrubbery (large, @1)=Matagal (@1) +Tree's swing=Balancinho de árvore +Water well=Poço de agua + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=verde +red=vermelho +white wood=madeira branca +white wood, with vegetation=madeira branca, com vegetação +wood=madeira +wood, with vegetation=madeira, com vegetação +yellow=amarelo diff --git a/homedecor_exterior/locale/homedecor_exterior.pt_BR.tr b/homedecor_exterior/locale/homedecor_exterior.pt_BR.tr new file mode 100644 index 00000000..1284c857 --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.pt_BR.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=Churrasqueira +Doghouse=Casa de Cachorro +Garden Lattice (@1)=Treliça de Jardim (@1) +Garden stone path=Caminho de pedra de jardim +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)=Matagal (@1) +Shrubbery (large, @1)=Matagal (@1) +Tree's swing=Balancinho de árvore +Water well=Poço de agua + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=verde +red=vermelho +white wood=madeira branca +white wood, with vegetation=madeira branca, com vegetação +wood=madeira +wood, with vegetation=madeira, com vegetação +yellow=amarelo diff --git a/homedecor_exterior/locale/homedecor_exterior.ru.tr b/homedecor_exterior/locale/homedecor_exterior.ru.tr new file mode 100644 index 00000000..88a1bba0 --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.ru.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=Барбекю +Doghouse=Собачья будка +Garden Lattice (@1)=Садовая решётка (@1) +Garden stone path=Садовая каменная дорожка +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)=Кустарник (@1) +Shrubbery (large, @1)=Кустарник (@1) +Tree's swing=Качели для дерева +Water well=Колодец с водой + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=зелёный +red=красный +white wood=белое дерево +white wood, with vegetation=белое дерево с растительностью +wood=дерево +wood, with vegetation=дерево с растительностью +yellow=жёлтый diff --git a/homedecor_exterior/locale/homedecor_exterior.zh_CN.tr b/homedecor_exterior/locale/homedecor_exterior.zh_CN.tr new file mode 100644 index 00000000..45ee2d00 --- /dev/null +++ b/homedecor_exterior/locale/homedecor_exterior.zh_CN.tr @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue=烧烤 +Doghouse=狗窝 +Garden Lattice (@1)=花园格子(@1) +Garden stone path=花园石径 +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)=灌木丛(@1) +Shrubbery (large, @1)=大灌木丛(@1) +Tree's swing=树的秋千 +Water well=水井 + +You have to point at the bottom side of an overhanging object to place a swing.= + +green=绿色 +red=红色 +white wood=白木 +white wood, with vegetation=带植被的白木 +wood=木材 +wood, with vegetation=带植被的木材 +yellow=黄色的 diff --git a/homedecor_exterior/locale/template.txt b/homedecor_exterior/locale/template.txt new file mode 100644 index 00000000..dafbc7d7 --- /dev/null +++ b/homedecor_exterior/locale/template.txt @@ -0,0 +1,25 @@ +# textdomain: homedecor_exterior + + +### init.lua ### + +Barbecue= +Doghouse= +Garden Lattice (@1)= +Garden stone path= +No room in your inventory to add a filled bucket!= +No room under there to hang a swing.= +Shrubbery (@1)= +Shrubbery (large, @1)= +Tree's swing= +Water well= + +You have to point at the bottom side of an overhanging object to place a swing.= + +green= +red= +white wood= +white wood, with vegetation= +wood= +wood, with vegetation= +yellow= diff --git a/homedecor_exterior/mod.conf b/homedecor_exterior/mod.conf new file mode 100644 index 00000000..40183adc --- /dev/null +++ b/homedecor_exterior/mod.conf @@ -0,0 +1,4 @@ +name = homedecor_exterior +description = Homedecor mod: exterior +depends = homedecor_common, default, dye, creative, basic_materials +optional_depends = moreblocks, building_blocks, bucket, screwdriver