diff --git a/mods/README.md b/mods/README.md index 158776e..2046af8 100644 --- a/mods/README.md +++ b/mods/README.md @@ -17,7 +17,7 @@ For information check [../README.md](../README.md) | default | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/c7cb79422ba19c696966472942db6177c934838d | | | doors | https://codeberg.org/minenux/minetest-mod-doors | https://codeberg.org/minenux/minetest-mod-doors/commit/a89ab0454deb4933b6e4971c57055c40b7938e5b | [doors/README.md](doors/README.md) | | dye | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/c7cb79422ba19c696966472942db6177c934838d | | -| farming | https://codeberg.org/minenux/minetest-mod-farming | https://codeberg.org/minenux/minetest-mod-farming/commit/10de84d12d24a87f3aa9abef73f87c6cebb2614c | [farming/README.md](farming/README.md) | +| farming | https://codeberg.org/minenux/minetest-mod-farming | https://codeberg.org/minenux/minetest-mod-farming/commit/00e4b3cb89d3c1b1d66b6af4821191c1d667e1bc | [farming/README.md](farming/README.md) | | fire | https://codeberg.org/minenux/minetest-mod-fire | https://codeberg.org/minenux/minetest-mod-fire/commit/4e5f7ad55314bd9b126fb133cfc5a32fa58b20d2 | [fire/README.md](fire/README.md) | | flowers | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/c7cb79422ba19c696966472942db6177c934838d | | | give_initial_stuff | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/c7cb79422ba19c696966472942db6177c934838d | | diff --git a/mods/farming/api.txt b/mods/farming/api.txt index 81092c6..cd8cc76 100644 --- a/mods/farming/api.txt +++ b/mods/farming/api.txt @@ -16,6 +16,7 @@ The farming API allows you to easily register plants and hoes. 'minlight' min light level needed to grow 'maxlight' max light level needed to grow 'steps' number of steps crop has in growth cycle + 'trellis' name of trellis node (e.g. "farming:trellis"), default: nil ### Hoe Definition diff --git a/mods/farming/crops/beans.lua b/mods/farming/crops/beans.lua index f1a6e16..02ebe1a 100644 --- a/mods/farming/crops/beans.lua +++ b/mods/farming/crops/beans.lua @@ -222,6 +222,7 @@ minetest.register_node("farming:beanpole_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:beans"] = { + trellis = "farming:beanpole", crop = "farming:beanpole", seed = "farming:beans", minlight = farming.min_light, diff --git a/mods/farming/crops/cocoa.lua b/mods/farming/crops/cocoa.lua index c5c0df7..da932d2 100644 --- a/mods/farming/crops/cocoa.lua +++ b/mods/farming/crops/cocoa.lua @@ -199,6 +199,7 @@ minetest.register_node("farming:cocoa_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:cocoa_beans"] = { + trellis = "default:jungletree", crop = "farming:cocoa", seed = "farming:cocoa_beans_raw", minlight = farming.min_light, diff --git a/mods/farming/crops/grapes.lua b/mods/farming/crops/grapes.lua index 47d64e0..ee8fe38 100644 --- a/mods/farming/crops/grapes.lua +++ b/mods/farming/crops/grapes.lua @@ -229,6 +229,7 @@ minetest.register_node("farming:grapes_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:grapes"] = { + trellis = "farming:trellis", crop = "farming:grapes", seed = "farming:grapes", minlight = farming.min_light, diff --git a/mods/farming/init.lua b/mods/farming/init.lua index fddbc59..87aa48d 100644 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20211204", + version = "20220309", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -407,6 +407,8 @@ end -- refill placed plant by crabman (26/08/2015) updated by TenPlus1 function farming.refill_plant(player, plantname, index) + if not player then return end + local inv = player:get_inventory() local old_stack = inv:get_stack("main", index) @@ -493,7 +495,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname) -- check for refill if itemstack:get_count() == 0 then - minetest.after(0.10, + minetest.after(0.2, farming.refill_plant, placer, name, diff --git a/mods/farming/locale/de.txt b/mods/farming/locale/de.txt index a18f79e..b06202d 100644 --- a/mods/farming/locale/de.txt +++ b/mods/farming/locale/de.txt @@ -2,7 +2,8 @@ # textdomain: farming # author: Xanthin # author: TheDarkTiger -# last update: 2020/Apr/26 +# author: SwissalpS +# last update: 2022/Feb/26 ###### folder . ###### @@ -10,22 +11,22 @@ Seed=Saatgut ### compatibility.lua ### -Banana= -Banana Leaves= -Orange= -Strawberry= +Banana=Banane +Banana Leaves=Bananenblätter +Orange=Apfelsine +Strawberry=Erdbeere ### food.lua ### Sugar=Zucker -Salt= -Rose Water= -Turkish Delight= -Garlic Bread= +Salt=Salz +Rose Water=Rosenwasser +Turkish Delight=Lokum +Garlic Bread=Knoblauchbrot Donut=Donut Chocolate Donut=Schokodonut Apple Donut=Apfeldonut -Porridge= -Jaffa Cake= +Porridge=Haferbrei +Jaffa Cake=Jaffakeks ### hoes.lua ### Hoe=Hacke @@ -36,8 +37,8 @@ Bronze Hoe=Bronzehacke Mese Hoe=Mesehacke Diamond Hoe=Diamanthacke # Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)= -Mithril Scythe (Right-click to harvest and replant crops)= +Hoe Bomb (use or throw on grassy areas to hoe land)=Hackbombe (Auf Grasland werfen oder benutzen) +Mithril Scythe (Right-click to harvest and replant crops)=Mithril-Sense (Rechts-Klick zum Ernten und Wiedereinpflanzen) # Surcharge du mod [Toolranks] à faire # ### soil.lua ### @@ -45,15 +46,15 @@ Soil=Ackerboden Wet Soil=Bewässerter Ackerboden ### utensils.lua ### -Wooden Bowl= -Saucepan= -Cooking Pot= -Baking Tray= -Skillet= -Mortar and Pestle= -Cutting Board= -Juicer= -Glass Mixing Bowl= +Wooden Bowl=Holzschale +Saucepan=Kasserolle +Cooking Pot=Kochtopf +Baking Tray=Kuchenblech +Skillet=Bratpfanne +Mortar and Pestle=Mörser und Stößel +Cutting Board=Schneidebrett +Juicer=Entsafter +Glass Mixing Bowl=Glasschüssel ###### folder ./crops ###### @@ -67,28 +68,28 @@ Green Beans=Grüne Bohnen Bean Pole (place on soil before planting beans)=Bohnenstange (vor dem Pflanzen der Bohnen auf den\nAckerboden stellen) ### beetroot.lua ### -Beetroot= -Beetroot Soup= +Beetroot=Rote Beete +Beetroot Soup=Rote Beete Suppe ### blueberry.lua ### Blueberries=Blaubeeren Blueberry Muffin=Blaubeermuffin -Blueberry Pie= +Blueberry Pie=Blaubeerkuchen ### carrot.lua ## Carrot=Möhre -Carrot Juice= +Carrot Juice=Möhrensaft Golden Carrot=Goldene Möhre ### chili.lua ### -Chili Pepper= -Bowl of Chili= +Chili Pepper=Chili +Bowl of Chili=Chili Schale ### cocoa.lua ### Cocoa Beans=Kakaobohne Cookie=Keks Bar of Dark Chocolate=Tafel Zartbitterschokolade -Chocolate Block= +Chocolate Block=Schokoladenstück ### coffee.lua ### Coffee Beans=Kaffeebohnen @@ -97,21 +98,21 @@ Cup of Coffee=Tasse Kaffee ### corn.lua ### Corn=Mais Corn on the Cob=Maiskolben -Cornstarch= +Cornstarch=Speisestärke Bottle of Ethanol=Flasche Ethanol ### cotton.lua ### Cotton Seed=Baumwollsamen Cotton=Baumwolle -String= +String=Faden ### cucumber.lua ### Cucumber=Gurke ### garlic.lua ### -Garlic clove= -Garlic= -Garlic Braid= +Garlic clove=Knoblauchzehe +Garlic=Knoblauch +Garlic Braid=Knoblauchzopf ### grapes.lua ### Grapes=Weintrauben @@ -122,7 +123,7 @@ Hemp Seed=Hanfsamen Hemp Leaf=Hanfblatt Bottle of Hemp Oil=Flasche mit Hanföl Hemp Fibre=Hanffaser -Hemp Block= +Hemp Block=Hanfblock Hemp Rope=Hanfseil ### melon.lua ### @@ -130,33 +131,33 @@ Melon Slice=Melonenscheibe Melon=Melone ### onion.lua ### -Onion= +Onion=Zwiebel ### peas.lua ### -Pea Pod= -Peas= -Pea Soup= +Pea Pod=Erbsenschote +Peas=Erbsen +Pea Soup=Erbsensuppe ### pepper.lua ### -Peppercorn= -Pepper= -Ground Pepper= +Peppercorn=Pfefferkorn +Pepper=Pfeffer +Ground Pepper=Gemahlener Pfeffer ### pinapple.lua ### -Pineapple Top= -Pineapple= -Pineapple Ring= -Pineapple Juice= +Pineapple Top=Ananasdeckel +Pineapple=Ananas +Pineapple Ring=Ananasscheibe +Pineapple Juice=Ananassaft ### potato.lua ### Potato=Kartoffel Baked Potato=Ofenkartoffel -Cucumber and Potato Salad= +Cucumber and Potato Salad=Gurken und Tomatensalat ### pumpkin.lua ### Pumpkin Slice=Kürbisscheibe Jack 'O Lantern (punch to turn on and off)=Kürbislaterne (Punch zum Ein- und Ausschalten) -Scarecrow Bottom= +Scarecrow Bottom=Vogelscheuchengestell Pumpkin Bread=Kürbisbrot Pumpkin Dough=Kürbisteig Pumpkin=Kürbis @@ -170,16 +171,16 @@ Rhubarb=Rhabarber Rhubarb Pie=Rhabarberkuchen ### ryeoatrice.lua ### -Rye= -Rye seed= -Oat= -Oat seed= -Rice= -Rice grains= -Rice Bread= -Rice Flour= -Multigrain Flour= -Multigrain Bread= +Rye=Roggen +Rye seed=Roggensaat +Oat=Hafer +Oat seed=Hafersamen +Rice=Reis +Rice grains=Reissaat +Rice Bread=Reiswaffel +Rice Flour=Reismehl +Multigrain Flour=Mehrkornmehl +Multigrain Bread=Mehrkornbrot ### tomato.lua ### Tomato=Tomate @@ -190,6 +191,6 @@ Wheat=Weizen Straw=Stroh Flour=Mehl Bread=Brot -Sliced Bread= -Toast= -Toast Sandwich= +Sliced Bread=Geschnittenes Brot +Toast=Toast +Toast Sandwich=Toast Sandwich diff --git a/mods/farming/locale/es.txt b/mods/farming/locale/es.txt index 185261b..c4915ea 100644 --- a/mods/farming/locale/es.txt +++ b/mods/farming/locale/es.txt @@ -1,172 +1,173 @@ # Translation of the farming mod by TenPlus1 # textdomain: farming # author: PICCORO Lenz McKAY -# last update: 2022/Feb/16 +# author: SwissalpS +# last update: 2022/Feb/26 ###### folder . ###### ### init.lua ### -Seed=Semillas +Seed=Semilla ### compatibility.lua ### Banana=Banana Banana Leaves=Hojas de banana Orange=Naranja -Strawberry=Fresas +Strawberry=Fresa ### food.lua ### -Sugar=Azucar +Sugar=Azúcar Salt=Sal Rose Water=Agua de rosa Turkish Delight=Delicia turca -Garlic Bread=Pan de Ajo +Garlic Bread=Pan de ajo Donut=Dona -Chocolate Donut=Dona de Chocolate -Apple Donut=Dona de Manzana +Chocolate Donut=Dona de chocolate +Apple Donut=Dona de manzana Porridge=Papilla -Jaffa Cake=Pastel de Jaffa +Jaffa Cake=Pastel de jaffa ### hoes.lua ### -Hoe=Azadon -Wooden Hoe=Azadon de Madera -Stone Hoe=Azadon de Piedra -Steel Hoe=Azadon de Acero -Bronze Hoe=Azadon de Bronze -Mese Hoe=Azadon de Mese -Diamond Hoe=Azadon de Diamante +Hoe=Azadón +Wooden Hoe=Azadón de madera +Stone Hoe=Azadón de piedra +Steel Hoe=Azadón de acero +Bronze Hoe=Azadón de bronze +Mese Hoe=Azadón de mese +Diamond Hoe=Azadón de diamante # Surcharge du mod [Toolranks] à faire # -Hoe Bomb (use or throw on grassy areas to hoe land)=Bomba de azada (usar o arrojar en áreas verdes para cavar tierra) +Hoe Bomb (use or throw on grassy areas to hoe land)=Azadón bomba (usar o tirar en áreas verdes para rozar) Mithril Scythe (Right-click to harvest and replant crops)=Guadaña de mithril (clic derecho para cosechar y replantar cultivos) # Surcharge du mod [Toolranks] à faire # ### soil.lua ### Soil=Suelo -Wet Soil=Suelo Seco +Wet Soil=Suelo mojado ### utensils.lua ### -Wooden Bowl=Cuenco de Madera +Wooden Bowl=Cuenco de madera Saucepan=Cacerola Cooking Pot=Olla -Baking Tray=Bandeja Hornear +Baking Tray=Bandeja de hornear Skillet=Sarten -Mortar and Pestle=Mortero y Maza +Mortar and Pestle=Mortero y maja Cutting Board=Tabla de cortar Juicer=Exprimidor -Glass Mixing Bowl=Tazón de mezcla de vidrio +Glass Mixing Bowl=Tazón de vidrio para mezclar ###### folder ./crops ###### ### barley.lua ### -Barley Seed=Semillas de Cevada -Barley=Cevada +Barley Seed=Semilla de cebada +Barley=Cebada ### beans.lua ### -Green Beans=Frijoles Verdes +Green Beans=Frijoles verdes Bean Pole (place on soil before planting beans)=Base de frijol (colocar en el suelo antes de plantar frijoles) ### beetroot.lua ### Beetroot=Remolacha -Beetroot Soup=Sopa de Remolacha +Beetroot Soup=Sopa de remolacha ### blueberry.lua ### Blueberries=Arándanos -Blueberry Muffin=Muffin de Arándanos -Blueberry Pie=Pastel de Arándanos +Blueberry Muffin=Muffin de arándanos +Blueberry Pie=Pastel de arándanos ### carrot.lua ## Carrot=Zanahoria -Carrot Juice=Jugo de Zanahoria -Golden Carrot=Zanahoria Dorada +Carrot Juice=Jugo de zanahoria +Golden Carrot=Zanahoria dorada ### chili.lua ### -Chili Pepper=Chile o ajies -Bowl of Chili=Tazon de Chile o ajies +Chili Pepper=Ají picante +Bowl of Chili=Tazón de chili ### cocoa.lua ### -Cocoa Beans=Amendras de Cacao +Cocoa Beans=Granos de cacao Cookie=Galleta -Bar of Dark Chocolate=Barra de Chocolate Negro -Chocolate Block=Bloque de Chocolate +Bar of Dark Chocolate=Barra de chocolate negro +Chocolate Block=Bloque de chocolate ### coffee.lua ### -Coffee Beans=Grano de Cafe -Cup of Coffee=Taza de Cafe +Coffee Beans=Granos de café +Cup of Coffee=Taza de café ### corn.lua ### -Corn=Maiz -Corn on the Cob=Mazorca de Maiz -Cornstarch=Almidon -Bottle of Ethanol=Garrafa de Etanol +Corn=Maíz +Corn on the Cob=Mazorca de maíz +Cornstarch=Almidón de maíz +Bottle of Ethanol=Botella de etanol ### cotton.lua ### -Cotton Seed=Sementes de Algodon -Cotton=Algodon -String=Cadena +Cotton Seed=Semilla de algodón +Cotton=Algodón +String=Guita ### cucumber.lua ### Cucumber=Pepino ### garlic.lua ### -Garlic clove=Diente de Ajo +Garlic clove=Diente de ajo Garlic=Ajo -Garlic Braid=Trenza de Ajo +Garlic Braid=Trenza de ajo ### grapes.lua ### Grapes=Uvas -Trellis (place on soil before planting grapes)=Grade de Ripas (colocar en el suelo antes de plantar las uvas) +Trellis (place on soil before planting grapes)=Enrejado (colocar en el suelo antes de plantar las uvas) ### hemp.lua ### -Hemp Seed=Semilla de Caniamo -Hemp Leaf=Folha de Caniamo -Bottle of Hemp Oil=Garrafa de Aceite de Caniamo -Hemp Fibre=Fibra de Caniamo -Hemp Block=Bloque de Caniamo -Hemp Rope=Corda de Caniamo +Hemp Seed=Semilla de cáñamo +Hemp Leaf=Hoja de cáñamo +Bottle of Hemp Oil=Botella de aceite de cáñamo +Hemp Fibre=Fibra de cáñamo +Hemp Block=Bloque de cáñamo +Hemp Rope=Cuerda de cáñamo ### melon.lua ### -Melon Slice=Rebanada de Melon +Melon Slice=Pedazo de Melón Melon=Melon ### onion.lua ### Onion=Cebolla ### peas.lua ### -Pea Pod=Vaina de guisante -Peas=Gisantes -Pea Soup=Sopa de Guisantes +Pea Pod=Vaina de guisantes +Peas=Guisantes +Pea Soup=Sopa de guisantes ### pepper.lua ### -Peppercorn=Grano de Pimienta +Peppercorn=Grano de pimienta Pepper=Pimienta -Ground Pepper=Pimienta Molida +Ground Pepper=Pimienta molida ### pinapple.lua ### -Pineapple Top=Tope de Piña -Pineapple=Pinia -Pineapple Ring=Anillo de pinia -Pineapple Juice=Jugo de pinia +Pineapple Top=Tapa de piña +Pineapple=Piña +Pineapple Ring=Anillo de piña +Pineapple Juice=Jugo de piña ### potato.lua ### -Potato=Batata -Baked Potato=Batata Cocida -Cucumber and Potato Salad=Ensalada de Pepino y Patatas +Potato=Patata +Baked Potato=Patata al horno +Cucumber and Potato Salad=Ensalada de pepino y patata ### pumpkin.lua ### -Pumpkin Slice=Pedazo de Calabaza -Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (golpea para encender o apagar) -Scarecrow Bottom=Espantapajaros abajo -Pumpkin Bread=Pan de Calabaza -Pumpkin Dough=Masa de Calabaza +Pumpkin Slice=Pedazo de calabaza +Jack 'O Lantern (punch to turn on and off)=Farol de Jack (golpea para encender o apagar) +Scarecrow Bottom=Espantapájaros abajo +Pumpkin Bread=Pan de calabaza +Pumpkin Dough=Masa de calabaza Pumpkin=Calabaza ### raspberry.lua ### Raspberries=Frambuesa -Raspberry Smoothie=Batida de Frambuesa +Raspberry Smoothie=Batido de frambuesa ### rhubarb.lua ### Rhubarb=Ruibarbo -Rhubarb Pie=Torta de Ruibarbo +Rhubarb Pie=Pastel de ruibarbo ### ryeoatrice.lua ### Rye=Centeno @@ -175,16 +176,16 @@ Oat=Avena Oat seed=Semilla de avena Rice=Arroz Rice grains=Granos de arroz -Rice Bread=PAn de arroz +Rice Bread=Pan de arroz Rice Flour=Harina de arroz -Multigrain Flour=Harina multicereal -Multigrain Bread=Pan multicereal +Multigrain Flour=Harina multigrano +Multigrain Bread=Pan multicereales ### tomato.lua ### Tomato=Tomate ### wheat.lua ### -Wheat Seed=Semillas de Trigo +Wheat Seed=Semilla de trigo Wheat=Trigo Straw=Paja Flour=Harina diff --git a/mods/farming/locale/farming.de.tr b/mods/farming/locale/farming.de.tr index 175990e..3fb935b 100644 --- a/mods/farming/locale/farming.de.tr +++ b/mods/farming/locale/farming.de.tr @@ -5,7 +5,7 @@ Apple Pie=Apfelkuchen Baked Potato=Ofenkartoffel Baking Tray=Kuchenblech Banana=Banane -Banana Leaves=Bananenblatt +Banana Leaves=Bananenblätter Bar of Dark Chocolate=Tafel Zartbitterschokolade Barley=Gerste Barley Seed=Gerstenkörner @@ -21,7 +21,7 @@ Bottle of Hemp Oil=Flasche mit Hanföl Bowl of Chili=Chili Schale Bread=Brot Bronze Hoe=Bronzehacke -Cabbage=Weißkohl +Cabbage=Kohl Cactus Juice=Kaktussaft Carrot=Möhre Carrot Juice=Möhrensaft @@ -48,7 +48,7 @@ Garlic=Knoblauch Garlic Braid=Knoblauchzopf Garlic Bread=Knoblauchbrot Garlic clove=Knoblauchzehe -Glass Mixing Bowl=Glasschlüssel +Glass Mixing Bowl=Glasschüssel Golden Carrot=Goldene Möhre Grapes=Weintrauben Green Beans=Grüne Bohnen @@ -106,6 +106,7 @@ Rose Water=Rosenwasser Rye=Roggen Rye seed=Roggensaat Salt=Salz +Salad=Salat Saucepan=Kasserolle Savanna Soil=Savannaerde Scarecrow Bottom=Vogelscheuchengestell diff --git a/mods/farming/locale/farming.es.tr b/mods/farming/locale/farming.es.tr index 09a86f3..773ac90 100644 --- a/mods/farming/locale/farming.es.tr +++ b/mods/farming/locale/farming.es.tr @@ -1,134 +1,134 @@ # textdomain:farming -%s Hoe=%s Azadon -Apple Donut=Dona de Manzana -Apple Pie=Pastel de Manzana -Baked Potato=Papa al Horno -Baking Tray=Bandeja Hornear -Banana=Platano -Banana Leaves=Hojas de Platano -Bar of Dark Chocolate=Barra de Chocolate amargo +%s Hoe=%s Azadón +Apple Donut=Dona de manzana +Apple Pie=Pastel de manzana +Baked Potato=Patata al horno +Baking Tray=Bandeja de hornear +Banana=Banana +Banana Leaves=Hojas de banana +Bar of Dark Chocolate=Barra de chocolate negro Barley=Cebada -Barley Seed=Semilla de Cebada -Bean Pole (place on soil before planting beans)=Base de frijol (colocar en el suelo antes de plantar los frijoles) +Barley Seed=Semilla de cebada +Bean Pole (place on soil before planting beans)=Base de frijol (colocar en el suelo antes de plantar frijoles) Beetroot=Remolacha -Beetroot Soup=Sopa de Remolacha +Beetroot Soup=Sopa de remolacha #Bibimbap= -Wild Blueberries=Arándanos Silvestres -Blueberry Muffin=Muffin de Arándanos +Wild Blueberries=Arándanos silvestres +Blueberry Muffin=Muffin de arándanos Blueberry Pie=Pastel de arándanos -Bottle of Ethanol=Botella de Etanol +Bottle of Ethanol=Botella de etanol Bottle of Hemp Oil=Botella de aceite de cáñamo -Bowl of Chili=Tazón de Chili +Bowl of Chili=Tazón de chili Bread=Pan -Bronze Hoe=Azadon de Bronze +Bronze Hoe=Azadón de bronze Cabbage=Repollo -Cactus Juice=Jugo de Cactus +Cactus Juice=Jugo de cactus Carrot=Zanahoria -Carrot Juice=Jugo de Zanahoria -Chili Pepper=Aji Picante +Carrot Juice=Jugo de zanahoria +Chili Pepper=Ají picante Chocolate Block=Bloque de chocolate Chocolate Donut=Dona de chocolate -Cocoa Beans=Granos De Cacao +Cocoa Beans=Granos de cacao Coffee Beans=Granos de café Cookie=Galleta -Cooking Pot=Olla de cocinar -Corn=Maiz -Corn on the Cob=Mazorca -Cornstarch=Maicena -Cotton=Algodon -Cotton Seed=Semilla de Algodon -Cucumber=Ensalada -Cucumber and Potato Salad=Ensalada de Pepino y Papas -Cup of Coffee=Taza de Cafe -Cutting Board=Tabla de Cortar -Diamond Hoe=Azado de Diamante +Cooking Pot=Olla +Corn=Maíz +Corn on the Cob=Mazorca de maíz +Cornstarch=Almidón de maíz +Cotton=Algodón +Cotton Seed=Semilla de algodón +Cucumber=Pepino +Cucumber and Potato Salad=Ensalada de pepino y patata +Cup of Coffee=Taza de café +Cutting Board=Tabla de cortar +Diamond Hoe=Azadón de diamante Donut=Dona Flour=Harina Garlic=Ajo -Garlic Braid=Trenza de Ajo -Garlic Bread=Pan de Ajo -Garlic clove=Diente de Ajo -Glass Mixing Bowl=Cuenco de vidrio -Golden Carrot=Zanahoria Dorada +Garlic Braid=Trenza de ajo +Garlic Bread=Pan de ajo +Garlic clove=Diente de ajo +Glass Mixing Bowl=Tazón de vidrio para mezclar +Golden Carrot=Zanahoria dorada Grapes=Uvas -Green Beans=Arvejas Verdes -Ground Pepper=Pimienta Molida -Hemp Block=Bloque de Canamo -Hemp Fibre=Fibra de Canamo -Hemp Leaf=Hoja de Canamo -Hemp Rope=Cuerda de Canamo -Hemp Seed=Semilla de Canamo -Hoe=Azadon -Hoe Bomb (use or throw on grassy areas to hoe land)=Azado Bomba (usar o tirar en áreas verdes para cavar) -Jack 'O Lantern (punch to turn on and off)=Lampara de Jack (pulsar para encender o apagar) -Jaffa Cake=Pastel de Jaffa -Juicer=Licuadora -Melon=Melon -Melon Slice=Rebanada de Melon -Mese Hoe=Azada de Mese -Mint Leaf=Hoja de Menta -Mint Seeds=Semilla de Menta -Mint Tea=Te de Menta -Mithril Scythe (Right-click to harvest and replant crops)=Hoz de Mithril (clic derecho para cosechar y replantar cultivos) -Mortar and Pestle=Mortero y Maja -Multigrain Bread=Pan Multicereales +Green Beans=Frijoles verdes +Ground Pepper=Pimienta molida +Hemp Block=Bloque de cáñamo +Hemp Fibre=Fibra de cáñamo +Hemp Leaf=Hoja de cáñamo +Hemp Rope=Cuerda de cáñamo +Hemp Seed=Semilla de cáñamo +Hoe=Azadón +Hoe Bomb (use or throw on grassy areas to hoe land)=Azadón bomba (usar o tirar en áreas verdes para rozar) +Jack 'O Lantern (punch to turn on and off)=Farol de Jack (golpea para encender o apagar) +Jaffa Cake=Pastel de jaffa +Juicer=Exprimidor +Melon=Sandía +Melon Slice=Rebanada de sandía +Mese Hoe=Azadón de mese +Mint Leaf=Hoja de menta +Mint Seeds=Semilla de menta +Mint Tea=Té de menta +Mithril Scythe (Right-click to harvest and replant crops)=Guadaña de mithril (clic derecho para cosechar y replantar cultivos) +Mortar and Pestle=Mortero y maja +Multigrain Bread=Pan multicereales Multigrain Flour=Harina multigrano -Oat seed=Semilla de Avena +Oat seed=Semilla de avena Oats=Avena Onion=Cebolla -Onion Soup=Sopa de Cebolla +Onion Soup=Sopa de cebolla Orange=Naranja Pasta=Pasta -Pea Pod=Vaina de Guisantes -Pea Soup=Sopa de Guisantes -Peas=Gisantes +Pea Pod=Vaina de guisantes +Pea Soup=Sopa de guisantes +Peas=Guisantes Pepper=Pimienta -Peppercorn=Vaina de Pimienta +Peppercorn=Grano de pimienta Pineapple=Piña Pineapple Juice=Jugo de piña Pineapple Ring=Anillo de piña -Pineapple Top=Hojas de piña -Porridge=Avena hojuelas +Pineapple Top=Tapa de piña +Porridge=Papilla Potato=Patata Pumpkin=Calabaza -Pumpkin Bread=Pan de Calabaza -Pumpkin Dough=Batido de Calabaza -Pumpkin Slice=Rebanada de Calabaza +Pumpkin Bread=Pan de calabaza +Pumpkin Dough=Masa de calabaza +Pumpkin Slice=Pedazo de calabaza Raspberries=Frambuesa -Raspberry Smoothie=Batido de Frambuesa -Rhubarb=Ruibardo +Raspberry Smoothie=Batido de frambuesa +Rhubarb=Ruibarbo Rhubarb Pie=Pastel de ruibarbo Rice=Arroz -Rice Bread=pan de arroz -Rice Flour=harina de arroz +Rice Bread=Pan de arroz +Rice Flour=Harina de arroz Rice grains=Granos de arroz -Rose Water=Agua de rosas +Rose Water=Agua de rosa Rye=Centeno -Rye seed=Semilla de Centeno +Rye seed=Semilla de centeno Salt=Sal Saucepan=Cacerola Savanna Soil=Suelo de sabana -Scarecrow Bottom=Espantapajaros abajo +Scarecrow Bottom=Espantapájaros abajo Seed=Semilla Skillet=Sarten -Sliced Bread=Pan Rebanado +Sliced Bread=Pan rebanado Soil=Suelo -Spaghetti=Espagueti -Steel Hoe=Azado de Acero -Stone Hoe=Azado de Piedra +Spaghetti=Espaguetis +Steel Hoe=Azadón de acero +Stone Hoe=Azadón de piedra Straw=Paja Strawberry=Fresa -String=Cadena -Sugar=Azucar +String=Guita +Sugar=Azúcar Toast=Tostadas -Toast Sandwich=Emparedado Tostados +Toast Sandwich=Emparedado de tostadas Tomato=Tomate Trellis (place on soil before planting grapes)=Enrejado (colocar en el suelo antes de plantar las uvas) -Turkish Delight=Delicia Turca +Turkish Delight=Delicia turca Wet Savanna Soil=Suelo humedo de savana Wet Soil=Suelo mojado Wheat=Trigo -Wheat Seed=Semilla de Trigo -Wild Cotton=Algodón Salvaje +Wheat Seed=Semilla de trigo +Wild Cotton=Algodón salvaje Wooden Bowl=Cuenco de madera -Wooden Hoe=Azada de madera +Wooden Hoe=Azadón de madera diff --git a/mods/farming/locale/farming.fr.tr b/mods/farming/locale/farming.fr.tr index 528ba21..4da1c81 100644 --- a/mods/farming/locale/farming.fr.tr +++ b/mods/farming/locale/farming.fr.tr @@ -13,7 +13,7 @@ Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur Beetroot=Betterave Beetroot Soup=Soupe de betterave Bibimbap=Bibimbap -Wild Blueberries=Myrtilles Sauvages +Wild Blueberries=Myrtilles sauvages Blueberry Muffin=Muffin aux myrtilles Blueberry Pie=Tarte aux myrtilles Bottle of Ethanol=Bouteille d'éthanol @@ -33,7 +33,7 @@ Coffee Beans=Grains de café Cookie=Biscuit Cooking Pot=Marmitte Corn=Maïs -Corn on the Cob=Maïs cuit +Corn on the Cob=Cobette (maïs cuit) Cornstarch=Fécule de maïs Cotton=Coton Cotton Seed=Graines de coton @@ -111,7 +111,7 @@ Savanna Soil=Terre de la savane binnée Scarecrow Bottom=Base d'épouventail Seed=Graine Skillet=Poêle -Sliced Bread=Tranche de Pain +Sliced Bread=Tranche de pain Soil=Terre binnée Spaghetti=Spaghetti Steel Hoe=Binette en acier diff --git a/mods/farming/locale/farming.zh_CN.tr b/mods/farming/locale/farming.zh_CN.tr index 8820705..adc97fe 100644 --- a/mods/farming/locale/farming.zh_CN.tr +++ b/mods/farming/locale/farming.zh_CN.tr @@ -60,7 +60,7 @@ Hemp Rope=麻绳 Hemp Seed=大麻籽 Hoe=锄头 Hoe Bomb (use or throw on grassy areas to hoe land)=锄弹（在草地上使用或扔在锄地上） -Jack 'O Lantern (punch to turn on and off)=南瓜灯（按一下开关） +Jack 'O Lantern (punch to turn on and off)=杰克灯（按一下开关） Jaffa Cake=佳发饼 Juicer=榨汁机 Melon=甜瓜 diff --git a/mods/farming/locale/farming.zh_TW.tr b/mods/farming/locale/farming.zh_TW.tr index a72f739..1ec8279 100644 --- a/mods/farming/locale/farming.zh_TW.tr +++ b/mods/farming/locale/farming.zh_TW.tr @@ -118,7 +118,7 @@ Steel Hoe=鋼鋤頭 Stone Hoe=石鋤 Straw=稻草 Strawberry=草莓 -String=線 +String=字符串 Sugar=糖 Toast=烤麵包片 Toast Sandwich=三明治麵包 diff --git a/mods/farming/locale/fr.txt b/mods/farming/locale/fr.txt index 04a5b1b..95559a7 100644 --- a/mods/farming/locale/fr.txt +++ b/mods/farming/locale/fr.txt @@ -2,7 +2,8 @@ # textdomain: farming # author: Papaou30 # author: TheDarkTiger -# last update: 2020/Apr/26 +# author: SwissalpS +# last update: 2022/Feb/26 ###### folder . ###### @@ -11,16 +12,16 @@ Seed=Graine ### compatibility.lua ### Banana=Banane -Banana Leaves=Feuilles de Banane +Banana Leaves=Feuilles de banane Orange=Orange Strawberry=Fraise ### food.lua ### Sugar=Sucre Salt=Sel -Rose Water=Eau de Rose -Turkish Delight=Douceur Turque -Garlic Bread=Pain à l'Ail +Rose Water=Eau de rose +Turkish Delight=Douceur turque +Garlic Bread=Pain à l'ail Donut=Beignet Chocolate Donut=Beignet au chocolat Apple Donut=Beignet aux pommes @@ -29,66 +30,66 @@ Jaffa Cake=Petit gâteau à l'orange "Jaffa" ### hoes.lua ### Hoe=Binette -Wooden Hoe=Binette en Bois -Stone Hoe=Binette en Pierre -Steel Hoe=Binette en Acier -Bronze Hoe=Binette en Bronze -Mese Hoe=Binette en Mese -Diamond Hoe=Binette en Diamant +Wooden Hoe=Binette en bois +Stone Hoe=Binette en pierre +Steel Hoe=Binette en acier +Bronze Hoe=Binette en bronze +Mese Hoe=Binette en mese +Diamond Hoe=Binette en diamant # Surcharge du mod [Toolranks] à faire # Hoe Bomb (use or throw on grassy areas to hoe land)=Bombe à binnage (Actionner ou lancer sur une zone herbeuse pour la binner) -Mithril Scythe (Right-click to harvest and replant crops)=Faux en Mithril (Récolte et replante des graines) +Mithril Scythe (Right-click to harvest and replant crops)=Faux en mithril (Récolte et replante des graines) # Surcharge du mod [Toolranks] à faire # ### soil.lua ### -Soil=Sol binné -Wet Soil=Sol binné humide +Soil=Terre binnée +Wet Soil=Terre humide et binnée ### utensils.lua ### -Wooden Bowl=Bol en Bois +Wooden Bowl=Bol en bois Saucepan=Casserole -Cooking Pot=Fait-tout +Cooking Pot=Marmitte Baking Tray=Lèche-frite Skillet=Poêle -Mortar and Pestle=Mortier et Pilon +Mortar and Pestle=Mortier et pilon Cutting Board=Planche à découper Juicer=Presse-agrumes -Glass Mixing Bowl=Terrine en Verre +Glass Mixing Bowl=Terrine en verre ###### folder ./crops ###### ### barley.lua ### -Barley Seed=Graine d'Orge +Barley Seed=Graine d'orge Barley=Orge ### beans.lua ### Green Beans=Haricots verts -Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur le sol avant de planter des haricots) +Bean Pole (place on soil before planting beans)=Tuteur pour haricots (placer sur le sol avant de planter des haricots) ### beetroot.lua ### -Beetroot=Betrave -Beetroot Soup=Soupe de Betrave +Beetroot=Betterave +Beetroot Soup=Soupe de betterave ### blueberry.lua ### Blueberries=Myrtilles -Blueberry Muffin=Muffin aux Myrtilles -Blueberry Pie=Tarte aux Myrtilles +Blueberry Muffin=Muffin aux myrtilles +Blueberry Pie=Tarte aux myrtilles ### carrot.lua ## Carrot=Carotte -Carrot Juice=Jus de Carotte +Carrot Juice=Jus de carotte Golden Carrot=Carotte dorée ### chili.lua ### -Chili Pepper=Piment Rouge -Bowl of Chili=Assiette de Chilli +Chili Pepper=Piment fort +Bowl of Chili=Bol de chilli ### cocoa.lua ### -Cocoa Beans=Fèves de Cacao -Cookie=Cookie -Bar of Dark Chocolate=Tablette de Chocolat noir -Chocolate Block=Block de Chocolat +Cocoa Beans=Fèves de cacao +Cookie=Biscuit +Bar of Dark Chocolate=Tablette de chocolat noir +Chocolate Block=Bloc de chocolat ### coffee.lua ### Coffee Beans=Grains de café @@ -96,12 +97,12 @@ Cup of Coffee=Tasse de café ### corn.lua ### Corn=Maïs -Corn on the Cob=Cobette (Maïs cuit) -Cornstarch=Fécule de Maïs -Bottle of Ethanol=Bouteille d'Éthanol +Corn on the Cob=Cobette (maïs cuit) +Cornstarch=Fécule de maïs +Bottle of Ethanol=Bouteille d'éthanol ### cotton.lua ### -Cotton Seed=Graines de Coton +Cotton Seed=Graines de coton Cotton=Coton String=Ficelle @@ -109,8 +110,8 @@ String=Ficelle Cucumber=Concombre ### garlic.lua ### -Garlic clove=Gousse d'Ail -Garlic=Tête d'Ail +Garlic clove=Gousse d'ail +Garlic=Tête d'ail Garlic Braid=Ail tressé ### grapes.lua ### @@ -118,52 +119,52 @@ Grapes=Raisins Trellis (place on soil before planting grapes)=Treillis (placer sur le sol avant de planter la vigne) ### hemp.lua ### -Hemp Seed=Graines de Chanvre -Hemp Leaf=Feuille de Chanvre -Bottle of Hemp Oil=Bouteille d'huile de Chanvre -Hemp Fibre=Fibre de Chanvre -Hemp Block=Bloc de Chanvre -Hemp Rope=Corde de Chanvre +Hemp Seed=Graines de chanvre +Hemp Leaf=Feuille de chanvre +Bottle of Hemp Oil=Bouteille d'huile de chanvre +Hemp Fibre=Fibre de chanvre +Hemp Block=Bloc de chanvre +Hemp Rope=Corde de chanvre ### melon.lua ### -Melon Slice=Tranche de Melon +Melon Slice=Tranche de melon Melon=Melon ### onion.lua ### Onion=Oignon ### peas.lua ### -Pea Pod=Cosse de Petit-poids -Peas=Petit-poids -Pea Soup=Soupe de Petit-poids +Pea Pod=Cosse de petit-pois +Peas=Petit-pois +Pea Soup=Soupe de petit-pois ### pepper.lua ### -Peppercorn=Grain de Poivre +Peppercorn=Grain de poivre Pepper=Poivron Ground Pepper=Poivre moulu ### pinapple.lua ### -Pineapple Top=Pousse d'Ananas +Pineapple Top=Pousse d'ananas Pineapple=Ananas -Pineapple Ring=Tranche d'Ananas -Pineapple Juice=Jus d'Ananas +Pineapple Ring=Tranche d'ananas +Pineapple Juice=Jus d'ananas ### potato.lua ### Potato=Pomme de terre Baked Potato=Pomme de terre cuite -Cucumber and Potato Salad=Salade de Pomme de terre au Concombre +Cucumber and Potato Salad=Salade de pomme de terre et concombre ### pumpkin.lua ### -Pumpkin Slice=Tranche de Citrouille +Pumpkin Slice=Tranche de citrouille Jack 'O Lantern (punch to turn on and off)=Jack 'O Lantern (Frapper pour allumer et éteindre) -Scarecrow Bottom=Base d'Epouventail -Pumpkin Bread=Pain à la Citrouille -Pumpkin Dough=Pâton de pain à la Citrouille +Scarecrow Bottom=Base d'épouventail +Pumpkin Bread=Pain à la citrouille +Pumpkin Dough=Pâton de pain à la citrouille Pumpkin=Citrouille ### raspberry.lua ### Raspberries=Framboises -Raspberry Smoothie=Smoothie aux Framboises +Raspberry Smoothie=Smoothie aux framboises ### rhubarb.lua ### Rhubarb=Rhubarbe @@ -171,15 +172,15 @@ Rhubarb Pie=Tarte à la rhubarbe ### ryeoatrice.lua ### Rye=Seigle -Rye seed=Grains de Seigle +Rye seed=Grains de seigle Oat=Orge -Oat seed=Grains d'Orge +Oat seed=Grains d'orge Rice=Riz -Rice grains=Grain de Riz -Rice Bread=Pain de Riz -Rice Flour=Farine de Riz -Multigrain Flour=Farine Multi-céréales -Multigrain Bread=Pain aux Céréales +Rice grains=Grain de riz +Rice Bread=Pain de riz +Rice Flour=Farine de riz +Multigrain Flour=Farine multi-céréales +Multigrain Bread=Pain aux céréales ### tomato.lua ### Tomato=Tomate @@ -190,6 +191,6 @@ Wheat=Blé Straw=Paille Flour=Farine Bread=Pain -Sliced Bread=Tranche de Pain -Toast=Pain Grillé -Toast Sandwich=Sandwich au Pain +Sliced Bread=Tranche de pain +Toast=Pain grillé +Toast Sandwich=Sandwich au pain grillé diff --git a/mods/farming/locale/zh_TW.txt b/mods/farming/locale/zh_TW.txt index 5bd109b..ef96d52 100644 --- a/mods/farming/locale/zh_TW.txt +++ b/mods/farming/locale/zh_TW.txt @@ -89,7 +89,7 @@ Potato=土豆 Baked Potato=焗馬鈴薯 Cucumber and Potato Salad=黃瓜土豆沙拉 Pumpkin Slice=南瓜片 -Jack 'O Lantern (punch to turn on and off)=傑克燈（按一下開關） +Jack 'O Lantern (punch to turn on and off)=南瓜燈（按一下開關） Scarecrow Bottom=稻草人屁股 Pumpkin Bread=南瓜麵包 Pumpkin Dough=南瓜麵糰