diff --git a/init.lua b/init.lua index c991198..eba8470 100644 --- a/init.lua +++ b/init.lua @@ -244,8 +244,8 @@ local function handle_command(name, param) ) elseif not facts[faction_name] then elseif name ~= factions.get_owner(faction_name) and not minetest.get_player_privs(name)[factions.priv] then - return false, S("This faction doesn't exist.") - return false, S("Permission denied: You are not the owner of this faction, " .. + return false, S("That faction doesn't exist.") + return false, S("Permission denied: You are not the owner of that faction, " .. "and don't have the @1 privilege.", factions.priv) elseif not factions.valid_password(faction_name, password) then return false, S("Permission denied: Wrong password.") @@ -279,7 +279,7 @@ local function handle_command(name, param) end end if facts[faction_name] == nil then - return false, S("This faction doesn't exist.") + return false, S("That faction doesn't exist.") else local fmembers = "" if table.getn(facts[faction_name].members) > factions.max_members_list then @@ -303,7 +303,7 @@ local function handle_command(name, param) end local player_factions = factions.get_player_factions(player_name) if not player_factions then - return false, S("This player doesn't exist or is in no faction") + return false, S("Player @1 doesn't exist or isn't in any faction.", player_name) else local str_owner = "" local str_member = "" @@ -317,7 +317,7 @@ local function handle_command(name, param) local summary = S("@1 is in the following factions: @2.", player_name, str_member) local owned_factions = factions.get_owned_factions(player_name) if not owned_factions then - summary = summary.. "\n" .. S("This player doesn't own any factions.") + summary = summary.. "\n" .. S("@1 doesn't own any factions.", player_name) else for _,v in ipairs(owned_factions) do if str_owner == "" then @@ -326,7 +326,8 @@ local function handle_command(name, param) str_owner = str_owner..", "..v end end - summary = summary .. "\n" .. S("This player is the owner of the following factions: @1.", str_owner) + summary = summary .. "\n" .. S("@1 is the owner of the following factions: @2.", + player_name, str_owner) end if minetest.get_player_privs(player_name)[factions.priv] then summary = summary .. "\n" .. S( @@ -405,10 +406,10 @@ local function handle_command(name, param) elseif target == nil then return false, S("Missing player name.") elseif factions.get_owner(faction_name) ~= name and not minetest.get_player_privs(name)[factions.priv] then - return false, S("Permission denied: You are not the owner of this faction, " .. + return false, S("Permission denied: You are not the owner of that faction, " .. "and don't have the @1 privilege.", factions.priv) elseif not facts[faction_name].members[target] then - return false, S("This player is not in the specified faction.") + return false, S("@1 is not in the specified faction.", target) elseif target == factions.get_owner(faction_name) then return false, S("You cannot kick the owner of a faction, " .. "use '/factions chown [faction]' to change the ownership.") @@ -443,7 +444,7 @@ local function handle_command(name, param) elseif password == nil then return false, S("Missing password.") elseif factions.get_owner(faction_name) ~= name and not minetest.get_player_privs(name)[factions.priv] then - return false, S("Permission denied: You are not the owner of this faction, " .. + return false, S("Permission denied: You are not the owner of that faction, " .. "and don't have the @1 privilege.", factions.priv) else if factions.set_password(faction_name, password) then @@ -485,7 +486,7 @@ local function handle_command(name, param) elseif password == nil then return false, S("Missing password.") elseif name ~= factions.get_owner(faction_name) and not minetest.get_player_privs(name)[factions.priv] then - return false, S("Permission denied: You are not the owner of this faction, " .. + return false, S("Permission denied: You are not the owner of that faction, " .. "and don't have the @1 privilege.", factions.priv) elseif not facts[faction_name].members[target] then return false, S("@1 isn't in your faction.", target) diff --git a/locale/playerfactions.fr.tr b/locale/playerfactions.fr.tr index 2615ca1..a0b8def 100644 --- a/locale/playerfactions.fr.tr +++ b/locale/playerfactions.fr.tr @@ -39,7 +39,7 @@ Ownership has been transferred to @1.=La propriété a été transférée à @2. Password has been updated.=Le mot de passe a été mis à jour. Permission denied: Wrong password.=Permission refusée : mauvais mot de passe. -Permission denied: You are not the owner of this faction, and don't have the @1 privilege.=Permission refusée : vous n’êtes pas le propriétaire de cette faction, et n’avez pas le privilège @1. +Permission denied: You are not the owner of that faction, and don't have the @1 privilege.=Permission refusée : vous n’êtes pas le propriétaire de cette faction, et n’avez pas le privilège @1. Permission denied: You can't use this command, @1 priv is needed.=Permission refusée : vous ne pouvez pas utiliser cette commande, le privilège @1 est nécessaire. @@ -55,12 +55,12 @@ The given faction doesn't exist.=La faction en question n’existe pas. The player doesn't exist.=Le joueur n’existe pas. The player is already in the faction "@1".=Le joueur est déjà dans la faction "@1". There are no factions yet.=Il n’y a pas encore de factions. -This faction doesn't exist.=Cette faction n’existe pas. +That faction doesn't exist.=Cette faction n’existe pas. The player name is nil or empty.=Le nom du joueur est nul ou vide. -This player doesn't exist or is in no faction=Ce joueur n’existe pas ou n’est dans aucune faction. -This player is not in the specified faction.=Le joueur n’est pas dans la faction spécifiée. -This player doesn't own any factions.=Ce joueur n’est propriétaire d’aucune faction. -This player is the owner of the following factions: @1.=Ce joueur n’est le propriétaire d’aucune des factions suivantes : @1. +Player @1 doesn't exist or isn't in any faction.=Le joueur @1 n’existe pas ou n’est dans aucune faction. +@1 is not in the specified faction.=@1 n’est pas dans la faction spécifiée. +@1 doesn't own any factions.=@1 n’est propriétaire d’aucune faction. +@1 is the owner of the following factions: @2.=@1 est le propriétaire des factions suivantes : @2. Transfer ownership of your faction=Transfert la propriété de votre faction Unknown subcommand. Run '/help factions' for help.=Sous-commande inconnue. Faites '/help factions' pour l’aide. You are already in a faction.=Vous êtes déjà dans une faction. diff --git a/locale/template.txt b/locale/template.txt index fb2458a..e891c78 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -39,7 +39,7 @@ Ownership has been transferred to @1.= Password has been updated.= Permission denied: Wrong password.= -Permission denied: You are not the owner of this faction, and don't have the @1 privilege.= +Permission denied: You are not the owner of that faction, and don't have the @1 privilege.= Permission denied: You can't use this command, @1 priv is needed.= @@ -55,12 +55,12 @@ The given faction doesn't exist.= The player doesn't exist.= The player is already in the faction "@1".= There are no factions yet.= -This faction doesn't exist.= +That faction doesn't exist.= The player name is nil or empty.= -This player doesn't exist or is in no faction= -This player is not in the specified faction.= -This player doesn't own any factions.= -This player is the owner of the following factions: @1.= +Player @1 doesn't exist or isn't in any faction.= +@1 is not in the specified faction.= +@1 doesn't own any factions.= +@1 is the owner of the following factions: @2.= Transfer ownership of your faction= Unknown subcommand. Run '/help factions' for help.= You are already in a faction.=