Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2023-11-22 23:04:43 +01:00
commit 2fda1adbd7
6 changed files with 8 additions and 8 deletions

View File

@ -87,7 +87,7 @@ Commands
* `/remove_area <ID>` -- 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 <ID>` -- Removes an area and all sub-areas of it.

View File

@ -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
})

View File

@ -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

View File

@ -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.=Lautoprotection est désactivée.
@ -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.

View File

@ -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.

View File

@ -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.=