diff --git a/circular_saw.lua b/circular_saw.lua index 174f344..fb8d142 100644 --- a/circular_saw.lua +++ b/circular_saw.lua @@ -13,8 +13,7 @@ circular_saw = {} circular_saw.known_stairs = setmetatable({}, { __newindex = function(k, v) local modname = minetest.get_current_modname() - print(("WARNING: mod %s tried to add node %s to the circular saw" - .. " manually."):format(modname, v)) + print(("WARNING: mod %s tried to add node %s to the circular saw manually."):format(modname, v)) end, }) @@ -130,7 +129,7 @@ function circular_saw:reset(pos) local owned_by = meta:get_string("owner") if owned_by and owned_by ~= "" then - owned_by = (" (%s)"):format(S("owned by @1", meta:get_string("owner"))) + owned_by = (" ("..S("owned by @1", meta:get_string("owner"))..")") else owned_by = "" end @@ -177,7 +176,7 @@ function circular_saw:update_inventory(pos, amount) local owned_by = meta:get_string("owner") if owned_by and owned_by ~= "" then - owned_by = (" (%s)"):format(S("owned by @1", meta:get_string("owner"))) + owned_by = (" ("..S("owned by @1", meta:get_string("owner"))..")") else owned_by = "" end @@ -366,15 +365,16 @@ function circular_saw.on_construct(pos) local meta = minetest.get_meta(pos) local fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots meta:set_string( + --FIXME Not work with @n in this part bug in minetest/minetest#7450. "formspec", "size[11,10]"..fancy_inv.. - "label[0,0;" ..F(S("Input\nmaterial")).. "]" .. - "list[current_name;input;1.5,0;1,1;]" .. + "label[0,0;" ..S("Input material").. "]" .. + "list[current_name;input;1.7,0;1,1;]" .. "label[0,1;" ..F(S("Left-over")).. "]" .. - "list[current_name;micro;1.5,1;1,1;]" .. - "label[0,2;" ..F(S("Recycle\noutput")).. "]" .. - "list[current_name;recycle;1.5,2;1,1;]" .. + "list[current_name;micro;1.7,1;1,1;]" .. + "label[0,2;" ..F(S("Recycle output")).. "]" .. + "list[current_name;recycle;1.7,2;1,1;]" .. "field[0.3,3.5;1,1;max_offered;" ..F(S("Max")).. ":;${max_offered}]" .. - "button[1,3.2;1,1;Set;" ..F(S("Set")).. "]" .. + "button[1,3.2;1.7,1;Set;" ..F(S("Set")).. "]" .. "list[current_name;output;2.8,0;8,6;]" .. "list[current_player;main;1.5,6.25;8,4;]" .. "listring[current_name;output]" .. diff --git a/init.lua b/init.lua index c3e9b63..71c0be0 100644 --- a/init.lua +++ b/init.lua @@ -12,9 +12,7 @@ moreblocks = {} local modpath = minetest.get_modpath("moreblocks") -local S, NS = dofile(modpath .. "/intllib.lua") -moreblocks.S = S -moreblocks.NS = NS +moreblocks.S = minetest.get_translator("moreblocks") dofile(modpath .. "/config.lua") dofile(modpath .. "/circular_saw.lua") diff --git a/locale/moreblocks.de.tr b/locale/moreblocks.de.tr new file mode 100644 index 0000000..8f7b8b9 --- /dev/null +++ b/locale/moreblocks.de.tr @@ -0,0 +1,86 @@ +# textdomain: moreblocks + +# German translation for More Blocks. +# Copyright © 2011-2020 Hugo Locurcio and contributors +# This file is distributed under the same license as the More Blocks package. +# Xanthin, 2014. +# CodeXP , 2018. + +#: circular_saw.lua + +Circular Saw=Kreissäge +Input material=Ausgangs-@nmaterial +Left-over=Rest +Max=Anzahl +Recycle output=Wiederver-@nwerten +Set=Ok +owned by @1=gehört @1 +Circular Saw is empty=Kreissäge ist leer +Circular Saw is working on @1=Kreissäge arbeitet mit @1 + +#: init.lua + +[moreblocks] loaded.=[moreblocks] geladen. + +#: nodes.lua + +Deprecated=veraltet +All-faces Acacia Tree=allseitiger Akazienbaumstamm +All-faces Aspen Tree=allseitiger Espenbaumstamm +All-faces Jungle Tree=allseitiger Tropenbaumstamm +All-faces Pine Tree=allseitiger Kieferbaumstamm +All-faces Tree=allseitiger Baumstamm +Cactus Brick=Kaktusziegel +Cactus Checker=Kaktus-Mosaik +Centered Wooden Tile=Holzfliese mittig +Checker Stone Tile=Stein-Mosaik +Circle Stone Bricks=Kreissteinziegel +Clean Glass=Klares Glas +Coal Checker=Kohlen-Mosaik +Coal Glass=Kohleglas +Coal Stone=Kohlestein +Coal Stone Bricks=Kohlesteinziegel +Compressed Cobblestone=Gepresster Kopfsteinpflaster +Compressed Dirt=Gepresste Erde +Copper Patina Block=Kupfer Edelrostblock +Empty Shelf=Leeres Regal +Full Wooden Tile=Vollholzfliese +Glow Glass=Leuchtglas +Iron Checker=Metall-Mosaik +Iron Glass=metallisiertes Glas +Iron Stone=Eisenstein +Iron Stone Bricks=Eisensteinziegel +Plankstone=Brettstein +Rope=Seil +Split Stone Tile=Geteilte Steinfliese +Stone Bricks=Steinziegel +Stone Tile=Steinfliese +Super Glow Glass=Superleuchtglas +Sweeper=Besen +Tar=Teer +Trap Desert Stone=Wüstensteinfalle +Trap Glass=Glasfalle +Trap Glow Glass=Leuchtglasfalle +Trap Obsidian=Obsidianfalle +Trap Obsidian Glass=Obsidianglasfalle +Trap Sandstone=Sandsteinfalle +Trap Stone=Steinfalle +Trap Super Glow Glass=Superleuchtglasfalle +Wooden Tile=Holzfliese +Offset Wooden Tile=Holzfliese versetzt +Downwards Wooden Tile=Holzfliese unten +Leftwards Wooden Tile=Holzfliese links +Rightwards Wooden Tile=Holzfliese rechts + +#: ownership.lua + +Sorry, @1 owns that spot.=Tut mir leid, dieser Bereich gehört @1. +someone=jemand + +#: stairsplus/common.lua + +@1 Microblock=@1mikroblock +@1 Slab=@1platte +@1 Slope=@1neigung +@1 Panel=@1paneel +@1 Stairs=@1treppe diff --git a/locale/moreblocks.es.tr b/locale/moreblocks.es.tr new file mode 100644 index 0000000..8c149cf --- /dev/null +++ b/locale/moreblocks.es.tr @@ -0,0 +1,92 @@ +# textdomain: moreblocks + +# Spanish translation for More Blocks. +# Copyright © 2011-2020 Hugo Locurcio and contributors +# This file is distributed under the same license as the More Blocks package. +# kaeza, 2013. +# CodeXP , 2018. +# Carlos Barraza 2020. + +#: circular_saw.lua + +Circular Saw=Sierra circular +Input material=Material de@nentrada +Left-over=Sobrante +Max=Maximo +Recycle output=Reciclar@nsalida +Set=Establecer +owned by @1=protegido por @1 +Circular Saw is empty=La sierra circular está vacia +Circular Saw is working on @1=Sierra circular trabajando en @1 +#WARNING: mod @1 tried to add node @2 to the circular saw manually.=ADVERTENCIA: el mod @1 intentó agregar el nodo @2 a la sierra circular. + +#: nodes.lua + +Deprecated=Obsoleto +All-faces Acacia Tree=Árbol de Acacia, todas las caras +All-faces Aspen Tree=Álamo temblón, todas las caras +All-faces Jungle Tree=Árbol de Selva, todas las caras +All-faces Pine Tree=Pino, todas las caras +All-faces Tree=Tronco de Árbol +Cactus Brick=Ladrillos de Cactus +Cactus Checker=Cuadros de Cactus +Centered Wooden Tile=Parqué​ Centrado +Checker Stone Tile=Cuadros de Baldosa de Piedra +Circle Stone Bricks=Bloques de Piedra Circulares +Clean Glass=Cristal Limpio +Coal Checker=Cuadros de Carbón +Coal Glass=Cristal con Carbón +Coal Stone=Carbón y Piedra +Coal Stone Bricks=Ladrillos de Piedra de Carbon +Compressed Cobblestone=Adoquin Comprimido +Compressed Dirt=Tierra Comprimida +Copper Patina Block=Bloque de Pátina de Cobre +Empty Shelf=Estante vacio +Full Wooden Tile=Parqué​ Completo +Glow Glass=Cristal Brillante +Iron Checker=Cuadros de Hierro +Iron Glass=Cristal con Hierro +Iron Stone=Hierro y Piedra +Iron Stone Bricks=Ladrillo de Piedra de Hierro +Plankstone=Tablones de piedra +Rope=Soga +Split Stone Tile=Baldosas de Piedra Partida +Stone Bricks=Ladrillos de Piedra +Stone Tile=Baldosa de Piedra +Super Glow Glass=Cristal Súper Brillante +Sweeper=Limpiador +Tar=Alquitrán +Trap Desert Stone=Piedra del Desierto Falsa +Trap Glass=Cristal Falso +Trap Glow Glass=Cristal Brillante Falso +Trap Obsidian=Obsidiana Falsa +Trap Obsidian Glass=Vidrio de Obsidiana Falso +Trap Sandstone=Arenisca Falsa +Trap Stone=Piedra Falsa +Trap Super Glow Glass=Cristal Súper Brillante Falso +Wooden Tile=Parqué​ +Offset Wooden Tile=Parqué​ Ajustado +Downwards Wooden Tile=Parqué​ hacia Abajo +Leftwards Wooden Tile=Parqué​ hacia la Izquierda +Rightwards Wooden Tile=Parqué​ hacia la Derecha + + +#: ownership.lua + +Sorry, @1 owns that spot.=Lo siento, @1 es dueño de ese lugar. +someone=alguien + +#: stairsplus/common.lua + +@1 Microblock=Microbloque de @1 +@1 Slab=Losa de @1 +@1 Slope=Pendiente de @1 +@1 Panel=Panel de @1 +@1 Stairs=Escalera de @1 + +#: registrations.lua + +Concrete=Concreto +Cement=Cemento +Brass Block=Bloque de latón +#LBM replaced @1 at @2=LBM (Modificador de Bloque al Cargar) reemplazo @1 en @2 diff --git a/locale/moreblocks.fr.tr b/locale/moreblocks.fr.tr new file mode 100644 index 0000000..eb9956d --- /dev/null +++ b/locale/moreblocks.fr.tr @@ -0,0 +1,87 @@ +# textdomain: moreblocks + +# French translation for More Blocks. +# Copyright © 2011-2020 Hugo Locurcio and contributors +# This file is distributed under the same license as the More Blocks package. +# Hugo Locurcio , 2013-2019. +# Jat15, 2013. +# CodeXP , 2018. + +#: circular_saw.lua + +Circular Saw=Scie circulaire +Input material=Matériau@nd'entrée +Left-over=Reste +Max=Max +Recycle output=Sortie à@nrecycler +Set=Définir +owned by @1=propriété de @1 +Circular Saw is empty=Scie circulaire vide +Circular Saw is working on @1=Scie circulaire manipulant @1 + +#: init.lua + +[moreblocks] loaded.=[moreblocks] a été chargé. + +#: nodes.lua + +Deprecated=déprécié +All-faces Acacia Tree=Tronc d'arbre d'acacia (toutes faces) +All-faces Aspen Tree=Tronc d'arbre de peuplier (toutes faces) +All-faces Jungle Tree=Tronc d'arbre de jungle (toutes faces) +All-faces Pine Tree=Tronc d'arbre de pin (toutes faces) +All-faces Tree=Tronc d'arbre (toutes faces) +Cactus Brick=Briques de cactus +Cactus Checker=Damier en cactus +Centered Wooden Tile=Dalle en bois centrée +Checker Stone Tile=Damier de dalle en pierre +Circle Stone Bricks=Briques en pierre circulaires +Clean Glass=Verre propre +Coal Checker=Damier en charbon +Coal Glass=Verre de charbon +Coal Stone=Pierre de charbon +Coal Stone Bricks=Briques en pierre de charbon +Compressed Cobblestone=Pierre taillée compressée +Compressed Dirt=Terre compressée +Copper Patina Block=Bloc de patine de cuivre +Empty Shelf=Étagère vide +Full Wooden Tile=Dalle en bois complète +Glow Glass=Verre brillant +Iron Checker=Damier de fer +Iron Glass=Verre de fer +Iron Stone=Pierre de fer +Iron Stone Bricks=Briques en pierre de fer +Plankstone=Pierre-bois +Rope=Corde +Split Stone Tile=Dalle en pierre découpée +Stone Bricks=Briques en pierre +Stone Tile=Dalle en pierre +Super Glow Glass=Verre très brillant +Sweeper=Balai +Tar=Bitume +Trap Desert Stone=Pierre du désert traversable +Trap Glass=Verre traversable +Trap Glow Glass=Verre brillant traversable +Trap Obsidian=Obsidienne traversable +Trap Obsidian Glass=Verre d'obsidienne traversable +Trap Sandstone=Grès traversable +Trap Stone=Pierre traversable +Trap Super Glow Glass=Verre très brillant traversable +Wooden Tile=Dalle en bois +Offset Wooden Tile=Dalle en bois décalée +Downwards Wooden Tile=Dalle en bois vers le bas +Leftwards Wooden Tile=Dalle en bois vers la gauche +Rightwards Wooden Tile=Dalle en bois vers la droite + +#: ownership.lua + +Sorry, @1 owns that spot.=Désolé, @1 possède cet endroit. +someone=quelqu'un + +#: stairsplus/common.lua + +@1 Microblock=Microbloc en @1 +@1 Slab=Demi-dalle en @1 +@1 Slope=Pente en @1 +@1 Panel=Barre en @1 +@1 Stairs=Escaliers en @1 diff --git a/locale/moreblocks.it.tr b/locale/moreblocks.it.tr new file mode 100644 index 0000000..bef3759 --- /dev/null +++ b/locale/moreblocks.it.tr @@ -0,0 +1,86 @@ +# textdomain: moreblocks + +# Italian translation for More Blocks. +# Copyright © 2011-2020 Hugo Locurcio and contributors +# This file is distributed under the same license as the More Blocks package. +# Emon, 2016. +# CodeXP , 2018. + +#: circular_saw.lua + +Circular Saw=Sega circolare +Input material=Materiale@niniziale +Left-over=Scarto +Max=Max. +Recycle output=Ricicla@nfinale +Set=Imp. +owned by @1= +Circular Saw is empty=Sega circolare, vuota +Circular Saw is working on @1=Sega circolare, in funzione su @1 + +#: init.lua + +[moreblocks] loaded.=[moreblocks] caricato. + +#: nodes.lua + +Deprecated= +All-faces Acacia Tree= +All-faces Aspen Tree= +All-faces Jungle Tree= +All-faces Pine Tree= +All-faces Tree=Albero su ogni lato +Cactus Brick=Mattoni di cactus +Cactus Checker=Scacchiera in cactus +Centered Wooden Tile=Mattonella in legno centrata +Checker Stone Tile= +Circle Stone Bricks=Mattoni concentrici in pietra +Clean Glass=Vetro pulito +Coal Checker=Scacchiera in carbone +Coal Glass=Vetro e carbone +Coal Stone=Pietra in carbone +Coal Stone Bricks=Mattoni di pietra in carbone +Compressed Cobblestone= +Compressed Dirt= +Copper Patina Block= +Empty Shelf=Scaffale Vuoto +Full Wooden Tile=Mattonella in legno pieno +Glow Glass=Vetro luminoso +Iron Checker=Scacchiera in ferro +Iron Glass=Vetro e ferro +Iron Stone=Pietra in ferro +Iron Stone Bricks=Mattoni di pietra in ferro +Plankstone=Pietra e legno +Rope=Corda +Split Stone Tile=Mattonella in pietra divisa +Stone Bricks= +Stone Tile=Mattonella in pietra +Super Glow Glass=Super vetro luminoso +Sweeper=Spazzola +Tar= +Trap Desert Stone= +Trap Glass=Vetro trappola +Trap Glow Glass=Vetro luminoso trappola +Trap Obsidian= +Trap Obsidian Glass= +Trap Sandstone= +Trap Stone=Pietra trappola +Trap Super Glow Glass=Super vetro luminoso trappola +Wooden Tile=Mattonella in legno +Offset Wooden Tile= +Downwards Wooden Tile= +Leftwards Wooden Tile= +Rightwards Wooden Tile= + +#: ownership.lua + +Sorry, @1 owns that spot.=Spiacente, quel punto è di proprietà di @1 +someone=qualcuno + +#: stairsplus/common.lua + +@1 Microblock=Microblocco @1 +@1 Slab=Lastra - @1 +@1 Slope= +@1 Panel=Pannello - @1 +@1 Stairs=Scale - @1 diff --git a/locale/moreblocks.pl.tr b/locale/moreblocks.pl.tr new file mode 100644 index 0000000..9d9fe19 --- /dev/null +++ b/locale/moreblocks.pl.tr @@ -0,0 +1,87 @@ +# textdomain: moreblocks + +# Polish translation for More Blocks. +# Copyright © 2011-2020 Hugo Locurcio and contributors +# This file is distributed under the same license as the More Blocks package. +# mat9117, 2019 +# CodeXP , 2018. + +#: circular_saw.lua + +Circular Saw=Piła tarczowa +Input material=wejście@nmateriał +Left-over=Resztki +Max=Maks +Recycle output=Przetwarzanie@nWyjście +Set=Ustaw +owned by @1=Należy do @1 +Circular Saw is empty=Piła tarczowa jest pusta +Circular Saw is working on @1=Piła tarczowa pracuje na @1 + +#: init.lua + +[moreblocks] loaded.=[moreblocks] załadowane. + +#: nodes.lua + +Deprecated=Przestarzałe +All-faces Acacia Tree=Wielostronna tekstura akacji +All-faces Aspen Tree=Wielostronna tekstura osiki +All-faces Jungle Tree=Wielostronna tekstura drzewa dżunglowego +All-faces Pine Tree=Wielostronna tekstura sosny +All-faces Tree=Wielostronna tekstura drzewa +Cactus Brick=Kaktusowa cegła +Cactus Checker=Kaktusowa szachownica +Centered Wooden Tile=Wyśrodkowany drewniany kafelek +Checker Stone Tile=Kamienna szachownica +Circle Stone Bricks=Okrągłe kamienne cegły +Clean Glass=Czyste szkło +Coal Checker=Węglowa szachownica +Coal Glass=Szkło węglowe +Coal Stone=Kamień węglowy +Coal Stone Bricks=Węglowe kamienne cegły +Compressed Cobblestone=Skompresowany bruk +Compressed Dirt=Skompresowana ziemia +Copper Patina Block=Blok patynowanej miedzi +Empty Shelf=Pusta półka +Full Wooden Tile=Pełny drewniany kafelek +Glow Glass=Świecące szkło +Iron Checker=Żelazna szachownica +Iron Glass=Żelazne szkło +Iron Stone=Żelazny kamień +Iron Stone Bricks=Żelazne kamienne cegły +Plankstone=Deskokamień +Rope=Lina +Split Stone Tile=Kamienny blok kafelkowy +Stone Bricks=Kamienne cegły +Stone Tile=Kamienny kafelek +Super Glow Glass=Super świecące szkło +Sweeper=Miotła +Tar=Smoła +Trap Desert Stone=Pułapka z pustynnego kamienia +Trap Glass=Szklana pułapka +Trap Glow Glass=Pułapka ze świecącego szkłą +Trap Obsidian=Obsydianowa pułapka +Trap Obsidian Glass=Pułapka z obsydianowego szkła +Trap Sandstone=Pułapka z piaskowca +Trap Stone=Kamienna pułapka +Trap Super Glow Glass=Pułapka z super świecącego szkła +Wooden Tile=Drewniany kafelek +Offset Wooden Tile= +Downwards Wooden Tile=Dolny drewniany kafelek +# @deprecated +Leftwards Wooden Tile=Lewy drewniany kafelek +# @deprecated +Rightwards Wooden Tile=Prawy drewniany kafelek + +#: ownership.lua +Sorry, @1 owns that spot.=Przykro mi, to miejsce należy do @1 +someone=ktoś + +#: stairsplus/common.lua + +@1 Microblock=@1 Mikroblok +@1 Slab=@1 Płyta +@1 Slope=@1 Spad +@1 Panel=@1 Panel +@1 Stairs=@1 Schody diff --git a/locale/moreblocks.ru.tr b/locale/moreblocks.ru.tr new file mode 100644 index 0000000..c45be83 --- /dev/null +++ b/locale/moreblocks.ru.tr @@ -0,0 +1,89 @@ +# textdomain: moreblocks + +# Russian translation for MOREBLOCKS minetest mod. +# Copyright (C) 2018 Hugo Locurcio and contributors +# This file is distributed under the same license as the MOREBLOCKS package. +# CodeXP , 2018. +# +#, fuzzy + +#: circular_saw.lua + +Circular Saw=циркулярная пила +Input material=Входной@nматериал +Left-over=Остатки +Max=Кол. +Recycle output=Пере-@nобработка +Set=ОК +owned by @1=принадлежит @1 +Circular Saw is empty=циркулярная пила пустая +Circular Saw is working on @1=циркулярная пила, @1 в обработке + +#: init.lua + +[MOD] moreblocks loaded.=[MOD] moreblocks загружен. + +#: nodes.lua + +Deprecated=устаревший +All-faces Acacia Tree=всестороннее бревно акации +All-faces Aspen Tree=всестороннее бревно осины +All-faces Jungle Tree=всестороннее бревно дерева джунглей +All-faces Pine Tree=всестороннее бревно сосновое +All-faces Tree=всестороннее бревно дерева +Cactus Brick=кирпич из кактуса +Cactus Checker=мозаика из кактуса +Centered Wooden Tile=деревянная мозаика (центр) +Checker Stone Tile=каменная мозаика +Circle Stone Bricks=кольцевой камень +Clean Glass=чистое стекло +Coal Checker=угольная мозаика +Coal Glass=угольное стекло +Coal Stone=угольный камень +Coal Stone Bricks=угольно-каменный кирпич +Compressed Cobblestone=прессованный булыжник +Compressed Dirt=прессованная земля +Copper Patina Block=медный патинированный блок +Empty Shelf=пустые полки +Full Wooden Tile=деревянная мозаика +Glow Glass=светящееся стекло +Iron Checker=стальная мозаика +Iron Glass=металлизированное стекло +Iron Stone=железный камень +Iron Stone Bricks=железно-каменный кирпич +Plankstone=дерево-каменная мозаика +Rope=верёвка +Split Stone Tile=каменная мозаика +Stone Bricks=каменный кирпич +Stone Tile=каменная плитка +Super Glow Glass=супер светящееся стекло +Sweeper=метёлка +Tar=смола +Trap Desert Stone=мнимый пустынный камень +Trap Glass=мнимое стекло +Trap Glow Glass=мнимое светящееся стекло +Trap Obsidian=мнимый обсидиан +Trap Obsidian Glass=мнимое обсидиановое стекло +Trap Sandstone=мнимый песчаник +Trap Stone=мнимый камень +Trap Super Glow Glass=мнимое супер светящееся стекло +Wooden Tile=деревянная мозаика +Offset Wooden Tile=деревянная мозаика (сверху) +# @deprecated +Downwards Wooden Tile=деревянная мозаика (снизу) +# @deprecated +Leftwards Wooden Tile=деревянная мозаика (слева) +# @deprecated +Rightwards Wooden Tile=деревянная мозаика (справа) + +#: ownership.lua +Sorry, @1 owns that spot.=Извините, это принадлежит @1. +someone=кому-то + +#: stairsplus/common.lua + +@1 Microblock=@1 (микроблок) +@1 Slab=@1 (плита) +@1 Slope=@1 (наклон) +@1 Panel=@1 (панель) +@1 Stairs=@1 (лестница) diff --git a/locale/moreblocks.template.tr b/locale/moreblocks.template.tr new file mode 100644 index 0000000..3358656 --- /dev/null +++ b/locale/moreblocks.template.tr @@ -0,0 +1,85 @@ +# textdomain: moreblocks + +#: circular_saw.lua + +Circular Saw= +Input material= +Left-over= +Max= +Recycle output= +Set= +owned by @1= +Circular Saw is empty= +Circular Saw is working on @1= +#WARNING: mod @1 tried to add node @2 to the circular saw manually.= + +#: nodes.lua + +Deprecated= +All-faces Acacia Tree= +All-faces Aspen Tree= +All-faces Jungle Tree= +All-faces Pine Tree= +All-faces Tree= +Cactus Brick= +Cactus Checker= +Centered Wooden Tile= +Checker Stone Tile= +Circle Stone Bricks= +Clean Glass= +Coal Checker= +Coal Glass= +Coal Stone= +Coal Stone Bricks= +Compressed Cobblestone= +Compressed Dirt= +Copper Patina Block= +Empty Shelf= +Full Wooden Tile= +Glow Glass= +Iron Checker= +Iron Glass= +Iron Stone= +Iron Stone Bricks= +Plankstone= +Rope= +Split Stone Tile= +Stone Bricks= +Stone Tile= +Super Glow Glass= +Sweeper= +Tar= +Trap Desert Stone= +Trap Glass= +Trap Glow Glass= +Trap Obsidian= +Trap Obsidian Glass= +Trap Sandstone= +Trap Stone= +Trap Super Glow Glass= +Wooden Tile= +Offset Wooden Tile= +Downwards Wooden Tile= +Leftwards Wooden Tile= +Rightwards Wooden Tile= + + +#: ownership.lua + +Sorry, @1 owns that spot.= +someone= + +#: stairsplus/common.lua + +@1 Microblock= +@1 Slab= +@1 Slope= +@1 Panel= +@1 Stairs= + +#: registrations.lua + +Concrete= +Cement= +Brass Block= +#LBM replaced @1 at @2= diff --git a/mod.conf b/mod.conf index 31f7f79..748fb64 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = moreblocks description = Adds various miscellaneous blocks to the game. depends = default -optional_depends = intllib,stairs,farming,wool,basic_materials +optional_depends = stairs,farming,wool,basic_materials diff --git a/nodes.lua b/nodes.lua index ab33375..3dc99d2 100644 --- a/nodes.lua +++ b/nodes.lua @@ -36,7 +36,7 @@ local function wood_tile_replace(itemstack, placer, pointed_thing) return itemstack end -local deprecated = (" (%s)"):format(S('Deprecated')) +local deprecated = (" ("..S('Deprecated')..")") local nodes = { ["wood_tile"] = { description = S("Wooden Tile"), diff --git a/stairsplus/common.lua b/stairsplus/common.lua index d42ccfa..561ed39 100644 --- a/stairsplus/common.lua +++ b/stairsplus/common.lua @@ -8,15 +8,15 @@ Licensed under the zlib license. See LICENSE.md for more information. local S = moreblocks.S local descriptions = { - ["micro"] = S("%s Microblock"), - ["slab"] = S("%s Slab"), - ["slope"] = S("%s Slope"), - ["panel"] = S("%s Panel"), - ["stair"] = S("%s Stairs"), + ["micro"] = "Microblock", + ["slab"] = "Slab", + ["slope"] = "Slope", + ["panel"] = "Panel", + ["stair"] = "Stairs", } stairsplus.register_single = function(category, alternate, info, modname, subname, recipeitem, fields) - local desc_base = descriptions[category]:format(fields.description) + local desc_base = S("@1 "..descriptions[category], fields.description) local def = {} if category ~= "slab" then diff --git a/stairsplus/registrations.lua b/stairsplus/registrations.lua index 088d903..42c0acf 100644 --- a/stairsplus/registrations.lua +++ b/stairsplus/registrations.lua @@ -4,7 +4,7 @@ More Blocks: registrations Copyright © 2011-2020 Hugo Locurcio and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] - +local S = moreblocks.S -- default registrations local default_nodes = { -- Default stairs/slabs/panels/microblocks: "stone", @@ -118,7 +118,7 @@ end if minetest.get_modpath("basic_materials") then stairsplus:register_all("technic","concrete","basic_materials:concrete_block",{ - description = "Concrete", + description = S("Concrete"), tiles = {"basic_materials_concrete_block.png",}, groups = {cracky=1, level=2, concrete=1}, sounds = default.node_sound_stone_defaults(), @@ -128,7 +128,7 @@ if minetest.get_modpath("basic_materials") then minetest.register_alias("prefab:concrete_slab","technic:slab_concrete") stairsplus:register_all("gloopblocks", "cement", "basic_materials:cement_block", { - description = "Cement", + description = S("Cement"), tiles = {"basic_materials_cement_block.png"}, groups = {cracky=2, not_in_creative_inventory=1}, sounds = default.node_sound_stone_defaults(), @@ -136,7 +136,7 @@ if minetest.get_modpath("basic_materials") then }) stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", { - description="Brass Block", + description= S("Brass Block"), groups={cracky=1, not_in_creative_inventory=1}, tiles={"basic_materials_brass_block.png"}, }) @@ -159,6 +159,6 @@ minetest.register_lbm({ }) minetest.log('action', "LBM replaced " .. node.name .. - " at " .. minetest.pos_to_string(pos)) + " at " .. minetest.pos_to_string(pos)) end, })