From c8cf4aba923506bde9ce6105dcbda4be9ef0f5c7 Mon Sep 17 00:00:00 2001 From: fluxionary <25628292+fluxionary@users.noreply.github.com> Date: Sat, 26 Aug 2023 02:40:59 -0700 Subject: [PATCH 1/2] Fix orthography (it's -> its) (#65) --- README.md | 2 +- chatcommands.lua | 2 +- internal.lua | 4 ++-- locale/areas.fr.tr | 2 +- locale/areas.it.tr | 2 +- locale/template.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7c6a464..1f5fba2 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Commands * `/remove_area ` -- Removes an area that you own. Any sub-areas of that area are made sub-areas of the removed area's parent, if it exists. - If the removed area has no parent it's sub-areas will have no parent. + If the removed area has no parent its sub-areas will have no parent. * `/recursive_remove_areas ` -- Removes an area and all sub-areas of it. diff --git a/chatcommands.lua b/chatcommands.lua index ccb07ab..41ea446 100644 --- a/chatcommands.lua +++ b/chatcommands.lua @@ -207,7 +207,7 @@ minetest.register_chatcommand("recursive_remove_areas", { areas:remove(id, true) areas:save() - return true, S("Removed area @1 and it's sub areas.", id) + return true, S("Removed area @1 and its sub areas.", id) end }) diff --git a/internal.lua b/internal.lua index 9591b3d..18f426a 100644 --- a/internal.lua +++ b/internal.lua @@ -118,7 +118,7 @@ function areas:add(owner, name, pos1, pos2, parent) return id end ---- Remove a area, and optionally it's children recursively. +--- Remove a area, and optionally its children recursively. -- If a area is deleted non-recursively the children will -- have the removed area's parent as their new parent. function areas:remove(id, recurse) @@ -195,7 +195,7 @@ function areas:isSubarea(pos1, pos2, id) end end --- Returns a table (list) of children of an area given it's identifier +-- Returns a table (list) of children of an area given its identifier function areas:getChildren(id) local children = {} for cid, area in pairs(self.areas) do diff --git a/locale/areas.fr.tr b/locale/areas.fr.tr index 9c0ad38..b5d9402 100644 --- a/locale/areas.fr.tr +++ b/locale/areas.fr.tr @@ -45,7 +45,7 @@ Protect your own area=Protège votre zone. Recursively remove areas using an ID=Supprime les zones récursivement en utilisant un ID. Remove an area using an ID=Supprime une zone en utilisant son ID. Removed area @1=Zone @1 supprimée. -Removed area @1 and it's sub areas.=Zone @1 et ses sous-zones supprimées. +Removed area @1 and its sub areas.=Zone @1 et ses sous-zones supprimées. Removes all ownerless areas=Supprime toutes les zones sans propriétaire Rename an area that you own=Renomme une zone qui vous appartient. Self protection is disabled.=L’autoprotection est désactivée. diff --git a/locale/areas.it.tr b/locale/areas.it.tr index 7f49052..006b04d 100644 --- a/locale/areas.it.tr +++ b/locale/areas.it.tr @@ -45,7 +45,7 @@ Protect your own area=Proteggi la tua area Recursively remove areas using an ID=Elimina ricorsivamente delle aree usando un ID Remove an area using an ID=Elimina un'area usando un ID Removed area @1=Eliminata l'area @1 -Removed area @1 and it's sub areas.=Eliminata l'area @1 e le sue sotto-aree. +Removed area @1 and its sub areas.=Eliminata l'area @1 e le sue sotto-aree. Removes all ownerless areas= Rename an area that you own=Rinomina un'area che ti appartiene Self protection is disabled.=L'auto-protezione è disattivata. diff --git a/locale/template.txt b/locale/template.txt index ced16f8..2026c5e 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -45,7 +45,7 @@ Protect your own area= Recursively remove areas using an ID= Remove an area using an ID= Removed area @1= -Removed area @1 and it's sub areas.= +Removed area @1 and its sub areas.= Removes all ownerless areas= Rename an area that you own= Self protection is disabled.= From cba647225ce68bb543b8911063b965a1527b3526 Mon Sep 17 00:00:00 2001 From: Niklp <89982526+Niklp09@users.noreply.github.com> Date: Mon, 28 Aug 2023 12:22:40 +0200 Subject: [PATCH 2/2] Add missing placeholder in French translation (#66) --- locale/areas.fr.tr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/areas.fr.tr b/locale/areas.fr.tr index b5d9402..bbbc089 100644 --- a/locale/areas.fr.tr +++ b/locale/areas.fr.tr @@ -123,7 +123,7 @@ Area position @1 set to @2=Position @1 de la zone définie à @2. Position @1 set to @2=Position @1 définie à @2. Position @1: =Position @1 : Select an area by ID.=Sélectionnez une zone par son ID. -Select position @1 by punching a node.=Sélectionnez une position en frappant un bloc. +Select position @1 by punching a node.=Sélectionnez une position @1 en frappant un bloc. Select positions by punching two nodes.=Sélectionnez une position en frappant deux blocs. Set area protection region position @1 to your location or the one specified=Définit la position @1 de la région de protection de zone à votre position ou à celle spécifiée.