From 69e272cd64f5b21636d3f7fe3ca5ee99fb6a3ded Mon Sep 17 00:00:00 2001 From: Niklp <89982526+Niklp09@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:51:09 +0200 Subject: [PATCH] Fix naming incositencies (#54) * Fix naming incositencies * Update translations --- dryplants/locale/dryplants.de.tr | 4 ++-- dryplants/locale/dryplants.eo.tr | 4 ++-- dryplants/locale/dryplants.fr.tr | 4 ++-- dryplants/locale/template.txt | 4 ++-- dryplants/reed.lua | 8 ++++---- ferns/horsetail.lua | 4 ++-- ferns/locale/ferns.de.tr | 5 +++-- ferns/locale/ferns.eo.tr | 5 +++-- ferns/locale/ferns.fr.tr | 5 +++-- ferns/locale/template.txt | 5 +++-- youngtrees/locale/template.txt | 1 - youngtrees/locale/youngtrees.de.tr | 1 - youngtrees/locale/youngtrees.eo.tr | 1 - youngtrees/locale/youngtrees.fr.tr | 1 - 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dryplants/locale/dryplants.de.tr b/dryplants/locale/dryplants.de.tr index 793a2d7..9558c58 100644 --- a/dryplants/locale/dryplants.de.tr +++ b/dryplants/locale/dryplants.de.tr @@ -7,12 +7,12 @@ Juncus=Binsen Wet Reed=Nasses Schilf Wet Reed Slab=Nasse Schilfplatte Wet Reed Roof=Nasses Schilfdach -Wet Reed Roof Corner=Nasser Schilfdachwinkel +Wet Reed Roof Corner 1=Nasser Schilfdachwinkel 1 Wet Reed Roof Corner 2=Nasser Schilfdachwinkel 2 Reed=Schilf Reed Slab=Schilfstufe Reed Roof=Schilfdach -Reed Roof Corner=Schilfdachwinkel +Reed Roof Corner 1=Schilfdachwinkel 1 Reed Roof Corner 2=Schilfdachwinkel Reedmace=Rohrkolben Reedmace, height: 1=Rohrkolben, Höhe: 1 diff --git a/dryplants/locale/dryplants.eo.tr b/dryplants/locale/dryplants.eo.tr index a9b36b9..afa0c0b 100644 --- a/dryplants/locale/dryplants.eo.tr +++ b/dryplants/locale/dryplants.eo.tr @@ -7,12 +7,12 @@ Juncus=Junko Wet Reed=Malseka Kano Wet Reed Slab=Slabo de Malseka Kano Wet Reed Roof=Tegmento de Malseka Kano -Wet Reed Roof Corner=Tegmentangulo de Malseka Kano +Wet Reed Roof Corner 1=Tegmentangulo 1 de Malseka Kano Wet Reed Roof Corner 2=Tegmentangulo 2 de Malseka Kano Reed=Kano Reed Slab=Slabo de Kano Reed Roof=Tegmento de Kano -Reed Roof Corner=Tegmentangulo de Kano +Reed Roof Corner 1=Tegmentangulo 1 de Kano Reed Roof Corner 2=Tegmentangulo 2 de Kano Reedmace=Tifeo Reedmace, height: 1=Tifeo, alteco: 1 diff --git a/dryplants/locale/dryplants.fr.tr b/dryplants/locale/dryplants.fr.tr index 4345799..b2a102f 100644 --- a/dryplants/locale/dryplants.fr.tr +++ b/dryplants/locale/dryplants.fr.tr @@ -7,12 +7,12 @@ Juncus=Joncs Wet Reed=Bloc de roseau humide Wet Reed Slab=Dalle en roseau humide Wet Reed Roof=Toit en roseau humide -Wet Reed Roof Corner=Angle de toit en roseau humide +Wet Reed Roof Corner 1=Angle de toit en roseau humide 1 Wet Reed Roof Corner 2=Angle de toit en roseau humide 2 Reed=Roseau Reed Slab=Dalle en roseau Reed Roof=Toit en roseau -Reed Roof Corner=Angle de toit en roseau +Reed Roof Corner 1=Angle de toit en roseau 1 Reed Roof Corner 2=Angle de toit en roseau 2 Reedmace=Roseau Reedmace, height: 1=Roseau, 1 de hauteur diff --git a/dryplants/locale/template.txt b/dryplants/locale/template.txt index a244774..a14ca62 100644 --- a/dryplants/locale/template.txt +++ b/dryplants/locale/template.txt @@ -7,12 +7,12 @@ Juncus= Wet Reed= Wet Reed Slab= Wet Reed Roof= -Wet Reed Roof Corner= +Wet Reed Roof Corner 1= Wet Reed Roof Corner 2= Reed= Reed Slab= Reed Roof= -Reed Roof Corner= +Reed Roof Corner 1= Reed Roof Corner 2= Reedmace= Reedmace, height: 1= diff --git a/dryplants/reed.lua b/dryplants/reed.lua index 1b7f0b3..1d3bbc7 100644 --- a/dryplants/reed.lua +++ b/dryplants/reed.lua @@ -168,10 +168,10 @@ for i in pairs(CoRNeR) do end ----------------------------------------------------------------------------------------------- --- Wet Reed Roof Corner +-- Wet Reed Roof Corner 1 ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:wetreed_roof_corner", { - description = S("Wet Reed Roof Corner"), + description = S("Wet Reed Roof Corner 1"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -316,10 +316,10 @@ minetest.register_node("dryplants:reed_roof", { }) ----------------------------------------------------------------------------------------------- --- Reed Roof Corner +-- Reed Roof Corner 1 ----------------------------------------------------------------------------------------------- minetest.register_node("dryplants:reed_roof_corner", { - description = S("Reed Roof Corner"), + description = S("Reed Roof Corner 1"), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", diff --git a/ferns/horsetail.lua b/ferns/horsetail.lua index f190b8b..21ef862 100644 --- a/ferns/horsetail.lua +++ b/ferns/horsetail.lua @@ -34,13 +34,13 @@ local function create_nodes() local node_drop = "ferns:horsetail_04" if i == 1 then - node_desc = S("Young Horsetail (Equisetum)") + node_desc = S("Young Horsetail (Equisetum) @1", 1) node_on_use = minetest.item_eat(1) -- young ones edible https://en.wikipedia.org/wiki/Equisetum node_drop = node_name elseif i == 4 then node_desc = S("Horsetail (Equisetum)") else - node_desc = S("Horsetail (Equisetum)").." ".. string.format("%02d", i) + node_desc = S("Horsetail (Equisetum) @1", i) end node_names[i] = node_name diff --git a/ferns/locale/ferns.de.tr b/ferns/locale/ferns.de.tr index a9582d7..ed94945 100644 --- a/ferns/locale/ferns.de.tr +++ b/ferns/locale/ferns.de.tr @@ -8,8 +8,9 @@ Giant Tree Fern Leaves=Riesige Baumfarnblätter Giant Tree Fern Leave End=Riesiges Baumfarnblattende Giant Fern Trunk=Riesiger Baumfarnstamm Giant Tree Fern Sapling=Riesiger Baumfarnsetzling -Young Horsetail (Equisetum)=Junger Schachtelhalm (Equisetum) +Tree Fern Crown (Dicksonia)=Baumfarnkrone (Dicksonia) +Young Horsetail (Equisetum) @1=Junger Schachtelhalm (Equisetum) @1 Horsetail (Equisetum)=Schachtelhalm (Equisetum) +Horsetail (Equisetum) @1= Schachtelhalm (Equisetum) @1 Fern Trunk (Dicksonia)=Farnstamm (Dicksonia) Tree Fern Sapling (Dicksonia)=Baumfarnsetzling (Dicksonia) -Tree Fern Crown (Dicksonia)=Baumfarnkrone (Dicksonia) diff --git a/ferns/locale/ferns.eo.tr b/ferns/locale/ferns.eo.tr index ad0bde3..11d0893 100644 --- a/ferns/locale/ferns.eo.tr +++ b/ferns/locale/ferns.eo.tr @@ -8,8 +8,9 @@ Giant Tree Fern Leaves=Folioj de Giganta Arba Filiko Giant Tree Fern Leave End=Folifino de Giganta Arba Filiko Giant Fern Trunk=Trunko de Giganta Arba Filiko Giant Tree Fern Sapling=Arbido de Giganta Arba Filiko -Young Horsetail (Equisetum)=Juna Ekvizeto (Equisetum) +Tree Fern Crown (Dicksonia)=Krono de Arba Filiko +Young Horsetail (Equisetum) @1=Juna Ekvizeto (Equisetum) @1 Horsetail (Equisetum)=Ekvizeto (Equisetum) +Horsetail (Equisetum) @1=Ekvizeto (Equisetum) @1 Fern Trunk (Dicksonia)=Trunko de Arba Filiko (Dicksonia) Tree Fern Sapling (Dicksonia)=Arbido de Arba Filiko (Dicksonia) -Tree Fern Crown (Dicksonia)=Krono de Arba Filiko diff --git a/ferns/locale/ferns.fr.tr b/ferns/locale/ferns.fr.tr index c893605..f7364f5 100644 --- a/ferns/locale/ferns.fr.tr +++ b/ferns/locale/ferns.fr.tr @@ -8,8 +8,9 @@ Giant Tree Fern Leaves=Feuilles de fougère géante Giant Tree Fern Leave End=Feuilles de fougère géante (extrémité) Giant Fern Trunk=Tronc de fougère géante Giant Tree Fern Sapling=Pousse de fougère géante -Young Horsetail (Equisetum)=Pousse de prêle (Equisetum) +Tree Fern Crown (Dicksonia)=Fougère en couronne (Dicksonia) +Young Horsetail (Equisetum) @1=Pousse de prêle (Equisetum) @1 Horsetail (Equisetum)=Prêle (Equisetum) +Horsetail (Equisetum) @1=Prêle (Equisetum) @1 Fern Trunk (Dicksonia)=Tronc de fougère en couronne (Dicksonia) Tree Fern Sapling (Dicksonia)=Pousse de fougère en couronne (Dicksonia) -Tree Fern Crown (Dicksonia)=Fougère en couronne (Dicksonia) diff --git a/ferns/locale/template.txt b/ferns/locale/template.txt index b438c8c..8000257 100644 --- a/ferns/locale/template.txt +++ b/ferns/locale/template.txt @@ -8,8 +8,9 @@ Giant Tree Fern Leaves= Giant Tree Fern Leave End= Giant Fern Trunk= Giant Tree Fern Sapling= -Young Horsetail (Equisetum)= +Tree Fern Crown (Dicksonia)= +Young Horsetail (Equisetum) @1= Horsetail (Equisetum)= +Horsetail (Equisetum) @1= Fern Trunk (Dicksonia)= Tree Fern Sapling (Dicksonia)= -Tree Fern Crown (Dicksonia)= diff --git a/youngtrees/locale/template.txt b/youngtrees/locale/template.txt index 33048ea..a7ebcaa 100644 --- a/youngtrees/locale/template.txt +++ b/youngtrees/locale/template.txt @@ -1,6 +1,5 @@ # textdomain: youngtrees Young Bamboo Tree= -Young Tree 2 (middle)= Young Tree (top)= Young Tree (middle)= Young Tree (bottom)= diff --git a/youngtrees/locale/youngtrees.de.tr b/youngtrees/locale/youngtrees.de.tr index 0024f8e..8ada50a 100644 --- a/youngtrees/locale/youngtrees.de.tr +++ b/youngtrees/locale/youngtrees.de.tr @@ -1,6 +1,5 @@ # textdomain: youngtrees Young Bamboo Tree=Junger Bambus -Young Tree 2 (middle)=Strauch 2 (Mitte) Young Tree (top)=Strauch (Spitze) Young Tree (middle)=Strauch (Mitte) Young Tree (bottom)=Strauch (Ansatz) diff --git a/youngtrees/locale/youngtrees.eo.tr b/youngtrees/locale/youngtrees.eo.tr index 3aeca86..365f0c7 100644 --- a/youngtrees/locale/youngtrees.eo.tr +++ b/youngtrees/locale/youngtrees.eo.tr @@ -1,6 +1,5 @@ # textdomain: youngtrees Young Bamboo Tree=Juna Bambuarbo -Young Tree 2 (middle)=Juna Arbo 2 (mezo) Young Tree (top)=Juna Arbo (supro) Young Tree (middle)=Juna Arbo (mezo) Young Tree (bottom)=Juna Arbo (malsupro) diff --git a/youngtrees/locale/youngtrees.fr.tr b/youngtrees/locale/youngtrees.fr.tr index 19d9533..1c9f437 100644 --- a/youngtrees/locale/youngtrees.fr.tr +++ b/youngtrees/locale/youngtrees.fr.tr @@ -1,6 +1,5 @@ # textdomain: youngtrees Young Bamboo Tree=Bambou jeune -Young Tree 2 (middle)=Arbuste 2 (milieu) Young Tree (top)=Arbuste (haut) Young Tree (middle)=Arbuste (milieu) Young Tree (bottom)=Arbuste (bas)