GITBOOK-76: change codemc url repo to roinuj's one

Fixed VanishUtils

.gitignore

@@ -1,10 +1,8 @@
 /target/
 /.idea/
-SimpleClans.iml
 /bin/
 /.classpath
 /.project
 /dependency-reduced-pom.xml
-/simpleclans-mc1.8.iml
 *.jar
 .settings

README.md

@@ -1,3 +1,5 @@
+[![SimpleClans Logo](https://i.imgur.com/Z8XWayV.png)](https://www.spigotmc.org/resources/simpleclans.71242/)
+
 SimpleClans
 ==========
 
@@ -8,10 +10,39 @@ Full featured clan system for PVP Minecraft Servers!
 [![Issues](https://img.shields.io/github/issues/RoinujNosde/SimpleClans.svg)](https://github.com/RoinujNosde/SimpleClans/issues)
 [![Crowdin](https://badges.crowdin.net/simpleclans/localized.svg)](https://crowdin.com/project/simpleclans)
 [![Discord](https://img.shields.io/discord/719557355917934613?label=discord&logo=discord)](https://discord.gg/CkNwgdE)
+[![bStats Servers](https://img.shields.io/bstats/servers/7131)](https://bstats.org/plugin/bukkit/SimpleClans/7131)
+[![bStats Players](https://img.shields.io/bstats/players/7131)](https://bstats.org/plugin/bukkit/SimpleClans/7131)
 
-Spigot resource page: https://www.spigotmc.org/resources/simpleclans.71242/
 
-Wiki page: https://github.com/RoinujNosde/SimpleClans/wiki
+#### Download Link
+
+* [Download from Spigot](https://www.spigotmc.org/resources/simpleclans.71242/)
+
+#### Documentation 
+
+* [Documentation](https://simpleclans.gitbook.io/simpleclans/)
+* Commands & Permissions
+  * [Permissions](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/permissions)
+  * [Commands](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/commands)
+  * [Clan Alliances and Rivalries](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/aliances-and-rivalries)
+  * [Clan Ranks with Permissions](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/ranks-with-permissions)
+* How to Setup
+  * [Configuration](https://simpleclans.gitbook.io/simpleclans/how-to-setup/configuration)
+  * [Translation](https://simpleclans.gitbook.io/simpleclans/how-to-setup/translation)
+  * [Clan Member Fee](https://simpleclans.gitbook.io/simpleclans/how-to-setup/member-fee)
+  * [Clan Upkeep](https://simpleclans.gitbook.io/simpleclans/how-to-setup/clan-upkeep)
+  * [Clan name above players head](https://simpleclans.gitbook.io/simpleclans/how-to-setup/clan-below-players-name)
+  * [Clan name on Tablist](https://simpleclans.gitbook.io/simpleclans/how-to-setup/clan-on-tablist)
+* Plugins & Development 
+  * [SimpleClans API Example](https://simpleclans.gitbook.io/simpleclans/other/simpleclans-api)
+  * [PlaceholderAPI Placeholders](https://simpleclans.gitbook.io/simpleclans/other/placeholderapi-support)
+  * [Land Protection Plugins](https://simpleclans.gitbook.io/simpleclans/other/land-claims)
+  
+#### Support & Suggestions
+
+* [Discord Support](https://discord.gg/CkNwgdE)
+* [Bugs and Suggestions](https://github.com/RoinujNosde/SimpleClans/issues)
+
 
 #### Developers
 
@@ -27,7 +58,7 @@ Including SimpleClans with Maven:
     <dependency>
         <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
         <artifactId>SimpleClans</artifactId>
-        <version>2.12.2</version>
+        <version>2.14.3</version> <!-- You can find the latest version at the bottom -->
         <scope>provided</scope>
     </dependency>
 </dependencies>
@@ -41,8 +72,12 @@ repositories {
     }
 }
 dependencies {
-    compileOnly "net.sacredlabyrinth.phaed.simpleclans:SimpleClans:2.12.2"
+    compileOnly "net.sacredlabyrinth.phaed.simpleclans:SimpleClans:2.14.3" // You can find the latest version at the bottom
 }
 ```
 
-Some examples on how to use the API: https://github.com/RoinujNosde/SimpleClans/wiki/SimpleClans-API-example
+##### Latest version:
+[![Bintray](https://img.shields.io/bintray/v/roinujnosde/bukkit-plugins/SimpleClans)](https://bintray.com/roinujnosde/bukkit-plugins/SimpleClans/_latestVersion)
+
+##### API Examples
+* [Examples of how to use the API](https://simpleclans.gitbook.io/simpleclans/other/simpleclans-api)

SimpleClans.iml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.9" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:16.0.2" level="project" />
+    <orderEntry type="library" name="Maven: io.papermc:paperlib:1.0.5" level="project" />
+    <orderEntry type="library" name="Maven: co.aikar:acf-paper:0.5.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.github.cryptomorin:XSeries:7.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.12" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.26.0-GA" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.4.0" level="project" />
+  </component>
+</module>

dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
   <artifactId>SimpleClans</artifactId>
   <name>SimpleClans</name>
-  <version>2.14.0</version>
+  <version>2.14.3</version>
   <url>http://dev.bukkit.org/server-mods/simpleclans/</url>
   <ciManagement>
     <system>jenkins</system>
@@ -86,6 +86,10 @@
               <pattern>com.cryptomorin.xseries</pattern>
               <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.xseries</shadedPattern>
             </relocation>
+            <relocation>
+              <pattern>org.reflections</pattern>
+              <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.reflections</shadedPattern>
+            </relocation>
           </relocations>
           <artifactSet>
             <excludes>
@@ -187,6 +191,26 @@
       <version>16.0.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.4.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>apiguardian-api</artifactId>
+          <groupId>org.apiguardian</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>opentest4j</artifactId>
+          <groupId>org.opentest4j</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>junit-platform-commons</artifactId>
+          <groupId>org.junit.platform</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <distributionManagement>
     <repository>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
     <artifactId>SimpleClans</artifactId>
-    <version>2.14.0</version>
+    <version>2.14.4.1</version>
     <name>SimpleClans</name>
     <url>http://dev.bukkit.org/server-mods/simpleclans/</url>
 
@@ -84,6 +84,10 @@
                             <pattern>com.cryptomorin.xseries</pattern>
                             <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.xseries</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.reflections</pattern>
+                            <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.reflections</shadedPattern>
+                        </relocation>
                     </relocations>
                     <artifactSet>
                         <excludes>
@@ -160,6 +164,12 @@
             <artifactId>reflections</artifactId>
             <version>0.9.12</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.4.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <!-- Repositories -->

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ChatBlock.java

@@ -3,6 +3,7 @@ package net.sacredlabyrinth.phaed.simpleclans;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -625,7 +626,7 @@ public class ChatBlock {
      * @param receiver
      * @param msg
      */
-    public static void sendMessage(CommandSender receiver, String msg) {
+    public static void sendMessage(@Nullable CommandSender receiver, @NotNull String msg) {
         if (receiver == null) {
             return;
         }
@@ -637,8 +638,8 @@ public class ChatBlock {
         }
     }
 
-    public static void sendMessageKey(@NotNull CommandSender receiver, @NotNull String key) {
-        sendMessage(receiver, lang(key, receiver));
+    public static void sendMessageKey(@Nullable CommandSender receiver, @NotNull String key, @NotNull Object... args) {
+        sendMessage(receiver, lang(key, receiver, args));
     }
 
     /**

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Clan.java

@@ -117,6 +117,12 @@ public class Clan implements Serializable, Comparable<Clan> {
      * @param player
      */
     public void deposit(double amount, Player player) {
+        BankDepositEvent event = new BankDepositEvent(player, this, amount);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return;
+        }
+        amount = event.getAmount();
         if (SimpleClans.getInstance().getPermissionsManager().playerHasMoney(player, amount)) {
             if (SimpleClans.getInstance().getPermissionsManager().playerChargeMoney(player, amount)) {
                 player.sendMessage(ChatColor.AQUA + lang("player.clan.deposit", player, amount));
@@ -138,6 +144,12 @@ public class Clan implements Serializable, Comparable<Clan> {
      * @param player
      */
     public void withdraw(double amount, Player player) {
+        BankWithdrawEvent event = new BankWithdrawEvent(player, this, amount);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return;
+        }
+        amount = event.getAmount();
         if (getBalance() >= amount) {
             if (SimpleClans.getInstance().getPermissionsManager().playerGrantMoney(player, amount)) {
                 player.sendMessage(ChatColor.AQUA + lang("player.clan.withdraw", player, amount));
@@ -299,7 +311,7 @@ public class Clan implements Serializable, Comparable<Clan> {
     /**
      * Check if the player is a member of this clan
      *
-     * @param player
+     * @param player the Player
      * @return confirmation
      */
     public boolean isMember(Player player) {
@@ -309,13 +321,17 @@ public class Clan implements Serializable, Comparable<Clan> {
     /**
      * Check if the player is a member of this clan
      *
-     * @param playerUniqueId
+     * @param playerUniqueId the Player's UUID
      * @return confirmation
      */
     public boolean isMember(UUID playerUniqueId) {
         return this.members.contains(playerUniqueId.toString());
     }
 
+    @SuppressWarnings("deprecation")
+    public boolean isMember(String playerName) {
+        return isMember(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
 
     /**
      * Returns a list with the contents of the bulletin board
@@ -719,6 +735,11 @@ public class Clan implements Serializable, Comparable<Clan> {
         return false;
     }
 
+    @SuppressWarnings("deprecation")
+    public boolean isLeader(String playerName) {
+        return isLeader(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Get all members that must pay the fee (that excludes leaders and players with the permission to bypass it)
      * 
@@ -1057,6 +1078,11 @@ public class Clan implements Serializable, Comparable<Clan> {
         SimpleClans.getInstance().getServer().getPluginManager().callEvent(new PlayerJoinedClanEvent(this, cp));
     }
 
+    @SuppressWarnings("deprecation")
+    public void removePlayerFromClan(String playerName) {
+        removePlayerFromClan(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Remove a player from a clan
      *
@@ -1090,6 +1116,11 @@ public class Clan implements Serializable, Comparable<Clan> {
         SimpleClans.getInstance().getServer().getPluginManager().callEvent(new PlayerKickedClanEvent(this, cp));
     }
 
+    @SuppressWarnings("deprecation")
+    public void promote(String playerName) {
+        promote(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Promote a member to a leader of a clan
      *
@@ -1109,6 +1140,11 @@ public class Clan implements Serializable, Comparable<Clan> {
         SimpleClans.getInstance().getServer().getPluginManager().callEvent(new PlayerPromoteEvent(this, cp));
     }
 
+    @SuppressWarnings("deprecation")
+    public void demote(String playerName) {
+        demote(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Demote a leader back to a member of a clan
      *

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ClanPlayer.java

@@ -40,8 +40,8 @@ public class ClanPlayer implements Serializable, Comparable<ClanPlayer>
     private long joinDate;
     private Set<String> pastClans = new HashSet<>();
     private final Map<String, Long> resignTimes = new HashMap<>();
-    private VoteResult vote;
-    private Channel channel;
+    private @Nullable VoteResult vote;
+    private @NotNull Channel channel;
 
     private boolean useChatShortcut = false;
     private boolean globalChat = true;
@@ -448,7 +448,7 @@ public class ClanPlayer implements Serializable, Comparable<ClanPlayer>
      *
      * @return the vote
      */
-    public VoteResult getVote()
+    public @Nullable VoteResult getVote()
     {
         return vote;
     }
@@ -458,7 +458,7 @@ public class ClanPlayer implements Serializable, Comparable<ClanPlayer>
      *
      * @param vote the vote to set
      */
-    public void setVote(VoteResult vote)
+    public void setVote(@Nullable VoteResult vote)
     {
         this.vote = vote;
     }
@@ -574,7 +574,8 @@ public class ClanPlayer implements Serializable, Comparable<ClanPlayer>
     }
 
     public String getLastSeenString(@Nullable CommandSender sender) {
-        if (toPlayer() != null) {
+        Player player = toPlayer();
+        if (player != null && player.isOnline() && !Helper.isVanished(sender, player)) {
             return lang("online", sender);
         }
         return new java.text.SimpleDateFormat("MMM dd, ''yy h:mm a").format(new Date(this.lastSeen));
@@ -944,42 +945,48 @@ public class ClanPlayer implements Serializable, Comparable<ClanPlayer>
         }
     }
 
-    public Channel getChannel()
+    public @NotNull Channel getChannel()
     {
         return channel;
     }
 
+    @Deprecated
     public boolean isGlobalChat()
     {
         return globalChat;
     }
 
+    @Deprecated
     public boolean isAllyChat()
     {
         return allyChat;
     }
 
+    @Deprecated
     public boolean isClanChat()
     {
         return clanChat;
     }
 
+    @Deprecated
     public void setGlobalChat(boolean globalChat)
     {
         this.globalChat = globalChat;
     }
 
+    @Deprecated
     public void setAllyChat(boolean allyChat)
     {
         this.allyChat = allyChat;
     }
 
+    @Deprecated
     public void setClanChat(boolean clanChat)
     {
         this.clanChat = clanChat;
     }
 
-    public void setChannel(Channel channel)
+    public void setChannel(@NotNull Channel channel)
     {
         this.channel = channel;
     }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Helper.java

@@ -1,11 +1,14 @@
 package net.sacredlabyrinth.phaed.simpleclans;
 
+import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import net.sacredlabyrinth.phaed.simpleclans.utils.KDRFormat;
-import net.sacredlabyrinth.phaed.simpleclans.uuid.UUIDMigration;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.simple.JSONArray;
@@ -24,8 +27,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.Map.Entry;
 
-import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
-
 /**
  * @author phaed
  */
@@ -80,10 +81,10 @@ public class Helper {
     /**
      * Converts a JSON String to a list of Ranks
      * 
-     * @param json
+     * @param json the JSON String
      * @return a list of ranks or null if the JSON String is null/empty
      */
-	public static List<Rank> ranksFromJson(String json) {
+	public static @Nullable List<Rank> ranksFromJson(String json) {
     	if (json != null && !json.isEmpty()) {
 	    	try {
 				JSONObject jo = (JSONObject) new JSONParser().parse(json);
@@ -750,8 +751,29 @@ public class Helper {
         }
         return result;
     }
-    
-    public static boolean isVanished(Player player) {
+
+    /**
+     * @deprecated use {@link VanishUtils#isVanished(CommandSender, Player)}
+     */
+    @Deprecated
+    @Contract("_, null -> false")
+    public static boolean isVanished(@Nullable CommandSender viewer, @Nullable Player player) {
+        if (isVanished(player)) {
+            return true;
+        }
+        if (viewer instanceof Player && player != null) {
+            return !((Player) viewer).canSee(player);
+        }
+
+        return false;
+    }
+
+    /**
+     * @deprecated use {@link VanishUtils#isVanished(Player)}
+     */
+    @Deprecated
+    @Contract("null -> false")
+    public static boolean isVanished(@Nullable Player player) {
         if (player != null && player.hasMetadata("vanished") && !player.getMetadata("vanished").isEmpty()) {
             return player.getMetadata("vanished").get(0).asBoolean();
         }
@@ -808,13 +830,12 @@ public class Helper {
     }
 
     private static String replacePlaceholders(String messageFormat, ClanPlayer cp, String leaderColor, String memberColor, String rankFormat, String msg) {
-        String message = ChatColor.translateAlternateColorCodes('&', messageFormat)
-                .replace("%clan%", cp.getClan().getColorTag())
+        return ChatColor.translateAlternateColorCodes('&', messageFormat)
+                .replace("%clan%", Objects.requireNonNull(cp.getClan()).getColorTag())
                 .replace("%nick-color%", (cp.isLeader() ? leaderColor : memberColor))
                 .replace("%player%", cp.getName())
                 .replace("%rank%", rankFormat)
                 .replace("%message%", msg);
-        return message;
     }
 
     /**

src/main/java/net/sacredlabyrinth/phaed/simpleclans/PlayerNameTabCompleter.java

@@ -1,61 +0,0 @@
-package net.sacredlabyrinth.phaed.simpleclans;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
-
-public class PlayerNameTabCompleter implements TabCompleter {
-    private final SimpleClans plugin;
-
-    public PlayerNameTabCompleter() {
-        plugin = SimpleClans.getInstance();
-    }
-
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender commandSender, Command command, @NotNull String s, String[] strings) {
-        if (command.getName().equalsIgnoreCase(plugin.getSettingsManager().getCommandClan())) {
-            if (strings.length < 2) {
-                return null;
-            }
-            Player player = null;
-            if (commandSender instanceof Player) {
-                player = (Player) commandSender;
-            }
-
-            if (strings[0].equalsIgnoreCase(lang("lookup.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("ban.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("unban.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("kick.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("trust.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("untrust.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("promote.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("demote.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("setrank.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("place.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("invite.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("kills.command", player))) {
-                List<String> list = new ArrayList<>();
-
-                for (Player p : plugin.getServer().getOnlinePlayers()) {
-                    if (p.getName().startsWith(strings[1])) {
-                        list.add(p.getName());
-                    }
-                }
-
-                Collections.sort(list);
-                return list;
-            }
-        }
-
-        return null;
-    }
-}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Request.java

@@ -1,5 +1,7 @@
 package net.sacredlabyrinth.phaed.simpleclans;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -16,16 +18,13 @@ public final class Request {
     private ClanPlayer requester;
     private int askCount;
 
-    /**
-     * @param plugin
-     * @param type
-     * @param acceptors
-     * @param msg
-     * @param requester
-     * @param clan
-     * @param target
-     */
-    public Request(SimpleClans plugin, ClanRequest type, List<ClanPlayer> acceptors, ClanPlayer requester, String target, Clan clan, String msg) {
+    public Request(SimpleClans plugin,
+                   ClanRequest type,
+                   @Nullable List<ClanPlayer> acceptors,
+                   ClanPlayer requester,
+                   String target,
+                   Clan clan,
+                   String msg) {
         this.type = type;
         this.target = target;
         this.clan = clan;
@@ -108,25 +107,15 @@ public final class Request {
         this.target = target;
     }
 
-    /**
-     * Used for leader voting
-     *
-     * @param playerNAme
-     * @param vote
-     */
-    public void vote(String playerNAme, VoteResult vote) {
+    public void vote(String playerName, VoteResult vote) {
         for (ClanPlayer cp : acceptors) {
-            if (cp.getName().equalsIgnoreCase(playerNAme)) {
+            if (cp.getName().equalsIgnoreCase(playerName)) {
                 cp.setVote(vote);
             }
         }
     }
 
-    /**
-     * Check whether all leaders have voted
-     *
-     * @return
-     */
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean votingFinished() {
         for (ClanPlayer cp : acceptors) {
             if (cp.getVote() == null) {
@@ -137,11 +126,6 @@ public final class Request {
         return true;
     }
 
-    /**
-     * Returns the players who have denied the request
-     *
-     * @return
-     */
     public List<String> getDenies() {
         List<String> out = new ArrayList<>();
 
@@ -154,11 +138,6 @@ public final class Request {
         return out;
     }
 
-    /**
-     * Returns the players who have denied the request
-     *
-     * @return
-     */
     public List<String> getAccepts() {
         List<String> out = new ArrayList<>();
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/SimpleClans.java

@@ -4,8 +4,7 @@ import co.aikar.commands.BukkitCommandIssuer;
 import net.sacredlabyrinth.phaed.simpleclans.commands.SCCommandManager;
 import net.sacredlabyrinth.phaed.simpleclans.language.LanguageMigration;
 import net.sacredlabyrinth.phaed.simpleclans.language.LanguageResource;
-import net.sacredlabyrinth.phaed.simpleclans.listeners.SCEntityListener;
-import net.sacredlabyrinth.phaed.simpleclans.listeners.SCPlayerListener;
+import net.sacredlabyrinth.phaed.simpleclans.listeners.*;
 import net.sacredlabyrinth.phaed.simpleclans.managers.*;
 import net.sacredlabyrinth.phaed.simpleclans.tasks.*;
 import net.sacredlabyrinth.phaed.simpleclans.ui.InventoryController;
@@ -16,6 +15,7 @@ import org.bstats.bukkit.Metrics;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -109,9 +109,13 @@ public class SimpleClans extends JavaPlugin {
     }
 
     private void registerEvents() {
-        getServer().getPluginManager().registerEvents(new SCEntityListener(), this);
-        getServer().getPluginManager().registerEvents(new SCPlayerListener(), this);
-        getServer().getPluginManager().registerEvents(new InventoryController(), this);
+        PluginManager pm = getServer().getPluginManager();
+        pm.registerEvents(new PlayerDeath(), this);
+        pm.registerEvents(new SCPlayerListener(), this);
+        pm.registerEvents(new InventoryController(), this);
+        pm.registerEvents(new TamableMobsSharing(this), this);
+        pm.registerEvents(new PvPOnlyInWar(this), this);
+        pm.registerEvents(new FriendlyFire(this), this);
     }
 
     private void migrateChatFormat() {

src/main/java/net/sacredlabyrinth/phaed/simpleclans/TeleportState.java

@@ -2,37 +2,31 @@ package net.sacredlabyrinth.phaed.simpleclans;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.UUID;
 
 public class TeleportState {
-    private UUID playerUniqueId;
-    private Location playerLocation;
-    private Location destination;
+    private final UUID playerUniqueId;
+    private final Location playerLocation;
+    private final Location destination;
     private int counter;
-    private String clanName;
+    private final String clanName;
     private boolean processing;
 
-    public TeleportState(Player player, Location dest, String clanName) {
-        this.destination = dest;
+    public TeleportState(Player player, Location destination, String clanName) {
+        this.destination = destination;
         this.playerLocation = player.getLocation();
         this.clanName = clanName;
         this.counter = SimpleClans.getInstance().getSettingsManager().getWaitSecs();
         this.playerUniqueId = player.getUniqueId();
     }
 
-    /**
-     * @return
-     */
+
     public Location getLocation() {
         return this.playerLocation;
     }
 
-    /**
-     * Whether its time for teleport
-     *
-     * @return
-     */
     public boolean isTeleportTime() {
         if (this.counter > 1) {
             this.counter--;
@@ -45,16 +39,16 @@ public class TeleportState {
     /**
      * The player that is waiting for teleport
      *
-     * @return
+     * @return the player
      */
-    public Player getPlayer() {
+    public @Nullable Player getPlayer() {
     	return SimpleClans.getInstance().getServer().getPlayer(this.playerUniqueId);
     }
 
     /**
      * Get seconds left before teleport
      *
-     * @return
+     * @return the counter
      */
     public int getCounter() {
         return this.counter;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/SCCommandManager.java

@@ -44,12 +44,7 @@ public class SCCommandManager extends PaperCommandManager {
     }
     
     private void configure() {
-        registerDependency(ClanManager.class, plugin.getClanManager());
-        registerDependency(SettingsManager.class, plugin.getSettingsManager());
-        registerDependency(StorageManager.class, plugin.getStorageManager());
-        registerDependency(PermissionsManager.class, plugin.getPermissionsManager());
-        registerDependency(RequestManager.class, plugin.getRequestManager());
-
+        registerDependencies();
         enableUnstableAPI("help");
         addCommandReplacements();
         registerContexts();
@@ -58,9 +53,18 @@ public class SCCommandManager extends PaperCommandManager {
         registerCompletions();
     }
 
+    private void registerDependencies() {
+        registerDependency(ClanManager.class, plugin.getClanManager());
+        registerDependency(SettingsManager.class, plugin.getSettingsManager());
+        registerDependency(StorageManager.class, plugin.getStorageManager());
+        registerDependency(PermissionsManager.class, plugin.getPermissionsManager());
+        registerDependency(RequestManager.class, plugin.getRequestManager());
+    }
+
     private void registerCompletions() {
         Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands.completions");
         Set<Class<? extends AbstractCompletion>> completions = reflections.getSubTypesOf(AbstractCompletion.class);
+        plugin.getLogger().info(String.format("Registering %d command completions...", completions.size()));
         for (Class<? extends AbstractCompletion> c : completions) {
             if (Modifier.isAbstract(c.getModifiers())) {
                 continue;
@@ -87,6 +91,7 @@ public class SCCommandManager extends PaperCommandManager {
     private void registerConditions() {
         Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands.conditions");
         Set<Class<? extends AbstractCondition>> conditions = reflections.getSubTypesOf(AbstractCondition.class);
+        plugin.getLogger().info(String.format("Registering %d command conditions...", conditions.size()));
         for (Class<? extends AbstractCondition> c : conditions) {
             if (Modifier.isAbstract(c.getModifiers())) {
                 continue;
@@ -112,6 +117,7 @@ public class SCCommandManager extends PaperCommandManager {
     private void registerContexts() {
         Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands.contexts");
         Set<Class<? extends AbstractContextResolver>> resolvers = reflections.getSubTypesOf(AbstractContextResolver.class);
+        plugin.getLogger().info(String.format("Registering %d command contexts...", resolvers.size()));
         for (Class<? extends AbstractContextResolver> cr : resolvers) {
             if (Modifier.isAbstract(cr.getModifiers())) {
                 continue;
@@ -128,13 +134,13 @@ public class SCCommandManager extends PaperCommandManager {
                 plugin.getLogger().log(Level.SEVERE, "Error registering context", ex);
             }
         }
-
     }
 
     private void registerCommands() {
         boolean forceCommandPriority = plugin.getSettingsManager().isForceCommandPriority();
         Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands");
         Set<Class<? extends BaseCommand>> commands = reflections.getSubTypesOf(BaseCommand.class);
+        plugin.getLogger().info(String.format("Registering %d base commands...", commands.size()));
         for (Class<? extends BaseCommand> c : commands) {
             //ACF already registers nested classes
             if (c.isMemberClass() || Modifier.isStatic(c.getModifiers())) {
@@ -156,13 +162,20 @@ public class SCCommandManager extends PaperCommandManager {
                 "clan", sm.getCommandClan(),
                 "deny", sm.getCommandDeny(),
                 "more", sm.getCommandMore(),
-                "ally", sm.getCommandAlly(),
+                "ally_chat", sm.getCommandAlly(),
                 "accept", sm.getCommandAccept(),
                 "clan_chat", sm.getCommandClanChat()
         );
 
-        SUBCOMMANDS.forEach(s ->
-                getCommandReplacements().addReplacement(s, (lang(s + ".command") + "|" + s)));
+        SUBCOMMANDS.forEach(s -> {
+            String command = optionalLang(s + ".command", null);
+            if (command == null) {
+                command = s;
+            }
+            command = command.replace(" ", "");
+            String replacement = command.equals(s) ? s : command + "|" + s;
+            getCommandReplacements().addReplacement(s, replacement);
+        });
     }
     
     @Override
@@ -203,6 +216,6 @@ public class SCCommandManager extends PaperCommandManager {
                 "modtag", "bb", "clear", "rival", "ally", "add", "remove", "stats", "coords", "vitals", "rivalries",
                 "alliances", "leaderboard", "allow", "block", "auto", "check", "assign", "unassign", "delete", "me",
                 "setdisplayname", "permissions", "tag", "deposit", "withdraw", "set", "status", "tp", "all", "everyone",
-                "lookup", "roster", "profile", "list", "create", "description", "start", "end", "admin");
+                "lookup", "roster", "profile", "list", "create", "description", "start", "end", "admin", "help");
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/AllyChatCommand.java

@@ -6,7 +6,7 @@ import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import org.bukkit.entity.Player;
 
-@CommandAlias("%ally")
+@CommandAlias("%ally_chat")
 @Description("{@@command.description.ally}")
 @CommandPermission("simpleclans.member.ally")
 @Conditions("%basic_conditions|clan_member|rank:name=ALLY_CHAT")
@@ -19,6 +19,7 @@ public class AllyChatCommand extends BaseCommand {
 
     @Default
     @HelpSearchTags("chat")
+    @CommandCompletion("@chat_subcommands")
     public void sendMessage(Player player, @Name("message") String message) {
         if (!settingsManager.isAllyChatEnable()) {
             return;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/BankCommand.java

@@ -49,9 +49,7 @@ public class BankCommand extends BaseCommand {
             ChatBlock.sendMessage(player, RED + message);
             return;
         }
-        if (amount < 0) {
-            amount = amount * -1;
-        }
+        amount = Math.abs(amount);
         clan.withdraw(amount, player);
     }
 
@@ -78,9 +76,7 @@ public class BankCommand extends BaseCommand {
             ChatBlock.sendMessage(player, RED + message);
             return;
         }
-        if (amount < 0) {
-            amount = amount * -1;
-        }
+        amount = Math.abs(amount);
         clan.deposit(amount, player);
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/BbCommand.java

@@ -40,7 +40,7 @@ public class BbCommand extends BaseCommand {
         ChatBlock.sendMessage(player, RED + lang("cleared.bb", player));
     }
 
-    @Subcommand("%bb")
+    @Subcommand("%bb %add")
     @CommandPermission("simpleclans.member.bb-add")
     @Conditions("rank:name=BB_ADD")
     @Description("{@@command.description.bb.post}")

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/ChatCommand.java

@@ -8,7 +8,7 @@ import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import org.bukkit.entity.Player;
 
 @CommandAlias("%clan_chat")
-@Conditions("%basic_conditions")
+@Conditions("%basic_conditions|clan_member")
 @CommandPermission("simpleclans.member.chat")
 @Description("{@@command.description.chat}")
 public class ChatCommand extends BaseCommand {
@@ -20,6 +20,7 @@ public class ChatCommand extends BaseCommand {
 
     @Default
     @HelpSearchTags("chat")
+    @CommandCompletion("@chat_subcommands")
     public void sendMessage(Player player, ClanPlayer cp, @Name("message") String message) {
         if (!settingsManager.getClanChatEnable()) {
             return;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/ClanCommands.java

@@ -6,6 +6,7 @@ import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
 import net.sacredlabyrinth.phaed.simpleclans.conversation.ResignPrompt;
+import net.sacredlabyrinth.phaed.simpleclans.events.TagChangeEvent;
 import net.sacredlabyrinth.phaed.simpleclans.managers.*;
 import net.sacredlabyrinth.phaed.simpleclans.utils.TagValidator;
 import org.bukkit.conversations.ConversationFactory;
@@ -40,17 +41,17 @@ public class ClanCommands extends BaseCommand {
     @Conditions("verified|rank:name=WAR_START")
     @Description("{@@command.description.war.start}")
     @CommandCompletion("@rivals")
-    public void startWar(Player player, ClanPlayer cp, Clan clan, @Name("clan") ClanInput other) {
+    public void startWar(Player player, ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other) {
         Clan war = other.getClan();
-        if (!clan.isRival(war.getTag())) {
+        if (!issuerClan.isRival(war.getTag())) {
             ChatBlock.sendMessage(player, RED + lang("you.can.only.start.war.with.rivals", player));
             return;
         }
-        if (!clan.isWarring(war.getTag())) {
-            List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(clan.getLeaders());
+        if (!issuerClan.isWarring(war.getTag())) {
+            List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(issuerClan.getLeaders());
 
             if (!onlineLeaders.isEmpty()) {
-                requestManager.addWarStartRequest(cp, war, clan);
+                requestManager.addWarStartRequest(cp, war, issuerClan);
                 ChatBlock.sendMessage(player, AQUA + lang("leaders.have.been.asked.to.accept.the.war.request",
                         player, war.getName()));
             } else {
@@ -66,10 +67,10 @@ public class ClanCommands extends BaseCommand {
     @Conditions("verified|rank:name=WAR_END")
     @Description("{@@command.description.war.end}")
     @CommandCompletion("@warring_clans")
-    public void endWar(Player player, ClanPlayer cp, Clan clan, @Name("clan") ClanInput other) {
+    public void endWar(Player player, ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other) {
         Clan war = other.getClan();
-        if (clan.isWarring(war.getTag())) {
-            requestManager.addWarEndRequest(cp, war, clan);
+        if (issuerClan.isWarring(war.getTag())) {
+            requestManager.addWarEndRequest(cp, war, issuerClan);
             ChatBlock.sendMessage(player, AQUA + lang("leaders.asked.to.end.rivalry", player, war.getName()));
         } else {
             ChatBlock.sendMessage(player, RED + lang("clans.not.at.war", player));
@@ -81,7 +82,13 @@ public class ClanCommands extends BaseCommand {
     @Conditions("verified|rank:name=MODTAG")
     @Description("{@@command.description.modtag}")
     public void modtag(Player player, Clan clan, @Single @Name("tag") String tag) {
-        String cleantag = Helper.cleanTag(tag);
+        TagChangeEvent event = new TagChangeEvent(player, clan, tag);
+        plugin.getServer().getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return;
+        }
+        tag = event.getNewTag();
+        String cleanTag = Helper.cleanTag(tag);
 
         TagValidator validator = new TagValidator(plugin, player, tag);
         if (validator.getErrorMessage() != null) {
@@ -89,7 +96,7 @@ public class ClanCommands extends BaseCommand {
             return;
         }
 
-        if (!cleantag.equals(clan.getTag())) {
+        if (!cleanTag.equals(clan.getTag())) {
             ChatBlock.sendMessage(player, RED + lang("you.can.only.modify.the.color.and.case.of.the.tag",
                     player));
             return;
@@ -122,37 +129,37 @@ public class ClanCommands extends BaseCommand {
     @CommandCompletion("@non_members")
     @Conditions("rank:name=INVITE")
     @Description("{@@command.description.invite}")
-    public void invite(Player player, ClanPlayer cp, Clan clan,
-                       @Conditions("not_banned|not_in_clan") @Name("player") ClanPlayerInput invited) {
+    public void invite(Player sender, ClanPlayer cp, Clan clan,
+                       @Conditions("not_banned|not_in_clan|online") @Name("player") ClanPlayerInput invited) {
         Player invitedPlayer = invited.getClanPlayer().toPlayer();
         if (invitedPlayer == null) return;
         if (!permissions.has(invitedPlayer, "simpleclans.member.can-join")) {
-            ChatBlock.sendMessage(player, RED +
-                    lang("the.player.doesn.t.not.have.the.permissions.to.join.clans", player));
+            ChatBlock.sendMessage(sender, RED +
+                    lang("the.player.doesn.t.not.have.the.permissions.to.join.clans", sender));
             return;
         }
-        if (invitedPlayer.getUniqueId().equals(player.getUniqueId())) {
-            ChatBlock.sendMessage(player, RED + lang("you.cannot.invite.yourself", player));
+        if (invitedPlayer.getUniqueId().equals(sender.getUniqueId())) {
+            ChatBlock.sendMessage(sender, RED + lang("you.cannot.invite.yourself", sender));
             return;
         }
         long minutesBeforeRejoin = cm.getMinutesBeforeRejoin(invited.getClanPlayer(), clan);
         if (minutesBeforeRejoin != 0) {
-            ChatBlock.sendMessage(player, RED +
-                    lang("the.player.must.wait.0.before.joining.your.clan.again", player, minutesBeforeRejoin));
+            ChatBlock.sendMessage(sender, RED +
+                    lang("the.player.must.wait.0.before.joining.your.clan.again", sender, minutesBeforeRejoin));
             return;
         }
 
         if (clan.getSize() >= settings.getMaxMembers()) {
-            ChatBlock.sendMessage(player, RED + lang("the.clan.members.reached.limit", player));
+            ChatBlock.sendMessage(sender, RED + lang("the.clan.members.reached.limit", sender));
             return;
         }
-        if (!cm.purchaseInvite(player)) {
+        if (!cm.purchaseInvite(sender)) {
             return;
         }
 
         requestManager.addInviteRequest(cp, invitedPlayer.getName(), clan);
-        ChatBlock.sendMessage(player, AQUA + lang("has.been.asked.to.join",
-                player, invitedPlayer.getName(), clan.getName()));
+        ChatBlock.sendMessage(sender, AQUA + lang("has.been.asked.to.join",
+                sender, invitedPlayer.getName(), clan.getName()));
     }
 
     @Subcommand("%fee %check")
@@ -169,9 +176,10 @@ public class ClanCommands extends BaseCommand {
 
     @Subcommand("%fee %set")
     @CommandPermission("simpleclans.leader.fee")
-    @Conditions("rank:name=FEE_SET")
+    @Conditions("rank:name=FEE_SET|change_fee")
     @Description("{@@command.description.fee.set}")
     public void setFee(Player player, Clan clan, @Name("fee") double fee) {
+        fee = Math.abs(fee);
         double maxFee = settings.getMaxMemberFee();
         if (fee > maxFee) {
             ChatBlock.sendMessage(player, RED
@@ -230,18 +238,18 @@ public class ClanCommands extends BaseCommand {
     @Conditions("verified|rivable|minimum_to_rival|rank:name=RIVAL_ADD")
     @CommandCompletion("@clans")
     @Description("{@@command.description.rival.add}")
-    public void addRival(Player player, Clan clan, @Conditions("verified|different") @Name("clan") ClanInput rival) {
+    public void addRival(Player player, Clan issuerClan, @Conditions("verified|different") @Name("clan") ClanInput rival) {
         Clan rivalInput = rival.getClan();
         if (settings.isUnrivable(rivalInput.getTag())) {
             ChatBlock.sendMessage(player, RED + lang("the.clan.cannot.be.rivaled", player));
             return;
         }
-        if (!clan.reachedRivalLimit()) {
-            if (!clan.isRival(rivalInput.getTag())) {
-                clan.addRival(rivalInput);
-                rivalInput.addBb(player.getName(), AQUA + lang("has.initiated.a.rivalry", clan.getName(),
+        if (!issuerClan.reachedRivalLimit()) {
+            if (!issuerClan.isRival(rivalInput.getTag())) {
+                issuerClan.addRival(rivalInput);
+                rivalInput.addBb(player.getName(), AQUA + lang("has.initiated.a.rivalry", issuerClan.getName(),
                         rivalInput.getName()), false);
-                clan.addBb(player.getName(), AQUA + lang("has.initiated.a.rivalry", player.getName(),
+                issuerClan.addBb(player.getName(), AQUA + lang("has.initiated.a.rivalry", player.getName(),
                         rivalInput.getName()));
             } else {
                 ChatBlock.sendMessage(player, RED + lang("your.clans.are.already.rivals", player));
@@ -258,11 +266,11 @@ public class ClanCommands extends BaseCommand {
     @Description("{@@command.description.rival.remove}")
     public void removeRival(Player player,
                             ClanPlayer cp,
-                            Clan clan,
+                            Clan issuerClan,
                             @Conditions("different") @Name("clan") ClanInput rival) {
         Clan rivalInput = rival.getClan();
-        if (clan.isRival(rivalInput.getTag())) {
-            requestManager.addRivalryBreakRequest(cp, rivalInput, clan);
+        if (issuerClan.isRival(rivalInput.getTag())) {
+            requestManager.addRivalryBreakRequest(cp, rivalInput, issuerClan);
             ChatBlock.sendMessage(player, AQUA + lang("leaders.asked.to.end.rivalry", player,
                     rivalInput.getName()));
         } else {
@@ -277,16 +285,16 @@ public class ClanCommands extends BaseCommand {
     @Description("{@@command.description.ally.add}")
     public void addAlly(Player player,
                         ClanPlayer cp,
-                        Clan clan,
+                        Clan issuerClan,
                         @Conditions("verified|different") @Name("clan") ClanInput other) {
         Clan input = other.getClan();
-        if (clan.isAlly(input.getTag())) {
+        if (issuerClan.isAlly(input.getTag())) {
             ChatBlock.sendMessage(player, RED + lang("your.clans.are.already.allies", player));
             return;
         }
         int maxAlliances = settings.getClanMaxAlliances();
         if (maxAlliances != -1) {
-            if (clan.getAllies().size() >= maxAlliances) {
+            if (issuerClan.getAllies().size() >= maxAlliances) {
                 ChatBlock.sendMessage(player, lang("your.clan.reached.max.alliances", player));
                 return;
             }
@@ -296,14 +304,14 @@ public class ClanCommands extends BaseCommand {
             }
         }
 
-        List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(clan.getLeaders());
+        List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(issuerClan.getLeaders());
         if (onlineLeaders.isEmpty()) {
             ChatBlock.sendMessage(player, RED + lang("at.least.one.leader.accept.the.alliance",
                     player));
             return;
         }
 
-        requestManager.addAllyRequest(cp, input, clan);
+        requestManager.addAllyRequest(cp, input, issuerClan);
         ChatBlock.sendMessage(player, AQUA + lang("leaders.have.been.asked.for.an.alliance",
                 player, input.getName()));
     }
@@ -313,12 +321,12 @@ public class ClanCommands extends BaseCommand {
     @CommandPermission("simpleclans.leader.ally")
     @Description("{@@command.description.ally.remove}")
     @CommandCompletion("@allied_clans")
-    public void removeAlly(Player player, Clan clan, @Conditions("different|allied_clan") @Name("clan") ClanInput ally) {
+    public void removeAlly(Player player, Clan issuerClan, @Conditions("different|allied_clan") @Name("clan") ClanInput ally) {
         Clan allyInput = ally.getClan();
-        clan.removeAlly(allyInput);
-        allyInput.addBb(player.getName(), AQUA + lang("has.broken.the.alliance", clan.getName(),
+        issuerClan.removeAlly(allyInput);
+        allyInput.addBb(player.getName(), AQUA + lang("has.broken.the.alliance", issuerClan.getName(),
                 allyInput.getName()), false);
-        clan.addBb(player.getName(), AQUA + lang("has.broken.the.alliance", player.getName(),
+        issuerClan.addBb(player.getName(), AQUA + lang("has.broken.the.alliance", player.getName(),
                 allyInput.getName()));
     }
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/DataCommands.java

@@ -6,6 +6,7 @@ import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.commands.data.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -58,7 +59,7 @@ public class DataCommands extends BaseCommand {
     @HelpSearchTags("local location")
     @Description("{@@command.description.coords}")
     public void coords(Player player, Clan clan) {
-        if (clan.getOnlineMembers().size() == 1) {
+        if (VanishUtils.getNonVanished(player, clan).size() == 1) {
             ChatBlock.sendMessage(player, RED + lang("you.are.the.only.member.online", player));
             return;
         }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/HomeCommands.java

@@ -6,6 +6,7 @@ import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.events.HomeRegroupEvent;
 import net.sacredlabyrinth.phaed.simpleclans.events.PlayerHomeSetEvent;
 import net.sacredlabyrinth.phaed.simpleclans.managers.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
@@ -38,14 +39,14 @@ public class HomeCommands extends BaseCommand {
     }
 
     private void processTeleport(Player player, ClanPlayer cp, Clan clan, Location location) {
-        HomeRegroupEvent homeRegroupEvent = new HomeRegroupEvent(clan, cp, clan.getOnlineMembers(), location);
+        HomeRegroupEvent homeRegroupEvent = new HomeRegroupEvent(clan, cp, VanishUtils.getNonVanished(player, clan), location);
         plugin.getServer().getPluginManager().callEvent(homeRegroupEvent);
 
         if (homeRegroupEvent.isCancelled() || !cm.purchaseHomeRegroup(player)) {
             return;
         }
 
-        plugin.getTeleportManager().teleport(clan, location);
+        plugin.getTeleportManager().teleport(player, clan, location);
     }
 
     @Subcommand("%regroup %home")
@@ -66,7 +67,7 @@ public class HomeCommands extends BaseCommand {
         processTeleport(player, cp, clan, location);
     }
 
-    @Subcommand("%home %tp")
+    @Subcommand("%home")
     @CommandPermission("simpleclans.member.home")
     @Conditions("rank:name=HOME_TP")
     @Description("{@@command.description.home.tp}")

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/ToggleCommand.java

@@ -53,7 +53,7 @@ public class ToggleCommand extends BaseCommand {
 
     @Subcommand("%fee")
     @CommandPermission("simpleclans.leader.fee")
-    @Conditions("rank:name=FEE_ENABLE")
+    @Conditions("rank:name=FEE_ENABLE|change_fee")
     @Description("{@@command.description.toggle.fee}")
     public void fee(Player player, Clan clan) {
         toggle(player, "feeon", "feeoff", clan.isMemberFeeEnabled(),

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/completions/ChatSubcommandsCompletion.java

@@ -0,0 +1,44 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.completions;
+
+import co.aikar.commands.BukkitCommandCompletionContext;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+
+@SuppressWarnings("unused")
+public class ChatSubcommandsCompletion extends AbstractSyncCompletion {
+
+    public ChatSubcommandsCompletion(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "chat_subcommands";
+    }
+
+    @Override
+    public Collection<String> getCompletions(BukkitCommandCompletionContext context) throws InvalidCommandArgument {
+        Player player = context.getPlayer();
+        if (player == null) {
+            return Collections.emptyList();
+        }
+        String leave = lang("leave", player);
+        List<String> subcommands = new ArrayList<>(Arrays.asList(lang("join", player), leave, lang("mute",
+                player)));
+        ClanPlayer cp = clanManager.getAnyClanPlayer(player.getUniqueId());
+        if (cp != null) {
+            if (cp.getChannel() == ClanPlayer.Channel.NONE) {
+                subcommands.remove(leave);
+            }
+        }
+
+        return subcommands;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/CanChangeFeeCondition.java

@@ -0,0 +1,55 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.ConditionFailedException;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.LocalDateTime;
+
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+
+@SuppressWarnings("unused")
+public class CanChangeFeeCondition extends AbstractCommandCondition {
+
+    private static final float HOUR_IN_MINUTES = 60;
+
+    public CanChangeFeeCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime collectTime = getCollectTime();
+        long interval = now.until(collectTime, MINUTES);
+        if (interval <= settingsManager.geteMemberFeeLastMinuteChangeInterval() * HOUR_IN_MINUTES) {
+            BukkitCommandIssuer issuer = context.getIssuer();
+            String error = lang("cannot.change.member.fee.now", issuer);
+            if (interval <= 60) {
+                error += lang("cannot.change.member.fee.minutes", issuer, interval);
+            } else {
+                error += lang("cannot.change.member.fee.hours", issuer, Math.ceil(interval / HOUR_IN_MINUTES));
+            }
+            throw new ConditionFailedException(error);
+        }
+    }
+
+    private LocalDateTime getCollectTime() {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime collectTime = now.withHour(settingsManager.getTasksCollectFeeHour())
+                .withMinute(settingsManager.getTasksCollectFeeMinute());
+        if (collectTime.isBefore(now)) {
+            collectTime = collectTime.plusDays(1);
+        }
+        return collectTime;
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "change_fee";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/SenderClanMemberCondition.java

@@ -0,0 +1,25 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("unused")
+public class SenderClanMemberCondition extends AbstractCommandCondition {
+
+    public SenderClanMemberCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
+        Conditions.assertClanMember(clanManager, context.getIssuer());
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "clan_member";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanCoords.java

@@ -1,6 +1,7 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.data;
 
 import net.sacredlabyrinth.phaed.simpleclans.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +28,7 @@ public class ClanCoords extends Sendable {
 
     private void populateRows() {
         Map<Integer, List<String>> rows = new TreeMap<>();
-        for (ClanPlayer cpm : clan.getOnlineMembers()) {
+        for (ClanPlayer cpm : VanishUtils.getNonVanished(player, clan)) {
             Player p = cpm.toPlayer();
 
             if (p != null) {

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanProfile.java

@@ -3,6 +3,7 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.data;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.utils.KDRFormat;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
@@ -24,7 +25,7 @@ public class ClanProfile extends Sendable {
                 .replace("%clan_description%", getDescription())
                 .replace("%clan_verified%", getVerifiedStatus())
                 .replace("%clan_leaders%", clan.getLeadersString(sm.getPageLeaderColor(), subColor + ", "))
-                .replace("%clan_online_count%", String.valueOf(clan.getOnlineMembers().size()))
+                .replace("%clan_online_count%", String.valueOf(VanishUtils.getNonVanished(sender, clan).size()))
                 .replace("%clan_size%", String.valueOf(clan.getSize()))
                 .replace("%clan_kdr%", KDRFormat.format(clan.getTotalKDR()))
                 .replace("%clan_rival_kills%", String.valueOf(clan.getTotalRival()))

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanRoster.java

@@ -35,7 +35,7 @@ public class ClanRoster extends Sendable {
             Player p = cp.toPlayer();
 
             String name = (cp.isTrusted() ? sm.getPageTrustedColor() : sm.getPageUnTrustedColor()) + cp.getName();
-            String lastSeen = p != null && p.isOnline() && !Helper.isVanished(p) ? GREEN + lang("online", sender) : WHITE + cp.getLastSeenDaysString(sender);
+            String lastSeen = p != null && p.isOnline() && !Helper.isVanished(sender, p) ? GREEN + lang("online", sender) : WHITE + cp.getLastSeenDaysString(sender);
 
             chatBlock.addRow("  " + name, YELLOW + Helper.parseColors(cp.getRankDisplayName()) + RESET, lastSeen);
         }
@@ -48,7 +48,7 @@ public class ClanRoster extends Sendable {
             Player p = cp.toPlayer();
 
             String name = sm.getPageLeaderColor() + cp.getName();
-            String lastSeen = p != null && p.isOnline() && !Helper.isVanished(p) ? GREEN + lang("online", sender)
+            String lastSeen = p != null && p.isOnline() && !Helper.isVanished(sender, p) ? GREEN + lang("online", sender)
                     : WHITE + cp.getLastSeenDaysString(sender);
 
             chatBlock.addRow("  " + name, YELLOW + Helper.parseColors(cp.getRankDisplayName()) + RESET, lastSeen);

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/general/GeneralCommands.java

@@ -25,7 +25,11 @@ import org.bukkit.conversations.Conversation;
 import org.bukkit.conversations.ConversationFactory;
 import org.bukkit.entity.Player;
 
+import java.util.HashMap;
+
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.conversation.CreateClanNamePrompt.NAME_KEY;
+import static net.sacredlabyrinth.phaed.simpleclans.conversation.CreateClanTagPrompt.TAG_KEY;
 import static org.bukkit.ChatColor.*;
 
 @CommandAlias("%clan")
@@ -59,7 +63,7 @@ public class GeneralCommands extends BaseCommand {
     @Subcommand("%create")
     @CommandPermission("simpleclans.leader.create")
     @Description("{@@command.description.create}")
-    public void create(Player player) {
+    public void create(Player player, @Optional @Name("tag") String tag, @Optional @Name("name") String name) {
         ClanPlayer cp = cm.getAnyClanPlayer(player.getUniqueId());
 
         if (cp != null && cp.getClan() != null) {
@@ -67,9 +71,11 @@ public class GeneralCommands extends BaseCommand {
                     cp.getClan().getName()));
             return;
         }
-
+        HashMap<Object, Object> initialData = new HashMap<>();
+        initialData.put(TAG_KEY, tag);
+        initialData.put(NAME_KEY, name);
         Conversation conversation = new ConversationFactory(plugin).withFirstPrompt(new CreateClanTagPrompt())
-                .withLocalEcho(true).buildConversation(player);
+                .withLocalEcho(true).withInitialSessionData(initialData).buildConversation(player);
         conversation.begin();
     }
 
@@ -125,7 +131,7 @@ public class GeneralCommands extends BaseCommand {
     @CommandCompletion("@clans")
     @CommandPermission("simpleclans.anyone.roster")
     @Description("{@@command.description.roster.other}")
-    public void roster(CommandSender sender, @Conditions("verified") @Name("player") ClanInput clan) {
+    public void roster(CommandSender sender, @Conditions("verified") @Name("clan") ClanInput clan) {
         ClanRoster r = new ClanRoster(plugin, sender, clan.getClan());
         r.send();
     }
@@ -153,7 +159,7 @@ public class GeneralCommands extends BaseCommand {
     @Description("{@@command.description.resetkdr}")
     public void resetKdr(Player player, ClanPlayer cp) {
         if (!settings.isAllowResetKdr()) {
-            ChatBlock.sendMessage(player, RED + lang("insufficient.permissions", player));
+            ChatBlock.sendMessage(player, RED + lang("disabled.command", player));
             return;
         }
         if (cm.purchaseResetKdr(player)) {
@@ -204,7 +210,8 @@ public class GeneralCommands extends BaseCommand {
         ChatBlock.sendBlank(player);
     }
 
-    @HelpCommand
+    @CatchUnknown
+    @Subcommand("%help")
     @Description("{@@command.description.help}")
     public void help(CommandSender sender, CommandHelp help) {
         boolean inClan = sender instanceof Player && cm.getClanByPlayerUniqueId(((Player) sender).getUniqueId()) != null;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/StaffCommands.java

@@ -3,7 +3,6 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.staff;
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
 import co.aikar.commands.bukkit.contexts.OnlinePlayer;
-import io.papermc.lib.PaperLib;
 import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
@@ -19,11 +18,9 @@ import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.Objects;
 import java.util.UUID;
-import java.util.logging.Level;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 import static org.bukkit.ChatColor.AQUA;
@@ -119,13 +116,7 @@ public class StaffCommands extends BaseCommand {
             return;
         }
 
-        PaperLib.teleportAsync(player, loc, PlayerTeleportEvent.TeleportCause.COMMAND).thenAccept(result -> {
-            if (result) {
-                ChatBlock.sendMessage(player, AQUA + lang("now.at.homebase", player, clan.getClan().getName()));
-            } else {
-                plugin.getLogger().log(Level.WARNING, "An error occurred while teleporting a player");
-            }
-        });
+        plugin.getTeleportManager().teleportToHome(player, clan.getClan());
     }
 
     @Subcommand("%ban")

src/main/java/net/sacredlabyrinth/phaed/simpleclans/conversation/CreateClanNamePrompt.java

@@ -4,6 +4,7 @@ import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.Helper;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.events.PreCreateClanEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.conversations.ConversationContext;
@@ -14,25 +15,44 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.conversation.CreateClanTagPrompt.TAG_KEY;
 
 public class CreateClanNamePrompt extends StringPrompt {
+    public static final String NAME_KEY = "name";
+
     @Override
     public @NotNull String getPromptText(@NotNull ConversationContext context) {
+        if (context.getSessionData(NAME_KEY) != null) {
+            return "";
+        }
         return lang("insert.clan.name", (Player) context.getForWhom());
     }
 
+    @Override
+    public boolean blocksForInput(@NotNull ConversationContext context) {
+        return context.getSessionData(NAME_KEY) == null;
+    }
+
     @Override
     public @Nullable Prompt acceptInput(@NotNull ConversationContext context, @Nullable String clanName) {
         SimpleClans plugin = (SimpleClans) context.getPlugin();
         Player player = (Player) context.getForWhom();
+        clanName = clanName != null ? clanName : (String) context.getSessionData(NAME_KEY);
+        context.setSessionData(NAME_KEY, null);
         if (plugin == null || clanName == null) return this;
 
         Prompt errorPrompt = validateName(plugin, player, clanName);
         if (errorPrompt != null) return errorPrompt;
 
+        String finalClanName = clanName;
         Bukkit.getScheduler().runTask(plugin, () -> {
+            String tag = (String) context.getSessionData(TAG_KEY);
             //noinspection ConstantConditions
-            processClanCreation(plugin, player, (String) context.getSessionData("tag"), clanName);
+            PreCreateClanEvent event = new PreCreateClanEvent(player, tag, finalClanName);
+            Bukkit.getServer().getPluginManager().callEvent(event);
+            if (!event.isCancelled()) {
+                processClanCreation(plugin, player, tag, finalClanName);
+            }
         });
 
         return END_OF_CONVERSATION;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/conversation/CreateClanTagPrompt.java

@@ -14,21 +14,33 @@ import org.jetbrains.annotations.Nullable;
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 
 public class CreateClanTagPrompt extends StringPrompt {
+    public static final String TAG_KEY = "tag";
+
     @Override
     public @NotNull String getPromptText(@NotNull ConversationContext context) {
+        if (context.getSessionData(TAG_KEY) != null) {
+            return "";
+        }
         return lang("insert.clan.tag", (Player) context.getForWhom());
     }
 
+    @Override
+    public boolean blocksForInput(@NotNull ConversationContext context) {
+        return context.getSessionData(TAG_KEY) == null;
+    }
+
     @Override
     public @Nullable Prompt acceptInput(@NotNull ConversationContext context, @Nullable String input) {
         Player player = (Player) context.getForWhom();
         SimpleClans plugin = (SimpleClans) context.getPlugin();
+        input = input != null ? input : (String) context.getSessionData(TAG_KEY);
+        context.setSessionData(TAG_KEY, null);
         if (input == null || plugin == null) return this;
 
         Prompt errorPrompt = validateTag(plugin, player, input);
         if (errorPrompt != null) return errorPrompt;
 
-        context.setSessionData("tag", input);
+        context.setSessionData(TAG_KEY, input);
         return new CreateClanNamePrompt();
     }
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/conversation/ResignPrompt.java

@@ -6,11 +6,9 @@ import java.util.Objects;
 
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
-import net.sacredlabyrinth.phaed.simpleclans.Helper;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
 import org.bukkit.ChatColor;
-import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.conversations.ConversationContext;
 import org.bukkit.conversations.Prompt;
 import org.bukkit.conversations.StringPrompt;
@@ -32,8 +30,11 @@ public class ResignPrompt extends StringPrompt {
         Player player = (Player) cc.getForWhom();
         String yes = lang("resign.yes", player);
         ClanManager cm = Objects.requireNonNull(plugin).getClanManager();
-        ClanPlayer cp = cm.getClanPlayer(player);
+        ClanPlayer cp = cm.getCreateClanPlayer(player.getUniqueId());
         Clan clan = cp.getClan();
+        if (clan == null) {
+            return END_OF_CONVERSATION;
+        }
         		
         if (yes.equalsIgnoreCase(input)) {
             if (!clan.isLeader(player) || clan.getLeaders().size() > 1) {

src/main/java/net/sacredlabyrinth/phaed/simpleclans/events/AddKillEvent.java

@@ -1,7 +1,6 @@
 package net.sacredlabyrinth.phaed.simpleclans.events;
 
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -10,12 +9,14 @@ import org.jetbrains.annotations.NotNull;
 public class AddKillEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancelled = false;
-    private ClanPlayer victim;
-    private ClanPlayer attacker;
-    public AddKillEvent(ClanPlayer attacker, ClanPlayer victim){
+    private final ClanPlayer victim;
+    private final ClanPlayer attacker;
+
+    public AddKillEvent(@NotNull ClanPlayer attacker, @NotNull ClanPlayer victim) {
         this.attacker = attacker;
         this.victim = victim;
     }
+
     @Override
     public boolean isCancelled() {
         return cancelled;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/events/BankDepositEvent.java

@@ -0,0 +1,57 @@
+package net.sacredlabyrinth.phaed.simpleclans.events;
+
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class BankDepositEvent extends PlayerEvent implements Cancellable {
+
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+    private final Clan clan;
+    private double amount;
+    private boolean cancelled;
+
+    public BankDepositEvent(@NotNull Player who, @NotNull Clan clan, double amount) {
+        super(who);
+        this.clan = clan;
+        this.amount = amount;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public @NotNull Clan getClan() {
+        return clan;
+    }
+
+    public double getOldBalance() {
+        return clan.getBalance();
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/events/BankWithdrawEvent.java

@@ -0,0 +1,58 @@
+package net.sacredlabyrinth.phaed.simpleclans.events;
+
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class BankWithdrawEvent extends PlayerEvent implements Cancellable {
+
+    private final Clan clan;
+    private double amount;
+    private boolean cancelled;
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    public BankWithdrawEvent(@NotNull Player who, @NotNull Clan clan, double amount) {
+        super(who);
+        this.clan = clan;
+        this.amount = amount;
+    }
+
+    public @NotNull Clan getClan() {
+        return clan;
+    }
+
+    public double getOldBalance() {
+        return clan.getBalance();
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/events/PreCreateClanEvent.java

@@ -0,0 +1,47 @@
+package net.sacredlabyrinth.phaed.simpleclans.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class PreCreateClanEvent extends PlayerEvent implements Cancellable {
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+    private boolean cancelled;
+    private final String tag;
+    private final String name;
+
+    public PreCreateClanEvent(@NotNull Player who, @NotNull String tag, @NotNull String name) {
+        super(who);
+        this.tag = tag;
+        this.name = name;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/events/RivalClanRemoveEvent.java

@@ -3,6 +3,7 @@ package net.sacredlabyrinth.phaed.simpleclans.events;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 /**
  *
@@ -28,7 +29,7 @@ public class RivalClanRemoveEvent extends Event {
     }
 
     @Override
-    public HandlerList getHandlers() {
+    public @NotNull HandlerList getHandlers() {
         return handlers;
     }
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/events/TagChangeEvent.java

@@ -0,0 +1,53 @@
+package net.sacredlabyrinth.phaed.simpleclans.events;
+
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class TagChangeEvent extends PlayerEvent implements Cancellable {
+
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+    private final @NotNull  Clan clan;
+    private @NotNull String newTag;
+    private boolean cancelled;
+
+    public TagChangeEvent(@NotNull Player player, @NotNull Clan clan, @NotNull String newTag) {
+        super(player);
+        this.clan = clan;
+        this.newTag = newTag;
+    }
+
+    public @NotNull Clan getClan() {
+        return clan;
+    }
+
+    public @NotNull String getNewTag() {
+        return newTag;
+    }
+
+    public void setNewTag(@NotNull String newTag) {
+        this.newTag = newTag;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancelled = cancel;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/language/LanguageResource.java

@@ -224,6 +224,9 @@ public class LanguageResource {
 			if (!defaultAsFallback && candidateLocales.size() != 1) {
 				candidateLocales.remove(Locale.ROOT);
 			}
+			if (baseName.startsWith("acf") && !candidateLocales.contains(Locale.ENGLISH) && defaultAsFallback) {
+				candidateLocales.add(Locale.ENGLISH);
+			}
 			return candidateLocales;
 		}
 
@@ -265,11 +268,12 @@ public class LanguageResource {
 			if (!defaultAsFallback) {
 				return null;
 			}
-			if (!locale.equals(defaultLocale) && !locale.equals(Locale.ROOT)) {
+			Locale root = baseName.startsWith("acf") ? Locale.ENGLISH : Locale.ROOT;
+			if (!locale.equals(defaultLocale) && !locale.equals(root)) {
 				return defaultLocale;
 			}
-			if (locale.equals(defaultLocale) && !defaultLocale.equals(Locale.ROOT)) {
-				return Locale.ROOT;
+			if (locale.equals(defaultLocale) && !defaultLocale.equals(root)) {
+				return root;
 			}
 
 			return null;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/listeners/Events.java

@@ -0,0 +1,34 @@
+package net.sacredlabyrinth.phaed.simpleclans.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+
+public class Events {
+
+    private Events() {}
+
+    @Nullable
+    @Contract("null -> null")
+    public static Player getAttacker(@Nullable EntityDamageEvent parentEvent) {
+        if (parentEvent instanceof EntityDamageByEntityEvent) {
+            EntityDamageByEntityEvent sub = (EntityDamageByEntityEvent) parentEvent;
+
+            if (sub.getDamager() instanceof Player) {
+                return  (Player) sub.getDamager();
+            }
+
+            if (sub.getDamager() instanceof Projectile) {
+                Projectile projectile = (Projectile) sub.getDamager();
+
+                if (projectile.getShooter() instanceof Player) {
+                    return  (Player) projectile.getShooter();
+                }
+            }
+        }
+        return null;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/listeners/FriendlyFire.java

@@ -0,0 +1,72 @@
+package net.sacredlabyrinth.phaed.simpleclans.listeners;
+
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class FriendlyFire implements Listener {
+
+    private final SimpleClans plugin;
+
+    public FriendlyFire(@NotNull SimpleClans plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onEntityDamage(EntityDamageEvent event) {
+        if (!(event.getEntity() instanceof Player) ||
+                plugin.getSettingsManager().isBlacklistedWorld(event.getEntity().getWorld())) {
+            return;
+        }
+        Player victim = (Player) event.getEntity();
+        Player attacker = Events.getAttacker(event);
+
+        if (attacker == null || attacker.getUniqueId().equals(victim.getUniqueId())) {
+            return;
+        }
+
+        ClanPlayer vcp = plugin.getClanManager().getClanPlayer(victim);
+
+        Clan victimClan = vcp == null ? null : vcp.getClan();
+        Clan attackerClan = plugin.getClanManager().getClanByPlayerUniqueId(attacker.getUniqueId());
+
+        process(event, attacker, vcp, victimClan, attackerClan);
+    }
+
+    private void process(EntityDamageEvent event,
+                         Player attacker,
+                         @Nullable ClanPlayer vcp,
+                         @Nullable Clan victimClan,
+                         @Nullable Clan attackerClan) {
+        if (vcp == null || victimClan == null || attackerClan == null) {
+            if (plugin.getSettingsManager().getSafeCivilians()) {
+                ChatBlock.sendMessageKey(attacker, "cannot.attack.civilians");
+                event.setCancelled(true);
+            }
+            return;
+        }
+
+        if (vcp.isFriendlyFire() || victimClan.isFriendlyFire() || plugin.getSettingsManager().isGlobalff()) {
+            return;
+        }
+
+        if (victimClan.equals(attackerClan)) {
+            ChatBlock.sendMessageKey(attacker, "cannot.attack.clan.member");
+            event.setCancelled(true);
+            return;
+        }
+
+        if (victimClan.isAlly(attackerClan.getTag())) {
+            ChatBlock.sendMessageKey(attacker, "cannot.attack.ally");
+            event.setCancelled(true);
+        }
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/listeners/PlayerDeath.java

@@ -0,0 +1,175 @@
+package net.sacredlabyrinth.phaed.simpleclans.listeners;
+
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.Kill;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.events.AddKillEvent;
+import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.InetSocketAddress;
+import java.time.LocalDateTime;
+import java.util.logging.Level;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+
+/**
+ * @author phaed
+ */
+public class PlayerDeath implements Listener {
+
+    private final SimpleClans plugin;
+
+    public PlayerDeath() {
+        plugin = SimpleClans.getInstance();
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onEntityDeath(PlayerDeathEvent event) {
+        Player victim = event.getEntity();
+        if (plugin.getSettingsManager().isBlacklistedWorld(victim.getLocation().getWorld())
+                || victim.hasMetadata("NPC")) {
+            return;
+        }
+
+        Player attacker = Events.getAttacker(victim.getLastDamageCause());
+        if (isInvalidKill(victim, attacker)) return;
+
+        ClanPlayer victimCp = plugin.getClanManager().getCreateClanPlayer(victim.getUniqueId());
+        ClanPlayer attackerCp = plugin.getClanManager().getCreateClanPlayer(attacker.getUniqueId());
+
+        addKill(victimCp, attackerCp);
+        giveMoneyReward(victimCp, attackerCp);
+
+        // record death for victim
+        victimCp.addDeath();
+        plugin.getStorageManager().updateClanPlayer(victimCp);
+    }
+
+    private void addKill(@NotNull ClanPlayer victim, @NotNull ClanPlayer attacker) {
+        if (victim.getClan() == null || attacker.getClan() == null || !victim.getClan().isVerified() ||
+                !attacker.getClan().isVerified()) {
+            addKill(Kill.Type.CIVILIAN, attacker, victim);
+        } else if (attacker.getClan().isRival(victim.getTag())) {
+            addKill(Kill.Type.RIVAL, attacker, victim);
+        } else {
+            addKill(Kill.Type.NEUTRAL, attacker, victim);
+        }
+    }
+
+    private void giveMoneyReward(@NotNull ClanPlayer victim, @NotNull ClanPlayer attacker) {
+        if (!plugin.getSettingsManager().isMoneyPerKill()) {
+            return;
+        }
+        Clan attackerClan = attacker.getClan();
+        if (attackerClan == null) {
+            return;
+        }
+        double reward = calculateReward(attacker, victim);
+        if (reward != 0) {
+            for (ClanPlayer cp : attackerClan.getOnlineMembers()) {
+                double money = Math.round((reward / attacker.getClan().getOnlineMembers().size()) * 100D) / 100D;
+                Player player = cp.toPlayer();
+                if (player == null) {
+                    continue;
+                }
+                player.sendMessage(ChatColor.AQUA + lang("player.got.money", player, money,
+                        victim.getName(), attacker.getKDR()));
+                plugin.getPermissionsManager().playerGrantMoney(player, money);
+            }
+        }
+    }
+
+    @Contract("_, null -> true")
+    private boolean isInvalidKill(@NotNull Player victim, @Nullable Player attacker) {
+        if (attacker == null || attacker.getUniqueId().equals(victim.getUniqueId())) {
+            return true;
+        }
+
+        if (SimpleClans.getInstance().getSettingsManager().isDenySameIPKills()) {
+            InetSocketAddress attackerAddress = attacker.getAddress();
+            InetSocketAddress victimAddress = victim.getAddress();
+            if (attackerAddress != null && victimAddress != null) {
+                if (attackerAddress.getHostString().equals(victimAddress.getHostString())) {
+                    plugin.getLogger().log(Level.INFO, "Blocked same IP kill calculating: {0} killed {1}. IP: {2}",
+                            new Object[]{attacker.getDisplayName(), victim.getDisplayName(),
+                                    attackerAddress.getHostString()});
+                    return true;
+                }
+            }
+        }
+        AddKillEvent addKillEvent = new AddKillEvent(plugin.getClanManager().getCreateClanPlayer(
+                attacker.getUniqueId()), plugin.getClanManager().getCreateClanPlayer(victim.getUniqueId()));
+        Bukkit.getServer().getPluginManager().callEvent(addKillEvent);
+        if (addKillEvent.isCancelled()) {
+            return true;
+        }
+
+        String kdrExempt = "simpleclans.other.kdr-exempt";
+        PermissionsManager pm = plugin.getPermissionsManager();
+        return pm.has(attacker, kdrExempt) || pm.has(victim, kdrExempt);
+    }
+
+    private void addKill(Kill.Type type, ClanPlayer attacker, ClanPlayer victim) {
+        if (type == null || attacker == null || victim == null) {
+            return;
+        }
+        final Kill kill = new Kill(attacker, victim, LocalDateTime.now());
+        if (plugin.getSettingsManager().isDelayBetweenKills() && plugin.getClanManager().isKillBeforeDelay(kill)) {
+            return;
+        }
+
+        if (plugin.getSettingsManager().isMaxKillsPerVictim()) {
+            plugin.getStorageManager().getKillsPerPlayer(attacker.getName(), data -> {
+                final int max = plugin.getSettingsManager().getMaxKillsPerVictim();
+                Integer kills = data.get(kill.getVictim().getName());
+                if (kills != null) {
+                    if (kills < max) {
+                        saveKill(kill, type);
+                    }
+                }
+            });
+    		return;
+    	}
+    	saveKill(kill, type);
+    }
+
+	private void saveKill(Kill kill, Kill.Type type) {
+		plugin.getClanManager().addKill(kill);
+    	ClanPlayer killer = kill.getKiller();
+    	ClanPlayer victim = kill.getVictim();
+		killer.addKill(type);
+		plugin.getStorageManager().insertKill(killer, victim, type.getShortname());
+	}
+
+    private double calculateReward(@NotNull ClanPlayer attacker, @NotNull ClanPlayer victim) {
+        double reward;
+        double multiplier = plugin.getSettingsManager().getKDRMultipliesPerKill();
+        double kdr = attacker.getKDR() * multiplier;
+        Clan attackerClan = attacker.getClan();
+        Clan victimClan = victim.getClan();
+        if (attackerClan == null || !attackerClan.isVerified() || victimClan == null || !victimClan.isVerified()) {
+            return 0;
+        }
+        if (attackerClan.isRival(victimClan.getTag())) {
+            if (attackerClan.isWarring(victimClan)) {
+                reward = kdr * 4;
+            } else reward = kdr * 2;
+        } else if (attackerClan.isAlly(victimClan.getTag())) {
+            reward = kdr * -1;
+        } else {
+            reward = kdr;
+        }
+        return reward;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/listeners/PvPOnlyInWar.java

@@ -0,0 +1,59 @@
+package net.sacredlabyrinth.phaed.simpleclans.listeners;
+
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class PvPOnlyInWar implements Listener {
+
+    private final SimpleClans plugin;
+
+    public PvPOnlyInWar(@NotNull SimpleClans plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    public void onEntityDamage(EntityDamageEvent event) {
+        if (!(event.getEntity() instanceof Player) ||
+                plugin.getSettingsManager().isBlacklistedWorld(event.getEntity().getWorld())) {
+            return;
+        }
+        Player victim = (Player) event.getEntity();
+        Player attacker = Events.getAttacker(event);
+
+        if (attacker == null || victim.getUniqueId().equals(attacker.getUniqueId())) {
+            return;
+        }
+
+        Clan attackerClan = plugin.getClanManager().getClanByPlayerUniqueId(attacker.getUniqueId());
+        Clan victimClan = plugin.getClanManager().getClanByPlayerUniqueId(victim.getUniqueId());
+
+        if (plugin.getSettingsManager().isPvpOnlywhileInWar()) {
+            process(event, attacker, victim, attackerClan, victimClan);
+        }
+    }
+
+    private void process(EntityDamageEvent event, Player attacker, Player victim, Clan attackerClan, Clan victimClan) {
+        if (attackerClan == null || victimClan == null) {
+            ChatBlock.sendMessageKey(attacker, "must.be.in.clan.to.pvp", victim.getName());
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.getPermissionsManager().has(victim, "simpleclans.mod.nopvpinwar")) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (!attackerClan.isWarring(victimClan)) {
+            ChatBlock.sendMessageKey(attacker, "clans.not.at.war.pvp.denied", victimClan.getName());
+            event.setCancelled(true);
+        }
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/listeners/SCEntityListener.java

@@ -1,406 +0,0 @@
-package net.sacredlabyrinth.phaed.simpleclans.listeners;
-
-import net.sacredlabyrinth.phaed.simpleclans.Clan;
-import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
-import net.sacredlabyrinth.phaed.simpleclans.Kill;
-import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
-import net.sacredlabyrinth.phaed.simpleclans.events.AddKillEvent;
-import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
-import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
-import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager.DataCallback;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.*;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-
-import java.text.MessageFormat;
-import java.time.LocalDateTime;
-import java.util.Map;
-import java.util.logging.Level;
-
-/**
- * @author phaed
- */
-public class SCEntityListener implements Listener
-{
-
-    private SimpleClans plugin;
-
-    /**
-     *
-     */
-    public SCEntityListener()
-    {
-        plugin = SimpleClans.getInstance();
-    }
-
-    /**
-     * @param event
-     */
-    @EventHandler(priority = EventPriority.LOW)
-    public void onEntityDeath(EntityDeathEvent event)
-    {
-        if (event.getEntity() instanceof Player)
-        {
-            Player victim = (Player) event.getEntity();
-
-            if (plugin.getSettingsManager().isBlacklistedWorld(victim.getLocation().getWorld().getName()))
-            {
-                return;
-            }
-
-            if (victim.hasMetadata("NPC"))
-            {
-                return;
-            }
-
-            Player attacker = null;
-
-            // find attacker
-
-            EntityDamageEvent lastDamageCause = victim.getLastDamageCause();
-
-            if (lastDamageCause instanceof EntityDamageByEntityEvent)
-            {
-                EntityDamageByEntityEvent entityEvent = (EntityDamageByEntityEvent) lastDamageCause;
-
-                if (entityEvent.getDamager() instanceof Player)
-                {
-                    attacker = (Player) entityEvent.getDamager();
-                } else if (entityEvent.getDamager() instanceof Projectile)
-                {
-                    Projectile projectile = (Projectile) entityEvent.getDamager();
-
-                    if (projectile.getShooter() instanceof Player)
-                    {
-                        attacker = (Player) projectile.getShooter();
-                    }
-                }
-            }
-
-            if (attacker != null)
-            {
-                if (attacker.getUniqueId().equals(victim.getUniqueId())) {
-                    return;
-                }
-            	if (SimpleClans.getInstance().getSettingsManager().isDenySameIPKills()) 
-            	{
-            		if (attacker.getAddress().getHostString().equals(victim.getAddress().getHostString())) 
-            		{
-            			plugin.getLogger().log(Level.INFO, "Blocked same IP kill calculating: {0} killed {1}. IP: {2}", new Object[]{
-                                    attacker.getDisplayName(), victim.getDisplayName(), attacker.getAddress().getHostString()
-                                });
-            			return;
-            			
-            		}
-            	}
-            	String kdrExempt = "simpleclans.other.kdr-exempt";
-            	PermissionsManager pm = plugin.getPermissionsManager();
-            	if (pm.has(attacker, kdrExempt) || pm.has(victim, kdrExempt)) {
-            		return;
-            	}
-
-            	AddKillEvent addKillEvent = new AddKillEvent(plugin.getClanManager().getCreateClanPlayer(
-            	        attacker.getUniqueId()),plugin.getClanManager().getCreateClanPlayer(victim.getUniqueId()));
-                Bukkit.getServer().getPluginManager().callEvent(addKillEvent);
-                if(addKillEvent.isCancelled()) return;
-
-                ClanPlayer victimCp = addKillEvent.getVictim();
-                ClanPlayer attackerCp = addKillEvent.getAttacker();
-                double reward = 0;
-                double multipier = plugin.getSettingsManager().getKDRMultipliesPerKill();
-                float kdr = attackerCp.getKDR();
-
-                if (victimCp.getClan() == null || attackerCp.getClan() == null || !victimCp.getClan().isVerified() || !attackerCp.getClan().isVerified())
-                {
-                    addKill(Kill.Type.CIVILIAN, attackerCp, victimCp);
-                } else if (attackerCp.getClan().isRival(victimCp.getTag()))
-                {
-                    if (attackerCp.getClan().isWarring(victimCp.getClan()))
-                    {
-                        reward = (double) kdr * multipier * 4;
-                    } else
-                    {
-                        reward = (double) kdr * multipier * 2;
-                    }
-                    addKill(Kill.Type.RIVAL, attackerCp, victimCp);
-                } else if (attackerCp.getClan().isAlly(victimCp.getTag()))
-                {
-                    reward = (double) kdr * multipier * -1;
-                } else
-                {
-                    reward = (double) kdr * multipier;
-                    addKill(Kill.Type.NEUTRAL, attackerCp, victimCp);
-                }
-
-                if (reward != 0 && plugin.getSettingsManager().isMoneyPerKill())
-                {
-                    for (ClanPlayer cp : attackerCp.getClan().getOnlineMembers())
-                    {
-                        double money = Math.round((reward / attackerCp.getClan().getOnlineMembers().size()) * 100D) / 100D;
-                        cp.toPlayer().sendMessage(ChatColor.AQUA + MessageFormat.format(lang("player.got.money",cp.toPlayer()), money, victim.getName(), kdr));
-                        plugin.getPermissionsManager().playerGrantMoney(cp.toPlayer(), money);
-                    }
-                }
-
-                // record death for victim
-                victimCp.addDeath();
-                plugin.getStorageManager().updateClanPlayer(victimCp);
-            }
-        }
-    }
-
-    private void addKill(Kill.Type type, ClanPlayer attacker, ClanPlayer victim) {
-    	if (type == null || attacker == null || victim == null) {
-    		return;
-    	}
-    	final Kill kill = new Kill(attacker, victim, LocalDateTime.now());
-    	if (plugin.getSettingsManager().isDelayBetweenKills() && plugin.getClanManager().isKillBeforeDelay(kill)) {
-    		return;
-    	}
-    	
-    	if (plugin.getSettingsManager().isMaxKillsPerVictim()) {
-    		plugin.getStorageManager().getKillsPerPlayer(attacker.getName(), new DataCallback<Map<String,Integer>>() {
-				
-				@Override
-				public void onResultReady(Map<String, Integer> data) {
-		    		final int max = plugin.getSettingsManager().getMaxKillsPerVictim();
-		    		Integer kills = data.get(kill.getVictim().getName());
-		    		if (kills != null) {
-		    			if (kills < max) {
-		    				saveKill(kill, type);
-		    			}
-		    		}
-				}
-			});
-    		return;
-    	}
-    	saveKill(kill, type);
-    }
-
-	private void saveKill(Kill kill, Kill.Type type) {
-		plugin.getClanManager().addKill(kill);
-    	ClanPlayer killer = kill.getKiller();
-    	ClanPlayer victim = kill.getVictim();
-		killer.addKill(type);
-		plugin.getStorageManager().insertKill(killer, victim, type.getShortname());
-	}
-    
-    /**
-     * @param event
-     */
-    @EventHandler(priority = EventPriority.LOW)
-    public void onPlayerInteract(PlayerInteractEntityEvent event)
-    {
-        if (event.isCancelled())
-        {
-            return;
-        }
-
-        if (plugin.getSettingsManager().isTamableMobsSharing() && event.getRightClicked() instanceof Tameable)
-        {
-        	Entity entity = event.getRightClicked();
-            Player player = event.getPlayer();
-            ClanPlayer cp = plugin.getClanManager().getClanPlayer(player);
-            Tameable tamed = (Tameable) entity;
-
-            if (tamed.isTamed())
-            {
-                if(entity instanceof Wolf && !((Wolf) entity).isSitting())
-                {
-                	return;
-                }
-                if (cp.getClan().isMember((Player) tamed.getOwner()))
-                {
-                    tamed.setOwner(player);
-                }
-            }
-        }
-    }
-
-    /**
-     * @param event
-     */
-    @EventHandler(priority = EventPriority.LOW)
-    public void onEntityTarget(EntityTargetLivingEntityEvent event)
-    {
-        if (plugin.getSettingsManager().isTamableMobsSharing())
-        {
-            if (event.getEntity() instanceof Tameable && event.getTarget() instanceof Player)
-            {
-                ClanPlayer cp = plugin.getClanManager().getClanPlayer((Player) event.getTarget());
-                Tameable wolf = (Tameable) event.getEntity();
-
-                if (wolf.isTamed() && cp.getClan().isMember((Player) wolf.getOwner()))
-                {
-                	// cancels the event if the attacker is one out of his clan
-                    event.setCancelled(true);
-                }
-            }
-        }
-    }
-
-    /**
-     * @param event
-     */
-    @EventHandler(priority = EventPriority.LOW)
-    public void onEntityDamage(EntityDamageEvent event)
-    {
-        if (event.isCancelled())
-        {
-            return;
-        }
-
-        Player attacker = null;
-        Player victim = null;
-
-
-        if (event instanceof EntityDamageByEntityEvent)
-        {
-            EntityDamageByEntityEvent sub = (EntityDamageByEntityEvent) event;
-
-            if (sub.getEntity() instanceof Player && sub.getDamager() instanceof Player)
-            {
-                attacker = (Player) sub.getDamager();
-                victim = (Player) sub.getEntity();
-            }
-
-            if (plugin.getSettingsManager().isTamableMobsSharing())
-            {
-                if (sub.getEntity() instanceof Wolf && sub.getDamager() instanceof Player)
-                {
-                    attacker = (Player) sub.getDamager();
-                    Wolf wolf = (Wolf) sub.getEntity();
-                    ClanPlayer cp = plugin.getClanManager().getClanPlayer(attacker);
-                    if (wolf.isTamed() && cp.getClan().isMember((Player) wolf.getOwner()))
-                    {
-                    	// Sets the wolf to friendly if the attacker is one out of his clan
-                        wolf.setAngry(false);
-                    }
-                }
-            }
-
-            if (sub.getEntity() instanceof Player && sub.getDamager() instanceof Projectile)
-            {
-                Projectile projectile = (Projectile) sub.getDamager();
-
-                if (projectile.getShooter() instanceof Player)
-                {
-                    attacker = (Player) projectile.getShooter();
-                    victim = (Player) sub.getEntity();
-                }
-            }
-        }
-
-        if (victim != null && plugin.getSettingsManager().isBlacklistedWorld(victim.getLocation().getWorld().getName()))
-        {
-        	return;
-        }
-
-        if (attacker != null && victim != null)
-        {
-            if (attacker.getUniqueId().equals(victim.getUniqueId())) {
-                return;
-            }
-
-            ClanPlayer acp = plugin.getClanManager().getClanPlayer(attacker);
-            ClanPlayer vcp = plugin.getClanManager().getClanPlayer(victim);
-
-
-            Clan vclan = vcp == null ? null : vcp.getClan();
-            Clan aclan = acp == null ? null : acp.getClan();
-
-
-            if (plugin.getSettingsManager().isPvpOnlywhileInWar())
-            {
-                // if one doesn't have clan then they cant be at war
-
-                if (aclan == null || vclan == null)
-                {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (plugin.getPermissionsManager().has(victim, "simpleclans.mod.nopvpinwar")
-                        && attacker != null && victim != null)
-                {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                // if not warring no pvp
-
-                if (!aclan.isWarring(vclan))
-                {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (vclan != null)
-            {
-                if (aclan != null)
-                {
-                    // personal ff enabled, allow damage
-
-                    if (vcp.isFriendlyFire())
-                    {
-                        return;
-                    }
-
-                    // clan ff enabled, allow damage
-
-                    if (vclan.isFriendlyFire())
-                    {
-                        return;
-                    }
-                    
-                    // global ff enabled, allow damage
-                    
-                    if (plugin.getSettingsManager().isGlobalff())
-                    {
-                        return;
-                    }
-
-                    // same clan, deny damage
-
-                    if (vclan.equals(aclan))
-                    {
-                        event.setCancelled(true);
-                        return;
-                    }
-
-                    // ally clan, deny damage
-
-                    if (vclan.isAlly(aclan.getTag()))
-                    {
-                        event.setCancelled(true);
-                    }
-                } else
-                {
-                    // not part of a clan - check if safeCivilians is set
-
-                    if (plugin.getSettingsManager().getSafeCivilians())
-                    {
-                        event.setCancelled(true);
-                    }
-                }
-            } else
-            {
-                // not part of a clan - check if safeCivilians is set
-
-                if (plugin.getSettingsManager().getSafeCivilians())
-                {
-                    event.setCancelled(true);
-                }
-            }
-        }
-    }
-}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/listeners/SCPlayerListener.java

@@ -1,6 +1,11 @@
 package net.sacredlabyrinth.phaed.simpleclans.listeners;
 
-import net.sacredlabyrinth.phaed.simpleclans.*;
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -9,8 +14,10 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.*;
 
-import java.util.Iterator;
+import java.util.Objects;
 
+import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.CLAN;
+import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.NONE;
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 
 /**
@@ -39,84 +46,58 @@ public class SCPlayerListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onPlayerChat(AsyncPlayerChatEvent event) {
-        if (plugin.getSettingsManager().isBlacklistedWorld(event.getPlayer().getLocation().getWorld())) {
+        Player player = event.getPlayer();
+        ClanPlayer cp = plugin.getClanManager().getClanPlayer(player.getUniqueId());
+        if (cp == null || plugin.getSettingsManager().isBlacklistedWorld(player.getLocation().getWorld())) {
             return;
         }
 
-        String message = event.getMessage();
-        ClanPlayer cp = plugin.getClanManager().getClanPlayer(event.getPlayer());
-
-        if (cp != null && !event.isCancelled()) {
-            if (cp.getChannel().equals(ClanPlayer.Channel.CLAN)) {
-                event.setCancelled(true);
-                if (!plugin.getPermissionsManager().has(cp.toPlayer(), "simpleclans.member.chat")) {
-                    ChatBlock.sendMessage(cp.toPlayer(), ChatColor.RED + lang("insufficient.permissions",cp.toPlayer()));
-                    return;
-                }
-
-                plugin.getClanManager().processClanChat(event.getPlayer(), message);
-            } else if (cp.getChannel().equals(ClanPlayer.Channel.ALLY)) {
-                event.setCancelled(true);
-                if (!plugin.getPermissionsManager().has(cp.toPlayer(), "simpleclans.member.ally")) {
-                    ChatBlock.sendMessage(cp.toPlayer(), ChatColor.RED + lang("insufficient.permissions",cp.toPlayer()));
-                    return;
-                }
-
-                plugin.getClanManager().processAllyChat(event.getPlayer(), message);
+        Channel channel = cp.getChannel();
+        if (channel != NONE) {
+            PermissionsManager pm = plugin.getPermissionsManager();
+            if ((channel == Channel.ALLY && !pm.has(player, "simpleclans.member.ally")) ||
+                    (channel == CLAN && !pm.has(player, "simpleclans.member.chat"))) {
+                ChatBlock.sendMessage(player, ChatColor.RED + lang("insufficient.permissions", player));
+                return;
             }
-        }
-
-        if (!plugin.getPermissionsManager().has(event.getPlayer(), "simpleclans.mod.nohide")) {
-            boolean isClanChat = event.getMessage().contains("" + ChatColor.RED + ChatColor.WHITE + ChatColor.RED + ChatColor.BLACK);
-            boolean isAllyChat = event.getMessage().contains("" + ChatColor.AQUA + ChatColor.WHITE + ChatColor.AQUA + ChatColor.BLACK);
-
-            for (Iterator<Player> iter = event.getRecipients().iterator(); iter.hasNext();) {
-                Player player = iter.next();
-
-                ClanPlayer rcp = plugin.getClanManager().getClanPlayer(player);
-
-                if (rcp != null) {
-                    if (!rcp.isClanChat() && isClanChat) {
-                        iter.remove();
-                        continue;
-                    }
-
-                    if (!rcp.isAllyChat() && isAllyChat) {
-                        iter.remove();
-                        continue;
-                    }
-
-                    if (!rcp.isGlobalChat() && !isAllyChat && !isClanChat) {
-                        iter.remove();
-                    }
-                }
+            switch (channel) {
+                case CLAN:
+                    plugin.getClanManager().processClanChat(player, event.getMessage());
+                    break;
+                case ALLY:
+                    plugin.getClanManager().processAllyChat(player, event.getMessage());
             }
+            event.setCancelled(true);
         }
+    }
 
-        if (plugin.getSettingsManager().isCompatMode()) {
-            if (plugin.getSettingsManager().isChatTags()) {
-                if (cp != null && cp.isTagEnabled()) {
-                    String tagLabel = cp.getClan().getTagLabel(cp.isLeader());
-
-                    Player player = event.getPlayer();
-
-                    if (player.getDisplayName().contains("{clan}")) {
-                        player.setDisplayName(player.getDisplayName().replace("{clan}", tagLabel));
-                    } else if (event.getFormat().contains("{clan}")) {
-                        event.setFormat(event.getFormat().replace("{clan}", tagLabel));
-                    } else {
-                        String format = event.getFormat();
-                        event.setFormat(tagLabel + format);
-                    }
+    @EventHandler
+    public void handleChatTags(AsyncPlayerChatEvent event) {
+        Player player = event.getPlayer();
+        ClanPlayer cp = plugin.getClanManager().getClanPlayer(player.getUniqueId());
+        if (cp == null || plugin.getSettingsManager().isBlacklistedWorld(player.getWorld())) {
+            return;
+        }
+        Clan clan = Objects.requireNonNull(cp.getClan());
+        if (plugin.getSettingsManager().isCompatMode() && plugin.getSettingsManager().isChatTags()) {
+            if (cp.isTagEnabled()) {
+                String tagLabel = clan.getTagLabel(cp.isLeader());
+                if (player.getDisplayName().contains("{clan}")) {
+                    player.setDisplayName(player.getDisplayName().replace("{clan}", tagLabel));
+                } else if (event.getFormat().contains("{clan}")) {
+                    event.setFormat(event.getFormat().replace("{clan}", tagLabel));
                 } else {
-                    event.setFormat(event.getFormat().replace("{clan}", ""));
-                    event.setFormat(event.getFormat().replace("tagLabel", ""));
+                    String format = event.getFormat();
+                    event.setFormat(tagLabel + format);
                 }
+            } else {
+                event.setFormat(event.getFormat().replace("{clan}", ""));
+                event.setFormat(event.getFormat().replace("tagLabel", ""));
             }
         } else {
-            plugin.getClanManager().updateDisplayName(event.getPlayer());
+            plugin.getClanManager().updateDisplayName(player);
         }
     }
 
@@ -153,23 +134,19 @@ public class SCPlayerListener implements Listener {
         SimpleClans.getInstance().getPermissionsManager().addClanPermissions(cp);
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerRespawn(PlayerRespawnEvent event) {
-        if (plugin.getSettingsManager().isBlacklistedWorld(event.getPlayer().getLocation().getWorld())) {
+        Player player = event.getPlayer();
+        if (!plugin.getSettingsManager().isTeleportOnSpawn() ||
+                plugin.getSettingsManager().isBlacklistedWorld(player.getWorld())) {
             return;
         }
 
-        if (plugin.getSettingsManager().isTeleportOnSpawn()) {
-            Player player = event.getPlayer();
-
-            ClanPlayer cp = plugin.getClanManager().getClanPlayer(player);
-
-            if (cp != null) {
-                Location loc = cp.getClan().getHomeLocation();
-
-                if (loc != null) {
-                    event.setRespawnLocation(loc);
-                }
+        Clan clan = plugin.getClanManager().getClanByPlayerUniqueId(player.getUniqueId());
+        if (clan != null) {
+            Location home = clan.getHomeLocation();
+            if (home != null) {
+                event.setRespawnLocation(home);
             }
         }
     }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/listeners/TamableMobsSharing.java

@@ -0,0 +1,84 @@
+package net.sacredlabyrinth.phaed.simpleclans.listeners;
+
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.bukkit.entity.AnimalTamer;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class TamableMobsSharing implements Listener {
+
+    private final SimpleClans plugin;
+
+    public TamableMobsSharing(@NotNull SimpleClans plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onEntityDamage(EntityDamageByEntityEvent event) {
+        if (plugin.getSettingsManager().isTamableMobsSharing()) {
+            if (event.getEntity() instanceof Wolf && event.getDamager() instanceof Player) {
+                ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(event.getDamager().getUniqueId());
+                if (cp == null || cp.getClan() == null) {
+                    return;
+                }
+                Wolf wolf = (Wolf) event.getEntity();
+                AnimalTamer owner = wolf.getOwner();
+                if (owner != null && cp.getClan().isMember(owner.getUniqueId())) {
+                    // Sets the wolf to friendly if the attacker is one out of his clan
+                    wolf.setAngry(false);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onEntityTarget(EntityTargetLivingEntityEvent event) {
+        if (plugin.getSettingsManager().isTamableMobsSharing()) {
+            if (event.getEntity() instanceof Tameable && event.getTarget() instanceof Player) {
+                ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(event.getTarget().getUniqueId());
+                if (cp == null || cp.getClan() == null) {
+                    return;
+                }
+                Tameable wolf = (Tameable) event.getEntity();
+                AnimalTamer owner = wolf.getOwner();
+                if (owner == null) {
+                    return;
+                }
+                if (cp.getClan().isMember(owner.getUniqueId())) {
+                    // cancels the event if the attacker is one out of his clan
+                    event.setCancelled(true);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onPlayerInteract(PlayerInteractEntityEvent event) {
+        if (plugin.getSettingsManager().isTamableMobsSharing() && event.getRightClicked() instanceof Tameable) {
+            Player player = event.getPlayer();
+            ClanPlayer cp = plugin.getClanManager().getAnyClanPlayer(player.getUniqueId());
+            if (cp == null || cp.getClan() == null) {
+                return;
+            }
+            Tameable tamed = (Tameable) event.getRightClicked();
+
+            if (tamed.getOwner() != null) {
+                if (tamed instanceof Wolf && !((Wolf) tamed).isSitting()) {
+                    return;
+                }
+                if (cp.getClan().isMember(tamed.getOwner().getUniqueId())) {
+                    tamed.setOwner(player);
+                }
+            }
+        }
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/ClanManager.java

@@ -4,6 +4,7 @@ import com.cryptomorin.xseries.XMaterial;
 import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.events.ChatEvent;
 import net.sacredlabyrinth.phaed.simpleclans.events.CreateClanEvent;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import net.sacredlabyrinth.phaed.simpleclans.uuid.UUIDMigration;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -227,6 +228,12 @@ public final class ClanManager {
         return clans.get(Helper.cleanTag(tag));
     }
 
+    @SuppressWarnings("deprecation")
+    @Nullable
+    public Clan getClanByPlayerName(String playerName) {
+        return getClanByPlayerUniqueId(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Get a player's clan
      *
@@ -315,6 +322,12 @@ public final class ClanManager {
         return cp;
     }
 
+    @SuppressWarnings("deprecation")
+    @Nullable
+    public ClanPlayer getClanPlayer(String playerName) {
+        return getClanPlayer(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Gets the ClanPlayer data object if a player is currently in a clan, null
      * if he's not in a clan
@@ -356,6 +369,11 @@ public final class ClanManager {
         return clanPlayers.get(playerUniqueId.toString());
     }
 
+    @SuppressWarnings("deprecation")
+    @Nullable
+    public ClanPlayer getAnyClanPlayer(String playerName) {
+        return getAnyClanPlayer(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
     /**
      * Gets the ClanPlayer object for the player, creates one if not found
      *
@@ -390,6 +408,12 @@ public final class ClanManager {
         return cp;
     }
 
+    @SuppressWarnings("deprecation")
+    @NotNull
+    public ClanPlayer getCreateClanPlayer(String playerName) {
+        return getCreateClanPlayer(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Announce message to the server
      *
@@ -470,6 +494,11 @@ public final class ClanManager {
             }
         }
     }
+
+    @SuppressWarnings("deprecation")
+    public void ban(String playerName) {
+        ban(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
 	
     /**
      * Bans a player from clan commands
@@ -1170,8 +1199,9 @@ public final class ClanManager {
         }
 
         double price = plugin.getSettingsManager().getHomeRegroupPrice();
+        Clan clan = Objects.requireNonNull(cp.getClan());
         if (!plugin.getSettingsManager().iseUniqueTaxOnRegroup()) {
-            price = price * cp.getClan().getOnlineMembers().size();
+            price = price * VanishUtils.getNonVanished(player, clan).size();
         }
 
         if (plugin.getSettingsManager().iseIssuerPaysRegroup()) {
@@ -1185,7 +1215,6 @@ public final class ClanManager {
                 }
             }
         } else {
-            Clan clan = cp.getClan();
             double balance = clan.getBalance();
             if (price > balance) {
                 player.sendMessage(ChatColor.RED + lang("clan.bank.not.enough.money",player));
@@ -1261,15 +1290,7 @@ public final class ClanManager {
 
         String command = split[0];
 
-        if (command.equals(lang("on",player))) {
-            cp.setClanChat(true);
-            plugin.getStorageManager().updateClanPlayer(cp);
-            ChatBlock.sendMessage(player, lang("enabled.clan.chat", player));
-        } else if (command.equals(lang("off",player))) {
-            cp.setClanChat(false);
-            plugin.getStorageManager().updateClanPlayer(cp);
-            ChatBlock.sendMessage(player, lang("disabled.clan.chat", player));
-        } else if (command.equals(lang("join",player))) {
+        if (command.equals(lang("join",player))) {
             cp.setChannel(ClanPlayer.Channel.CLAN);
             plugin.getStorageManager().updateClanPlayer(cp);
             ChatBlock.sendMessage(player, lang("joined.clan.chat", player));
@@ -1278,7 +1299,7 @@ public final class ClanManager {
             plugin.getStorageManager().updateClanPlayer(cp);
             ChatBlock.sendMessage(player, lang("left.clan.chat", player));
         } else if (command.equals(lang("mute",player))) {
-            if (cp.isMuted()) {
+            if (!cp.isMuted()) {
                 cp.setMuted(true);
                 ChatBlock.sendMessage(player, lang("muted.clan.chat", player));
             } else {
@@ -1364,23 +1385,15 @@ public final class ClanManager {
 
         String command = split[0];
 
-        if (command.equals(lang("on",player))) {
-            cp.setAllyChat(true);
-            plugin.getStorageManager().updateClanPlayer(cp);
-            ChatBlock.sendMessage(player, lang("enabled.ally.chat", player));
-        } else if (command.equals(lang("off",player))) {
-            cp.setAllyChat(false);
-            plugin.getStorageManager().updateClanPlayer(cp);
-            ChatBlock.sendMessage(player, lang("disabled.ally.chat", player));
-        } else if (command.equals(lang("join",player))) {
+        if (command.equals(lang("join", player))) {
             cp.setChannel(ClanPlayer.Channel.ALLY);
             plugin.getStorageManager().updateClanPlayer(cp);
             ChatBlock.sendMessage(player, lang("joined.ally.chat", player));
-        } else if (command.equals(lang("leave",player))) {
+        } else if (command.equals(lang("leave", player))) {
             cp.setChannel(ClanPlayer.Channel.NONE);
             plugin.getStorageManager().updateClanPlayer(cp);
             ChatBlock.sendMessage(player, lang("left.ally.chat", player));
-        } else if (command.equals(lang("mute",player))) {
+        } else if (command.equals(lang("mute", player))) {
             if (!cp.isMutedAlly()) {
                 cp.setMutedAlly(true);
                 ChatBlock.sendMessage(player, lang("muted.ally.chat", player));

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/PlaceholdersManager.java

@@ -5,6 +5,7 @@ import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
@@ -372,7 +373,8 @@ public final class PlaceholdersManager extends PlaceholderExpansion {
 				return String.valueOf(clan.getInactiveDays());
 			}
 			case "clan_onlinemembers_count": {
-				return String.valueOf(clan.getOnlineMembers().size());
+				return String.valueOf(VanishUtils.getNonVanished(player == null ? null : player.toPlayer(),
+						clan).size());
 			}
 			case "clan_allies_count": {
 				return String.valueOf(clan.getAllies().size());

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/RequestManager.java

@@ -18,8 +18,8 @@ import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
  * @author phaed
  */
 public final class RequestManager {
-    private SimpleClans plugin;
-    private HashMap<String, Request> requests = new HashMap<>();
+    private final SimpleClans plugin;
+    private final HashMap<String, Request> requests = new HashMap<>();
 
     /**
      *
@@ -29,23 +29,10 @@ public final class RequestManager {
         askerTask();
     }
 
-    /**
-     * Check whether the clan has a pending request
-     *
-     * @param tag
-     * @return
-     */
     public boolean hasRequest(String tag) {
         return requests.containsKey(tag);
     }
 
-    /**
-     * Add a demotion request
-     *
-     * @param requester
-     * @param demotedName
-     * @param clan
-     */
     public void addDemoteRequest(ClanPlayer requester, String demotedName, Clan clan) {
     	if (requests.containsKey(clan.getTag())) {
     		return;
@@ -63,13 +50,6 @@ public final class RequestManager {
         ask(req);
     }
 
-    /**
-     * Add a promotion request
-     *
-     * @param requester
-     * @param promotedName
-     * @param clan
-     */
     public void addPromoteRequest(ClanPlayer requester, String promotedName, Clan clan) {
     	if (requests.containsKey(clan.getTag())) {
     		return;
@@ -84,12 +64,6 @@ public final class RequestManager {
         ask(req);
     }
 
-    /**
-     * Add a clan disband request
-     *
-     * @param requester
-     * @param clan
-     */
     public void addDisbandRequest(ClanPlayer requester, Clan clan) {
     	if (requests.containsKey(clan.getTag())) {
     		return;
@@ -126,13 +100,6 @@ public final class RequestManager {
         ask(req);
     }
 
-    /**
-     * Add an clan war request
-     *
-     * @param requester
-     * @param warClan
-     * @param requestingClan
-     */
     public void addWarStartRequest(ClanPlayer requester, Clan warClan, Clan requestingClan) {
     	if (requests.containsKey(warClan.getTag())) {
     		return;
@@ -147,13 +114,6 @@ public final class RequestManager {
         ask(req);
     }
 
-    /**
-     * Add an war end request
-     *
-     * @param requester
-     * @param warClan
-     * @param requestingClan
-     */
     public void addWarEndRequest(ClanPlayer requester, Clan warClan, Clan requestingClan) {
     	if (requests.containsKey(warClan.getTag())) {
     		return;
@@ -168,13 +128,6 @@ public final class RequestManager {
         ask(req);
     }
 
-    /**
-     * Add an clan alliance request
-     *
-     * @param requester
-     * @param allyClan
-     * @param requestingClan
-     */
     public void addAllyRequest(ClanPlayer requester, Clan allyClan, Clan requestingClan) {
     	if (requests.containsKey(allyClan.getTag())) {
     		return;
@@ -189,13 +142,6 @@ public final class RequestManager {
         ask(req);
     }
 
-    /**
-     * Add an clan rivalry break request
-     *
-     * @param requester
-     * @param rivalClan
-     * @param requestingClan
-     */
     public void addRivalryBreakRequest(ClanPlayer requester, Clan rivalClan, Clan requestingClan) {
        	if (requests.containsKey(rivalClan.getTag())) {
     		return;
@@ -210,11 +156,6 @@ public final class RequestManager {
         ask(req);
     }
 
-    /**
-     * Record one player's accept vote
-     *
-     * @param cp
-     */
     public void accept(ClanPlayer cp) {
         Request req = requests.get(cp.getTag());
 
@@ -230,11 +171,6 @@ public final class RequestManager {
         }
     }
 
-    /**
-     * Record one player's deny vote
-     *
-     * @param cp
-     */
     public void deny(ClanPlayer cp) {
         Request req = requests.get(cp.getTag());
 
@@ -250,12 +186,6 @@ public final class RequestManager {
         }
     }
 
-    /**
-     * Process the answer from an invite and add the player to the clan if accepted
-     *
-     * @param req
-     * @param vote
-     */
     public void processInvite(Request req, VoteResult vote) {
         Clan clan = req.getClan();
         String invited = req.getTarget();
@@ -265,22 +195,18 @@ public final class RequestManager {
             if (cp == null) {
                 return;
             }
-
+            ChatBlock.sendMessageKey(Bukkit.getPlayerExact(invited), "accepted.invitation", clan.getName());
             clan.addBb(ChatColor.AQUA + lang("joined.the.clan", invited));
             plugin.getClanManager().serverAnnounce(lang("has.joined", invited, clan.getName()));
             clan.addPlayerToClan(cp);
         } else {
+            ChatBlock.sendMessageKey(Bukkit.getPlayerExact(invited), "denied.invitation", clan.getName());
             clan.leaderAnnounce(ChatColor.RED + lang("membership.invitation", invited));
         }
 
         requests.remove(req.getTarget().toLowerCase());
     }
-    
-    /**
-     * Check to see if votes are complete and process the result
-     *
-     * @param req
-     */
+
     public void processResults(Request req) {
     	Clan requesterClan = req.getClan();
     	ClanPlayer requesterCp = req.getRequester();
@@ -484,7 +410,7 @@ public final class RequestManager {
         final String message = tag + " " + plugin.getSettingsManager().getRequestMessageColor() + req.getMsg();
 
         if (req.getType().equals(ClanRequest.INVITE)) {
-            Player player = Helper.getPlayer(req.getTarget());
+            Player player = Bukkit.getPlayerExact(req.getTarget());
 
             if (player != null) {
                 String options = lang("accept.or.deny", player, ChatBlock.makeEmpty(Helper.stripColors(tag)) + " " + ChatColor.DARK_GREEN + "/" + plugin.getSettingsManager().getCommandAccept() + plugin.getSettingsManager().getPageHeadingsColor(), ChatColor.DARK_RED + "/" + plugin.getSettingsManager().getCommandDeny());

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/SettingsManager.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.*;
 
 import com.cryptomorin.xseries.XMaterial;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import net.sacredlabyrinth.phaed.simpleclans.utils.RankingNumberResolver.RankingType;
 import org.bukkit.World;
@@ -74,6 +75,7 @@ public final class SettingsManager {
     private double eResetKdr;
     private double eMaxMemberFee;
     private double eMemberFeeSetPrice;
+    private int eMemberFeeLastMinuteChangeInterval;
     private double eClanUpkeep;
     private String serverName;
     private boolean chatTags;
@@ -269,6 +271,7 @@ public final class SettingsManager {
         ePurchaseResetKdr = getConfig().getBoolean("economy.purchase-reset-kdr");
         ePurchaseMemberFeeSet = getConfig().getBoolean("economy.purchase-member-fee-set");
         eMemberFeeSetPrice = getConfig().getDouble("economy.member-fee-set-price");
+        eMemberFeeLastMinuteChangeInterval = getConfig().getInt("member-fee-last-minute-change-interval", 8);
         eResetKdr = getConfig().getDouble("economy.reset-kdr-price");
         eCreationPrice = getConfig().getDouble("economy.creation-price");
         eVerificationPrice = getConfig().getDouble("economy.verification-price");
@@ -303,13 +306,13 @@ public final class SettingsManager {
         bbLoginSize = getConfig().getInt("bb.login-size", bbSize);
         bbColor = getConfig().getString("bb.color");
         bbAccentColor = getConfig().getString("bb.accent-color");
-        commandClan = getConfig().getString("commands.clan");
-        commandAlly = getConfig().getString("commands.ally");
-        commandGlobal = getConfig().getString("commands.global");
-        commandMore = getConfig().getString("commands.more");
-        commandDeny = getConfig().getString("commands.deny");
-        commandAccept = getConfig().getString("commands.accept");
-        commandClanChat = getConfig().getString("commands.clan_chat");
+        commandClan = getConfig().getString("commands.clan", "clan");
+        commandAlly = getConfig().getString("commands.ally", "ally");
+        commandGlobal = getConfig().getString("commands.global", "global");
+        commandMore = getConfig().getString("commands.more", "more");
+        commandDeny = getConfig().getString("commands.deny", "deny");
+        commandAccept = getConfig().getString("commands.accept", "accept");
+        commandClanChat = getConfig().getString("commands.clan_chat", ".");
         forceCommandPriority = getConfig().getBoolean("commands.force-priority");
         homebaseSetOnce = getConfig().getBoolean("clan.homebase-can-be-set-only-once");
         waitSecs = getConfig().getInt("clan.homebase-teleport-wait-secs");
@@ -407,7 +410,7 @@ public final class SettingsManager {
         if (database.contains(":")) {
             String[] strings = database.split(":");
             database = strings[0];
-            port = Integer.valueOf(strings[1]);
+            port = Integer.parseInt(strings[1]);
         }
 
         save();
@@ -691,7 +694,11 @@ public final class SettingsManager {
     public double geteMemberFeeSetPrice() {
         return eMemberFeeSetPrice;
     }
-    
+
+    public int geteMemberFeeLastMinuteChangeInterval() {
+        return eMemberFeeLastMinuteChangeInterval;
+    }
+
     /**
      * Do leaders need to pay for setting the member fee?
      * @return true if so
@@ -753,6 +760,11 @@ public final class SettingsManager {
         return false;
     }
 
+    @SuppressWarnings("deprecation")
+    public boolean isBanned(String playerName) {
+        return isBanned(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Check whether a player is banned
      *
@@ -783,6 +795,11 @@ public final class SettingsManager {
         save();
     }
 
+    @SuppressWarnings("deprecation")
+    public void addBanned(String playerName) {
+        addBanned(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * Remove a player from the banned list
      *
@@ -795,6 +812,11 @@ public final class SettingsManager {
         save();
     }
 
+    @SuppressWarnings("deprecation")
+    public void removeBanned(String playerName) {
+        removeBanned(Bukkit.getOfflinePlayer(playerName).getUniqueId());
+    }
+
     /**
      * @return the plugin
      */

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/StorageManager.java

@@ -1126,22 +1126,27 @@ public final class StorageManager {
             query = "ALTER TABLE sc_kills ADD victim_uuid VARCHAR( 255 ) DEFAULT NULL;";
             core.execute(query);
         }
+        boolean useMysql = plugin.getSettingsManager().isUseMysql();
         if (!core.existsColumn("sc_players", "uuid")) {
             query = "ALTER TABLE sc_players ADD uuid VARCHAR( 255 ) DEFAULT NULL;";
             core.execute(query);
 
-            if (plugin.getSettingsManager().isUseMysql()) {
+            if (useMysql) {
                 query = "ALTER TABLE `sc_players` ADD UNIQUE `uq_player_uuid` (`uuid`);";
                 core.execute(query);
             }
 
             updatePlayersToUUID();
 
-            query = "ALTER TABLE sc_players DROP INDEX uq_sc_players_1;";
+            if (useMysql) {
+                query = "ALTER TABLE sc_players DROP INDEX uq_sc_players_1;";
+            } else {
+                query = "DROP INDEX IF EXISTS uq_sc_players_1;";
+            }
             core.execute(query);
         }
 
-        if (core.existsColumn("sc_players", "uuid") && !plugin.getSettingsManager().isUseMysql()) {
+        if (core.existsColumn("sc_players", "uuid") && !useMysql) {
             query = "CREATE UNIQUE INDEX IF NOT EXISTS `uq_player_uuid` ON `sc_players` (`uuid`);";
             core.execute(query);
         }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/TeleportManager.java

@@ -2,9 +2,7 @@ package net.sacredlabyrinth.phaed.simpleclans.managers;
 
 import io.papermc.lib.PaperLib;
 import net.sacredlabyrinth.phaed.simpleclans.*;
-
-import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
-
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -12,6 +10,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+import org.jetbrains.annotations.NotNull;
 
 import java.text.MessageFormat;
 import java.util.HashMap;
@@ -20,13 +19,12 @@ import java.util.List;
 import java.util.Random;
 import java.util.logging.Level;
 
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+
 public final class TeleportManager {
     private final SimpleClans plugin;
     private final HashMap<String, TeleportState> waitingPlayers = new HashMap<>();
 
-    /**
-     *
-     */
     public TeleportManager() {
         plugin = SimpleClans.getInstance();
         startCounter();
@@ -35,13 +33,13 @@ public final class TeleportManager {
     /**
      * Add player to teleport waiting queue
      *
-     * @param player
-     * @param dest
-     * @param clanName
+     * @param player      the Player
+     * @param destination the destination
+     * @param clanName    the Clan name
      */
-    public void addPlayer(Player player, Location dest, String clanName) {
+    public void addPlayer(Player player, Location destination, String clanName) {
         int secs = SimpleClans.getInstance().getSettingsManager().getWaitSecs();
-        waitingPlayers.put(player.getUniqueId().toString(), new TeleportState(player, dest, clanName));
+        waitingPlayers.put(player.getUniqueId().toString(), new TeleportState(player, destination, clanName));
 
         if (secs > 0) {
             ChatBlock.sendMessage(player, ChatColor.AQUA
@@ -50,8 +48,23 @@ public final class TeleportManager {
     }
 
     @SuppressWarnings("deprecation")
-    public void teleport(Clan clan, Location location) {
-        List<ClanPlayer> members = clan.getOnlineMembers();
+    private void sendTeleportBlocks(Player player, Location loc) {
+        int x = loc.getBlockX();
+        int z = loc.getBlockZ();
+
+        if (plugin.getSettingsManager().isTeleportBlocks()) {
+            player.sendBlockChange(new Location(loc.getWorld(), x + 1, loc.getBlockY() - 1, z + 1),
+                    Material.GLASS, (byte) 0);
+            player.sendBlockChange(new Location(loc.getWorld(), x - 1, loc.getBlockY() - 1, z - 1),
+                    Material.GLASS, (byte) 0);
+            player.sendBlockChange(new Location(loc.getWorld(), x + 1, loc.getBlockY() - 1, z - 1),
+                    Material.GLASS, (byte) 0);
+            player.sendBlockChange(new Location(loc.getWorld(), x - 1, loc.getBlockY() - 1, z + 1),
+                    Material.GLASS, (byte) 0);
+        }
+    }
+
+    private void teleport(Clan clan, Location location, List<ClanPlayer> members) {
         for (ClanPlayer cp : members) {
             Player player = cp.toPlayer();
             if (player == null) {
@@ -59,14 +72,8 @@ public final class TeleportManager {
             }
             int x = location.getBlockX();
             int z = location.getBlockZ();
-            player.sendBlockChange(new Location(location.getWorld(), x + 1, location.getBlockY(), z + 1),
-                    Material.GLASS, (byte) 0);
-            player.sendBlockChange(new Location(location.getWorld(), x - 1, location.getBlockY(), z - 1),
-                    Material.GLASS, (byte) 0);
-            player.sendBlockChange(new Location(location.getWorld(), x + 1, location.getBlockY(), z - 1),
-                    Material.GLASS, (byte) 0);
-            player.sendBlockChange(new Location(location.getWorld(), x - 1, location.getBlockY(), z + 1),
-                    Material.GLASS, (byte) 0);
+            sendTeleportBlocks(player, location);
+
             Random r = new Random();
             int xx = r.nextInt(2) - 1;
             int zz = r.nextInt(2) - 1;
@@ -81,107 +88,89 @@ public final class TeleportManager {
         }
     }
 
+    public void teleport(@NotNull Player requester, @NotNull Clan clan, @NotNull Location location) {
+        teleport(clan, location, VanishUtils.getNonVanished(requester, clan));
+    }
+
+    public void teleport(Clan clan, Location location) {
+        teleport(clan, location, VanishUtils.getNonVanished(null, clan));
+    }
+
     private void dropItems(Player player) {
-        if (plugin.getSettingsManager().isDropOnHome()) {
-            PlayerInventory inv = player.getInventory();
-            ItemStack[] contents = inv.getContents();
-
-            for (ItemStack item : contents) {
-                if (item == null) {
-                    continue;
-                }
-
-                List<Material> itemsList = plugin.getSettingsManager().getItemsList();
-
-                if (itemsList.contains(item.getType())) {
-                    player.getWorld().dropItemNaturally(player.getLocation(), item);
-                    inv.remove(item);
-                }
+        if (plugin.getPermissionsManager().has(player, "simpleclans.mod.keep-items")) {
+            return;
+        }
+        List<Material> itemsList = plugin.getSettingsManager().getItemsList();
+        PlayerInventory inv = player.getInventory();
+        boolean dropOnHome = plugin.getSettingsManager().isDropOnHome();
+        boolean keepOnHome = plugin.getSettingsManager().isKeepOnHome();
+        ItemStack[] contents = inv.getContents();
+        for (ItemStack item : contents) {
+            if (item == null) {
+                continue;
             }
-        } else if (plugin.getSettingsManager().isKeepOnHome()) {
-            PlayerInventory inv = player.getInventory();
-            ItemStack[] contents = inv.getContents().clone();
-
-            for (ItemStack item : contents) {
-                if (item == null) {
-                    continue;
-                }
-
-                List<Material> itemsList = plugin.getSettingsManager().getItemsList();
-
-                if (!itemsList.contains(item.getType())) {
-                    player.getWorld().dropItemNaturally(player.getLocation(), item);
-                    inv.remove(item);
-                }
+            if ((dropOnHome && itemsList.contains(item.getType())) ||
+                    (keepOnHome && !itemsList.contains(item.getType()))) {
+                player.getWorld().dropItemNaturally(player.getLocation(), item);
+                inv.remove(item);
             }
         }
     }
 
     private void startCounter() {
-        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
-            @SuppressWarnings("deprecation")
-            @Override
-            public void run() {
-                for (Iterator<TeleportState> iter = waitingPlayers.values().iterator(); iter.hasNext(); ) {
-                    TeleportState state = iter.next();
-
-                    if (state.isProcessing()) {
-                        continue;
-                    }
-                    state.setProcessing(true);
-
-                    Player player = state.getPlayer();
-
-                    if (player != null) {
-                        if (state.isTeleportTime()) {
-                            if (Helper.isSameBlock(player.getLocation(), state.getLocation())) {
-                                Location loc = state.getDestination();
-
-                                int x = loc.getBlockX();
-                                int z = loc.getBlockZ();
-
-                                if (plugin.getSettingsManager().isTeleportBlocks()) {
-                                    player.sendBlockChange(new Location(loc.getWorld(), x + 1, loc.getBlockY() - 1, z + 1), Material.GLASS, (byte) 0);
-                                    player.sendBlockChange(new Location(loc.getWorld(), x - 1, loc.getBlockY() - 1, z - 1), Material.GLASS, (byte) 0);
-                                    player.sendBlockChange(new Location(loc.getWorld(), x + 1, loc.getBlockY() - 1, z - 1), Material.GLASS, (byte) 0);
-                                    player.sendBlockChange(new Location(loc.getWorld(), x - 1, loc.getBlockY() - 1, z + 1), Material.GLASS, (byte) 0);
-                                }
-
-                                if (!plugin.getPermissionsManager().has(player, "simpleclans.mod.keep-items")) {
-                                    dropItems(player);
-                                }
-
-                                SimpleClans.debug("teleporting");
-
-                                Location location = new Location(loc.getWorld(), loc.getBlockX() + .5, loc.getBlockY(), loc.getBlockZ() + .5);
-                                PaperLib.teleportAsync(player, location, PlayerTeleportEvent.TeleportCause.COMMAND).thenAccept(result -> {
-                                    if (result) {
-                                        ChatBlock.sendMessage(player, ChatColor.AQUA + lang("now.at.homebase", player, state.getClanName()));
-                                    } else {
-                                        plugin.getLogger().log(Level.WARNING, "An error occurred while teleporting a player");
-                                    }
-                                });
-
-                            } else {
-                                ChatBlock.sendMessage(player, ChatColor.RED + lang("you.moved.teleport.cancelled",player));
-                            }
-
-                            iter.remove();
-                        } else {
-                            if (!Helper.isSameBlock(player.getLocation(), state.getLocation())) {
-                                ChatBlock.sendMessage(player, ChatColor.RED + lang("you.moved.teleport.cancelled",player));
-                                iter.remove();
-                            } else {
-                                ChatBlock.sendMessage(player, ChatColor.AQUA + "" + state.getCounter());
-                            }
-                        }
-                    } else {
-                        iter.remove();
-                    }
-
-                    state.setProcessing(false);
+        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
+            waitingPlayers.values().removeIf(ts -> ts.getPlayer() == null);
+            for (Iterator<TeleportState> iter = waitingPlayers.values().iterator(); iter.hasNext(); ) {
+                TeleportState state = iter.next();
+                Player player = state.getPlayer();
+                if (state.isProcessing() || player == null) {
+                    continue;
                 }
+                state.setProcessing(true);
+
+                if (!Helper.isSameBlock(player.getLocation(), state.getLocation())) {
+                    ChatBlock.sendMessage(player, ChatColor.RED + lang("you.moved.teleport.cancelled", player));
+                    iter.remove();
+                    continue;
+                }
+                if (state.isTeleportTime()) {
+                    teleport(state);
+                    iter.remove();
+                } else {
+                    ChatBlock.sendMessage(player, ChatColor.AQUA + "" + state.getCounter());
+                }
+
+                state.setProcessing(false);
             }
         }, 0, 20L);
     }
+
+    private void teleport(TeleportState state) {
+        Player player = state.getPlayer();
+        if (player == null) {
+            return;
+        }
+        Location loc = state.getDestination();
+        sendTeleportBlocks(player, loc);
+        dropItems(player);
+        loc.clone().add(.5, .5, .5);
+        teleportToHome(player, loc, state.getClanName());
+    }
+
+    public void teleportToHome(@NotNull Player player, @NotNull Location destination, @NotNull String clanName) {
+        PaperLib.teleportAsync(player, destination, PlayerTeleportEvent.TeleportCause.COMMAND).thenAccept(result -> {
+            if (result) {
+                ChatBlock.sendMessage(player, ChatColor.AQUA + lang("now.at.homebase", player, clanName));
+            } else {
+                plugin.getLogger().log(Level.WARNING, "An error occurred while teleporting a player");
+            }
+        });
+    }
+
+    public void teleportToHome(@NotNull Player player, @NotNull Clan clan) {
+        if (clan.getHomeLocation() == null) {
+            return;
+        }
+        teleportToHome(player, clan.getHomeLocation(), clan.getName());
+    }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/tasks/PlayerHeadCacheTask.java

@@ -38,6 +38,10 @@ public class PlayerHeadCacheTask extends BukkitRunnable {
         players.sort(Comparator.comparing(ClanPlayer::getName));
 
         for (ClanPlayer player : players) {
+            if (isCancelled()) {
+                plugin.getLogger().info("Player heads caching task cancelled!");
+                return;
+            }
             ItemStack itemStack = new ItemStack(Material.PLAYER_HEAD);
             SkullMeta itemMeta = (SkullMeta) itemStack.getItemMeta();
             if (itemMeta != null) {

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ui/frames/ClanDetailsFrame.java

@@ -5,6 +5,7 @@ import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel;
 import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import net.sacredlabyrinth.phaed.simpleclans.ui.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -235,7 +236,7 @@ public class ClanDetailsFrame extends SCFrame {
 		if (plugin.getSettingsManager().isePurchaseHomeRegroup()) {
 			price = plugin.getSettingsManager().getHomeRegroupPrice();
 			if (!plugin.getSettingsManager().iseUniqueTaxOnRegroup()) {
-				price = price * clan.getOnlineMembers().size();
+				price = price * VanishUtils.getNonVanished(getViewer(), clan).size();
 			}
 		}
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ui/frames/Components.java

@@ -8,6 +8,7 @@ import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.ui.*;
 import net.sacredlabyrinth.phaed.simpleclans.utils.KDRFormat;
 import net.sacredlabyrinth.phaed.simpleclans.utils.Paginator;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -89,7 +90,7 @@ public class Components {
                             clan.getDescription() != null && !clan.getDescription().isEmpty() ? clan.getDescription() : lang("no.description",viewer)),
                     lang("gui.clandetails.clan.lore.status",viewer, clan.isVerified() ? lang("verified",viewer) : lang("unverified",viewer)),
                     lang("gui.clandetails.clan.lore.leaders",viewer, clan.getLeadersString("", ", ")),
-                    lang("gui.clandetails.clan.lore.online.members",viewer, clan.getOnlineMembers().size(), clan.getMembers().size()),
+                    lang("gui.clandetails.clan.lore.online.members",viewer, VanishUtils.getNonVanished(viewer, clan).size(), clan.getMembers().size()),
                     lang("gui.clandetails.clan.lore.kdr",viewer, KDRFormat.format(clan.getTotalKDR())),
                     lang("gui.clandetails.clan.lore.kill.totals",viewer, clan.getTotalRival(), clan.getTotalNeutral(), clan.getTotalCivilian()),
                     lang("gui.clandetails.clan.lore.deaths",viewer, clan.getTotalDeaths()),

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ui/frames/CoordsFrame.java

@@ -9,12 +9,12 @@ import net.sacredlabyrinth.phaed.simpleclans.ui.SCComponent;
 import net.sacredlabyrinth.phaed.simpleclans.ui.SCComponentImpl;
 import net.sacredlabyrinth.phaed.simpleclans.ui.SCFrame;
 import net.sacredlabyrinth.phaed.simpleclans.utils.Paginator;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
@@ -36,7 +36,7 @@ public class CoordsFrame extends SCFrame {
 
 	@Override
 	public void createComponents() {
-		List<ClanPlayer> allMembers = subject.getOnlineMembers();
+		List<ClanPlayer> allMembers = VanishUtils.getNonVanished(getViewer(), subject);
 		allMembers.sort((cp1, cp2) -> Boolean.compare(cp1.isLeader(), cp2.isLeader()));
 
 		paginator = new Paginator(getSize() - 9, allMembers.size());

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ui/frames/InviteFrame.java

@@ -20,20 +20,22 @@ import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 
 public class InviteFrame extends SCFrame {
 
-	private Paginator paginator;
+	private final Paginator paginator;
 	private final SimpleClans plugin;
+	private final List<Player> players;
 
 	public InviteFrame(SCFrame parent, Player viewer) {
 		super(parent, viewer);
 		this.plugin = SimpleClans.getInstance();
+		ClanManager cm = plugin.getClanManager();
+		players = plugin.getServer().getOnlinePlayers().stream().filter(p -> cm.getClanPlayer(p) == null)
+				.collect(Collectors.toList());
+		paginator = new Paginator(getSize() - 9, players.size());
+
 	}
 
 	@Override
 	public void createComponents() {
-		ClanManager cm = plugin.getClanManager();
-		List<Player> players = plugin.getServer().getOnlinePlayers().stream().filter(p -> cm.getClanPlayer(p) == null).collect(Collectors.toList());
-		paginator = new Paginator(getSize() - 9, players.size());
-
 		addHeader();
 
 		int slot = 9;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ui/frames/MainFrame.java

@@ -27,34 +27,46 @@ public class MainFrame extends SCFrame {
 		add(Components.getPlayerComponent(this, getViewer(), getViewer(), 0, false));
 		add(Components.getClanComponent(this, getViewer(),
 				plugin.getClanManager().getCreateClanPlayer(getViewer().getUniqueId()).getClan(), 1, true));
+		addLeaderboard();
+		addClanList();
+		addResetKdr();
+		addStaff();
+		addLanguageSelector();
+		addOtherCommands();
+	}
 
+	private void addOtherCommands() {
+		SCComponent otherCommands = new SCComponentImpl(lang("gui.main.other.commands.title",getViewer()),
+				Collections.singletonList(lang("gui.main.other.commands.lore",getViewer())), XMaterial.BOOK, 8);
+		otherCommands.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "help", false));
+		add(otherCommands);
+	}
+
+	private void addStaff() {
+		if (plugin.getPermissionsManager().has(getViewer(), "simpleclans.mod.staffgui")) {
+			SCComponent staff = new SCComponentImpl.Builder(XMaterial.COMMAND_BLOCK).withSlot(6).withDisplayName(
+					lang("gui.main.staff.title", getViewer())).withLore(Collections.singletonList(lang("gui.main.staff.lore", getViewer()))).build();
+			staff.setPermission(ClickType.LEFT, "simpleclans.mod.staffgui");
+			staff.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new StaffFrame(this, getViewer())));
+			add(staff);
+		}
+	}
+
+	private void addLeaderboard() {
 		SCComponent leaderboard = new SCComponentImpl(lang("gui.main.leaderboard.title",getViewer()),
 				Collections.singletonList(lang("gui.main.leaderboard.lore",getViewer())), XMaterial.PAINTING, 3);
 		leaderboard.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new LeaderboardFrame(getViewer(), this)));
 		leaderboard.setPermission(ClickType.LEFT, "simpleclans.anyone.leaderboard");
 		add(leaderboard);
+	}
 
+	private void addClanList() {
 		SCComponent clanList = new SCComponentImpl(lang("gui.main.clan.list.title", getViewer()),
 				Collections.singletonList(lang("gui.main.clan.list.lore", getViewer())), XMaterial.PURPLE_BANNER,
 				4);
 		clanList.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new ClanListFrame(this, getViewer())));
 		clanList.setPermission(ClickType.LEFT, "simpleclans.anyone.list");
 		add(clanList);
-
-		addResetKdr();
-		if (plugin.getPermissionsManager().has(getViewer(), "simpleclans.mod.staffgui")) {
-			SCComponent staff = new SCComponentImpl.Builder(XMaterial.COMMAND_BLOCK).withSlot(6).withDisplayName(
-					lang("gui.main.staff.title", getViewer())).build();
-			staff.setPermission(ClickType.LEFT, "simpleclans.mod.staffgui");
-			staff.setListener(ClickType.LEFT, () -> InventoryDrawer.open(new StaffFrame(this, getViewer())));
-			add(staff);
-		}
-		addLanguageSelector();
-
-		SCComponent otherCommands = new SCComponentImpl(lang("gui.main.other.commands.title",getViewer()),
-				Collections.singletonList(lang("gui.main.other.commands.lore",getViewer())), XMaterial.BOOK, 8);
-		otherCommands.setListener(ClickType.LEFT, () -> InventoryController.runSubcommand(getViewer(), "help", false));
-		add(otherCommands);
 	}
 
 	private void addLanguageSelector() {
@@ -92,7 +104,7 @@ public class MainFrame extends SCFrame {
 
 	@Override
 	public @NotNull String getTitle() {
-		return lang("gui.main.title",getViewer());
+		return lang("gui.main.title", getViewer(), plugin.getSettingsManager().getServerName());
 	}
 
 	@Override

src/main/java/net/sacredlabyrinth/phaed/simpleclans/utils/VanishUtils.java

@@ -0,0 +1,56 @@
+package net.sacredlabyrinth.phaed.simpleclans.utils;
+
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanishUtils {
+
+    private VanishUtils() {}
+
+    public static @NotNull List<ClanPlayer> getNonVanished(@Nullable CommandSender viewer, @NotNull Clan clan) {
+        return getNonVanished(viewer, clan.getAllMembers());
+    }
+
+    public static @NotNull List<ClanPlayer> getNonVanished(@Nullable CommandSender viewer,
+                                                        @NotNull List<ClanPlayer> clanPlayers) {
+        ArrayList<ClanPlayer> nonVanished = new ArrayList<>();
+        for (ClanPlayer cp : clanPlayers) {
+            Player player = cp.toPlayer();
+            if (!isVanished(viewer, player)) {
+                nonVanished.add(cp);
+            }
+        }
+        return nonVanished;
+    }
+
+    @Contract("_, null -> true")
+    public static boolean isVanished(@Nullable CommandSender viewer, @Nullable Player player) {
+        if (isVanished(player)) {
+            return true;
+        }
+        if (viewer instanceof Player) {
+            return !((Player) viewer).canSee(player);
+        }
+
+        return false;
+    }
+
+    @Contract("null -> true")
+    public static boolean isVanished(@Nullable Player player) {
+        if (player == null || !player.isOnline()) {
+            return true;
+        }
+        if (player.hasMetadata("vanished") && !player.getMetadata("vanished").isEmpty()) {
+            return player.getMetadata("vanished").get(0).asBoolean();
+        }
+        return false;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/utils/YAMLSerializer.java

@@ -35,6 +35,7 @@ public class YAMLSerializer {
         YamlConfiguration config = new YamlConfiguration();
         if (cs != null) {
             try {
+                config.loadFromString(cs);
                 return (T) config.get("cs");
             } catch (Exception e) {
                 LOGGER.warning(String.format(

src/main/resources/config.yml

@@ -88,6 +88,7 @@ economy:
     purchase-member-fee-set: false
     member-fee-set-price: 1000.0
     member-fee-enabled: false
+    member-fee-last-minute-change-interval: 8
     max-member-fee: 200.0
     upkeep: 200.0
     upkeep-enabled: false

src/main/resources/messages.properties

@@ -82,6 +82,7 @@ acf-core.parameter.displayname=display name
 acf-core.parameter.permission=permission
 acf-core.parameter.message=message
 acf-core.parameter.tag=tag
+acf-core.parameter.name=name
 acf-core.parameter.fee=fee
 acf-core.parameter.description=description
 acf-core.parameter.player=player
@@ -180,9 +181,6 @@ command.description.rank.permissions.available=Lists the available rank permissi
 command.description.rank.permissions.rank=Lists a rank''s permissions
 command.description.rank.permissions.add=Adds a permission to a rank
 command.description.rank.permissions.remove=Removes a permission from a rank
-0.place=/{0} place [player] [tag]{1} - Place a player in a clan
-0.toggle.command=/{0} toggle [{2}]{1} - Toggle personal settings
-0.kills=/{0} kills{1} - View your kill counts
 home-menu=/{0} home{1} - Teleport to clan home-base
 home-set-menu=/{0} home set{1} - Set the clan''s home base
 home-clear-menu=/{0} home clear{1} - Clear the clan''s home base
@@ -518,7 +516,7 @@ gui.back.title=&fBack
 gui.previous.page.title=&fPrevious Page
 gui.next.page.title=&fNext Page
 gui.lore.no.permission=&cYou don''t have permission to see this!
-gui.main.title=SimpleClans
+gui.main.title={0} - clan menu
 gui.main.languageselector.title=&fSelect your language
 gui.main.languageselector.lore.left.click=&7Left-click to select your language
 gui.main.languageselector.lore.right.click=&7Right-click to help translating
@@ -532,6 +530,7 @@ gui.main.reset.kdr.lore=&7Left-click to reset your KDR
 gui.main.leaderboard.title=&fLeaderboard
 gui.main.leaderboard.lore=&7Left-click to see the leaderboard
 gui.main.staff.title=&fStaff
+gui.main.staff.lore=&7Left-click to open staff menu
 gui.staff.title=Staff
 gui.staff.clan.list.lore.left.click=&7Left-click to see all clans
 gui.staff.clan.list.lore.right.click=&7Right-click to see all unverified clans
@@ -719,14 +718,10 @@ gui.confirmation.return=&7Click here to return
 gui.not.supported=&cAn error occurred while opening the GUI! Disabling it... Did you download the correct version?
 staff.member.verify.clan=&cA staff member must verify your clan!
 player.already.has.that.rank=&cThe player already has that rank!
-enabled.clan.chat=&bYou have enabled clan chat
-disabled.clan.chat=&bYou have disabled clan chat
 joined.clan.chat=&bYou have joined clan chat
 left.clan.chat=&bYou have left clan chat
 muted.clan.chat=&bYou have muted clan chat
 unmuted.clan.chat=&bYou have unmuted clan chat
-enabled.ally.chat=&bYou have enabled ally chat
-disabled.ally.chat=&bYou have disabled ally chat
 joined.ally.chat=&bYou have joined ally chat
 left.ally.chat=&bYou have left ally chat
 muted.ally.chat=&bYou have muted ally chat
@@ -775,4 +770,14 @@ player.lookup=\
   &7Inactive: &f%player_inactive_days%&7/&f%player_max_inactive_days% days\n  \
   %kill_type_line%
 economy.disabled=&cEconomy disabled!
-has.been.purged={0}''s data has been purged
+has.been.purged={0}''s data has been purged
+accepted.invitation=&bYou have accepted {0}''s invitation
+denied.invitation=&cYou have denied {0}''s invitation
+must.be.in.clan.to.pvp=&cYou and {0} must be clan members to PvP!
+clans.not.at.war.pvp.denied=&cYour clan is not at war with {0}!
+cannot.attack.civilians=&cYou cannot attack civilians!
+cannot.attack.clan.member=&cYou cannot attack another clan member!
+cannot.attack.ally=&cYou cannot attack an ally!
+cannot.change.member.fee.now=&cYou cannot change the member fee close to its collection time. 
+cannot.change.member.fee.hours=&cTry again in {0} hours...
+cannot.change.member.fee.minutes=&cTry again in {0} minute(s)...

src/main/resources/messages_de_DE.properties

@@ -1,7 +1,12 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=beschreibung
 create.command=erstellen
+delete.command=löschen
+rank.command=rang
+permissions.command=berechtigung
 list.command=liste
+list.type.name=name
+list.type.size=groesse
+list.type.active=aktiv
 profile.command=profil
 roster.command=mitglieder
 lookup.command=suchen
@@ -12,17 +17,33 @@ vitals.command=vitale
 coords.command=koordinaten
 stats.command=stats
 ally.command=verbündeter
+add.command=anlegen
+remove.command=entfernen
+allow.command=zulassen
+block.command=blockieren
+auto.command=auto
+check.command=prüfen
+assign.command=zuweisen
+unassign.command=aufheben
 rival.command=rivale
 bb.command=bb
+clear.command=leeren
 modtag.command=modtag
 toggle.command=umschalten
+tag.command=markieren
+deposit.command=einzahlen
+all.command=alles
+withdraw.command=auszahlen
 invite.command=einladen
 kick.command=kick
 bank.command=bank
+status.command=status
 fee.command=gebühr
+set.command=setzen
 purge.command=bereinigen
 trust.command=vertrauen
 untrust.command=vertrauen entziehen
+admin.command=admin
 promote.command=befördern
 demote.command=herunterstufen
 clanff.command=clanff
@@ -37,94 +58,34 @@ globalff.command=globalff
 kills.command=kills
 mostkilled.command=mostkilled
 war.command=krieg
+start.command=start
+end.command=ende
 home.command=home
+me.command=ich
+tp.command=tp
 setrank.command=setrank
 place.command=platzieren
 resetkdr.command=zurücksetzen kdr
+everyone.command=jeder
 help.command=hilfe
-usage.description=Verwendung\: /{0} Beschreibung [description]
-usage.resetkdr=Verwendung\: /{0} zurückgesetzen kdr [alle/Spieler]
-usage.clan.alliances=Verwendung\: /{0} Allianzen
-usage.ally=Verwendung\: /{0} ally hinzufügen/entfernen [tag]
-usage.ban.unban=Verwendung\: /{0} ban/entbannen [player]
-usage.rival=Verwendung\: /{0} rivale hinzufügen/entfernen [tag]
-usage.war=Verwendung\: /{0} Krieg starten/beenden [tag]
-usage.clanff=Verwendung\: /{0} Clanff erlaubt/blockieren
-usage.0.coords=Verwendung\: /{0} Koordinaten
-usage.demote.leader=Aufruf\: /{0} Demote [leader]
-usage.0.disband=Verwendung\: /{0} auflösen
-usage.0.ff.allow.auto=Verwendung\: /{0} ff erlauben/automatisch
-usage.0.globalff.allow.auto=Verwendung\: /{0} Globalff erlauben/Auto
-usage.0.permissions.player=Aufruf\: /{0} Berechtigungen [clan] hinzufügen/entfernen [permission]
-usage.0.invite.player=Verwendung\: /{0} Einladen [player]
-usage.kick.player=Aufruf\: /{0} Kick [player]
-usage.bank=Verwendung\: /{0} Bankabhebung/Einzahlung/Status [amount]
-usage.fee=Verwendung\: /{0} Gebührenprüfung/Set [amount]
-usage.purge=Verwendung\: /{0} löschen [player]
-usage.0.modtag.tag=Usage\: /{0} modtag [tag]
-usage.list=Verwendung\: /{0} Liste [Name/size/kdr/founded/aktiv] [auf/desc]
-usage.lookup.tag=Verwendung\: /{0} Suche [tag]
-usage.0.profile.tag=Verwendung\: /{0} Profil [tag]
-usage.0.promote.member=Verwendung\: /{0} befördern <member>
-usage.0.rivalries=Verwendung\: /{0} Rivalitäten
-usage.0.roster.tag=Verwendung\: /{0} Liste [tag]
-usage.0.stats=Verwendung\: /{0} Statistik
-usage.0.trust.player=Aufruf\: /{0} Vertrauen [player]
-usage.0.untrust.player=Aufruf\: /{0} nicht Vertrauen [player]
-usage.0.verify.tag=Verwendung\: /{0} verifizieren [tag]
-usage.0.vitals=Verwendung\: /{0} vitale
-usage.0.place=Aufruf\: /{0} Platz [player] [tag]
-usage.0.leaderboard=Verwendung\: /{0} Rangliste
-0.reload.1.reload.configuration=/party reload - Lädt die config neu
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} Globalff erlauben/auto {1} - global friendly fire setzen
-0.place=/{0} Platziere [player] [tag]{1} - Platziere einen Spieler in einen Clan
-0.ban.unban.player.1.ban.unban.a.player=/{0} Ban/Entbannen [player]{1} - Ban/Entbannen eines Spielers
-0.hometp.clan.1.tp.home.a.clan=/{0} home tp [clan]{1} - Teleportiere zu allen Clans Häusern
-0.disband.tag.1.disband.a.clan=/{0} auflösen [tag]{1} - einen Clan auflösen
-0.resetkdr.1.resets.kdr=/{0} kdrzurücksetzen Spieler/alle{1} - Setzen das KDR von alle Spieler oder nur einer
-0.resetkdr.1.resets.your.kdr=/{0} resetkdr{1} - Setzt deine KDR zurück
-0.purge.player.1.purge.a.player=/{0} reinigen [player]{1} - Reinigen einen Spieler
-0.verify.tag.1.verify.an.unverified.clan=/{0} verify [tag]{1} - Verifiziere einen nicht verifizierten Clan
-0.verify.1.purchase.verification.of.your.clan=/{0} überprüfen{1} - Kaufe Verifizierung deines Gilden
-0.list.1.lists.all.clans=/{0} liste [sortieren durch] [aufst/abst]{1} - Listet alle Gilden - (sortieren durch\: Name/Größe/KDR/gegründet/aktiv)
-0.profile.1.view.your.clan.s.profile=/{0} profile{1} - Zeigt dir das Profil deines Clans
-0.profile.tag.1.view.a.clan.s.profile=/{0} profile [tag]{1} - Zeigt dir das Profil eines Clans
-0.lookup.1.lookup.your.info=/{0} suche{1} - Suche nach deine Information
-0.lookup.player.1.lookup.a.player.s.info=/{0} suche [Spieler]{1} - Suche nach die Information eines Spielers
-0.leaderboard.1.view.leaderboard=/{0} leaderboard{1} - Zeigt die Rangliste
-0.alliances.1.view.all.clan.alliances=/{0} alliances{1} - Zeigt alle Clan Allianzen
-0.rivalries.1.view.all.clan.rivalries=/{0} rivalries{1} - Zeigt alle Clan Rivalen
-0.roster.1.view.your.clan.s.member.list=/{0} Röster{1} - Listet alle Clanmitglieder auf
-0.roster.tag.1.view.a.clan.s.member.list=/{0} Röster [tag]{1} - Listet alle Mitglieder eines Clans auf
-0.vitals.1.view.your.clan.member.s.vitals=/{0} vitale{1} - Zeigt die Vitale deiner Clan Mitglieder an
-0.coords.1.view.your.clan.member.s.coordinates=/{0} coords{1} - Zeigt die Koordinaten deiner Clan Mitglieder an
-0.stats.1.view.your.clan.member.s.stats=/{0} stats{1} - Zeigt die Statistiken deiner Clan Mitglieder an
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} ally add/remove [tag]{1} - Eine Clan-Allianz hinzufügen/entfernen
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rival add/remove [tag]{1} - Einen Clan-Rivalen hinzufügen/entfernen
-0.bb.1.display.bulletin.board=/{0} bb{1} - Zeigt das schwarze Brett an
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} bb [msg]{1} - Fügt eine Nachricht zum schwarzen Brett hinzu
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modtag [tag]{1} - Ändert den Clan-Tag
-0.description.description.1.modify.the.clan.s.description=/{0} description [description]{1} - Ändert die Clan-Beschreibung
-0.invite.player.1.invite.a.player=/{0} invite [player]{1} - Lade einen Spieler ein
-0.kick.player.1.kick.a.player.from.the.clan=/{0} kick [player]{1} - Schmeißt einen Spieler aus dem Clan
-0.trust.untrust.player.1.set.trust.level1=/{0} trust [player]{1} - Macht einen Spieler Vertrauenswürdig
-0.trust.untrust.player.1.set.trust.level2=/{0} untrust [player]{1} - Macht einen Spieler Unvertrauenswürdig
-0.promote.member.1.promote.a.member.to.leader=/{0} promote [member]{1} - Befördert einen Spieler zum Anführer
-0.demote.leader.1.demote.a.leader.to.member=/{0} demote [leader]{1} - Degradiert einen Anführer zum Mitglied
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} clanff allow/block{1} - Schaltet den Teambeschuss des Clans um
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} ff allow/auto{1} - Schaltet den persönlichen Teambeschuss um
-0.toggle.command=/{0} toggle [{2}]{1} - Schaltet die persönlichen Einstellungen um
-0.resign.1.resign.from.the.clan=/{0} resign{1} - Trete aus dem Clan zurück
-0.disband.1.disband.your.clan=/{0} disband{1} - Löse deinen Clan auf
-0.kills=/{0} Kills{1} - Zeigt die Anzahl deiner Kills an
-0.killsplayer=/{0} Kills [player]{1} - Zeigt die Anzahl der Kills eines Spielers an
-0.fee.check=/{0} fee check {1}- Überprüfe ob Beiträge aktiviert sind und wie hoch sie sind
-0.fee.set=/{0} fee set [amount]{1} - Setzt die Höhe des Beitrags für Mitglieder
-0.mostkilled=/{0} mostkilled{1} - Zeigt die am meisten getötet Anzahl an
+acf-core.parameter.member=mitglieder
+acf-core.parameter.rank=rang
+acf-core.parameter.leader=anfuehrer
+acf-core.parameter.displayname=anzeigename
+acf-core.parameter.permission=berechtigung
+acf-core.parameter.message=nachricht
+acf-core.parameter.fee=gebühr
+acf-core.parameter.description=beschreibung
+acf-core.parameter.player=spieler
+acf-core.parameter.clan=clan
+acf-core.parameter.type=typ
+acf-core.parameter.order=bestellung
+acf-core.parameter.help=seite oder schlüsselwörter
+command.description.stats=Zeigt die Mitgliederstatistik deines Clans an
+command.description.rivalries=Zeigt alle Clan-Rivalitäten
 home-menu=/{0} Home{1} - Teleportiert dich in die Clan Basis
 home-set-menu=/{0} Home set{1} - Setzt die Clan Basis
 home-clear-menu=/{0} Home clear{1} - Entfernt die Clan Basis
-example.clan.modtag.4kfo.4l=Beispiel\: /Clan Montag &4R&fd&4L
 clan=Clan
 allies=Alliierte
 alliances=allianzen
@@ -208,11 +169,9 @@ clan.players=Clan Spieler\: {0}
 clans=Clans\: {0}
 banned=Dir wurde verboten Clan-Commands zu benutzen
 nothing.more.to.see=Nichts mehr zu sehen
-nothing.to.deny=Nichts zum verweigern
 no.leader.permissions=Du hast keine Anführer Berechtigungen
 you.have.already.voted=Du hast bereits abgestimmt
 has.voted.to.deny={0} hat fürs verweigern gestimmt
-nothing.to.accept=Nichts zum akzeptieren
 view.next.page=Gebe /{0} ein, um die nächste Seite anzuzeigen.
 voted.to.accept={0} hat fürs akzeptieren gestimmt
 bulletin.board.header={0}* {1}{2} schwarzes Brett
@@ -221,14 +180,10 @@ has.been.disbanded.alliance.ended={0} wurde aufgelöst. Allianz beendet.
 clan.disbanded=Clan aufgelöst
 1.color.day=1 {0}Tag
 many.color.days={0}{1} Tage
-does.not.match=Passt zu keinem Clan Command
-simpleclans.command.failure=SimpleClans Command Fehler\: {0}
 insufficient.permissions=Unzureichende Berechtigungen
 clan.is.not.verified=Clan ist nicht verifiziert
 not.a.member.of.any.clan=Du bist kein Mitglied in einem Clan
 minimum.to.make.alliance=Dein Clan muss mindestens {0} Spieler haben um Allianzen zu bilden
-no.clan.matched=Kein Clan stimmte überein
-cannot.ally.with.an.unverified.clan=Du kannst dich mit unverifizierten Clans nicht verbünden
 your.clans.are.not.allies=Deine Clans sind keine Verbündeten
 has.broken.the.alliance={0} hat die Allianz mit {1} aufgelöst
 at.least.one.leader.accept.the.alliance=Mindestens ein Anführer des Clans muss online sein um die Allianz zu akzeptieren
@@ -268,7 +223,6 @@ global.friendy.fire.is.now.managed.by.each.clan=Globales Friendy-fire wird nun v
 global.friendy.fire.is.already.being.managed.by.each.clan=Globales Friendy-fire wird bereits von jedem Clan verwaltet
 global.friendly.fire.is.set.to.allowed=Globales Friendy-fire ist erlaubt
 global.friendly.fire.is.already.being.allowed=Globales Friendy-fire ist bereits erlaubt
-no.player.matched=Kein Spieler gefunden
 the.player.doesn.t.not.have.the.permissions.to.join.clans=Der Spieler hat nicht die Berechtigung, Clans beizutreten
 you.cannot.invite.yourself=Du kannst dich nicht einladen
 this.player.is.banned.from.using.clan.commands=Dieser Spieler ist von der Verwendung von Clan-Befehlen ausgeschlossen
@@ -283,28 +237,18 @@ total.clans=Gesamte Clans\:
 legend=Legende\:
 kill.type.civilian=Töte Typ\: {0}Zivilist
 no.player.data.found=Keine Spielerdaten gefunden
-kill.type.0=Töte Typ\: {0}
-s.player.info={0}''s Spieler-Info
 clan.0=Clan\: {0}
 status.0=Status\:{0}
 rank.0=Rang\: {0}
 kdr.0=KDR\: {0}
-deaths.0=Tode\: {0}
-fee.0.value.1=Gebühr\: {0}, {1}$
-join.date.0=Beitrittsdatum\: {0}
-last.seen.0=Zuletzt gesehen\: {0}
-past.clans.0=Letzte Clans\: {0}
 inactive.0=Inaktiv\: {0}
 clan.commands=clan Befehle
 tag.changed.to.0=Tag geändert zu {0}
 name.0=Name\: {0}
 description.0=Beschreibung\: {0}
 leaders.0=Anführer\:{0}
-members.online.0=Mitglieder Online\: {0}
 allies.0=Allianz\: {0}
 rivals.0=Rivalen\: {0}
-founded.0=Gefunden\: {0}
-the.member.to.be.promoted.must.be.online=Das zu befördernde Mitglied muss online sein
 the.player.does.not.have.the.permissions.to.lead.a.clan=Der Spieler hat nicht die Berechtigung einen Clan zu führen
 you.cannot.promote.yourself=Du kannst dich nicht selbst befördern\!
 the.player.is.already.a.leader=Der Spieler ist bereits Anführer
@@ -324,8 +268,6 @@ hunger=Hunger
 stone=Stein
 iron=Eisen
 the.clan.cannot.be.rivaled=Der Clan kann nicht rivalieren
-capeoff=Umhang ausgeschaltet
-capeon=Umhang eingeschaltet
 tagoff=Kürzel ausgeschaltet
 tagon=Kürzel eingeschaltet
 depositon=Einzahlung eingeschaltet
@@ -350,6 +292,8 @@ join=beitreten
 mute=stummschalten
 player.rank.changed=Rang würde gesetzt
 your.clans.are.already.rivals=Eure Clans sind bereits Rivalen
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.disband.lore=&7Middle-Klick, um deinen Clan aufzulösen
 gui.clandetails.chat.title=&fChat
 gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bSendet eine Nachricht an den Clan Chat
@@ -371,6 +315,7 @@ gui.playerdetails.player.lore.kill.totals=&7Kill Totale\: &b[Rival\:{0} Neutral\
 gui.playerdetails.player.lore.deaths=&7Tode\: &b{0}
 gui.playerdetails.player.lore.join.date=&7Beitrittsdatum\: &b{0}
 gui.playerdetails.player.lore.last.seen=&7Zuletzt gesehen\: &b{0}
+# suppress inspection "TrailingSpacesInProperty"
 gui.playerdetails.player.lore.past.clans.separator=&b, 
 gui.playerdetails.player.lore.past.clans=&7Letzte Clans\: &b{0}
 gui.playerdetails.player.lore.inactive=&7Inaktiv\:{0}/{1} Tage
@@ -386,18 +331,16 @@ gui.playerdetails.trust.lore.left.click=&7Linksklick zum Vertrauen
 gui.playerdetails.untrust.lore.right.click=&7Rechtsklick, um das Vertrauen aufzuheben
 staff.member.verify.clan=&cEin Admin muss deinen Clan verifizieren\!
 player.already.has.that.rank=&cDer Spieler hat bereits diesen Rang\!
-enabled.clan.chat=&bDu hast den Clan-Chat aktiviert
-disabled.clan.chat=&bDu hast den Clan-Chat deaktiviert
 joined.clan.chat=&bDu bist dem Clan-Chat beigetreten
 left.clan.chat=&bDu hast den Clan-Chat verlassen
 muted.clan.chat=&bDu hast den Clan-Chat stumm geschaltet
 unmuted.clan.chat=&bDu hast den Clan-Chat freigeschaltet
-enabled.ally.chat=&bDu hast den Allianzchat aktiviert
-disabled.ally.chat=&bDu hast den Allianzchat deaktiviert
 joined.ally.chat=&bDu hast dem Allianzchat beigetreten
 left.ally.chat=&bDu hast den Allianzchat verlassen
 muted.ally.chat=&bDu hast den Allianz-Chat stumm gemacht
 unmuted.ally.chat=&bDu hast den Allianzchat freigeschaltet
 player.already.in.this.clan=&cDer Spieler ist bereits in diesem Clan
 your.clan.reached.max.alliances=&cDein Clan hat die maximale Anzahl an Allianzen erreicht
-other.clan.reached.max.alliances=&cDer andere Clan hat die maximale Anzahl an Allianzen erreicht
+other.clan.reached.max.alliances=&cDer andere Clan hat die maximale Anzahl an Allianzen erreicht
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_es_ES.properties

@@ -1,7 +1,17 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=description
 create.command=create
+delete.command=delete
+rank.command=rank
+setdisplayname.command=setdisplayname
+permissions.command=permissions
 list.command=list
+list.order.asc=asc
+list.order.desc=desc
+list.type.name=name
+list.type.kdr=kdr
+list.type.size=size
+list.type.founded=founded
+list.type.active=active
 profile.command=profile
 roster.command=roster
 lookup.command=lookup
@@ -12,17 +22,33 @@ vitals.command=vitals
 coords.command=coords
 stats.command=stats
 ally.command=ally
+add.command=add
+remove.command=remove
+allow.command=allow
+block.command=block
+auto.command=auto
+check.command=check
+assign.command=assign
+unassign.command=unassign
 rival.command=rival
 bb.command=bb
+clear.command=clear
 modtag.command=modtag
 toggle.command=toggle
+tag.command=tag
+deposit.command=deposit
+all.command=all
+withdraw.command=withdraw
 invite.command=invite
 kick.command=kick
 bank.command=bank
+status.command=status
 fee.command=fee
+set.command=set
 purge.command=purge
 trust.command=trust
 untrust.command=untrust
+admin.command=admin
 promote.command=promote
 demote.command=demote
 clanff.command=clanff
@@ -37,99 +63,126 @@ globalff.command=globalff
 kills.command=kills
 mostkilled.command=mostkilled
 war.command=war
+start.command=start
+end.command=end
 home.command=home
+regroup.command=regroup
+me.command=me
+tp.command=tp
 setrank.command=setrank
 place.command=place
 resetkdr.command=resetkdr
+everyone.command=everyone
 setbanner.command=setbanner
 help.command=ayuda
-usage.description=Uso\: /{0} description [description]
-usage.resetkdr=Uso\: /{0} resetkdr [all/player]
-usage.clan.alliances=Uso\: /{0} alliances
-usage.ally=Uso\: /{0} ally add/remove [tag]
-usage.ban.unban=Uso\: /{0} ban/unban [player]
-usage.rival=Uso\: /{0} rival add/remove [tag]
-usage.war=Uso\: /{0} war start/end [tag]
-usage.clanff=Uso\: /{0} clanff allow/block
-usage.0.coords=Uso\: /{0} coords
-usage.create=Uso\: /{0} create
-usage.demote.leader=Uso\: /{0} demote [leader]
-usage.0.disband=Uso\: /{0} disband
-usage.0.ff.allow.auto=Uso\: /{0} ff allow/auto
-usage.0.globalff.allow.auto=Uso\: /{0} globalff allow/auto
-usage.0.permissions.player=Uso\: /{0} permissions [clan] add/remove [permission]
-usage.0.invite.player=Uso\: /{0} invite [player]
-usage.kick.player=Uso\: /{0} kick [player]
-usage.bank=Uso\: /{0} bank withdraw/deposit/status [amount]
-usage.fee=Uso\: /{0} fee check/set [amount]
-usage.purge=Uso\: /{0} purge [player]
-usage.0.modtag.tag=Uso\: /{0} modtag [tag]
-usage.list=Uso\: /{0} list [name/size/kdr/founded/active] [asc/desc]
-usage.lookup.tag=Uso\: /{0} lookup [tag]
-usage.0.profile.tag=Uso\: /{0} profile [tag]
-usage.0.promote.member=Uso\: /{0} promote <member>
-usage.0.rivalries=Uso\: /{0} rivalries
-usage.0.roster.tag=Uso\: /{0} roster [tag]
-usage.0.stats=Uso\: /{0} stats
-usage.0.trust.player=Uso\: /{0} trust [player]
-usage.0.untrust.player=Uso\: /{0} untrust [player]
-usage.0.verify.tag=Uso\: /{0} verify [tag]
-usage.0.vitals=Uso\: /{0} vitals
-usage.0.place=Uso\: /{0} place [player] [tag]
-usage.0.leaderboard=Uso\: /{0} leaderboard
-0.reload.1.reload.configuration=/{0} reload{1} - Reinicia la configuracion
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} globalff allow/auto {1} - Activa el daño entre amigos global
-0.place=/{0} place [player] [tag]{1} - Pon a un jugador en un clan
-0.ban.unban.player.1.ban.unban.a.player=/{0} ban/unban [player]{1} - Banea o desbanea a un jugador
-0.hometp.clan.1.tp.home.a.clan=/{0} home tp [clan]{1} - Teletransportate a la casa de un clan
-0.disband.tag.1.disband.a.clan=/{0} disband [tag]{1} - Disuelve un clan
-0.resetkdr.1.resets.kdr=/{0} resetkdr player/all{1} - Reinicia el KDR de todos los jugadores o de solo uno
-0.resetkdr.1.resets.your.kdr=/{0} resetkdr{1} - Reinicia tu KDR
-0.purge.player.1.purge.a.player=/{0} purge [player]{1} - Purga a un jugador
-0.verify.tag.1.verify.an.unverified.clan=/{0} verify [tag]{1} - Verifica un clan no verificado
-0.verify.1.purchase.verification.of.your.clan=/{0} verify{1} - Compra la verificacion de tu clan
-0.list.1.lists.all.clans=/{0} list [order by] [asc/desc]{1} - Lista todos los clanes - (ordenado por\: nombre/tamaño/kdr/fundado/activo)
-0.profile.1.view.your.clan.s.profile=/{0} profile{1} - Mira el perfil de tu clan
-0.profile.tag.1.view.a.clan.s.profile=/{0} profile [tag]{1} - Mira el perfil de un clan
-0.lookup.1.lookup.your.info=/{0} lookup{1} - Mira tu informacion
-0.lookup.player.1.lookup.a.player.s.info=/{0} lookup [player]{1} - Mira la informacion de un jugador
-0.leaderboard.1.view.leaderboard=/{0} leaderboard{1} - Mira el top de clanes
-0.alliances.1.view.all.clan.alliances=/{0} alliances{1} - Mira todas las alianzas de los clanes
-0.rivalries.1.view.all.clan.rivalries=/{0} rivalries{1} - Mira todas las rivaldiades de los clanes
-0.roster.1.view.your.clan.s.member.list=/{0} roster{1} - Mira la lista de miembros de tu clan
-0.roster.tag.1.view.a.clan.s.member.list=/{0} roster [tag]{1} - Mira la lista de miembros de un clan
-0.vitals.1.view.your.clan.member.s.vitals=/{0} vitals{1} - Mira los signos vitales de los miembros de tu clan
-0.coords.1.view.your.clan.member.s.coordinates=/{0} coords{1} - Mira las coordenadas de los miembros de tu clan
-0.stats.1.view.your.clan.member.s.stats=/{0} stats{1} - Mira las estadisticas de los miembros de tu clan
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} ally add/remove [tag]{1} - Agrega/quita un clan aliado
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rival add/remove [tag]{1} - Agrega/quita un clan rival
-0.bb.1.display.bulletin.board=/{0} bb{1} - Muestra el tablon de anuncios
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} bb [msg]{1} - Agrega un mensaje al tablon de anuncios
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modtag [tag]{1} - Modifica el tag del clan
-0.description.description.1.modify.the.clan.s.description=/{0} description [description]{1} - Modifica la descripcion del clan
-0.invite.player.1.invite.a.player=/{0} invite [player]{1} - Invita a un jugador
-0.kick.player.1.kick.a.player.from.the.clan=/{0} kick [player]{1} - Echa a un jugador del clan
-0.trust.untrust.player.1.set.trust.level1=/{0} trust [player]{1} - Pon a un miembro como confiable
-0.trust.untrust.player.1.set.trust.level2=/{0} untrust [player]{1} - Pon a un miembro como no confiable
-0.promote.member.1.promote.a.member.to.leader=/{0} promote [member]{1} - Promueve a un miembro a lider
-0.demote.leader.1.demote.a.leader.to.member=/{0} demote [leader]{1} - Degrada a un lider a miembro
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} clanff allow/block{1} - Maneja el fuego amigo del clan
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} ff allow/auto{1} - Maneja tu fuego amigo personal
-0.toggle.command=/{0} toggle [{2}]{1} - Maneja configuraciones personales
-0.resign.1.resign.from.the.clan=/{0} resign{1} - Abandona tu clan
-0.disband.1.disband.your.clan=/{0} disband{1} - Disuelve tu clan
-0.create.1.purchase.a.new.clan=/{0} create{1} - Compra un nuevo clan
-0.create.1.create.a.new.clan=/{0} create{1} - Crea un nuevo clan
-0.kills=/{0} kills{1} - Mira tu cantidad de asesinatos
-0.killsplayer=/{0} kills [player]{1} - Mira la cantidad de asesinatos de un jugador
-0.fee.check=/{0} fee check {1}- Revisa si la cuota esta habilitada y de cuanto es
-0.fee.set=/{0} fee set [amount]{1} - Pon la cuota de los miembros del clan
-0.mostkilled=/{0} mostkilled{1} - Mira la mayor cantidad de asesinatos del server
+acf-core.parameter.member=miembro
+acf-core.parameter.rank=rango
+acf-core.parameter.leader=líder
+acf-core.parameter.displayname=nombre de pantalla
+acf-core.parameter.permission=permiso
+acf-core.parameter.message=mensaje
+acf-core.parameter.tag=tag
+acf-core.parameter.fee=tarifa
+acf-core.parameter.description=descripción
+acf-core.parameter.player=jugador
+acf-core.parameter.clan=clan
+acf-core.parameter.type=tipo
+acf-core.parameter.order=orden
+acf-core.parameter.help=pagina o palabras clave
+command.description.stats=Muestra las estadisticas de los miembros de tu clan
+command.description.rivalries=Muestra todas las rivalidades del clan
+command.description.mostkilled=Muestra el top de asesinatos del server
+command.description.kills=Muestra la cantidad de asesinatos tuyas o de un jugador
+command.description.lookup=Muestra tu informacion
+command.description.lookup.other=Muestra informacion de un jugador
+command.description.leaderboard=Muestra la tabla de posiciones
+command.description.roster.other=Lista los miembros de otro clan
+command.description.roster=Lista los miembros de tu clan
+command.description.profile.other=Muestra el perfil de otro clan
+command.description.profile=Muestra el perfil de tu clan
+command.description.vitals=Muestra las vitalidades de tu clan y aliados
+command.description.list=Lista todos los clanes
+command.description.chat=Habla en el chat del clan
+command.description.ally=Habla en el chat de aliados 
+command.description.deny=Deniega una solicitud
+command.description.accept=Acepta una solicitud
+command.description.more=Muestra mas informacion
+command.description.create=Crea un clan
+command.description.ff.allow=Activa tu fuego amigo personal
+command.description.ff.auto=Establece tu fuego amigo personal en automatico
+command.description.globalff.allow=Activa el fuego amigo global
+command.description.globalff.auto=Establece el fuego amigo global en automatico
+command.description.clanff.allow=Activa el fuego amigo de tu clan
+command.description.clanff.block=Desactiva el fuego amigo de tu clan
+command.description.description=Establece la descripcion de tu clan
+command.description.ban=Banea a un jugador de usar comandos de clanes
+command.description.unban=Desbanea a un jugador de usar comandos de clanes
+command.description.regroup.me=Reagrupa los miembros de tu clan en tu ubicacion
+command.description.regroup.home=Reagrupa los miembros de tu clan en la casa del clan
+command.description.home.tp=Teletransporta a la casa de tu clan
+command.description.home.clear=Borra la casa de tu clan
+command.description.home.set=Establece la casa de tu clan
+command.description.mod.home.set=Establece la casa de un clan
+command.description.mod.home.tp=Teletransporta a la casa de un clan
+command.description.rival.remove=Remueve a un rival
+command.description.rival.add=Añade a un rival
+command.description.ally.remove=Remueve a un aliado
+command.description.kick=Expulsa a un miembro de tu clan
+command.description.bb.display=Muestra el tablero de anuncios
+command.description.bb.clear=Limpia el tablero de anuncios
+command.description.bb.post=Publica un mensaje en el tablero de anuncios de tu clan
+command.description.place=Coloca a un jugador en un clan
+command.description.reload=Recarga el plugin y su configuracion
+command.description.trust=Confia en un miembro
+command.description.untrust=Desconfia a un miembro
+command.description.resign=Abandona tu clan
+command.description.help=Muestra esta ayuda o busca en ayuda
+command.description.ally.add=Añade un aliado
+command.description.clan=Abre la interfaz grafica
+command.description.disband=Disuelve tu clan
+command.description.mod.disband=Disuelve un clan
+command.description.modtag=Modifica la etiqueta de un clan
+command.description.purge=Purga informacion de un jugador
+command.description.setbanner=Establece la bandera de tu clan
+command.description.verify=Verifica tu clan
+command.description.mod.verify=Verifica un clan
+command.description.invite=Invita a un jugador a tu clan
+command.description.fee.check=Muestra el valor de la tarifa de tu clan y si esta activada
+command.description.fee.set=Establece la tarifa de tu clan
+command.description.bank.status=Comprueba el balance bancario de tu clan
+command.description.bank.withdraw.all=Retira todo del banco de tu clan
+command.description.bank.withdraw.amount=Retira un monto del banco de tu clan
+command.description.bank.deposit.all=Deposita todo tu dinero en el banco de tu clan
+command.description.bank.deposit.amount=Deposita un monto de tu dinero en el banco de tu clan
+command.description.war.start=Empieza una guerra
+command.description.war.end=Termina una guerra
+command.description.resetkdr.everyone=Restablece el KDR de todos los jugadores
+command.description.resetkdr.player=Restablece el KDR de un jugador
+command.description.resetkdr=Restablece tu KDR
+command.description.admin.demote=Degrada algun lider de algun clan
+command.description.demote=Degrada un lider
+command.description.admin.promote=Promueve algun miembro de algun clan
+command.description.promote=Promueve un miembro a lider
+command.description.toggle.bb=Establece si el tablero de anuncios debe mostrarse al entrar al servidor
+command.description.toggle.tag=Establece si el tag de tu clan deberia mostrarse al lado de tu nombre
+command.description.toggle.deposit=Establece si los depositos de dinero estan permitidos en tu clan
+command.description.toggle.withdraw=Establece si los retiros de dinero estan permitidos en tu clan
+command.description.toggle.fee=Establece si la tarifa del clan esta activada
+command.description.alliances=Lista toda las alianzas de los clanes
+command.description.coords=Muestra las coordenadas de los miembros de tu clan
+command.description.rank.assign=Asigna un rango a un miembro
+command.description.rank.unassign=Desasigna a un miembro de un rango
+command.description.rank.create=Crea un rango
+command.description.rank.delete=Elimina un rango
+command.description.rank.list=Lista los rangos de tu clan
+command.description.rank.setdisplayname=Establece el nombre de pantalla de tu rango
+command.description.rank.permissions.available=Lista los permisos de rango disponibles
+command.description.rank.permissions.rank=Lista los permisos de un rango
+command.description.rank.permissions.add=Añade un permiso a un rango
+command.description.rank.permissions.remove=Quita un permiso de un rango
 home-menu=/{0} home{1} - Telertransportate a la casa del clan
 home-set-menu=/{0} home set{1} - Fija la casa del clan
 home-clear-menu=/{0} home clear{1} - Remueve la casa del clan
-home-regroup-menu=/{0} home regroup [me]{1} - Reagrupa a todos los miembros del clan en la casa o en tu ubicacion
-example.clan.modtag.4kfo.4l=Ejemplo\: /clan modtag &4K&fo&4L
 clan=Clan
 allies=Aliados
 alliances=alianzas
@@ -215,11 +268,10 @@ clan.players=Jugadores del clan\: {0}
 clans=Clanes\: {0}
 banned=Fuiste baneado de usar comandos de clanes
 nothing.more.to.see=Nada mas que ver
-nothing.to.deny=Nada que denegar
+nothing.to.vote=&cNada que aceptar o denegar
 no.leader.permissions=No tienes permisos de lider
 you.have.already.voted=Ya has votado
 has.voted.to.deny={0} ha votado denegar
-nothing.to.accept=Nada que aceptar
 view.next.page=Escribe /{0} para ver la pagina siguiente.
 voted.to.accept={0} ha votado aceptar
 bulletin.board.header={0}* {1}{2} tablon de anuncios
@@ -228,14 +280,13 @@ has.been.disbanded.alliance.ended={0} ha sido disuelto. La alianza ha finalizado
 clan.disbanded=Clan Disuelto
 1.color.day=1 {0}dia
 many.color.days={0}{1} dias
-does.not.match=No es un comando de clanes
-simpleclans.command.failure=SimpleClans command failure\: {0}
 insufficient.permissions=Permisos insuficientes
 clan.is.not.verified=El clan no esta verificado
+player.not.a.member.of.any.clan=&cEl jugador no es miembro de ningun clan
 not.a.member.of.any.clan=No eres un miembro de ningun clan
 minimum.to.make.alliance=Tu clan debe tener por lo menos {0} para hacer alianzas
-no.clan.matched=Ningun clan encontrado
-cannot.ally.with.an.unverified.clan=No puedes aliarte con un clan no verificado
+cannot.be.same.clan=&cDebes introducir un clan distinto al tuyo\!
+other.clan.not.verified=&cEl otro clan no esta verificado\!
 your.clans.are.not.allies=Sus clanes no son aliados
 has.broken.the.alliance={0} ha roto la alianza con {1}
 at.least.one.leader.accept.the.alliance=Por lo menos un lider del otro clan debe estar conectado para hacer la alianza
@@ -275,7 +326,6 @@ global.friendy.fire.is.now.managed.by.each.clan=Fuego amigo global es ahora mane
 global.friendy.fire.is.already.being.managed.by.each.clan=Fuego amigo global ya es manejado por cada clan
 global.friendly.fire.is.set.to.allowed=Fuego amigo global fue habilitado
 global.friendly.fire.is.already.being.allowed=Fuego amigo global ya esta habilitado
-no.player.matched=Ningun jugador encontrado
 the.player.doesn.t.not.have.the.permissions.to.join.clans=El jugador no tiene permiso de unirse a clanes
 you.cannot.invite.yourself=No puedes invitarte a vos mismo
 this.player.is.banned.from.using.clan.commands=Este jugador fue baneado de usar comandos de clanes
@@ -290,30 +340,20 @@ total.clans=Clanes Totales\:
 legend=Leyenda\:
 kill.type.civilian=Tipo de Asesinato\: {0}Civil
 no.player.data.found=No se encontro informacion de jugador
-kill.type.0=Tipo de Asesinato\: {0}
-s.player.info={0} informacion de jugador
 clan.0=Clan\: {0}
 status.0=Estatus\: {0}
 rank.0=Rango\: {0}
 kdr.0=KDR\: {0}
-deaths.0=Muertes\: {0}
-fee.0.value.1=Cuota\: {0}, {1} $
-join.date.0=Fecha de union\: {0}
-last.seen.0=Ultima vez visto\: {0}
-past.clans.0=Clanes anteriores\: {0}
 inactive.0=Inactivo\: {0}
-kill.totals=Asesinatos Totales\:
 clan.commands=comandos de clan
 you.can.only.modify.the.color.and.case.of.the.tag=Solo se puede modificar el color de la etiqueta
 tag.changed.to.0=Tag cambiado a {0}
 name.0=Nombre\: {0}
 description.0=Descripcion\: {0}
 leaders.0=Lideres\: {0}
-members.online.0=Miembros Online\: {0}
 allies.0=Aliados\: {0}
 rivals.0=Rivales\: {0}
-founded.0=Fundado\: {0}
-the.member.to.be.promoted.must.be.online=El miembro a ser promovido debe estar online
+other.player.must.be.online=&cEl jugador debe estar en linea\!
 the.player.does.not.have.the.permissions.to.lead.a.clan=El jugador no tiene permiso de ser lider de un clan
 you.cannot.promote.yourself=No puedes promoverte a ti mismo
 the.player.is.already.a.leader=El jugador ya es un lider
@@ -348,7 +388,6 @@ denied.war.req={0} denego la solicitud de guerra de {1}
 you.are.no.longer.at.war={0} no esta mas en guerra con {1}
 end.war.denied=Solicitud de terminar la guerra fue denegada por {0}
 denied.war.end={0} denego la solicitud de {1} de terminar con la guerra
-0.war=/{0} war{1} start/end [tag] - Empezar o terminar una guerra
 has.initiated.a.rivalry={0} ha iniciado una rivalidad con {1}
 start=start
 end=end
@@ -377,8 +416,6 @@ hunger=Hambre
 stone=piedra
 iron=hierro
 the.clan.cannot.be.rivaled=El clan no puede hacerse rival
-capeoff=Capa desactivada
-capeon=Capa activada
 bboff=Tabla de anuncios desactivada
 bbon=Tabla de anuncios activada
 tagoff=Tag desactivada
@@ -416,7 +453,6 @@ bb.clan.withdraw={0} $ fueron retirados
 player.clan.withdraw=Has retirado {0}
 clan.bank.not.enough.money=El banco de tu clan no tiene suficientes fondos
 your.clans.are.not.rivals=Sus clanes no son rivales
-you.cannot.rival.your.own.clan=No puedes ser rival de tu propio clan
 the.clan.members.reached.limit=La cantidad de miembros de tu clan llego al limite
 you.have.reseted.your.kdr=Has reseteado tu KDR
 you.have.reseted.0.kdr=Has reseteado el KDR de {0}
@@ -425,7 +461,6 @@ resign.yes=Yes
 resign.no=No
 resign.confirmation=Estas seguro que quieres abandonar el clan? {0}
 resign.success=Has abandonado el clan exitosamente
-player.is.not.a.leader.of.any.clan=El jugador no es lider de ningun clan
 you.cannot.demote.the.last.leader=No puedes degradar al ultimo lider
 player.successfully.demoted=El jugador fue degradado correctamente
 bb.ago= ago 
@@ -443,7 +478,6 @@ fee.disabled=disabled
 fee.set=La cuota fue puesta correctamente
 max.fee.allowed.is.0=La cuota maxima permitida es {0}
 fee.collected={0} $ fueron retirados por la cuota del clan
-invalid.fee=El valor insertado no es valido
 player.purged=El jugador fue purgado correctamente
 upkeep.collected={0} $ fueron retirados por el mantenimiento
 balance.is.not.enough.for.upkeep=Los fondos del clan no son suficientes para pagar el mantenimiento ({0} $), deposita el monto para evitar que se disuelva el clan
@@ -459,43 +493,19 @@ available.rank.permissions=Permisos habilitados para rangos\:
 rank.already.exists=El rango ya existe
 rank.0.does.not.exist=El rango {0} no existe
 rank.created=Rango creado
-invalid.permission={0} no es un permiso valido\! Usa uno de estos\: {1}
 permission.0.added.to.rank.1=Permiso {0} agregado al rango {1}
 permission.0.removed.from.rank.1=Permiso {0} removido del rango {1}
 rank.0.deleted=Rango {0} eliminado
-usage.0.rank.create=Uso\: /{0} rank create [name]
-usage.0.rank.create.noargs=Uso\: /{0} rank create
-usage.0.rank.setdisplayname=Uso\: /{0} rank setdisplayname [rank] [displayname], el nombre de muetra puede ser varias palabras y tener colores
-usage.0.rank.delete=Uso\: /{0} rank delete [rank]
-usage.0.rank.permissions=Uso\: /{0} rank permissions [rank] [add/remove] [permission]
-usage.0.rank.assign=Uso\: /{0} rank assign [player] [rank]
-usage.0.rank.unassign=Uso\: /{0} rank unassign [player]
-usage.0.rank=Uso\: /{0} rank [create/assign/unassign/delete/list/setdisplayname/permissions]
 clans.ranks=Rangos del Clan\:
 ranks.list.item={0}\# {1} ({2})
 no.ranks=Ningun rango fue creado
 rank.no.permissions=Este rango no tiene ningun permiso
 player.unassigned.from.rank=Jugador desasignado del rango
-rank.command=rank
-0.rank.create.1.create.rank=/{0} rank create{1} - Crea un rango
-0.rank.assign.player.rank.1.assign.rank.to.player=/{0} rank assign [player] [rank]{1} - Asigna a un miembro un rango
-0.rank.unassign.player.1.unassign.player.from.rank=/{0} rank unassign [player]{1} - Desasigna a un miembro de un rango
-0.rank.delete.rank.1.delete.rank=/{0} rank delete [rank]{1} - Elimina un rango
-0.rank.list.1.list.ranks=/{0} rank list{1} - Lista todos los rangos
-0.rank.setdisplayname.rank.displayname.1.set.rank.displayname=/{0} rank setdisplayname [rank] [displayname]{1} - Pon el nombre de muestra de un rango
-0.rank.permissions.1.list.available.permissions=/{0} rank permissions{1} - Lista los permisos disponibles
-0.rank.permissions.rank.1.list.rank.permissions=/{0} rank permissions [rank]{1} - Lista los permisos de un rango
-0.rank.permissions.rank.add.permission.1.add.a.permission.to.rank=/{0} rank permissions [rank] add [permission]{1} - Agrega un permiso a un rango
-0.rank.permissions.rank.remove.permission.1.remove.a.permission.from.rank=/{0} rank permissions [rank] remove [permission]{1} - Quita el permiso de un rango
 you.must.be.0.or.have.the.permission.1.to.use.this=Debes ser {0} o tu lider debe darle a tu rango el permiso {1} para usar esto
-deposit.not.allowed=Deposito no permitido
-withdraw.not.allowed=Retiro no permitido
+deposit.not.allowed=Depositos desactivados, usa /%clan %toggle %deposit para activarlo
+withdraw.not.allowed=Retiros desactivados, usa /%clan %toggle %withdraw para activarlo
 resign.request.cancelled=Solicitud para abandonar el clan cancelada.
 promotion.vote.has.been.requested.from.all.leaders=Votacion para promover ha sido solicitada a todos los lideres
-0.message.1.send.a.message.to.clan.chat=/{0} [message]{1} - Envia un mensaje al chat de tu clan
-0.join.leave.3.join.leave.the.clan.chat=/{0} {1}/{2}{3} - Entrar/Salir del chat de tú clan
-0.message.1.send.a.message.to.ally.chat=/{0} [message]{1} - Enviar un mensaje al chat de la alianza
-0.join.leave.3.join.leave.the.ally.chat=/{0} {1}/{2}{3} - Entrar/salir del chat de la alianza
 allowed=permitido
 blocked=bloqueado
 chat.joined=se ha unido
@@ -505,7 +515,7 @@ gui.back.title=&fAtras
 gui.previous.page.title=&fPágina anterior
 gui.next.page.title=&fPagina siguiente
 gui.lore.no.permission=&cNo tienes permiso para ver esto\!
-gui.main.title=SimpleClans
+gui.main.title={0} - menu del clan
 gui.main.languageselector.title=&fElige tu idioma
 gui.main.languageselector.lore.left.click=&7Clic izquierdo para seleccionar tu idioma
 gui.main.languageselector.lore.right.click=&7Clic derecho para ayudar traduciendo
@@ -597,7 +607,9 @@ gui.clandetails.clan.lore.kdr=&7KDR\: &b{0}
 gui.clandetails.clan.lore.kill.totals=&7Asesinatos Totales\: &b[Rivales\:{0} Neutrales\:{1} Civiles\:{2}]
 gui.clandetails.clan.lore.deaths=&7Muertes\: &b{0}
 gui.clandetails.clan.lore.fee=&7Cuota\: &b{0}, {1} $
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.allies.separator=&b, 
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.rivals.separator=&b, 
 gui.clandetails.clan.lore.allies=&7Aliados\: &b{0}
 gui.clandetails.clan.lore.rivals=&7Rivales\: &b{0}
@@ -671,6 +683,7 @@ gui.playerdetails.player.lore.kill.totals=&7Asesinatos Totales\: &b[Rivales\:{0}
 gui.playerdetails.player.lore.deaths=&7Muertes\: &b{0}
 gui.playerdetails.player.lore.join.date=&7Fecha de ingreso\: &b{0}
 gui.playerdetails.player.lore.last.seen=&7Visto por ultima vez\: &b{0}
+# suppress inspection "TrailingSpacesInProperty"
 gui.playerdetails.player.lore.past.clans.separator=&b, 
 gui.playerdetails.player.lore.past.clans=&7Clanes anteriores\: &b{0}
 gui.playerdetails.player.lore.inactive=&7Inactivo\: &b{0}/{1} dias
@@ -703,14 +716,10 @@ gui.confirmation.return=&7Haz clic aqui para regresar
 gui.not.supported=&cHa ocurrido un error al abrir la GUI\! Desactivandola... ¿Descargaste la version correcta?
 staff.member.verify.clan=&cUn miembro del staff debe verificar tu clan\!
 player.already.has.that.rank=&cEl jugador ya tiene ese rango\!
-enabled.clan.chat=&bHas activado el chat del clan
-disabled.clan.chat=&bHas desactivado el chat del clan
 joined.clan.chat=&bTe has unido al chat del clan
 left.clan.chat=&bHas dejado el chat del clan
 muted.clan.chat=&bHas silenciado el chat del clan
 unmuted.clan.chat=&bHas des-silenciado el chat del clan
-enabled.ally.chat=&bHas activado el chat de aliados
-disabled.ally.chat=&bHas desactivado el chat de aliados
 joined.ally.chat=&bTe has unido al chat de aliados
 left.ally.chat=&bHas dejado el chat de aliados
 muted.ally.chat=&bHas silenciado el chat de aliados
@@ -724,4 +733,20 @@ insert.rank.name=&bPon el nombre del rango\:
 click.to.help.translating=&bHaz clic en este link para ayudar a traducir\:\n&r{0}
 your.clan.must.have.members.to.verify=&cTu clan debe tener al menos {0} miembros para ser verificado\!
 you.must.hold.a.banner=&cDebes tener un estandarte en tu mano\!
-you.changed.clan.banner=&bHas cambiado el estandarte de tu clan\!
+you.changed.clan.banner=&bHas cambiado el estandarte de tu clan\!
+your.clan.already.verified=&cTu clan ya esta verificado\!
+# suppress inspection "TrailingSpacesInProperty"
+clan.profile=\n&7Perfil de &b%clan_name%&8-------------------------------------------\n \n  &7Nombre\: &e[&8%clan_color_tag%&e] &b%clan_name%\n  &7Descripcion\: &f%clan_description%\n  &7Estatus\: &f%clan_verified%\n  &7Lideres\: %clan_leaders%\n  &7Miembros en Linea\: &f%clan_online_count%&7/&f%clan_size%\n  &7KDR\: &e%clan_kdr%\n  &7Asesinatos Totales\: &8[Rivales\:&f%clan_rival_kills% &8Neutrales\:&f%clan_neutral_kills% &8Civiles\:&f%clan_civilian_kills%&8]\n  &7Muertes\: &f%clan_deaths%\n  &7Tarifa\: &f%clan_fee_enabled%&7, &f%clan_fee_value% $\n  &7Aliados\: &f%clan_allies%\n  &7Rivales\: &f%clan_rivals%\n  &7Fundado\: &f%clan_founded%\n  &7Inactivo\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dias\n  
+player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name%
+# suppress inspection "TrailingSpacesInProperty"
+player.lookup.killtype=&7Tipo de Asesinato\: %player_kill_type%\n  
+player.lookup=\n&Informacion de jugador &b%player_name% &8-------------------------------------------\n \n  &7Clan\: &f%clan_name%\n  &7Rango\: &f%player_rank%\n  &7Estatus\: &f%player_status%\n  &7KDR\: &e%player_kdr%\n  &7Asesinatos Totales\: &8[Rivales\:&f%player_rival_kills% &8Neutrales\:&f%player_neutral_kills% &8Civiles\:&f%player_civilian_kills%&8]\n  &7Muertes\: &f%player_deaths%\n  &7Fecha de Ingreso\: &f%player_join_date%\n  &7Visto por Ultima Vez\: &f%player_last_seen%\n  &7Clanes Anteriores\: &f%player_past_clans%\n  &7Inactivo\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dias\n  %kill_type_line%
+economy.disabled=&cEconomia desactivada\!
+has.been.purged=La informacion de {0} fue purgada
+accepted.invitation=&bHas aceptado la invitacion de {0}
+denied.invitation=&cHas denegado la invitacion de {0}
+must.be.in.clan.to.pvp=&cTu y {0} deben ser miembros de un clan para hacer PvP\!
+clans.not.at.war.pvp.denied=&cTu clan no esta en guerra con {0}\!
+cannot.attack.civilians=&cNo puedes atacar civiles\!
+cannot.attack.clan.member=&cNo puedes atacar miembros de tu clan\!
+cannot.attack.ally=&cNo puedes atacar a un aliado\!

src/main/resources/messages_fr_FR.properties

@@ -1,7 +1,16 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=description
 create.command=créer
+delete.command=supprimer
+rank.command=rang
+setdisplayname.command=setdisplayname
+permissions.command=permissions
 list.command=liste
+list.order.desc=desc
+list.type.name=nome
+list.type.kdr=kda
+list.type.size=taille
+list.type.founded=fondé
+list.type.active=actif
 profile.command=profile
 roster.command=membres
 lookup.command=recherche
@@ -12,17 +21,33 @@ vitals.command=vitaux
 coords.command=coordonnées
 stats.command=statistiques
 ally.command=allie
+add.command=ajouter
+remove.command=retirer
+allow.command=autoriser
+block.command=bloquer
+auto.command=automatique
+check.command=vérifier
+assign.command=assigner
+unassign.command=enlever
 rival.command=rival
 bb.command=bb
+clear.command=effacer
 modtag.command=modtag
 toggle.command=basculer
+tag.command=tag
+deposit.command=dépôt
+all.command=tout
+withdraw.command=retirer
 invite.command=inviter
 kick.command=expulser
 bank.command=banque
+status.command=statut
 fee.command=frais
+set.command=définir
 purge.command=purge
 trust.command=confiance
 untrust.command=méfiance
+admin.command=admin
 promote.command=promouvoir
 demote.command=rétrograder
 clanff.command=clanff
@@ -37,95 +62,84 @@ globalff.command=globalff
 kills.command=tue
 mostkilled.command=plustué
 war.command=guerre
+start.command=commencer
+end.command=finir
 home.command=domicile
+regroup.command=regrouper
+me.command=moi
+tp.command=tp
 setrank.command=définitlerang
 place.command=place
 resetkdr.command=réinitialisationkdr
+everyone.command=tout le monde
+setbanner.command=définir la bannière
 help.command=aide
-usage.description=Utilisation\: /{0} description [description]
-usage.resetkdr=Utilisation\: /{0} resetkdr [all/player]
-usage.clan.alliances=Utilisation\: /{0} alliances
-usage.ally=Utilisation\: /{0} ally add/remove [tag]
-usage.ban.unban=Utilisation\: /{0} ban/unban [player]
-usage.rival=Utilisation\: /{0} rival add/remove [tag]
-usage.war=Utilisation\: /{0} war start/end [tag]
-usage.clanff=Utilisation\: /{0} clanff allow/block
-usage.0.coords=Utilisation\: /{0} coords
-usage.demote.leader=Utilisation\: /{0} demote [leader]
-usage.0.disband=Utilisation\: /{0} disband
-usage.0.ff.allow.auto=Utilisation\: /{0} ff allow/auto
-usage.0.globalff.allow.auto=Utilisation\: /{0} globalff allow/auto
-usage.0.permissions.player=Utilisation\: /{0} permissions [clan] add/remove [permission]
-usage.0.invite.player=Utilisation\: /{0} invite [player]
-usage.kick.player=Utilisation\: /{0} kick [player]
-usage.bank=Utilisation\: /{0} bank withdraw/deposit/status [amount]
-usage.fee=Utilisation\: /{0} fee check/set [amount]
-usage.purge=Utilisation \: /{0} purge [player]
-usage.0.modtag.tag=Utilisation\: /{0} modtag [tag]
-usage.list=Utilisation\: /{0} list [name/size/kdr/founded/active] [asc/desc]
-usage.lookup.tag=Utilisation\: /{0} lookup [tag]
-usage.0.profile.tag=Utilisation\: /{0} profile [tag]
-usage.0.promote.member=Utilisation\: /{0} promote <member>
-usage.0.rivalries=Utilisation\: /{0} rivalries
-usage.0.roster.tag=Utilisation\: /{0} roster [tag]
-usage.0.stats=Utilisation\: /{0} stats
-usage.0.trust.player=Utilisation\: /{0} trust [player]
-usage.0.untrust.player=Utilisation\: /{0} untrust [player]
-usage.0.verify.tag=Utilisation\: /{0} verify [tag]
-usage.0.vitals=Utilisation\: /{0} vitals
-usage.0.place=Utilisation\: /{0} place [player] [tag]
-usage.0.leaderboard=Utilisation\: /{0} leaderboard
-0.reload.1.reload.configuration=/{0} reload{1} - Recharge la configuration
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} globalff allow/auto {1} - Définit le feu allié mondialement
-0.place=/{0} place [player] [tag]{1} - Place un joueur dans un clan
-0.ban.unban.player.1.ban.unban.a.player=/{0} ban/unban [player]{1} - Banni/débanni un joueur
-0.hometp.clan.1.tp.home.a.clan=/{0} home tp [clan]{1} - Téléporte à toutes les bases de clans
-0.disband.tag.1.disband.a.clan=/{0} disband [tag]{1} - Dissoudre un clan
-0.resetkdr.1.resets.kdr=/{0} resetkdr player/all{1} - Réinitialise la KDR pour tous les joueurs ou juste l''un d''entre eux
-0.resetkdr.1.resets.your.kdr=/{0} resetkdr{1} - Réinitialise votre KDR
-0.purge.player.1.purge.a.player=/{0} purge [player]{1} - Purge un joueur
-0.verify.tag.1.verify.an.unverified.clan=/{0} verify [tag]{1} - Vérifier un clan non vérifié
-0.verify.1.purchase.verification.of.your.clan=/{0} verify {1} - Acheter la vérification de votre clan
-0.list.1.lists.all.clans=/{0} list [order by] [asc/desc]{1} - Liste tous les clans - (Par ordre\: nom/taille/kdr/fondé/actif)
-0.profile.1.view.your.clan.s.profile=/{0} profile{1} - Voir le profile de votre clan
-0.profile.tag.1.view.a.clan.s.profile=/{0} profile [tag]{1} - Voir le profile d''un clan
-0.lookup.1.lookup.your.info=/{0} lookup{1} - Rechercher vos informations
-0.lookup.player.1.lookup.a.player.s.info=/{0} lookup [player]{1} - Rechercher les informations d''un joueur
-0.leaderboard.1.view.leaderboard=/{0} leaderboard{1} - Voir le classement
-0.alliances.1.view.all.clan.alliances=/{0} alliances{1} - Voir toutes les alliances de clan
-0.rivalries.1.view.all.clan.rivalries=/{0} rivalries{1} - Voir toutes les rivalités du clan
-0.roster.1.view.your.clan.s.member.list=/{0} roster{1} - Voir la liste des membres de votre clan
-0.roster.tag.1.view.a.clan.s.member.list=/{0} roster [tag]{1} - Voir une liste de membres d''un clan
-0.vitals.1.view.your.clan.member.s.vitals=/{0} vitals{1} - Voir les signes vitaux d''un membre du clan
-0.coords.1.view.your.clan.member.s.coordinates=/{0} coords{1} - Voir les coordonnées d''un membre de votre clan
-0.stats.1.view.your.clan.member.s.stats=/{0} stats{1} - Voir les statistiques d''un membre de votre clan
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} ally add/remove [tag]{1} - Ajouter/supprimer un clan allié
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rival add/remove [tag]{1} - Ajouter/supprimer un clan rival
-0.bb.1.display.bulletin.board=/{0} bb{1} - Afficher le tableau d''affichage
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} bb [msg]{1} - Ajouter un message au tableau d''affichage
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modtag [tag]{1} - Modifier le tag du clan
-0.description.description.1.modify.the.clan.s.description=/{0} description [description]{1} - Modifier la description du clan
-0.invite.player.1.invite.a.player=/{0} invite [player]{1} - Inviter un joueur
-0.kick.player.1.kick.a.player.from.the.clan=/{0} kick [player]{1} - Expulser un joueur du clan
-0.trust.untrust.player.1.set.trust.level1=/{0} trust [player]{1} - Définir le membre comme étant de confiance
-0.trust.untrust.player.1.set.trust.level2=/{0} untrust [player]{1} - Définir le membre comme n''étant pas de confiance
-0.promote.member.1.promote.a.member.to.leader=/{0} promote [member]{1} - Promouvoir un joueur en chef
-0.demote.leader.1.demote.a.leader.to.member=/{0} demote [leader]{1} - Rétrograder un chef en membre
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} clanff allow/block{1} - Définir le feu allié du clan
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} clanff allow/block{1} - Définir le feu allié personnel
-0.toggle.command=/{0} toggle [{2}]{1} - Définir les paramètres personnels
-0.resign.1.resign.from.the.clan=/{0} resign{1} - Démissionner d''un clan
-0.disband.1.disband.your.clan=/{0} disband {1} - Dissoudre votre clan
-0.kills=/{0} kills{1} - Voir votre nombre de tués
-0.killsplayer=/{0} kills [player]{1} - Voir le nombre de tués d''un joueur
-0.fee.check=/{0} fee check {1}- Vérifier que les frais soient activés et de combien sont-ils
-0.fee.set=/{0} fee set [amount]{1} - Définit la cotisation du membre du clan
-0.mostkilled=/{0} mostkilled{1} - Voir les plus tués du serveur
+acf-core.parameter.member=membre
+acf-core.parameter.rank=rang
+acf-core.parameter.leader=chef
+acf-core.parameter.displayname=Nom affiché
+acf-core.parameter.permission=autorisation
+acf-core.parameter.message=message
+acf-core.parameter.tag=tag
+acf-core.parameter.description=description
+acf-core.parameter.player=joueur
+acf-core.parameter.clan=clan
+acf-core.parameter.help=page ou mots-clés
+command.description.list=Liste de tous les clans
+command.description.ally=Parle dans le chat des alliés 
+command.description.deny=Refuser une demande
+command.description.accept=Accepter une demande
+command.description.more=Voir plus d'infos
+command.description.create=Créer un clan
+command.description.ff.allow=Défini vos dégats aux autres joueurs sur désactivé
+command.description.ff.auto=Défini vos dégats aux autres joueurs sur automatique
+command.description.globalff.allow=Défini le combat allié du serveur sur activé
+command.description.globalff.auto=Défini le combat allié du serveur sur automatique
+command.description.clanff.allow=Défini le combat allié de votre clan sur activé
+command.description.clanff.block=Défini le combat allié de votre clan sur bloqué
+command.description.description=Défini votre description de clan
+command.description.ban=Banni un joueur des commandes du clan
+command.description.unban=Débanni un joueur des commandes du clan
+command.description.regroup.me=Regroupe les membres de votre clan à votre emplacement
+command.description.regroup.home=Regroupe les membres de votre clan à votre home de clan
+command.description.home.tp=Téléporte vers votre home de clan
+command.description.home.clear=Efface votre home de clan
+command.description.home.set=Défini votre home de clan
+command.description.mod.home.set=Défini un home de clan
+command.description.mod.home.tp=Téléporte à un home de clan
+command.description.rival.remove=Retire un rival
+command.description.rival.add=Ajoute un rival
+command.description.ally.remove=Retire un allié
+command.description.kick=Expulse un membre de votre clan
+command.description.place=Place un joueur dans un clan
+command.description.reload=Recharge le plugin et sa configuration
+command.description.trust=Fait confiance à un membre
+command.description.untrust=Ne fait plus confiance à un membre
+command.description.ally.add=Ajoute un allié
+command.description.clan=Ouvre l'interface
+command.description.disband=Dissoudre votre clan
+command.description.mod.disband=Dissoudre un clan
+command.description.modtag=Modifie votre tag de clan
+command.description.purge=Purge certainnes données du joueur
+command.description.setbanner=Défini votre bannière de clan
+command.description.verify=Vérifie ton clan
+command.description.mod.verify=Vérifie un clan
+command.description.invite=Invite un joueur dans votre clan
+command.description.bank.status=Vérifie la balance bancaire de votre clan
+command.description.bank.withdraw.all=Retirer tout de la banque de votre clan
+command.description.bank.withdraw.amount=Retirer un montant de la banque de votre clan
+command.description.bank.deposit.all=Déposez tout votre argent dans la banque de votre clan
+command.description.bank.deposit.amount=Déposez une somme d'argent dans la banque de votre clan
+command.description.war.start=Commence une guerre
+command.description.war.end=Termine une guerre
+command.description.resetkdr.everyone=Réinitialise la KDA de tout le monde
+command.description.resetkdr.player=Réinitialise la KDA d'un joueur
+command.description.resetkdr=Réinitialise ton KDA
+command.description.admin.demote=Rétrograder n'importe quel chef de n'importe quel clan
+command.description.demote=Rétrograde un chef
 home-menu=/{0} home{1} - Téléporte au domicile du clan
 home-set-menu=/{0} home set{1} - Définir le domicile du clan
 home-clear-menu=/{0} home set{1} - Effacer le domicile du clan
-home-regroup-menu=/{0} home regroup [me]{1} - Regroupe tous les membres au domicile du clan ou à vous
-example.clan.modtag.4kfo.4l=Exemple\: /clan modtag &4K&fo&4L
 clan=Clan
 allies=Alliés
 alliances=alliances
@@ -211,11 +225,9 @@ clan.players=Joueurs du Clan\: {0}
 clans=Clans\: {0}
 banned=Vous êtes banni des commandes de clan
 nothing.more.to.see=Rien de plus à voir
-nothing.to.deny=Rien à refuser
 no.leader.permissions=Vous n'avez pas les permissions de chef
 you.have.already.voted=Vous avez déjà voté
 has.voted.to.deny={0} a voté pour refuser
-nothing.to.accept=Rien à accepter
 view.next.page=Tapez /{0} pour voir la page suivante.
 voted.to.accept={0} a voté pour accepter
 bulletin.board.header={0}* {1}{2} tableau d’affichage
@@ -224,14 +236,10 @@ has.been.disbanded.alliance.ended={0} a été dissous. L''alliance est terminée
 clan.disbanded=Clan Dissous
 1.color.day=1 {0}jour
 many.color.days={0}{1} jours
-does.not.match=Ne correspond pas à une commande de clan
-simpleclans.command.failure=Échec de la commande SimpleClans\: {0}
 insufficient.permissions=Permissions insuffisantes
 clan.is.not.verified=Le clan n'est pas vérifié
 not.a.member.of.any.clan=Vous n'êtes membre d'aucun clan
 minimum.to.make.alliance=Votre clan doit avoir au moins {0} joueurs pour faire des alliances
-no.clan.matched=Aucun clan correspondant
-cannot.ally.with.an.unverified.clan=Vous ne pouvez pas vous allier avec un clan non vérifié
 your.clans.are.not.allies=Vos clans ne sont pas alliés
 has.broken.the.alliance={0} a rompu l''alliance avec {1}
 at.least.one.leader.accept.the.alliance=Au moins un chef de l'alliance doit être en ligne pour accepter l'alliance
@@ -271,7 +279,6 @@ global.friendy.fire.is.now.managed.by.each.clan=Le feu d'allié est maintenant g
 global.friendy.fire.is.already.being.managed.by.each.clan=Le feu d'allié est déjà géré par chaque clan
 global.friendly.fire.is.set.to.allowed=Le feu d'allié global est configuré sur autorisé
 global.friendly.fire.is.already.being.allowed=Le feu d'allié global est déjà configuré sur autorisé
-no.player.matched=Aucun joueur correspondant
 the.player.doesn.t.not.have.the.permissions.to.join.clans=Le joueur n'a pas les permissions pour rejoindre les clans
 you.cannot.invite.yourself=Vous ne pouvez pas vous invitez vous-même
 this.player.is.banned.from.using.clan.commands=Ce joueur n'est pas autorisé à utiliser les commandes du clan
@@ -286,30 +293,19 @@ total.clans=Total des clans\:
 legend=Légende\:
 kill.type.civilian=Type de Tué\: {0}Civil
 no.player.data.found=Pas de données de joueur trouvées
-kill.type.0=Type de Tué\: {0}
-s.player.info=Information du joueur {0}
 clan.0=Clan\: {0}
 status.0=Statuts\: {0}
 rank.0=Rang\: {0}
 kdr.0=KDR\: {0}
-deaths.0=Morts\: {0}
-fee.0.value.1=Frais\: {0}, {1} $
-join.date.0=Date d''inscription\: {0}
-last.seen.0=Vu pour la dernière fois\: {0}
-past.clans.0=Clans Précédents\: {0}
 inactive.0=Inactif\: {0}
-kill.totals=Total des tués\:
 clan.commands=commandes de clan
 you.can.only.modify.the.color.and.case.of.the.tag=Vous ne pouvez seulement modifier la couleur et le tag
 tag.changed.to.0=Tag changé à {0}
 name.0=Nom\: {0}
 description.0=Description\: {0}
 leaders.0=Chefs\: {0}
-members.online.0=Membres En Ligne\: {0}
 allies.0=Alliés\: {0}
 rivals.0=Rivaux\: {0}
-founded.0=Fondé\: {0}
-the.member.to.be.promoted.must.be.online=Le membre à promouvoir doit être en ligne
 the.player.does.not.have.the.permissions.to.lead.a.clan=Le joueur n'a pas la permission de diriger un clan
 you.cannot.promote.yourself=Vous ne pouvez pas vous promouvoir vous-même
 the.player.is.already.a.leader=Le joueur est déjà un chef
@@ -344,7 +340,6 @@ denied.war.req={0} a refusé la demande de guerre envoyée par {1}
 you.are.no.longer.at.war={0} n’est plus en guerre avec {1}
 end.war.denied=La demande pour mettre fin à la guerre a été refusée par {0}
 denied.war.end={0} a refusé la demande de {1} pour mettre fin à la guerre
-0.war=/{0} war{1} start/end [tag] - Démarrer ou terminer une guerre
 has.initiated.a.rivalry={0} a initié une rivalité avec {1}
 start=début
 end=fin
@@ -373,8 +368,6 @@ hunger=Faim
 stone=pierre
 iron=fer
 the.clan.cannot.be.rivaled=Le clan ne peut pas être rivalisé
-capeoff=Cape désactivée
-capeon=Cape activée
 bboff=BB désactivé
 bbon=BB activé
 tagoff=Tag désavtivé
@@ -412,7 +405,6 @@ bb.clan.withdraw={0} $ ont été retirés
 player.clan.withdraw=Vous retirez {0}
 clan.bank.not.enough.money=Votre banque de clans n'a pas assez d'argent
 your.clans.are.not.rivals=Vos clans ne sont pas rivaux
-you.cannot.rival.your.own.clan=Vous ne pouvez pas rivaliser avec votre propre clan
 the.clan.members.reached.limit=La limite des membres de votre clan a été atteinte
 you.have.reseted.your.kdr=Vous avez réinitialisé votre KDR
 you.have.reseted.0.kdr=Vous avez réinitialisé la KDR de {0}
@@ -421,7 +413,6 @@ resign.yes=Oui
 resign.no=Non
 resign.confirmation=Êtes-vous sûr de vouloir démissionner ? {0}
 resign.success=Vous avez démissionné de votre clan avec succès
-player.is.not.a.leader.of.any.clan=Le joueur n'est un chef d'aucun clan
 you.cannot.demote.the.last.leader=Vous ne pouvez pas rétrograder le dernier chef
 player.successfully.demoted=Le lecteur a été rétrogradé avec succès
 bb.ago= il y a 
@@ -439,7 +430,6 @@ fee.disabled=désactivé
 fee.set=Les frais ont été définis avec succès
 max.fee.allowed.is.0=Les frais maximaux autorisés sont de {0}
 fee.collected={0} $ ont été retirés pour les frais de clan
-invalid.fee=La valeur que vous avez insérée n'est pas valide
 player.purged=Le joueur a bien été purgé
 upkeep.collected={0} $ ont été retirés pour l''entretien
 balance.is.not.enough.for.upkeep=Le solde du clan n''est pas suffisant pour payer l''entretien ({0} $), déposez le montant pour éviter d''être dissous
@@ -455,41 +445,17 @@ available.rank.permissions=Permissions disponibles pour les rangs\:
 rank.already.exists=Le rang existe déjà
 rank.0.does.not.exist=Le rang {0} n''existe pas
 rank.created=Rang créé
-invalid.permission={0} n''est pas une permission valide \! Utilisez une de celles-ci\: {1}
 permission.0.added.to.rank.1=Permission {0} ajoutée au rang {1}
 permission.0.removed.from.rank.1=Permission {0} supprimée du rang {1}
 rank.0.deleted=Rang {0} supprimé
-usage.0.rank.create=Utilisation\: /{0} rank create [name]
-usage.0.rank.setdisplayname=Utilisation\: /{0} rank setdisplayname [rank] [displayname], les noms d''affichages peuvent contenir plusieurs morts et contenir plusieurs codes couleur
-usage.0.rank.delete=Utilisation\: /{0} rank delete [rank]
-usage.0.rank.permissions=Utilisation\: /{0} rank permissions [rank] [add/remove] [permission]
-usage.0.rank.assign=Utilisation\: /{0} rank assign [player] [rank]
-usage.0.rank.unassign=Utilisation\: /{0} rank unassign [player]
-usage.0.rank=Utilisation\: /{0} rank [create/assign/unassign/delete/list/setdisplayname/permissions]
 clans.ranks=Rangs du clan\:
 ranks.list.item={0}\# {1} ({2})
 no.ranks=Aucun rang n'a été créé
 rank.no.permissions=Ce rang n'a aucune permission
 player.unassigned.from.rank=Joueur retiré d'un rang
-rank.command=rang
-0.rank.assign.player.rank.1.assign.rank.to.player=/{0} rank assign [player] [rank]{1} - Assigner un rang à un membre
-0.rank.unassign.player.1.unassign.player.from.rank=/{0} rank unassign [player]{1} - Retire un rang à un membre
-0.rank.delete.rank.1.delete.rank=/{0} rank delete [rank]{1} - Supprimer un rang
-0.rank.list.1.list.ranks=/{0} rank list{1} - Liste des rangs
-0.rank.setdisplayname.rank.displayname.1.set.rank.displayname=/{0} rank setdisplayname [rank] [displayname]{1} - Définir le nom d''affichage du rang
-0.rank.permissions.1.list.available.permissions=/{0} rank permissions{1} - Liste les permissions disponibles
-0.rank.permissions.rank.1.list.rank.permissions=/{0} rank permissions [rank]{1} - Listes les permissions d''un rang
-0.rank.permissions.rank.add.permission.1.add.a.permission.to.rank=/{0} rank permissions [rank] add [permission]{1} - Ajoute une permission à un rang
-0.rank.permissions.rank.remove.permission.1.remove.a.permission.from.rank=/{0} rank permissions [rank] remove [permission]{1} - Retire une permission d''un rang
 you.must.be.0.or.have.the.permission.1.to.use.this=Vous devez être {0} ou votre chef doit donner à votre rang la permission {1} pour utiliser ceci
-deposit.not.allowed=Le dépôt n'est pas autorisé
-withdraw.not.allowed=Le retrait n'est pas autorisé
 resign.request.cancelled=Demande de démission annulée
 promotion.vote.has.been.requested.from.all.leaders=Le vote de promotion a été demandé par tous les chefs
-0.message.1.send.a.message.to.clan.chat=/{0} [message]{1} - Envoier un message dans le chat de votre clan
-0.join.leave.3.join.leave.the.clan.chat=/{0} {1}/{2}{3} - Rejoindre/quitter le chat de votre clan
-0.message.1.send.a.message.to.ally.chat=/{0} [message]{1} - Envoyer un message au chat allié
-0.join.leave.3.join.leave.the.ally.chat=/{0} {1}/{2}{3} - Rejoindre/quitter le chat allié
 allowed=autorisé
 blocked=bloqué
 chat.joined=rejoint
@@ -499,7 +465,6 @@ gui.back.title=&fRetour
 gui.previous.page.title=&fPage Précédente
 gui.next.page.title=&fPage Suivante
 gui.lore.no.permission=Vous n'avez pas la permission pour effectuer cela\!
-gui.main.title=SimpleClans
 gui.main.other.commands.title=&fAutres commandes
 gui.main.other.commands.lore=&7Clic gauche pour voir toutes les commandes du clan
 gui.main.clan.list.title=&fListe des Clans
@@ -562,6 +527,8 @@ gui.add.permission.permission.title=&f{0}
 gui.add.permission.permission.lore=&7Clic gauche pour ajouter cette permission au rang
 gui.clandetails.title=[{0}] {1}
 gui.clandetails.free.agent.title=&Agent Libre
+gui.clandetails.free.agent.create.clan.price.lore=&7Prix\: &b{0}
+gui.clandetails.free.agent.create.clan.lore=&7Clic gauche pour créer un clan
 gui.clandetails.clan.title=&f[{0}&f] {1}
 gui.clandetails.clan.lore.description=&Description\: {0}
 gui.clandetails.clan.lore.status=&fStatus\: {0}
@@ -571,27 +538,62 @@ gui.clandetails.clan.lore.kdr=&fKDR\: {0}
 gui.clandetails.clan.lore.kill.totals=&fNombre de meurtres\: [Rival\:{0} Neutre\:{1} Civile\:{2}]
 gui.clandetails.clan.lore.deaths=&fMorts\: {0}
 gui.clandetails.clan.lore.fee=&Frais\: {0}, {1} $
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.allies.separator=&b, 
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.rivals.separator=&b, 
 gui.clandetails.clan.lore.allies=&Alliés\: {0}
+gui.clandetails.clan.lore.rivals=&7Rivaux\: &b{0}
+gui.clandetails.clan.lore.founded=&7Fondé le\: &b{0}
+gui.clandetails.clan.lore.inactive=&7Inactif\: &b{0}/{1} jours
 gui.clandetails.allies.title=&fAlliés
 gui.clandetails.allies.lore=&fClic gauche pour voir vos alliés ou en ajouter plus
 gui.clandetails.rivals.title=&fRivaux
 gui.clandetails.rivals.lore=&fClic gauche pour voir vos rivaux ou en ajouter plus
 gui.clandetails.roster.title=&fListe
 gui.clandetails.roster.lore=&fClic gauche pour voir les membres de votre clan ou inviter plus
+gui.staffclandetails.roster.lore=&7Clic gauche pour voir les membres du clan
 gui.clandetails.coords.title=&fCoordonnées
 gui.clandetails.coords.lore=&fClic gauche pour voir les coordonnées des membres de votre clan
 gui.clandetails.home.title=&fMaison
+gui.clandetails.home.lore.teleport.price=&7Prix de téléportation \: &b{0}
 gui.clandetails.home.lore.teleport=&fClic gauche pour vous téléporter à la maison de votre clan
+gui.staffclandetails.home.lore.teleport=&fClic gauche pour vous téléporter à ce home de votre clan
 gui.clandetails.home.lore.clear=&fClic milieu pour effacer la maison de votre clan
+gui.clandetails.home.lore.set.price=&7Définir le prix\: &b{0}
 gui.clandetails.home.lore.set=&fClic droit pour définir le domicile de votre clan
+gui.staffclandetails.home.lore.set=&fClic droit pour définir ce home de clan
 gui.clandetails.regroup.title=&fRegrouper
+gui.clandetails.regroup.lore.price=&7Prix\: &b{0}
+gui.clandetails.regroup.lore.home=&7Clic gauche pour regrouper les membres de votre clan au home du clan
+gui.clandetails.regroup.lore.me=&7Clic droit pour regrouper les membres de votre clan à votre emplacement
 gui.clandetails.ff.title=&Feu allié
 gui.clandetails.ff.personal.lore=&fPersonnel\: {0}
 gui.clandetails.ff.clan.lore=&fClan\: {0}
 gui.clandetails.ff.personal.toggle.lore=&fClic gauche pour activer/désactiver votre feu allié
 gui.clandetails.ff.clan.toggle.lore=&fClic droit pour activer/désactiver le feu allié de votre clan
+gui.clandetails.bank.title=&fBank
+gui.clandetails.bank.balance.lore=§7Solde \: &b{0}
+gui.clandetails.bank.withdraw.status.lore=&7Retirer \: &b{0}
+gui.clandetails.bank.deposit.status.lore=&7Dépôt\: &b{0}
+gui.clandetails.bank.withdraw.toggle.lore=&7Clic du milieu pour activer/désactiver le statut de retrait
+gui.clandetails.bank.deposit.toggle.lore=&7Clic droit pour activer/désactiver le statut de dépôt
+gui.clandetails.fee.status.lore=&7Statut\: &b{0}
+gui.clandetails.fee.value.lore=&7Valeur \: &b{0}
+gui.clandetails.rank.title=&fRang
+gui.clandetails.rank.lore=&7Clic gauche pour voir les rangs du clan et les modifier
+gui.clandetails.verified.title=&fVérifié
+gui.clandetails.not.verified.title=&fNon vérifié
+gui.clandetails.verify.price.lore=&7Prix\: &b{0}
+gui.clandetails.not.verified.lore=&7Clic gauche pour vérifier votre clan
+gui.staffclandetails.not.verified.lore=&7Clic gauche pour vérifier ce clan
+gui.clandetails.disband.title=&fDissoudre
+gui.clandetails.disband.lore=&7Clic du milieu pour dissoudre votre clan
+gui.staffclandetails.disband.lore=&7Clic gauche pour dissoudre ce clan
+gui.clandetails.chat.title=&fChat
+gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - Envoie un message au chat du clan
+gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bRejoindre/quitte le chat du clan
+gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - Envoie un message au chat d''allié
 gui.playerdetails.title={0}
 gui.playerdetails.player.title=&f{0}
 gui.playerdetails.player.lore.noclan=&fClan\: Aucun
@@ -603,6 +605,7 @@ gui.playerdetails.player.lore.kill.totals=&fNombre de tués\: [Rival\:{0} Neutre
 gui.playerdetails.player.lore.deaths=&fMorts\: {0}
 gui.playerdetails.player.lore.join.date=&fDate d''adhésion\: {0}
 gui.playerdetails.player.lore.last.seen=&fVu pour la dernière fois\: {0}
+# suppress inspection "TrailingSpacesInProperty"
 gui.playerdetails.player.lore.past.clans.separator=&b, 
 gui.playerdetails.player.lore.past.clans=&fAnciens clans\: {0}
 gui.playerdetails.player.lore.inactive=&fInactif\: {0}/{1} jours
@@ -616,11 +619,13 @@ gui.playerdetails.unassign.lore.right.click=&fClic droit pour dés-assigner
 gui.playerdetails.trust.untrust.title=&fFaire confiance/Ne pas faire confiance
 gui.playerdetails.trust.lore.left.click=&fClic gauche pour faire confiance
 gui.playerdetails.untrust.lore.right.click=&fClic droit pour ne pas faire confiance
-disabled.ally.chat=&bVous avez désactivé le chat allié
 joined.ally.chat=&bVous avez rejoint le chat allié
 left.ally.chat=&bVous avez quitté le chat allié
 muted.ally.chat=&bVous avez rendu muet le chat allié
 unmuted.ally.chat=&bVous avez réactivé le chat allié
 player.already.in.this.clan=&cLe joueur est déjà dans ce clan
 your.clan.reached.max.alliances=&cVotre clan a atteint le nombre maximum d'alliances
-other.clan.reached.max.alliances=&cL'autre clan a atteint le nombre maximum d'alliances
+other.clan.reached.max.alliances=&cL'autre clan a atteint le nombre maximum d'alliances
+you.changed.clan.banner=&bVous avez changé la bannière de votre clan\!
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_hu_HU.properties

@@ -1,81 +1,7 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=Leírás
-usage.resetkdr=Használat\: /{0} resetkdr [all/player]
-usage.clan.alliances=Használat\: /{0} alliances
-usage.ally=Használat\: /{0} ally add/remove [címke]
-usage.ban.unban=Használat\: /{0} ban/unban [játékos]
-usage.rival=Használat\: /{0} rival add/remove [címke]
-usage.war=Használat\: /{0} war start/end [címke]
-usage.clanff=Használat\: /{0} clanff allow/block
-usage.0.coords=Használat\: /{0} coords
-usage.demote.leader=Használat\: /{0} demote [vezető]
-usage.0.disband=Használat\: /{0} disband
-usage.0.ff.allow.auto=Használat\: /{0} ff allow/auto
-usage.0.globalff.allow.auto=Használat\: /{0} globalff allow/auto
-usage.0.permissions.player=Használat\: /{0} permissions [klán] add/remove [jog]
-usage.0.invite.player=Használat\: /{0} invite [játékos]
-usage.kick.player=Használat\: /{0} kick [játékos]
-usage.bank=Használat\: /{0} bank withdraw/deposit/status [mennyiség]
-usage.0.modtag.tag=Használat\: /{0} modtag [címke]
-usage.lookup.tag=Használat\: /{0} lookup [címke]
-usage.0.profile.tag=Használat\: /{0} profile [címke]
-usage.0.promote.member=Használat\: /{0} promote <tag>
-usage.0.rivalries=Használat\: /{0} rivalries
-usage.0.roster.tag=Használat\: /{0} roster [címke]
-usage.0.stats=Használat\: /{0} stats
-usage.0.trust.player=Használat\: /{0} trust [játékos]
-usage.0.untrust.player=Használat\: /{0} untrust [játékos]
-usage.0.verify.tag=Használat\: /{0} verify [címke]
-usage.0.vitals=Használat\: /{0} vitals
-usage.0.place=Használat\: /{0} place [player] [címke]
-usage.0.leaderboard=Használat\: /{0} leaderboard
-0.reload.1.reload.configuration=/{0} reload{1} - Konfiguráció újratöltése
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} globalff allow/auto {1} - Beállítsa a globális barátságot
-0.place=/{0} place [player] [címke]{1} - Berak egy játékost egy klánba
-0.ban.unban.player.1.ban.unban.a.player=/{0} ban/unban [játékos]{1} - Kitiltja/visszaengedi a játékost
-0.hometp.clan.1.tp.home.a.clan=/{0} home tp [clan]{1} - Elteleportálja minden klán otthonába
-0.disband.tag.1.disband.a.clan=/{0} disband [címke]{1} - Eltávolít egy klánt
-0.resetkdr.1.resets.kdr=/{0} resetkdr player/all{1} - Visszaállítsa az összes játékos KDR-jét vagy csak egy
-0.resetkdr.1.resets.your.kdr=/{0} resetkdr{1} - Visszaállítja KDR-t
-0.verify.tag.1.verify.an.unverified.clan=/{0} verify [címke]{1} - Ellenőrzi az ellenőrzött klánt
-0.verify.1.purchase.verification.of.your.clan=/{0} verify{1} - A klán megvásárlásának ellenőrzése
-0.list.1.lists.all.clans=/{0} list [name/size/kdr/founded/active] [asc/desc]{1} - Lists all clans
-0.profile.1.view.your.clan.s.profile=/{0} profile{1} - Megtekinti a klán profilját
-0.profile.tag.1.view.a.clan.s.profile=/{0} profile [címke]{1} - Klán profiljának megtekintése
-0.lookup.1.lookup.your.info=/{0} lookup{1} - Megkeresi az adatait
-0.lookup.player.1.lookup.a.player.s.info=/{0} lookup [játékos]{1} - Megkeresi a játékos információit
-0.leaderboard.1.view.leaderboard=/{0} leaderboard{1} - Megnézi a ranglistát
-0.alliances.1.view.all.clan.alliances=/{0} alliances{1} - Megtekinti az összes klán szövetséget
-0.rivalries.1.view.all.clan.rivalries=/{0} rivalries{1} - Megtekinti az összes klánversenyt
-0.roster.1.view.your.clan.s.member.list=/{0} roster{1} - Megtekinti a klán taglistáját
-0.roster.tag.1.view.a.clan.s.member.list=/{0} roster [címke]{1} - Egy osztály taglista megtekintéset
-0.vitals.1.view.your.clan.member.s.vitals=/{0} vitals{1} - Megtekinti a klántagod vitálását
-0.coords.1.view.your.clan.member.s.coordinates=/{0} coords{1} - Megtekinti a klántagod koordinátáit
-0.stats.1.view.your.clan.member.s.stats=/{0} stats{1} - Megtekinti a klántag statisztikáit
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} ally add/remove [címke]{1} - Egy szövetséges klán hozzáadása/eltávolítása
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rival add/remove [címke]{1} - Egy rivális klán hozzáadása/eltávolítása
-0.bb.1.display.bulletin.board=/{0} bb{1} - Hirdetőtábla megjelenítése
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} bb [msg]{1} - Üzenet hozzáadása a hirdetőtáblához
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modtag [címke]{1} - Módosítja a klán címkéjét
-0.invite.player.1.invite.a.player=/{0} invite [játékos]{1} - Meghív egy játékost
-0.kick.player.1.kick.a.player.from.the.clan=/{0} kick [játékos]{1} - Kirúg egy játékost a klánból
-0.trust.untrust.player.1.set.trust.level1=/{0} trust [játékos]{1} - Beállítja a tagot megbízhatónak
-0.trust.untrust.player.1.set.trust.level2=/{0} untrust [játékos]{1} - Beállítja a tagot megbízhatatlannak
-0.promote.member.1.promote.a.member.to.leader=/{0} promote [tag]{1} - Támogat egy tagot vezetőnek
-0.demote.leader.1.demote.a.leader.to.member=/{0} demote [vezető]{1} - Vezet egy vezetőt a tagnak
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} clanff allow/block{1} - Kapcsolja a klán baráti tüzet
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} ff allow/auto{1} - Kapcsolja a személyes barátságos tüzet
-0.toggle.command=/{0} toggle [{2}]{1} - A személyes beállítások módosítása
-0.resign.1.resign.from.the.clan=/{0} resign{1} - Tiltakozik a klánról
-0.disband.1.disband.your.clan=/{0} disband{1} - Lehúzza a klánját
-0.kills=/{0} kills{1} - Megnézi az ölésedet
-0.killsplayer=/{0} kills [játékos]{1} - Megtekinti a játékos ölési számát
-0.mostkilled=/{0} mostkilled{1} - Megtekinti a kiszolgálón leggyakoribb ölési számokat
 home-menu=/{0} home{1} - Teleportálás a klán hazai bázisához
 home-set-menu=/{0} home set{1} - Beállítsa a klán hazai bázisát
 home-clear-menu=/{0} home clear{1} - Törli a klán hazai bázisát
-home-regroup-menu=/{0} home regroup [me]{1} - Áthelyezi az összes tagot a háziasított klán vagy magad számára
-example.clan.modtag.4kfo.4l=Példa\: /clan modtag &4K&fo&4L
 clan=Klán
 allies=Szövetségesek
 alliances=szövetségek
@@ -159,11 +85,9 @@ clan.players=Klán játékosok\: {0}
 clans=Klánok\: {0}
 banned=Kitiltottad a klánparancsok használatát
 nothing.more.to.see=Semmi többet látni
-nothing.to.deny=Semmi tagadni
 no.leader.permissions=Nincs vezető engedélye
 you.have.already.voted=Már szavaztál
 has.voted.to.deny={0} tagadta a szavazást
-nothing.to.accept=Semmi elfogadni
 view.next.page=Típus /{0} a következő oldal megtekintéséhez.
 voted.to.accept={0} elfogadták
 bulletin.board.header={0}* {1}{2} hirdetőtábla
@@ -172,14 +96,10 @@ has.been.disbanded.alliance.ended={0} feloszlott. A Szövetség véget ért.
 clan.disbanded=A klán megszűnt
 1.color.day=1 {0}nap
 many.color.days={0}{1} nap
-does.not.match=Nem egyezik a klán parancsával
-simpleclans.command.failure=A SimpleClans parancs sikertelen\: {0}
 insufficient.permissions=Nincs elegendő engedély
 clan.is.not.verified=A klán nem ellenőrzött
 not.a.member.of.any.clan=Nem vagy tagja semmilyen klánnak
 minimum.to.make.alliance=A klánnak legalább {0} játékosnak kell lennie ahhoz, hogy szövetségeket kössön
-no.clan.matched=Nincsenek klánok
-cannot.ally.with.an.unverified.clan=Nem tudsz szövetséget kötni egy be nem bizonyított klánnal
 your.clans.are.not.allies=A klánod nem szövetségesek
 has.broken.the.alliance={0} megszakította a szövetséget {1}
 at.least.one.leader.accept.the.alliance=A szövetség legalább egy vezetőjének online kell lennie ahhoz, hogy elfogadja a szövetséget
@@ -216,7 +136,6 @@ global.friendy.fire.is.now.managed.by.each.clan=A globális barátságos tüzet
 global.friendy.fire.is.already.being.managed.by.each.clan=A globális barátságos tüzeket már kezelik minden egyes klán
 global.friendly.fire.is.set.to.allowed=A globális barátságos tűz megengedett
 global.friendly.fire.is.already.being.allowed=A globális barátságos tűz már engedélyezett
-no.player.matched=Nincs olyan játékos, aki megfelelt
 the.player.doesn.t.not.have.the.permissions.to.join.clans=A játékosnak nincs joga a klánokhoz való csatlakozáshoz
 you.cannot.invite.yourself=Nem hívhatod meg magad
 this.player.is.banned.from.using.clan.commands=Ez a játékos tiltja a klánparancsok használatát
@@ -231,27 +150,17 @@ total.clans=Összes klán\:
 legend=Legenda\:
 kill.type.civilian=Ölés típus\: {0} Civil
 no.player.data.found=Nincsenek játékosadatok
-kill.type.0=Ölés típus\: {0}
-s.player.info={0} játékos adatai
 clan.0=Klán\: {0}
 status.0=Állapot\: {0}
 rank.0=Rang\: {0}
-deaths.0=Halálok\: {0}
-join.date.0=Csatlakozás dátuma\: {0}
-last.seen.0=Utoljára látva\: {0}
-past.clans.0=Múlt klánok\: {0}
 inactive.0=Elérhetetlen(ek)\: {0}
-kill.totals=Összes ölés\:
 clan.commands=klán parancsok
 you.can.only.modify.the.color.and.case.of.the.tag=Csak a címke színét és esetét módosíthatod
 tag.changed.to.0=A címke megváltoztatva {0}
 name.0=Név\: {0}
 leaders.0=Vezetők\: {0}
-members.online.0=Tagok online\: {0}
 allies.0=Szövetségesek\: {0}
 rivals.0=Vetélytárs(ak)\: {0}
-founded.0=Alapított\: {0}
-the.member.to.be.promoted.must.be.online=A támogatni kívánt tagnak online-nak kell lennie
 the.player.does.not.have.the.permissions.to.lead.a.clan=A játékosnak nincs joga a klán vezetésére
 you.cannot.promote.yourself=Nem reklámozhatod magad
 the.player.is.already.a.leader=A játékos már vezető szerepet játszik
@@ -286,7 +195,6 @@ denied.war.req={0} megtagadta {1} által küldött háborús kérést
 you.are.no.longer.at.war={0} már nincs háborúban {1} ellen
 end.war.denied=A háború befejezésére irányuló kérelmet a(z) {0}
 denied.war.end={0} tagadta {1} kérését a háború befejezésére
-0.war=/{0} war{1} start/end [tag] - Háború indítása vagy befejezése
 has.initiated.a.rivalry={0} rivalizációt indított {1} ellen
 materials=Anyagok
 server.announce=Szerver bejelentés
@@ -294,8 +202,6 @@ clan.announce=Klán bejelentés
 leader.announce=Vezetői bejelentés
 hunger=Éhség
 the.clan.cannot.be.rivaled=A klán nem lehet versengeni
-capeoff=A köpeny kikapcsolva
-capeon=A köpeny bekapcsolva
 bboff=BB kikapcsolva
 bbon=BB bekapcsolva
 tagoff=Tag kikapcsolva
@@ -328,8 +234,12 @@ bb.clan.withdraw={0} $ visszavonták
 player.clan.withdraw=Visszavonsz {0}
 clan.bank.not.enough.money=A klán bankjaidnak nincs elég pénzük
 your.clans.are.not.rivals=A klánok nem riválisok
-you.cannot.rival.your.own.clan=Nem tudsz versengeni a saját klánoddal
 the.clan.members.reached.limit=A klán tagjai elérik a határt
 you.have.reseted.your.kdr=Visszaállítottad KDR-t
 you.have.reseted.0.kdr=Visszaállítottad a(z) {0} KDR-t
-you.have.reseted.kdr.of.all.players=Visszaállítottad a játékosok KDR-jét
+you.have.reseted.kdr.of.all.players=Visszaállítottad a játékosok KDR-jét
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_it_IT.properties

@@ -1,15 +1,111 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=descrizione
 create.command=creare
+delete.command=elimina
+rank.command=grado
 profile.command=profilo
 roster.command=membri
 lookup.command=ricerca
 alliances.command=alleanze
 coords.command=coordinate
 stats.command=statistiche
-usage.description=Uso\: /{0} descrizione [descrizione]
-usage.clan.alliances=Uso\: /{0} alleanze
-usage.0.coords=Uso\: /{0} coordinate
+bank.command=banca
+admin.command=amministratore
+verify.command=verifica
+kills.command=uccisioni
+mostkilled.command=più uccisioni
+war.command=guerra
+start.command=inizia
+end.command=fine
+home.command=casa
+regroup.command=riorganizzazione
+me.command=io
+tp.command=tp
+setrank.command=impostagrado
+place.command=posiziona
+resetkdr.command=resetkdr
+everyone.command=tutti
+help.command=aiuto
+command.description.list=Mostra tutti i clan
+command.description.ally=Parli nella chat degli alleati 
+command.description.deny=Rifiuta una richiesta
+command.description.accept=Accetta una richiesta
+command.description.more=Mostra più informazioni
+command.description.create=Crea un clan
+command.description.ff.allow=Permetti il fuoco amico su di te
+command.description.ff.auto=Lascia gestire il fuoco amico in automatico
+command.description.globalff.allow=Permetti il fuoco amico globale
+command.description.globalff.auto=Lascia gestire il fuoco amico globale in automatico
+command.description.clanff.allow=Permetti il fuoco amico nel tuo clan
+command.description.clanff.block=Nega il fuoco amico nel tuo clan
+command.description.description=Imposta la descrizione del tuo clan
+command.description.ban=Banna un giocatore dai comandi del clan
+command.description.unban=Sbanna un giocatore dai comandi del clan
+command.description.regroup.me=Raggruppa i membri del tuo clan alla tua posizione
+command.description.regroup.home=Raggruppa i membri del tuo clan alla base del clan
+command.description.home.tp=Teletrasportati alla base del clan
+command.description.home.clear=Cancella la base del tuo clan
+command.description.home.set=Imposta la base del tuo clan
+command.description.mod.home.set=Imposta la base del tuo clan
+command.description.mod.home.tp=Teletrasportati alla base di un clan
+command.description.rival.remove=Rimuove un rivale
+command.description.rival.add=Aggiungi un rivale
+command.description.ally.remove=Rimuovi un alleato
+command.description.kick=Espelli un membro dal tuo clan
+command.description.bb.display=Visualizza il bollettino del tuo clan
+command.description.bb.clear=Cancella il bollettino del tuo clan
+command.description.bb.post=Invia un messaggio al bollettino del tuo clan
+command.description.place=Colloca un giocatore in un clan
+command.description.reload=Ricarica il plugin ed i file di configurazione
+command.description.ally.add=Aggiungi un alleato
+command.description.clan=Apre la GUI
+command.description.disband=Sciogli il tuo clan
+command.description.mod.disband=Sciogli un clan
+command.description.modtag=Modifica il tag del tuo clan
+command.description.verify=Verifica il tuo clan
+command.description.mod.verify=Verifica un clan
+command.description.invite=Invita un giocatore nel tuo clan
+command.description.fee.set=Imposta le commissioni del tuo clan
+command.description.bank.status=Controlla il saldo bancario del tuo clan
+command.description.bank.withdraw.all=Preleva tutto dalla banca del tuo clan
+command.description.bank.withdraw.amount=Preleva una somma dalla banca del tuo clan
+command.description.bank.deposit.all=Deposita tutti i tuoi soldi nella banca del tuo clan
+command.description.bank.deposit.amount=Deposita un importo del tuo denaro nella banca del tuo clan
+command.description.war.start=Inizia una guerra
+command.description.war.end=Termina una guerra
+command.description.resetkdr.everyone=Reimposta il KDR di tutti
+command.description.resetkdr.player=Reimposta il KDR di un giocatore
+command.description.resetkdr=Reimposta il tuo KDR
+command.description.admin.demote=Retrocedi un leader da un clan
+command.description.demote=Retrocedi un leader
+command.description.admin.promote=Promuovi un membro da un clan
+command.description.promote=Promuovi membro a Leader
+command.description.rank.create=Crea un rango
+command.description.rank.delete=Elimina un rango
+clan=Clan
+allies=Alleati
+alliances=alleanze
+coords=coordinate
+name=Nome
+distance=Distanza
+coords.upper=Coordinate
+world=Mondo
+kdr=KDR
+members=Membri
+rival=Rivale
+civilian=Civili
+neutral=Neutrale
+days=giorni
+rivals=Rivale
+rivalries=rivalità
+online=In Linea
+player=Giocatore
+seen=Ultima Visita
+leader=leader
+roster=membri
+trusted=attendibile
+untrusted=non attendibile
+deaths=Morti
+stats=statistiche
 health=Vita
 armor=Armatura
 weapons=Armi
@@ -19,9 +115,11 @@ unverified=Non verificato
 profile=profilo
 civilian.abbreviation=Civ
 rank=Rango
+leaders=Leader
 none=Nessuno
 today=Oggi
 kills=Uccisioni
+mostkilled=Maggior numero di uccisioni
 killcount=Numero di Uccisioni
 attacker=Attaccante
 victim=Vittima
@@ -55,10 +153,9 @@ sqlite.connection.failed= Connessione SQLite fallita
 clan.players=Giocatori di Clan\: {0}
 banned=Sei bannato dall'usare i comandi del clan
 nothing.more.to.see=Niente di più da vedere
-nothing.to.deny=Niente da negare
+nothing.to.vote=&cNulla da accettare o negare
 you.have.already.voted=Hai già votato
 has.voted.to.deny={0} ha votato per negare
-nothing.to.accept=Niente da accettare
 view.next.page=Digita /{0} per visualizzare la pagina successiva.
 voted.to.accept={0} ha votato per accettare
 has.been.disbanded.rivalry.ended={0} è stato sciolto. La rivalità è finita.
@@ -66,13 +163,9 @@ has.been.disbanded.alliance.ended={0} è stato sciolto. L''alleanza è finita.
 clan.disbanded=Clan sciolto
 1.color.day=1 {0}giorno
 many.color.days={0}{1} giorni
-does.not.match=Non corrisponde a un comando di clan
-simpleclans.command.failure=Comando SimpleClans fallito\: {0}
 clan.is.not.verified=Il clan non è verificato
 not.a.member.of.any.clan=Non sei membro di nessun clan
 minimum.to.make.alliance=Il tuo clan deve avere almeno {0} giocatori per poter fare un''alleanza
-no.clan.matched=Nessun clan corrispondente
-cannot.ally.with.an.unverified.clan=Non puoi allearti con un clan non verificato
 your.clans.are.not.allies=I tuoi clan non sono alleati
 has.broken.the.alliance={0} ha rotto l''alleanza con {1}
 at.least.one.leader.accept.the.alliance=Almeno un leader dell'alleato deve essere online per accettare l'alleanza
@@ -90,14 +183,80 @@ your.tag.cannot.contain.the.following.colors=Il tuo tag non può contenere i seg
 your.tag.cannot.contain.color.codes=Il tuo tag non può contenere codici di colore
 you.cannot.set.colored.ranks=Non puoi impostare ranghi colorati
 your.clan.name.cannot.be.longer.than.characters=Il nome del tuo clan non può contenere più di {0} caratteri
+clan.created=Clan {0} creati
+total.clans=Clan totali\:
+legend=Legenda\:
+leaders.0=Leader\: {0}
+allies.0=Alleati\: {0}
+rivals.0=Rivali\: {0}
+start=inizia
+end=fine
+add=aggiungi
+remove=rimuovi
+allow=permetti
+block=blocca
+auto=automatico
+war=guerra
+materials=Materiali
+diamond=diamante
+gold=oro
+wood=legna
+server.announce=Annuncio Del Server
+clan.announce=Annuncio del clan
+leader.announce=Annuncio del Leader
+hunger=Fame
+stone=pietra
+iron=ferro
+resign.yes=Sì
+resign.no=No
+bb.ago= fa 
+bb.moments=momenti
+bb.seconds= secondi
+bb.minutes= minuti
+bb.one.minute=1 minuto
+bb.hours= ore
+bb.one.hour=1 ora
+bb.days= giorni
+bb.one.day=1 giorno
+the.fee.is.0.and.its.current.value.is.1=La commissione è {0} e il suo valore attuale è {1}$
+fee.enabled=abilitato
+fee.disabled=disabilitato
+no.description=Nessuna descrizione
+disabled.command=Comando disabilitato
+rank.created=Rango creato
+gui.previous.page.title=Pagina Precedente
+gui.next.page.title=&fPagina Successiva
+gui.main.languageselector.title=Seleziona la tua lingua
+gui.main.other.commands.title=&fAltri comandi
+gui.main.clan.list.title=&fLista Clan
 gui.main.reset.kdr.lore.price=&7Prezzo\: &b{0}
+gui.player.list.title=Elenco dei giocatori
+gui.warning.title=Attenzione
+gui.warning.no.permission.plugin.lore=&7Non hai i permessi per eseguire questa azione\!
+gui.warning.not.verified.title=&fNon verificato
+gui.allies.title=Alleati
+gui.add.ally.clan.lore=&7Click sinistro per alleare questo clan
+gui.rivals.title=Rivali
+gui.rivals.add.title=&fAggiungi un rivale
+gui.add.rival.title=Aggiungi un rivale
+gui.clanlist.title=Clans - Totale\: {0}
+gui.ranks.title=Gradi
 gui.ranks.title.set.rank=Imposta Rango - Attuale\: {0}
+gui.ranks.create.title=&fCrea un rango
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.allies.separator=&b, 
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.rivals.separator=&b, 
 gui.clandetails.clan.lore.founded=&7Fondato\: &b{0}
 gui.clandetails.clan.lore.inactive=&7Inattivo\: &b{0}/{1} giorni
+gui.clandetails.home.title=&fCasa
+gui.clandetails.home.lore.set.price=&7Imposta prezzo\: &b{0}
+gui.clandetails.regroup.lore.price=&7Prezzo\: &b{0}
 gui.clandetails.bank.balance.lore=&7Saldo\: &b{0}
 gui.clandetails.fee.status.lore=&7Stato\: &b{0}
 gui.clandetails.fee.value.lore=&7Valore\: &b{0}
+# suppress inspection "TrailingSpacesInProperty"
 gui.playerdetails.player.lore.past.clans.separator=&b, 
-player.already.has.that.rank=&cIl giocatore ha già questo rango\!
+player.already.has.that.rank=&cIl giocatore ha già questo rango\!
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_nl_NL.properties

@@ -1,7 +1,17 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=beschrijving
 create.command=maak
+delete.command=verwijderen
+rank.command=rang
+setdisplayname.command=setschermnaam
+permissions.command=toestemmingen
 list.command=lijst
+list.order.asc=oplopend
+list.order.desc=aflopend
+list.type.name=naam
+list.type.kdr=kdr
+list.type.size=grootte
+list.type.founded=opgericht
+list.type.active=actief
 profile.command=profiel
 roster.command=rooster
 lookup.command=opzoeken
@@ -12,17 +22,33 @@ vitals.command=vitalen
 coords.command=coördinaten
 stats.command=statistieken
 ally.command=bondgenoot
+add.command=toevoegen
+remove.command=verwijderen
+allow.command=toestaan
+block.command=blokkeren
+auto.command=auto
+check.command=controle
+assign.command=toewijzen
+unassign.command=loskoppelen
 rival.command=rivaal
 bb.command=bb
+clear.command=wissen
 modtag.command=modtag
 toggle.command=toggle
+tag.command=label
+deposit.command=storten
+all.command=alle
+withdraw.command=opnemen
 invite.command=uitnodigen
 kick.command=uitzetten
 bank.command=bank
+status.command=status
 fee.command=kosten
+set.command=set
 purge.command=verwijder
 trust.command=vertrouwen
 untrust.command=niet meer vertrouwen
+admin.command=beheerder
 promote.command=promoten
 demote.command=degradeer
 clanff.command=clanff
@@ -37,38 +63,36 @@ globalff.command=globalff
 kills.command=moorden
 mostkilled.command=meestemoorden
 war.command=oorlog
+start.command=start
+end.command=einde
 home.command=huis
+regroup.command=hergroeperen
+me.command=mij
+tp.command=tp
 setrank.command=setrank
 place.command=plaats
 resetkdr.command=resetkdr
+everyone.command=iedereen
+setbanner.command=setbanner
 help.command=help
-usage.description=Gebruik\: /{0} beschrijving [description]
-usage.resetkdr=Gebruik\: /{0} resetkdr [alle/speler]
-usage.clan.alliances=Gebruik\: /{0} bondgenootschappen
-usage.ally=Gebruik\: /{0} ally toevoegen/verwijderen [tag]
-usage.ban.unban=Gebruik\: /{0} ban/unban [player]
-usage.rival=Gebruik\: /{0} rivaal toevoegen/verwijderen [tag]
-usage.war=Gebruik\: /{0} oorlog begin/eindig [tag]
-0.stats.1.view.your.clan.member.s.stats=/{0} statistieken{1} - Bekijk de statistieken van je clan lid
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} ally add/remove [tag]{1} - Toevoegen/verwijderen van een ally clan
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rival add/remove [tag]{1} - Toevoegen/verwijderen van een rivalisch clan
-0.bb.1.display.bulletin.board=/{0} bb{1} - Toon prikbord
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} bb [msg]{1} - Voeg een bericht toe aan het prikbord
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modtag [tag]{1} - Wijzig de clan''s tag
-0.description.description.1.modify.the.clan.s.description=/{0} beschrijving [description]{1} - Wijzig de beschrijving van de clan''s
-0.invite.player.1.invite.a.player=/{0} nodigt [player]{1} uit - Een speler uitnodigen
-0.kick.player.1.kick.a.player.from.the.clan=/{0} schop [player]{1} - Verwijder een speler uit de clan
-0.trust.untrust.player.1.set.trust.level1=/{0} vertrouwen [player]{1} - Stel lid als vertrouwd in
-0.trust.untrust.player.1.set.trust.level2=/{0} heeft afstand gedaan [player]{1} - Stel lid in als niet-vertrouwd
-0.promote.member.1.promote.a.member.to.leader=/{0} promo [member]{1} - Promoot een lid tot leider
-0.demote.leader.1.demote.a.leader.to.member=/{0} degradeer [leader]{1} - Degradeer een leider tot lid
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} clanff staat{1} toe/blok - Toon clan''s vriendelijke damage
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} ff staat{1} toe/automatisch toe - Schakel persoonlijke vriendelijke damage aan
-0.toggle.command=/{0} wisselknop [{2}]{1} - Persoonlijke instellingen wisselen
-0.resign.1.resign.from.the.clan=/{0} ontneemt{1} - Teken uit de clan
-0.disband.1.disband.your.clan=/{0} ontbindt{1} - Ontbind je clan
-0.create.1.purchase.a.new.clan=/{0} heeft{1} gemaakt - Koop een nieuwe clan
-0.create.1.create.a.new.clan=/{0} maakt{1} - Maak een nieuwe clan
-0.kills=/{0} gedood{1} - Bekijk je dodingsaantallen
-0.killsplayer=/{0} spelers gedood [player]{1} - Bekijk het aantal doden van een speler
-0.fee.check=/{0} kosten check {1}- Check of de kost aan is gezet en hoeveel het is
+command.description.list=Toon alle clans
+command.description.ally=Gesprekken in de ally chat 
+command.description.deny=Weigert een verzoek
+command.description.accept=Accepteert een verzoek
+command.description.more=Laat meer informatie zien
+command.description.create=Maakt een clan
+command.description.ff.allow=Stelt je persoonlijke vriendelijke vuur naar toestaan
+command.description.ff.auto=Stelt je persoonlijke vriendelijke vuur naar automatisch
+command.description.globalff.allow=Stelt je globale vriendelijke vuur naar toestaan
+command.description.globalff.auto=Stelt je globale vriendelijke vuur naar automatisch
+command.description.clanff.allow=Stelt je clan's persoonlijke vriendelijke vuur naar toestaan
+command.description.clanff.block=Stelt je clan's persoonlijke vriendelijke vuur naar geblokkeerd
+command.description.description=Stel je clanomschrijving in
+command.description.ban=Verbied een speler van clancommando's
+command.description.unban=Deblokkeert een speler van clancommando's
+command.description.regroup.me=Hergroepeert je clan leden naar je locatie
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_no_NO.properties

@@ -0,0 +1,49 @@
+description.command=beskrivelse
+create.command=opprette
+list.command=liste
+profile.command=profil
+roster.command=roster
+lookup.command=oppslag
+leaderboard.command=ledertabell
+alliances.command=allianser
+rivalries.command=rivalisering
+vitals.command=vitaler
+coords.command=koord
+stats.command=statistikk
+ally.command=alliert
+rival.command=motspiller
+bb.command=bb
+modtag.command=modtag
+toggle.command=veksle
+invite.command=invitere
+kick.command=spark
+bank.command=bank
+fee.command=gebyr
+purge.command=rens
+trust.command=tillit
+untrust.command=utillit
+promote.command=promotere
+demote.command=demotere
+clanff.command=klanff
+ff.command=ff
+resign.command=trekke
+disband.command=oppløse
+verify.command=bekreft
+ban.command=forbud
+unban.command=uforbod
+reload.command=lastpånytt
+globalff.command=globalff
+kills.command=dreper
+mostkilled.command=mestetdrept
+war.command=krig
+home.command=hjem
+setrank.command=setterang
+place.command=sted
+resetkdr.command=tilbakesettekdr
+setbanner.command=settebanner
+help.command=hjelp
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_pl_PL.properties

@@ -1,95 +1,188 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
+description.command=opis
 create.command=stworz
+delete.command=usun
+rank.command=ranking
+setdisplayname.command=ustaw nazwe wyswietlana
+permissions.command=uprawnienia
+list.command=lista
+list.order.asc=asc
+list.order.desc=opis
+list.type.name=nazwa
+list.type.kdr=k/d/r
+list.type.size=wielkosc
+list.type.founded=reputacja
+list.type.active=aktywne
 profile.command=profil
 roster.command=lista
 lookup.command=wyszukaj
 leaderboard.command=ranking
 alliances.command=sojusze
 rivalries.command=wrogowie
+vitals.command=staty
 coords.command=wspolrzedne
 stats.command=staty
 ally.command=sojusznik
-rival.command=wrog
+add.command=dodaj
+remove.command=usun
+allow.command=zezwol
+block.command=wylacz
+auto.command=automatycznie
+check.command=sprawdz
+assign.command=przydziel
+unassign.command=odepnij
+rival.command=wróg
 bb.command=tablica
+clear.command=wyczysc
+modtag.command=modtag
 toggle.command=przelacz
-invite.command=zapros
-kick.command=wyrzuc
+tag.command=tag
+deposit.command=wplata
+all.command=wszystkie
+withdraw.command=wyplata
+invite.command=zaproś
+kick.command=wyrzuć
+bank.command=bank
+status.command=status
+fee.command=oplata
+set.command=ustaw
+purge.command=oczysc
 trust.command=ufaj
 untrust.command=nieufaj
+admin.command=administrator
 promote.command=awansuj
 demote.command=degraduj
 clanff.command=klanff
+ff.command=ff
 resign.command=opusc
 disband.command=rozwiaz
 verify.command=weryfikuj
+ban.command=ban
+unban.command=unban
 reload.command=przeladuj
+globalff.command=globalff
 kills.command=zabija
+mostkilled.command=mostkille
 war.command=wojna
+start.command=rozpocznij
+end.command=zakoncz
 home.command=dom
-usage.clan.alliances=Usage\: /{0} sojusze
-usage.ally=Usage\: /{0} sojusznik dodaje/usuwa [tag]
-usage.ban.unban=Usage\: /{0} ban/unban [gracz]
-usage.rival=Usage\: /{0} wrog dodaje/usuwa [tag]
-usage.clanff=Usage\: /{0} klanff wlacza/wylacza
-usage.0.coords=Usage\: /{0} wspolrzedne
-usage.demote.leader=Usage\: /{0} degraduj [przywodca]
-usage.0.disband=Usage\: /{0} rozwiarz
-usage.0.ff.allow.auto=Usage\: /{0} ff wlacza/klanowe
-usage.0.globalff.allow.auto=Usage\: /{0} globalff wlacza/klanowe
-usage.0.invite.player=Usage\: /{0} zapros [gracza]
-usage.kick.player=Usage\: /{0} wyrzuc [gracza]
-usage.list=Usage\: /{0} lista
-usage.lookup.tag=Usage\: /{0} wyszukaj [tag]
-usage.0.profile.tag=Usage\: /{0} profil [tag]
-usage.0.promote.member=Usage\: /{0} awansuj <czlonka>
-usage.0.rivalries=Usage\: /{0} wszyscywrogowie
-usage.0.roster.tag=Usage\: /{0} lista [tag]
-usage.0.stats=Usage\: /{0} staty
-usage.0.trust.player=Usage\: /{0} ufaj [gracz]
-usage.0.untrust.player=Usage\: /{0} nieufaj [gracz]
-usage.0.verify.tag=Usage\: /{0} weryfikuj [tag]
-usage.0.leaderboard=Usage\: /{0} ranking
-0.reload.1.reload.configuration=/{0} reload{1} - Przeladuj konfiguracje
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} globalff wlacza/klanowe {1} - Ustawienie globalnego FF
-0.ban.unban.player.1.ban.unban.a.player=/{0} ban/unban [gracz]{1} - Banuje/odbanowuje gracza
-0.disband.tag.1.disband.a.clan=/{0} rozwiaz [tag]{1} - Rozwiazuje klan
-0.verify.tag.1.verify.an.unverified.clan=/{0} weryfikuj [tag]{1} - Zatwierdza niezweryfikowany klan
-0.verify.1.purchase.verification.of.your.clan=/{0} weryfikuj{1} - Zakup weryfikacji dla klanu
-0.list.1.lists.all.clans=/{0} list{1} - Lista wszystkich klanow
-0.profile.1.view.your.clan.s.profile=/{0} profil{1} - Podglad profilu wlasnego klanu
-0.profile.tag.1.view.a.clan.s.profile=/{0} profil [tag]{1} - Podglad profilu wybranego klanu
-0.lookup.1.lookup.your.info=/{0} wyszukaj{1} - Zwraca informacje o sobie
-0.lookup.player.1.lookup.a.player.s.info=/{0} wyszukaj [gracz]{1} - Zwraca informacje o innym graczu
-0.leaderboard.1.view.leaderboard=/{0} ranking{1} - Tablica statystyk klanow
-0.alliances.1.view.all.clan.alliances=/{0} sojusze{1} - Podglad wszystkich sojuszy klanu
-0.rivalries.1.view.all.clan.rivalries=/{0} wrogowie{1} - Podglad wszystkich wrogow klanu
-0.roster.1.view.your.clan.s.member.list=/{0} spis{1} - Lista czlonkow klanu
-0.roster.tag.1.view.a.clan.s.member.list=/{0} spis [tag]{1} - Lista czlonkow danego klanu
-0.vitals.1.view.your.clan.member.s.vitals=/{0} staty{1} - Podglad stanu czlonkow klanu
-0.coords.1.view.your.clan.member.s.coordinates=/{0} wspolrzedne{1} - Wspolrzedne czlonkow wlasnego klanu
-0.stats.1.view.your.clan.member.s.stats=/{0} staty{1} - Podglad statystyk czlonkow twojego klanu
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} sojusznik dodaje/usuwa [tag]{1} - dodaje/usuwa sojuszniczy klan
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} wrog dodaje/usuwa [tag]{1} - dodaje/usuwa wrogi klan
-0.bb.1.display.bulletin.board=/{0} tablica{1} - Wyswietla tablice ogloszen klanu
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} tablica [msg]{1} - dodaje informacje do tablicy ogloczen klanu
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modtag [tag]{1} - Zmienia tag klanu
-0.invite.player.1.invite.a.player=/{0} zapros [gracza]{1} - Zaprasza gracza do klanu
-0.kick.player.1.kick.a.player.from.the.clan=/{0} wyrzuc [gracza]{1} - Wyrzuca gracza z klanu
-0.trust.untrust.player.1.set.trust.level1=/{0} ufaj [gracz]{1} - Ustawia stopien zaufania
-0.trust.untrust.player.1.set.trust.level2=/{0} nieufaj [gracz]{1} - Ustawia stopien zaufania nieufaj
-0.promote.member.1.promote.a.member.to.leader=/{0} awansuj [czlonek]{1} - Awansuje czlonka na przywodce klanu
-0.demote.leader.1.demote.a.leader.to.member=/{0} degraduj [przywodca]{1} - Degraduje przywodce do rangi czlonka
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} klanff wlacza/wylacza{1} - Wlacza/wylacza ranienie sie w klanie
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} ff wlacza/klanowe{1} - Wlacza/klanowe osobiste ustawienie friendly fire
-0.toggle.command=/{0} toggle [{2}]{1} - Przelacz ustawienia osobiste
-0.resign.1.resign.from.the.clan=/{0} opusc{1} - Odejscie z klanu
-0.disband.1.disband.your.clan=/{0} rozwiaz {1} - Rozwiazuje klan
-0.kills=/{0} {1}zabojstwa - Wyswietl ilosc zabojstw w klanie
-0.killsplayer=/{0} zabojstwa [gracz] {1} - Zobacz ilosc zabojstw gracza
-0.mostkilled=/{0} mostkilled {1} - Zobacz najwieksza ilosc zabojstw
+regroup.command=uloz
+me.command=ja
+tp.command=tp
+setrank.command=ustaw range
+place.command=miejsce
+resetkdr.command=resetuj kdr
+everyone.command=wszyscy
+setbanner.command=ustaw baner
+help.command=pomoc
+acf-core.parameter.member=Członek
+acf-core.parameter.rank=Ranga
+acf-core.parameter.leader=Przywódca
+acf-core.parameter.displayname=Wyświetlana nazwa
+acf-core.parameter.permission=Uprawnienia
+acf-core.parameter.message=Wiadomość
+acf-core.parameter.tag=Tag
+acf-core.parameter.fee=Opłata
+acf-core.parameter.description=Opis
+acf-core.parameter.player=Gracz
+acf-core.parameter.clan=Klan
+acf-core.parameter.type=Typ
+acf-core.parameter.order=Zamówienie
+acf-core.parameter.help=Strona lub słowa kluczowe
+command.description.stats=Pokaż statystyki członków twojego klanu 
+command.description.rivalries=Pokazuje wszystkie rywalizacje klanów
+command.description.mostkilled=Pokazuje liczbę najczęściej zabitych na serwerze
+command.description.kills=Pokazuje liczbę zabójstw twojego lub innego gracza
+command.description.lookup=Sprawdź swoje informacje
+command.description.lookup.other=Sprawdź informacje o graczu
+command.description.leaderboard=Pokazuje tabelę liderów
+command.description.roster.other=Wyświetla listę członków innego klanu
+command.description.roster=Wyświetla listę członków klanu
+command.description.profile.other=Pokazuje profil innego klanu
+command.description.profile=Pokazuje profil klanu
+command.description.vitals=Pokazuje życia klanu i sojuszników
+command.description.list=Lista wszystkich klanów
+command.description.chat=Rozmawiaj na chacie sojuszu
+command.description.ally=Rozmawiaj na chacie sojuszu
+command.description.deny=Odrzuć zapytanie
+command.description.accept=Przyjmij zapytanie
+command.description.more=Pokaż więcej informacji
+command.description.create=Stwórz klan
+command.description.ff.allow=Ustawia Friendly Fire klanu na dozwolony
+command.description.ff.auto=Ustawia Twój Friendly Fire na auto
+command.description.globalff.allow=Ustawia Friendly Fire na dozwolone
+command.description.globalff.auto=Ustawia Friendy Fire na auto
+command.description.clanff.allow=Ustawia przyjazny ogień klanu na dozwolony
+command.description.clanff.block=Ustawia przyjazny ogień klanu na zablokowany
+command.description.description=Ustaw opis klanu
+command.description.ban=Banuje gracza z poleceń klanu
+command.description.unban=Banuje gracza z poleceń klanu
+command.description.regroup.me=Przegrupowuje użytkowników klanu do Twojej lokalizacji
+command.description.regroup.home=Przesyła użytkowników klanu do domu klanu
+command.description.home.tp=Teleportuje się do domu klanu
+command.description.home.clear=Usuwa dom klanu
+command.description.home.set=Ustaw dom klanu
+command.description.mod.home.set=Ustaw dom klanu
+command.description.mod.home.tp=Teleportuj do domu klanu
+command.description.rival.remove=Usuń rywali
+command.description.rival.add=Dodaj rywala
+command.description.ally.remove=Usuń sojusznika
+command.description.kick=Wyrzuć członka z twojego klanu
+command.description.bb.display=wyświetl tablicę ogłoszeń klanu
+command.description.bb.clear=wyczyść tablicę ogłoszeń klanu
+command.description.bb.post=Opublikuj wiadomość na tablicy ogłoszeń klanu
+command.description.place=Umieszcza gracza w klanu
+command.description.reload=Odśwież wtyczkę i jej konfigurację
+command.description.trust=Zaufany członek
+command.description.untrust=Niezaufany członek
+command.description.resign=Rezygnacja z klanu
+command.description.help=Pokazuje pomoc lub wyszukiwanie w pomocy
+command.description.ally.add=Dodaj sojusznika
+command.description.clan=Otwórz GUI
+command.description.disband=Rozwiąż swój klan
+command.description.mod.disband=Rozwiąż klan
+command.description.modtag=Modyfikuj tag klanu
+command.description.purge=Puste dane gracza
+command.description.setbanner=Ustaw baner klanu
+command.description.verify=Zweryfikuj swój klan
+command.description.mod.verify=Zweryfikuj klan
+command.description.invite=Zaproś gracza do klanu
+command.description.fee.check=Sprawdza wartość opłaty klanowej, jeśli jest włączona
+command.description.fee.set=Ustaw podatek twojego klanu
+command.description.bank.status=Sprawdź stan banku twojego klanu
+command.description.bank.withdraw.all=Wypłaca wszystko z banku klanu
+command.description.bank.withdraw.amount=Wypłać kwotę z banku klanu
+command.description.bank.deposit.all=Depozyt wszystkich Twoich pieniędzy do banku klanu
+command.description.bank.deposit.amount=Depozytuj pieniądze do banku klanu
+command.description.war.start=Rozpoczęcie wojny
+command.description.war.end=Kończy wojnę
+command.description.resetkdr.everyone=Resetuje KDR wszystkich
+command.description.resetkdr.player=Resetuje KDR gracza
+command.description.resetkdr=Resetuje swój KDR
+command.description.admin.demote=Demotuje dowolnego lidera z klanu
+command.description.demote=Demotuje lidera
+command.description.admin.promote=Promuj dowolnego członka z klanu
+command.description.promote=Awansuje członka do lidera
+command.description.toggle.bb=Ustala czy tablica bulletin powinna być wyświetlana podczas logowania
+command.description.toggle.tag=Ustala czy tag klanu ma być wyświetlany obok Twojego imienia
+command.description.toggle.deposit=Przełącza, czy wpłaty są dozwolone na klanu
+command.description.toggle.withdraw=Przełącza, czy wpłaty są dozwolone na klanu
+command.description.toggle.fee=Przełącza, czy opłata klanu jest włączona
+command.description.alliances=Wyświetla listę wszystkich sojuszy klanów
+command.description.coords=Pokazuje współrzędne członków klanu
+command.description.rank.assign=Przydziela rangę członkowi
+command.description.rank.unassign=Nie przypisuje członka z rangi
+command.description.rank.create=Tworzy rangę
+command.description.rank.delete=Usuwa rangę
+command.description.rank.list=Wyświetla rangę klanu
+command.description.rank.setdisplayname=Ustawia wyświetlaną nazwę rangi
+command.description.rank.permissions.available=Wyświetla dostępne uprawnienia rangi
+command.description.rank.permissions.rank=Modyfikuj pozwolenia rangi
+command.description.rank.permissions.add=Dodaj uprawnienia do tego węzła
+command.description.rank.permissions.remove=Usuwa uprawnienia z rangi
 home-menu=/{0} home{1} - Teleportuje w miejsce zapisanej lokacji
 home-set-menu=/{0} home set{1} - Ustaw teleport klanu 
-example.clan.modtag.4kfo.4l=Przyklad\: /clan modtag &4K&ille&4L
+home-clear-menu=/{0} dom czysty{1} - wyczyść bazę klanu
 clan=Klan
 allies=Sojusznicy
 alliances=Sojusze
@@ -98,6 +191,7 @@ name=Imie
 distance=Odleglosc
 coords.upper=Wspolrzedne
 world=Swiat
+kdr=KDR
 members=Czlonkowie
 clans.lower=Klans
 rival=Wrog
@@ -107,6 +201,7 @@ free.agent=Wolny Strzelec
 days=Dni
 rivals=Wrgogowie
 rivalries=Wrogie
+online=Online
 player=Gracz
 seen=Widziany
 leader=Przywodca
@@ -125,6 +220,7 @@ verified=zweryfikowane
 unverified=niezweryfikowane
 profile=profil
 civilian.abbreviation=Cyw
+rank=Ranga
 leaders=Przywodcy
 none=Zaden
 today=Dzis
@@ -134,6 +230,7 @@ killcount=Zabij hrabia
 attacker=Agresor
 victim=Ofiara
 kill.death.ratio=Stosunek Zabojstw/Zgonow
+nokillsfound=Nie znaleziono zabójstw
 promoted.to.leader={0} zostal awansowany na przywodce
 denied.demotion={0} odrzucil degradacje {1}. Nie osiagnieto porozumienia.
 membership.invitation={0} odmowil zaproszenia w szeregi klanu
@@ -171,11 +268,10 @@ clan.players=gracze klanu \: {0}
 clans=Klany\: {0}
 banned=Masz bana na uzywanie klanowych komend
 nothing.more.to.see=Nic wiecej tu nie ma
-nothing.to.deny=Nic wiecej do odrzucenia
+nothing.to.vote=&cNic do zaakceptowania lub odrzucenia
 no.leader.permissions=Nie masz uprawnien wodza
 you.have.already.voted=Juz oddales swoj glos w tej sprawie
 has.voted.to.deny={0} glosowal przeciw
-nothing.to.accept=Nic do zaakceptowania
 view.next.page=Wpisz /{0} by przejsc do nastepnej strony
 voted.to.accept={0} zaglosowal za
 bulletin.board.header={0}* {1}{2} Tablica ogloszen
@@ -184,14 +280,13 @@ has.been.disbanded.alliance.ended={0} zostal rozwiazany. Koniec przymieza.
 clan.disbanded=Rozwiazano klan
 1.color.day=1 {0}dni
 many.color.days={0}{1} dni
-does.not.match=Nie ma takiej komendy klanowej
-simpleclans.command.failure=SimpleClans blad polecenia\: {0}
 insufficient.permissions=Niewystarczajace uprawnienia
 clan.is.not.verified=Klan nie zweryfikowany
+player.not.a.member.of.any.clan=&cGracz nie jest członkiem żadnego klanu
 not.a.member.of.any.clan=Nie jestes czlonkiem zadnego klanu
 minimum.to.make.alliance=Muszisz miec w klanie co najmniej {0} czlonkow aby moc zawierac sojusze.
-no.clan.matched=Zaden klan nie odpowiada zapytaniu
-cannot.ally.with.an.unverified.clan=Nie mozesz zawrzec przymieza z niezweryfikowanym klanem.
+cannot.be.same.clan=&cMusisz wstawić klan inny niż twoj\!
+other.clan.not.verified=&cInny klan nie jest zweryfikowany\!
 your.clans.are.not.allies=Wasze klany nie sa sojusznikami
 has.broken.the.alliance={0} zerwal sojusz z {1}
 at.least.one.leader.accept.the.alliance=Co najmniej jeden z przywodcow klanu musi byc dostepny aby przyjac propozycje sojuszu.
@@ -205,9 +300,12 @@ you.banned=Zostales pozbawiony komend klanowych (masz bana)
 clan.wide.friendly.fire.blocked=Friendly Fire dla calego klanu jest wylaczony.
 clan.wide.friendly.fire.is.allowed=Friendly Fire dla calego klanu jest wlaczony.
 you.are.the.only.member.online=Jestes jedynym czlonkiem klanu online. Badz czujny.
+your.clan.color.tag.cannot.be.longer.than.characters=&cKolorowy tag klanu nie może być dłuższy niż {0} znaków
 your.clan.tag.cannot.be.longer.than.characters=Tag twojego klanu nie moze byc dluzszy niz {0} znakow.
 your.clan.tag.must.be.longer.than.characters=Tag twojego klanu musi miec wiecej niz {0} znakow.
 your.tag.cannot.contain.the.following.colors=Tag twojego klanu nie moze zawierac nastepujacych kolorow\: {0}
+your.tag.cannot.contain.color.codes=Twój tag nie może zawierać kodów kolorów
+you.cannot.set.colored.ranks=Nie możesz ustawić koloru rang
 your.clan.name.cannot.be.longer.than.characters=Nazwa klanu nie moze byc dluzsza niz {0} znakow
 your.clan.name.must.be.longer.than.characters=Nazwa twojego klanu musi byc dluzsza niz {0} znakow
 your.clan.tag.can.only.contain.letters.numbers.and.color.codes=Tag twojego klanu moze zawierac wylacznie litery,cyfry oraz kody kolorow
@@ -217,6 +315,7 @@ you.must.first.resign=Najpierw musisz odejsc z {0}
 clan.with.this.tag.already.exists=Klan o takim Tagu juz istnieje
 get.your.clan.verified.to.access.advanced.features=Weryfikacja twojego klanu umozliwi dostep do pozostalych opcji
 clan.created=Clan {0} pomyslnie utworzony
+not.enough.leaders.online.to.vote.on.demotion=Brak wystarczającej liczby liderów online, aby głosować na ta degradacje
 demotion.vote.has.been.requested.from.all.leaders=Wszyscy przywodcy zostali poproszeni o glos w sprawie degradacji
 player.is.not.a.leader.of.your.clan=Ten gracz nie jest przywodca twojego klanu
 clan.has.been.disbanded=Klan {0} zostal rozwiazany
@@ -225,54 +324,48 @@ friendy.fire.is.now.managed.by.your.clan=Ustawienie Friendly fire zgodne z obecn
 personal.friendly.fire.is.set.to.allowed=Osobisty Friendly fire zostal wlaczony
 global.friendy.fire.is.now.managed.by.each.clan=Swiatowy Friendly fire zalezy teraz od indywidualnych ustalen kazdego klanu
 global.friendy.fire.is.already.being.managed.by.each.clan=Friendly fire juz jest zalezny od ustawien klanow
-global.friendly.fire.is.set.to.allowed=Wlaczenie globalnego Friendly fire
-global.friendly.fire.is.already.being.allowed=Globalny Friendly fire juz jest wlaczony
-no.player.matched=Nie odnaleziono gracza
-the.player.doesn.t.not.have.the.permissions.to.join.clans=Ten gracz nie ma uprawnien aby wstepowac do klanow
-you.cannot.invite.yourself=Nie mozesz zprosic samego siebie\! Czujemy sie samotni co? Znajdz owce lub dwie.
-this.player.is.banned.from.using.clan.commands=Ten gracz ma zablokowany dostep do komend klanowych
-the.player.is.already.member.of.another.clan=Ten gracz jest juz czlonkiem innego klanu.
-has.been.asked.to.join={0} zostal zapytany czy chce dolaczyc do {1}
-you.cannot.kick.yourself=Nie mozesz sam siebie wykopac. No prosze, bez masochizmu.
-the.player.is.not.a.member.of.your.clan=Ten gracz nie jest czlonkiem twojego klanu
-you.cannot.kick.another.leader=Nie mozesz wykopac innego przywodcy.
-has.been.kicked.by={0} zostal wykopany przez {1}
-no.clans.have.been.created=Zadne klany nie zostaly utworzone
-total.clans=Wszystkich klanow\:
+global.friendly.fire.is.set.to.allowed=Włączono globalny ogień przyjacielski 
+global.friendly.fire.is.already.being.allowed=Globalny ogień przyjacielski jest już włączony
+the.player.doesn.t.not.have.the.permissions.to.join.clans=Gracz nie ma uprawnień do dołączenia do klanów
+you.cannot.invite.yourself=Nie możesz zaprosić samego siebie
+this.player.is.banned.from.using.clan.commands=Ten gracz ma zablokowany dostęp do komend klanowych
+the.player.is.already.member.of.another.clan=Ten gracz jest już członkiem innego klanu
+has.been.asked.to.join={0} został zapytany o dołączenie do {1}
+you.cannot.kick.yourself=Nie możesz wyrzucić samego siebie
+the.player.is.not.a.member.of.your.clan=Ten gracz nie jest członkiem twojego klanu
+you.cannot.kick.another.leader=Nie możesz wyrzucić innego przywódcy
+has.been.kicked.by={0} został wyrzucony przez {1}
+no.clans.have.been.created=Żadne klany nie zostały utworzone
+total.clans=Wszystkie klany\:
 legend=Legenda\:
 kill.type.civilian=Zabito\: {0}Cywili
-no.player.data.found=Brak danych o graczach
-kill.type.0=Zabito\: {0}
-s.player.info={0}''statystki
+no.player.data.found=Nie znaleziono danych gracza
 clan.0=Klan\: {0}
-deaths.0=Smierci\: {0}
-join.date.0=Data dolaczenia\: {0}
-last.seen.0=Ostatnio widzany\: {0}
-past.clans.0=Poprzednie klany\: {0}
+status.0=Status\: {0}
+rank.0=Ranga\: {0}
+kdr.0=KDR\: {0}
 inactive.0=Nieaktywny\: {0}
-kill.totals=Zabojstw w sumie\:
 clan.commands=komendy klanowe
-you.can.only.modify.the.color.and.case.of.the.tag=Jedyne co mozesz zmieniac to obramowanie i kolory Tagu
-tag.changed.to.0=Tag zmieniono na {0}
-name.0=Imie\: {0}
-leaders.0=Przywodcy\: {0}
-members.online.0=Klanowicze w grze\: {0}
-allies.0=Sojusznikow\: {0}
-rivals.0=Wrogo\: {0}
-founded.0=Utworzono\: {0}
-the.member.to.be.promoted.must.be.online=Gracz ktory ma dostac awans musi byc dostepny.
-the.player.does.not.have.the.permissions.to.lead.a.clan=Ten gracz nie ma uprawnien aby dowodzic klanem.
-you.cannot.promote.yourself=Nie mozesz sam siebie awansowac\! To bylby ciekawy klan nie ?
-the.player.is.already.a.leader=Ten gracz juz jest przywodca
-configuration.reloaded=Przeladowano ustawienia
-last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Ostatni przywodca nie moze odejsc. Musisz wyznaczyc inna osobe na przywodce lub rozwiazac klan.
-0.has.resigned={0} zlozyl rezygnacje.
-you.cannot.trust.yourself=Nie mozesz sam siebie oznaczyc jako osobe zaufana. To by troche mijalo sie z celem, nie sadzisz ?
-leaders.are.already.trusted=Wszyscy przywodcy sa automatycznie oznaczeni jako zaufani
-this.player.is.already.trusted=Ten gracz juz jest oznaczony jako zaufany
-has.been.given.trusted.status.by={0} otrzymal status zaufanego od {1}
+you.can.only.modify.the.color.and.case.of.the.tag=Możesz modyfikować tylko kolor i wielkość liter tagu
+tag.changed.to.0=Tag zmieniony na {0}
+name.0=Nazwa\: {0}
+description.0=Opis\: {0}
+leaders.0=Przywódcy\: {0}
+allies.0=Sojusznicy\: {0}
+rivals.0=Wrogowie\: {0}
+other.player.must.be.online=&cGracz musi być online\!
+the.player.does.not.have.the.permissions.to.lead.a.clan=Ten gracz nie ma uprawnień, aby dowodzić klanem
+you.cannot.promote.yourself=Nie możesz awansować samego siebie 
+the.player.is.already.a.leader=Ten gracz jest już przywódcą
+configuration.reloaded=Przeładowano ustawienia
+last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan=Ostatni dowódca nie może zrezygnować. Musisz wyznaczyć innego dowódcę lub rozwiązać klan
+0.has.resigned={0} zrezygnował
+you.cannot.trust.yourself=Nie możesz oznaczyć samego siebie jako osobę zaufaną 
+leaders.are.already.trusted=Przywódcy są już oznaczeni jako zaufani 
+this.player.is.already.trusted=Ten gracz już jest oznaczony jako zaufany
+has.been.given.trusted.status.by={0} otrzymał status zaufanego od {1}
 this.player.is.not.banned=Ten gracz nie jest zbanowany
-player.removed.from.the.banned.list=Gracza usunieto z listy banow
+player.removed.from.the.banned.list=Gracz usunięty z listy zbanowanych
 you.have.been.unbanned.from.clan.commands=Zostales odbanowany w prawach klanowych i mozesz ponownie korzystac komend.
 you.cannot.untrust.yourself=Nie mozesz sam siebie oznaczyc jako osobe niezaufana. Popros kogos kto cie dobrze poznal.
 leaders.cannot.be.untrusted=Przywodca nie mozna ustawic statusu osoby negodnej zaufania.
@@ -285,38 +378,379 @@ clan.0.has.been.verified=Clan {0} zostal zweryfikowany\!
 total.clan.players.0=Wszystkich graczy\: {0}
 proposing.war={0} proponuje rozpoczac wojne z {1}
 you.can.only.start.war.with.rivals=Mozesz tylko rozpoczac wojne z rywalami
-leaders.have.been.asked.to.accept.the.war.request={0} przywodcy zostali poproszeni o zaakceptowanie zadania wojny
-leaders.asked.to.end.rivalry={0} przywodcy zostali poproszeni, by zakonczyc wojne
-proposing.to.end.the.war={0} proponuje, by zakonczyc wojne z {1}
-clans.already.at.war=Twoj klany sa juz w czasie wojny
-clans.not.at.war=Twoj klanow nie sa w stanie wojny
+leaders.have.been.asked.to.accept.the.war.request={0} przywódcy zostali poproszeni o zaakceptowanie wypowiedzenia wojny
+leaders.asked.to.end.rivalry={0} przywódcy zostali zapytani o zakończenie wojny
+proposing.to.end.the.war={0} proponuje zakończenie wojny z {1}
+clans.already.at.war=Klany są już w stanie wojny
+clans.not.at.war=Klany nie są w stanie wojny
 you.are.at.war={0} jest teraz w stanie wojny z {1}
-denied.war.req={0} zaprzeczyl wniosek wojny wyslany przez {1}
-you.are.no.longer.at.war={0} nie jest juz w stanie wojny z {1}
-end.war.denied=zadanie zakonczenia wojny zostala odrzucona przez {0}
+denied.war.req={0} odrzucił prośbę o wojnę wysłaną przez {1}
+you.are.no.longer.at.war={0} nie jest już w stanie wojny z {1}
+end.war.denied=Żądanie zakończenia wojny zostało odrzucone przez {0}
 denied.war.end={0} zaprzeczyl wniosek wojny wyslany przez {1}
-0.war=/{0} wojna{1} poczatek/koniec [tag] - Start/koniec wojny
-start=poczatku
-end=konca
-add=dodaje
-remove=usuwa
-allow=wlacza
-block=wylacza
-auto=klanowe
+has.initiated.a.rivalry={0} zapoczątkował rywalizację z {1}
+start=rozpocznij
+end=zakończ
+add=dodaj
+remove=usuń
+allow=zezwól
+block=zablokuj
+auto=automatycznie
 war=wojna
+0.s.sword.1.2.b.bow.3.4.a.arrow={0}S\=Miecz{1}, {2}B\=Łuk{3}, {4}A\=Strzały
 weapon.S=M
 weapon.B=K
 weapon.A=S
-materials=Materialy
+materials=Materiały
+armor.h=H
+armor.c=C
+armor.l=L
+armor.B=B
 diamond=diament
-gold=zloto
+gold=złoto
 wood=drewno
-server.announce=Server oglaszaj?
-clan.announce=Klan oglaszaj?
-leader.announce=Kierownik oglaszaj?
-hunger=Glod
+server.announce=Ogłoszenie serwera
+clan.announce=Ogłoszenie klanu
+leader.announce=Ogłoszenie przywódcy
+hunger=Głód
+stone=kamien
+iron=żelazo
 the.clan.cannot.be.rivaled=Klan nie moze byc rywalizowal
-home.base.only.once=Baze mozna ustawic tylko raz
-rival.limit.reached=Masz juz rywala limit. Nie mozesz rywalizowac juz wiecej klanow.
-you.moved.teleport.cancelled=Zostal przeniesiony, teleport anulowane
-waiting.for.teleport.stand.still.for.0.seconds=Oczekiwanie na teleport, stac na {0} sekund
+bboff=BB wyłączony
+bbon=BB włączony
+tagoff=Tag wyłączony
+tagon=Tag włączony
+depositon=Depozyt włączony
+depositoff=Depozyt wyłączony
+withdrawon=Wypłacanie włączone
+withdrawoff=Wypłacanie wyłączone
+feeoff=Opłata wyłączona
+feeon=Opłata włączona
+home.base.only.once=Baza główna może być ustawiona tylko raz
+now.at.homebase=Jesteś teraz w bazie głównej {0}
+hombase.set=Baza domowa klanu ustawiona na\: {0}
+hombase.cleared=Wyczyszczono bazę domową klanu
+hombase.mod.set={0} Baza główna ustawiona na\:
+hombase.not.set=Baza główna nie została ustawiona
+rival.limit.reached=Osiągnąłeś limit rywalizacji. Nie możesz rywalizować z więcej z większą liczbą klanów.
+you.moved.teleport.cancelled=Poruszyłeś się, teleportowanie anulowane
+waiting.for.teleport.stand.still.for.0.seconds=Oczekiwanie na teleport, stój w miejscu na {0} sekund
+on=wł
+off=wył
+leave=opuść
+join=dołącz
+mute=wycisz
+player.rank.changed=Ranking został ustawiony
+your.clans.are.already.rivals=Wasze klany to juz sojusznicy
+player.got.money=Masz {0} za zabicie {1} na podstawie KDR\: {2}
+cleared.bb=Usunięto tablicę ogłoszeń.
+clan.balance=Saldo Klanowe\: {0}
+bb.fee.player.kicked={0} został/a wyrzucony/a za nieuiszczenie opłaty
+bb.fee.set={0} $ oznacza opłatę
+bb.clan.deposit={0} $ zostało wpłaconych
+player.clan.deposit=Złożyłeś {0}
+bb.clan.withdraw={0} $ zostało wypłaconych
+player.clan.withdraw=Wypłaciłeś {0}
+clan.bank.not.enough.money=Twój bank klanów nie ma wystarczającej ilości pieniędzy
+your.clans.are.not.rivals=Wasze klany nie sa sojusznikami
+the.clan.members.reached.limit=Twoi członkowie klanu osiągnęli limit
+you.have.reseted.your.kdr=Zresetowałeś swój KDR
+you.have.reseted.0.kdr=Zresetowałeś KDR {0}
+you.have.reseted.kdr.of.all.players=Zresetowałeś KDR wszystkich graczy
+resign.yes=Tak
+resign.no=Nie
+resign.confirmation=Czy na pewno chcesz zrezygnować? {0}
+resign.success=Pomyślnie zrezygnowałeś z klanu
+you.cannot.demote.the.last.leader=Nie możesz zdegradować ostatniego lidera
+player.successfully.demoted=Gracz został pomyślnie obniżony
+bb.ago= temu
+bb.moments=chwile
+bb.seconds= sekundy
+bb.minutes= minuty
+bb.one.minute=1 minuta
+bb.hours= godziny
+bb.one.hour=1 godzina
+bb.days= Dni
+bb.one.day=1 dzień
+the.fee.is.0.and.its.current.value.is.1=Opłata wynosi {0} , a jej obecna wartość wynosi {1}$
+fee.enabled=włączone
+fee.disabled=wylaczone
+fee.set=Opłata została ustawiona
+max.fee.allowed.is.0=Maksymalna dozwolona opłata to {0}
+fee.collected={0} $ zostało pobrane za opłatę klanową
+player.purged=Gracz został pomyślnie oczyszczony
+upkeep.collected={0} $ zostały wycofane na utrzymanie
+balance.is.not.enough.for.upkeep=Saldo klanu nie wystarczy do opłacenia utrzymania ({0} $), wpłacić kwotę, aby uniknąć rozwiązania
+your.clan.description.must.be.longer.than=Twój klanowy opis nie moze byc dluzszy, niz {0} znakow
+your.clan.description.cannot.be.longer.than=Twój opis klanu nie może być dłuższy niż {0} znakow
+description.changed=Pomyslnie, zmieniles opis klanu
+no.description=Bez opisu
+the.player.must.wait.0.before.joining.your.clan.again=Ten gracz musi poczekać {0} minut przed ponownym dołączeniem do klanu
+disabled.command=Wyłączone komendy
+rank.displayname.updated=Nazwa wyświetlana rangi została zaktualizowana\!
+rank.0.permissions=Uprawnienia {0}rangi\:
+available.rank.permissions=Dostępne uprawnienia dla rangi\:
+rank.already.exists=Ranga już istnieje
+rank.0.does.not.exist=Ranga {0} nie istnieje
+rank.created=Utworzono rangę
+permission.0.added.to.rank.1=Uprawnienia {0} dodane do rangi {1}
+permission.0.removed.from.rank.1=Uprawnienie {0} usunięte z rangi {1}
+rank.0.deleted=Ranga {0} usunięta
+clans.ranks=Ranga Klanu\:
+ranks.list.item={0}\# {1} ({2})
+no.ranks=Nie utworzono rang
+rank.no.permissions=Ta ranga nie ma żadnych uprawnień
+player.unassigned.from.rank=Gracz nieprzypisany do rangi
+you.must.be.0.or.have.the.permission.1.to.use.this=Musisz być {0} lub twój lider musi dać swoją rangę {1} aby użyć tego
+deposit.not.allowed=Wpłata jest niedozwolona, użyj /%clan %toggle %dedeposit
+withdraw.not.allowed=Wypłata jest niedozwolona, użyj /%clan %toggle %withdraw aby na to zezwolić
+resign.request.cancelled=Rezygnacja została anulowana
+promotion.vote.has.been.requested.from.all.leaders=Prośba o awans została złożona dla wszystkich przywódców
+allowed=dozwolone
+blocked=zablokowane
+chat.joined=dołączył
+chat.not.joined=nie dołączył
+gui.loading=&7Ładowanie...
+gui.back.title=&Wstecz
+gui.previous.page.title=&fPoprzednia strona
+gui.next.page.title=&fNastępna strona
+gui.lore.no.permission=Nie masz uprawnień żeby to zrobić\!
+gui.main.title={0} - menu klanu
+gui.main.languageselector.title=Wybierz język
+gui.main.languageselector.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby wybrać swój język
+gui.main.languageselector.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby pomóc w tłumaczeniu
+gui.main.other.commands.title=&fInne komendy
+gui.main.other.commands.lore=&7Kliknij lewym przyciskiem myszy, zeby zobaczyć listę klanów
+gui.main.clan.list.title=&fLista klanów
+gui.main.clan.list.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę klanów
+gui.main.reset.kdr.title=&fReset KDR
+gui.main.reset.kdr.lore.price=&7Cena\: &b{0}
+gui.main.reset.kdr.lore=&7Kliknij lewym przyciskiem myszy, aby zresetować KDR
+gui.main.leaderboard.title=&fRanking
+gui.main.leaderboard.lore=&7Lewy-przycisk, zeby zobaczyc ranking
+gui.main.staff.title=&fStaff
+gui.main.staff.lore=&7Kliknij lewym przyciskiem myszy aby otworzyć Staff menu
+gui.staff.title=Staff
+gui.staff.clan.list.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę klanów
+gui.staff.clan.list.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby zobaczyć wszystkie niezweryfikowane klany
+gui.player.list.title=Lista graczy
+gui.staff.player.list.title=&Lista graczy
+gui.staff.player.list.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby zobaczyć wszystkich graczy
+gui.staff.player.list.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby zobaczyć wszystkich graczy online
+gui.staff.global.ff.title=&fGlobalny Friendly Fire
+gui.staff.global.ff.lore.status=&7Status\: &b{0}
+gui.staff.global.ff.lore.toggle=&7Kliknij lewym przyciskiem myszy, aby przełączyć Friendly Fire
+gui.staff.reload.title=&fPrzeładuj
+gui.staff.reload.lore=&7Kliknij lewym przyciskiem myszy, aby przeładować wtyczkę
+gui.staff.clanlist.unverified.title=Niezweryfikowane Klany - Razem\: {0}
+gui.staff.clanlist.toplace.title=Wybierz nowy klan {0}
+gui.warning.title=Ostrzeżenie
+gui.warning.no.permission.title=&fBrak uprawnień
+gui.warning.no.permission.plugin.lore=Nie masz uprawnień żeby to zrobić\!
+gui.warning.no.permission.leader.lore=&7Czy jesteś jednym z przywódców klanu?
+gui.warning.no.permission.rank.lore=&7Musisz być {0} lub twój lider musi dać swoją rangę {1} aby tego użyć\!
+gui.warning.not.verified.title=&fNiezweryfikowany
+gui.warning.not.verified.lore=&7Twój klan musi zostać zweryfikowany\!
+gui.allies.title=Sojusznicy
+gui.allies.clan.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć tego sojusznika
+gui.allies.add.title=&Dodaj sojusznika
+gui.add.ally.title=Dodaj sojusznika
+gui.add.ally.clan.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę klanów
+gui.rivals.title=Wrog
+gui.rivals.clan.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć tego sojusznika
+gui.rivals.add.title=&fDodaj rywala
+gui.add.rival.title=Dodaj rywala
+gui.add.rival.clan.lore=&7Kliknij lewym przyciskiem myszy, aby rywalizować z klanem
+gui.clanlist.title=Klany - Razem\: {0}
+gui.clanlist.clan.title=&fKlan\: [{0}&f] {1}
+gui.clanlist.clan.lore.position=&b\#{0}
+gui.clanlist.clan.lore.kdr=&7KDR\: &b{0}
+gui.clanlist.clan.lore.members=&7Członkowie\: &b{0}
+gui.coords.title=Współrzędne
+gui.coords.player.lore.distance=&7Odległość\: &b{0}
+gui.coords.player.lore.coords=&7Współrzędne\: &b{0} {1} {2}
+gui.coords.player.lore.world=&7Świat\: &b{0}
+gui.invite.title=Zaproś gracza
+gui.invite.player.title=&f{0}
+gui.invite.player.price.lore=&7Cena\: &b{0}
+gui.invite.player.lore=&7Kliknij lewym przyciskiem myszy, aby zaprosić
+gui.roster.title={0} Lista
+gui.roster.invite.title=&fZaproszenie
+gui.roster.invite.lore=&7Zaproś gracza do klanu
+gui.leaderboard.title=Ranking - graczy\: {0}
+gui.leaderboard.player.title=&f\#{0} {1}
+gui.ranks.title=Rangi
+gui.ranks.title.set.rank=Ustaw rangę - obecnie\: {0}
+gui.ranks.create.title=&fUtwórz rangę
+gui.ranks.create.lore=&7Kliknij lewym przyciskiem myszy, aby utworzyć rangę
+gui.ranks.rank.title=&fRanga\: {0}
+gui.ranks.rank.displayname.lore=&7Wyświetlana nazwa\: &b{0}
+gui.ranks.rank.remove.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć tę rangę
+gui.ranks.rank.edit.permissions.lore=&7Kliknij lewym przyciskiem myszy, aby edytować uprawnienia rangi
+gui.ranks.rank.assign.lore=&7Kliknij lewym przyciskiem myszy, aby przypisać tę rangę do {0}
+gui.permissions.title=Uprawnienia {0}
+gui.permissions.add.title=&fDodaj uprawnienia
+gui.permissions.permission.title=&f{0}
+gui.permissions.permission.lore=&7Kliknij prawym przyciskiem myszy, aby usunąć to uprawnienie z rangi
+gui.add.permission.title=Dodaj uprawnienie
+gui.add.permission.permission.title=&f{0}
+gui.add.permission.permission.lore=&7Kliknij lewym przyciskiem myszy aby dodać to uprawnienie do rangi
+gui.clandetails.title={0} {1}
+gui.clandetails.free.agent.title=&fWolny Agent
+gui.clandetails.free.agent.create.clan.price.lore=&7Cena\: &b{0}
+gui.clandetails.free.agent.create.clan.lore=&7Kliknij lewym przyciskiem myszy, aby utworzyć klan
+gui.clandetails.clan.title=&f[{0}&f] {1}
+gui.clandetails.clan.lore.description=&7Opis\: &b{0}
+gui.clandetails.clan.lore.status=&7Status\: &b{0}
+gui.clandetails.clan.lore.leaders=&7Liderzy\: &b{0}
+gui.clandetails.clan.lore.online.members=&7Członkowie online\: &b{0}/{1}
+gui.clandetails.clan.lore.kdr=&7KDR\: &b{0}
+gui.clandetails.clan.lore.kill.totals=&7Kille Razem\: &b[Wrogowie\:{0} Neutralni\:{1} Cywile\:{2}]
+gui.clandetails.clan.lore.deaths=&Smierci\: {0}
+gui.clandetails.clan.lore.fee=&7Opłata\: &b{0}, {1}$
+# suppress inspection "TrailingSpacesInProperty"
+gui.clandetails.clan.lore.allies.separator=&b, 
+# suppress inspection "TrailingSpacesInProperty"
+gui.clandetails.clan.lore.rivals.separator=&b, 
+gui.clandetails.clan.lore.allies=&Sojusznicy\: {0}
+gui.clandetails.clan.lore.rivals=&Wrogowie\: {0}
+gui.clandetails.clan.lore.founded=&7Założono\: &b{0}
+gui.clandetails.clan.lore.inactive=&7Nieaktywne\: &b{0}/{1} dni
+gui.clandetails.allies.title=&fSojusznicy
+gui.clandetails.allies.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć swoich sojuszników lub dodać więcej
+gui.clandetails.rivals.title=&fWrogowie
+gui.clandetails.rivals.lore=&7Kliknij lewym przyciskiem myszy aby zobaczyć swoich rywali lub dodać więcej
+gui.clandetails.roster.title=&fLista
+gui.clandetails.roster.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć członków klanu lub zaprosić więcej
+gui.staffclandetails.roster.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć listę klanów
+gui.clandetails.coords.title=&fWspółrzędne
+gui.clandetails.coords.lore=&Pokazuje współrzędne członków klanu
+gui.clandetails.home.title=&fHome
+gui.clandetails.home.lore.teleport.price=&7Cena Teleportacji\: &b{0}
+gui.clandetails.home.lore.teleport=&7Kliknij lewym przyciskiem myszy, aby teleportować się do domu klanu
+gui.staffclandetails.home.lore.teleport=&7Kliknij lewym przyciskiem myszy, aby teleportować się do domu klanu
+gui.clandetails.home.lore.clear=&7Kliknij środkowo aby wyczyścić dom klanu
+gui.clandetails.home.lore.set.price=&7Ustaw cenę\: &b{0}
+gui.clandetails.home.lore.set=&7Kliknij prawym przyciskiem myszy, aby ustawić dom klanu
+gui.staffclandetails.home.lore.set=&7Kliknij prawym przyciskiem myszy, aby ustawić dom klanu
+gui.clandetails.regroup.title=&fPrzegrupowanie
+gui.clandetails.regroup.lore.price=&7Cena\: &b{0}
+gui.clandetails.regroup.lore.home=&7Kliknij lewym przyciskiem myszy, aby przegrupować członków klanu w bazie
+gui.clandetails.regroup.lore.me=&7Kliknij prawym przyciskiem myszy, aby przegrupować członków klanu w Twojej lokalizacji
+gui.clandetails.ff.title=&fFriendly Fire
+gui.clandetails.ff.personal.lore=&7Osobiste\: &b{0}
+gui.clandetails.ff.clan.lore=&7Klan\: &b{0}
+gui.clandetails.ff.personal.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć Friendly Fire
+gui.clandetails.ff.clan.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć klanu Friendly Fire
+gui.clandetails.bank.title=&fBank
+gui.clandetails.bank.balance.lore=&7Saldo\: &b{0}
+gui.clandetails.bank.withdraw.status.lore=&7Wypłata\: &b{0}
+gui.clandetails.bank.deposit.status.lore=&7Depozyt\: &b{0}
+gui.clandetails.bank.withdraw.toggle.lore=&7Kliknij środkiem, aby przełączyć status wypłaty
+gui.clandetails.bank.deposit.toggle.lore=&7Kliknij prawym przyciskiem myszy, aby przełączyć status wpłaty
+gui.clandetails.fee.title=&fOpłata
+gui.clandetails.fee.status.lore=&7Status\: &b{0}
+gui.clandetails.fee.value.lore=&7Wartość\: &b{0}
+gui.clandetails.fee.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć status opłaty
+gui.clandetails.rank.title=&fRanga
+gui.clandetails.rank.lore=&7Kliknij lewym przyciskiem myszy, aby zobaczyć rangi klanu i edytować je
+gui.clandetails.verified.title=&fZweryfikowano
+gui.clandetails.not.verified.title=&fNiezweryfikowany
+gui.clandetails.verify.price.lore=&7Cena\: &b{0}
+gui.clandetails.not.verified.lore=&7Kliknij lewym przyciskiem myszy, aby zweryfikować swój klan
+gui.staffclandetails.not.verified.lore=&7Kliknij lewym przyciskiem myszy, aby zweryfikować ten klan
+gui.clandetails.resign.title=&fZrezygnuj
+gui.clandetails.resign.lore=&7Kliknij lewym przyciskiem myszy, aby zrezygnować z klanu
+gui.clandetails.disband.title=&fRozwiąż
+gui.clandetails.disband.lore=&7Kliknij środkowym przyciskiem myszy, aby rozwiązać klan.
+gui.staffclandetails.disband.lore=&7Kliknij lewym przyciskiem myszy, aby rozwiązać ten klan.
+gui.clandetails.chat.title=&fCzat
+gui.clandetails.chat.clan.chat.lore=&7/{0} [message] - &bWysyła wiadomość do czatu klanowego
+gui.clandetails.chat.clan.join.leave.lore=&7/{0} {1}/{2} - &bDołącza/opuszcza czat klanowy
+gui.clandetails.chat.ally.chat.lore=&7/{0} [message] - &bWysyła wiadomość do czatu sojusznika
+gui.clandetails.chat.ally.join.leave.lore=&7/{0} {1}/{2} - &bDołącza/opuszcza czat sojusznika
+gui.clandetails.chat.clan.status.lore=&7Klan\: &b{0}
+gui.clandetails.chat.ally.status.lore=&Sojusznicy\: {0}
+gui.clandetails.chat.clan.toggle.lore=&7Kliknij lewym przyciskiem myszy, aby przełączyć status czatu klanowego
+gui.clandetails.chat.ally.toggle.lore=&7Kliknij prawym przyciskiem myszy, aby przełączyć status czatu sojusznika
+gui.playerdetails.title={0}
+gui.playerdetails.player.title=&f{0}
+gui.playerdetails.player.lore.noclan=&7Klan\: &bBrak
+gui.playerdetails.player.lore.clan=&7Klan\: &b[{0}&b] {1}
+gui.playerdetails.player.lore.rank=&7Ranga\: &b{0}
+gui.playerdetails.player.lore.status=&7Status\: &b{0}
+gui.playerdetails.player.lore.kdr=&7KDR\: &b{0}
+gui.playerdetails.player.lore.kill.totals=&7Kille Razem\: &b[Wrogowie\:{0} Neutralni\:{1} Cywile\:{2}]
+gui.playerdetails.player.lore.deaths=&Smierci\: {0}
+gui.playerdetails.player.lore.join.date=&7Data dołączenia\: &b{0}
+gui.playerdetails.player.lore.last.seen=&7Ostatnio widziany\: &b{0}
+# suppress inspection "TrailingSpacesInProperty"
+gui.playerdetails.player.lore.past.clans.separator=&b, 
+gui.playerdetails.player.lore.past.clans=&Poprzednie klany\: {0}
+gui.playerdetails.player.lore.inactive=&7Nieaktywny\: &b{0}/{1} dni
+gui.playerdetails.kick.title=&fWyrzuć
+gui.playerdetails.promote.demote.title=&fPromocja/Degradacja
+gui.playerdetails.promote.lore.left.click=&7Kliknij lewym przyciskiem myszy aby promować
+gui.playerdetails.demote.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby zdegradować
+gui.playerdetails.assign.unassign.title=&fPrzypisz/Cofnij przypisanie rangi
+gui.playerdetails.assign.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby przypisać
+gui.playerdetails.unassign.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby cofnąć przypisanie
+gui.playerdetails.trust.untrust.title=&fZaufany/Niezaufany
+gui.playerdetails.trust.lore.left.click=&7Kliknij lewym przyciskiem myszy aby promować
+gui.playerdetails.untrust.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby przestać ufać
+gui.playerdetails.ban.unban.title=&fBan/Odbanuj
+gui.playerdetails.ban.left.click=&7Kliknij lewym przyciskiem myszy, aby zbanować tego gracza z klanu
+gui.playerdetails.unban.right.click=&7Kliknij prawym przyciskiem myszy, aby odblokować tego gracza
+gui.playerdetails.resetkdr.lore=&7Kliknij lewym przyciskiem myszy, aby zresetować KDR tego gracza
+gui.playerdetails.purge.title=&fWyczyść
+gui.playerdetails.purge.lore=&7Kliknij lewym przyciskiem myszy, aby wyczyścić dane tego gracza
+gui.playerdetails.place.title=&fPoloz
+gui.playerdetails.place.lore=&7Kliknij lewym przyciskiem myszy, aby wybrać klan dla tego gracza
+gui.languageselector.title=Języki - obecnie\: {0}
+gui.languageselector.language.title=&f{0}
+gui.languageselector.language.lore.left.click=&7Kliknij lewym przyciskiem myszy, aby wybrać swój język
+gui.languageselector.language.lore.translation.status=&7Status tłumaczenia\: &b{0}%
+gui.languageselector.language.lore.right.click=&7Kliknij prawym przyciskiem myszy, aby pomóc w tłumaczeniu
+gui.confirmation.title=Potwierdź
+gui.confirmation.confirm=&7Kliknij tutaj, aby potwierdzić
+gui.confirmation.return=&7Kliknij tutaj, aby powrócić
+gui.not.supported=&cWystąpił błąd podczas otwierania GUI\! Wyłączanie... Czy pobrałeś poprawną wersję?
+staff.member.verify.clan=&cAdmin musi zweryfikować Twój klan\!
+player.already.has.that.rank=&cGracz ma już taką rangę\!
+joined.clan.chat=&bDołączyłeś do klanowego czatu
+left.clan.chat=&bOpuściłeś czat klanowy
+muted.clan.chat=&bWyciszyłeś czat klanowy
+unmuted.clan.chat=&bWyciszyłeś czat klanowy
+joined.ally.chat=&bDołączyłeś do czatu sojusznika
+left.ally.chat=&bOpuściłeś czat sojusznika
+muted.ally.chat=&bWyciszyłeś czat klanowy
+unmuted.ally.chat=&bWłączyłeś czat klanowy
+player.already.in.this.clan=&cGracz jest już w tym klanu
+your.clan.reached.max.alliances=&cTwój klan osiągnął maksymalną liczbę sojuszy
+other.clan.reached.max.alliances=&cTen klan osiągnął maksymalną liczbę sojuszy
+insert.clan.tag=&bWstaw tag klanu\:
+insert.clan.name=&bWprowadź nazwę klanu\:
+insert.rank.name=&bWprowadź nazwę rangi\:
+click.to.help.translating=&bKliknij ten link, aby pomóc w tłumaczeniu\:\n&r{0}
+your.clan.must.have.members.to.verify=&cTwój klan musi mieć co najmniej {0} członków, aby mógł zostać zweryfikowany\!
+you.must.hold.a.banner=&cMusisz mieć baner w ręce\!
+you.changed.clan.banner=&bZmieniłeś baner Twojego klanu\!
+your.clan.already.verified=&Ten klan jest już zweryfikowany\!
+# suppress inspection "TrailingSpacesInProperty"
+clan.profile=\n&b%clan_name%&7 profil &8-------------------------------------------\n \n  &7Nazwa\: &e[&8%clan_color_tag%&e] &b%clan_name%\n  &7Opis\: &f%clan_description%\n  &7Status\: &f%clan_verified%\n  &7Szef\: %clan_leaders%\n  &7Online\: &f%clan_online_count%&7/&f%clan_size%\n  &7KDR\: &e%clan_kdr%\n  &7Zabojstwa\: &8[Rival\:&f%clan_rival_kills% &8Neutral\:&f%clan_neutral_kills% &8Civilian\:&f%clan_civilian_kills%&8]\n  &7Zgony\: &f%clan_deaths%\n  &7Oplata\: &f%clan_fee_enabled%&7, &f%clan_fee_value% $\n  &7Sojusznicy\: &f%clan_allies%\n  &7Wrogowie\: &f%clan_rivals%\n  &7Zalozona\: &f%clan_founded%\n  &7Nieaktywny\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dni
+player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name%
+# suppress inspection "TrailingSpacesInProperty"
+player.lookup.killtype=&7Typ zabójstwa\: %player_kill_type%\n  
+player.lookup=\n&b%player_name%&7 Info &8-------------------------------------------\n \n  &7Klan\: &f%clan_name%\n  &7Ranga\: &f%player_rank%\n  &7Status\: &f%player_status%\n  &7KDR\: &e%player_kdr%\n  &7Kille\: &8[Rival\:&f%player_rival_kills% &8Neutral\:&f%player_neutral_kills% &8Civilian\:&f%player_civilian_kills%&8]\n  &7Zgony\: &f%player_deaths%\n  &7Data dolaczenia\: &f%player_join_date%\n  &7Ostatnie zalogowanie\: &f%player_last_seen%\n  &7Ostatni klan\: &f%player_past_clans%\n  &7Nieaktywny\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dni\n  %kill_type_line%
+economy.disabled=&cGospodarka wyłączona\!
+has.been.purged=Dane {0}zostały wyczyszczone
+accepted.invitation=&bZaakceptowałeś zaproszenie {0}
+denied.invitation=&cOdmówiłeś zaproszenia {0}
+must.be.in.clan.to.pvp=&cTy i {0} musisz być członkami klanu do PvP\!
+clans.not.at.war.pvp.denied=&cTwój klan nie jest w wojnie z {0}\!
+cannot.attack.civilians=&cNie możesz atakować cywilów\!
+cannot.attack.clan.member=&cNie możesz zaatakować innego członka klanu\!
+cannot.attack.ally=&cNie możesz zaatakować sojusznika\!
+cannot.change.member.fee.now=&cNie możesz zmienić składki członkowskiej blisko czasu jej pobrania.
+cannot.change.member.fee.hours=&cSpróbuj ponownie za {0} godzin...
+cannot.change.member.fee.minutes=&cSpróbuj ponownie za {0} minut...

src/main/resources/messages_pt_BR.properties

@@ -1,7 +1,17 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=descricao
 create.command=criar
+delete.command=deletar
+rank.command=cargo
+setdisplayname.command=nomeexibicao
+permissions.command=permissoes
 list.command=listar
+list.order.asc=asc
+list.order.desc=desc
+list.type.name=nome
+list.type.kdr=kdr
+list.type.size=tamanho
+list.type.founded=fundado
+list.type.active=ativo
 profile.command=perfil
 roster.command=membros
 lookup.command=detalhes
@@ -12,17 +22,33 @@ vitals.command=saude
 coords.command=coordenadas
 stats.command=estatisticas
 ally.command=aliado
+add.command=adicionar
+remove.command=remover
+allow.command=permitir
+block.command=bloquear
+auto.command=auto
+check.command=verificar
+assign.command=atribuir
+unassign.command=desatribuir
 rival.command=rival
 bb.command=bb
+clear.command=limpar
 modtag.command=mudartag
 toggle.command=alternar
+tag.command=tag
+deposit.command=depositar
+all.command=tudo
+withdraw.command=sacar
 invite.command=convidar
 kick.command=expulsar
 bank.command=banco
+status.command=estado
 fee.command=taxa
+set.command=definir
 purge.command=apagar
 trust.command=confiar
 untrust.command=naoconfiar
+admin.command=admin
 promote.command=promover
 demote.command=rebaixar
 clanff.command=clanff
@@ -37,100 +63,126 @@ globalff.command=globalff
 kills.command=mortes
 mostkilled.command=maismatou
 war.command=guerra
+start.command=iniciar
+end.command=terminar
 home.command=base
+regroup.command=reagrupar
+me.command=mim
+tp.command=tp
 setrank.command=definircargo
 place.command=colocar
 resetkdr.command=redefinirkdr
+everyone.command=todos
 setbanner.command=defestandarte
 help.command=ajuda
-usage.description=Uso\: /{0} descricao [descrição]
-usage.resetkdr=Uso\: /{0} redefinirkdr [all/jogador]
-usage.clan.alliances=Uso\: /{0} aliancas
-usage.ally=Uso\: /{0} aliado adicionar/remover [tag]
-usage.ban.unban=Uso\: /{0} banir/desbanir [jogador]
-usage.rival=Uso\: /{0} rival adicionar/remover [tag]
-usage.war=Uso\: /{0} guerra iniciar/finalizar [tag]
-usage.clanff=Uso\: /{0} clanff permitir/bloquear
-usage.0.coords=Uso\: /{0} coordenadas
-usage.create=Uso\: /{0} criar
-usage.demote.leader=Uso\: /{0} rebaixar [líder]
-usage.0.disband=Uso\: /{0} debandar
-usage.0.ff.allow.auto=Uso\: /{0} ff permitir/auto
-usage.0.globalff.allow.auto=Uso\: /{0} globalff permitir/auto
-usage.0.permissions.player=Uso\: /{0} permissions [clan] adicionar/remover [permission]
-usage.0.invite.player=Uso\: /{0} convidar [jogador]
-usage.kick.player=Uso\: /{0} expulsar [jogador]
-usage.bank=Uso\: /{0} banco withdraw/deposit/status [quantidade]
-usage.fee=Uso\: /{0} taxa check/set [quantidade]
-usage.purge=Uso\: /{0} apagar [jogador]
-usage.0.modtag.tag=Uso\: /{0} mudartag [tag]
-usage.list=Uso\: /{0} listar
-usage.lookup.tag=Uso\: /{0} detalhes [tag]
-usage.0.profile.tag=Uso\: /{0} perfil [tag]
-usage.0.promote.member=Uso\: /{0} promover <member>
-usage.0.rivalries=Uso\: /{0} rivalidades
-usage.0.roster.tag=Uso\: /{0} membros [tag]
-usage.0.stats=Uso\: /{0} estatisticas
-usage.0.trust.player=Uso\: /{0} confiar [jogador]
-usage.0.untrust.player=Uso\: /{0} naoconfiar [jogador]
-usage.0.verify.tag=Uso\: /{0} verificar [tag]
-usage.0.vitals=Uso\: /{0} saude
-usage.0.place=Uso\: /{0} colocar [jogador] [tag]
-usage.0.leaderboard=Uso\: /{0} ranking
-0.reload.1.reload.configuration=/{0} recarregar{1} - Recarregar configuração
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} globalff permitir/auto {1} - Define o fogo amigo global
-0.place=/{0} place [jogador] [tag]{1} - Coloca um jogador em um clã
-0.ban.unban.player.1.ban.unban.a.player=/{0} ban/unban [jogador]{1} - Bane/desbane um jogador
-0.hometp.clan.1.tp.home.a.clan=/{0} base tp [clan]{1} - Teleporta para a base de um clã
-0.disband.tag.1.disband.a.clan=/{0} debandar [tag]{1} - Debanda um clã
-0.resetkdr.1.resets.kdr=/{0} redefinirkdr jogador/all{1} - Redefine o KDR de todos os jogadores ou de apenas um
-0.resetkdr.1.resets.your.kdr=/{0} redefinirkdr{1} - Redefine o seu KDR
-0.purge.player.1.purge.a.player=/{0} apagar [jogador]{1} - Apaga os dados de um jogador
-0.verify.tag.1.verify.an.unverified.clan=/{0} verificar [tag]{1} - Verifica um clã
-0.verify.1.purchase.verification.of.your.clan=/{0} verificar{1} - Compra a verifição para o seu clã
-0.list.1.lists.all.clans=/{0} listar [name/size/kdr/founded/active] [asc/desc]{1} - Lista todos os clãs
-0.profile.1.view.your.clan.s.profile=/{0} perfil{1} - Mostra o perfil do seu clã
-0.profile.tag.1.view.a.clan.s.profile=/{0} perfil [tag]{1} - Mostra o perfil de um clã
-0.lookup.1.lookup.your.info=/{0} detalhes{1} - Mostra suas informações
-0.lookup.player.1.lookup.a.player.s.info=/{0} detalhes [jogador]{1} - Mostra informações sobre um jogador
-0.leaderboard.1.view.leaderboard=/{0} ranking{1} - Mostra o ranking de jogadores
-0.alliances.1.view.all.clan.alliances=/{0} aliancas{1} - Mostra todas as alianças do clã
-0.rivalries.1.view.all.clan.rivalries=/{0} rivalidades{1} - Mostra todas as rivalidades do clã
-0.roster.1.view.your.clan.s.member.list=/{0} membros{1} - Mostra a lista de membros do seu clã
-0.roster.tag.1.view.a.clan.s.member.list=/{0} membros [tag]{1} - Mostra a lista de membros de um clã
-0.vitals.1.view.your.clan.member.s.vitals=/{0} saude{1} - Mostra os sinais vitais dos membros do seu clã
-0.coords.1.view.your.clan.member.s.coordinates=/{0} coordenadas{1} - Mostra as coordenadas dos membros do seu clã
-0.stats.1.view.your.clan.member.s.stats=/{0} estatisticas{1} - Mostra as estatísticas dos membros do seu clã
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} aliado adicionar/remover [tag]{1} - Adiciona/remove um clã aliado
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rival adicionar/remover [tag]{1} - Adiciona/remove um clã rival
-0.bb.1.display.bulletin.board=/{0} bb{1} - Mostra o quadro de avisos
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} bb [msg]{1} - Adiciona uma mensagem para o quadro de avisos
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} mudartag [tag]{1} - Modifica a tag do seu clã
-0.description.description.1.modify.the.clan.s.description=/{0} descricao [descrição]{1} - Modifica a descrição do clã
-0.invite.player.1.invite.a.player=/{0} convidar [jogador]{1} - Convida um jogador
-0.kick.player.1.kick.a.player.from.the.clan=/{0} expulsar [jogador]{1} - Expulsa um jogador do clã
-0.trust.untrust.player.1.set.trust.level1=/{0} confiar [jogador]{1} - Marca um membro como confiável
-0.trust.untrust.player.1.set.trust.level2=/{0} naoconfiar [jogador]{1} - Marca um membro como não-confiável
-0.promote.member.1.promote.a.member.to.leader=/{0} promover [membro]{1} - Promove um membro para líder
-0.demote.leader.1.demote.a.leader.to.member=/{0} rebaixar [líder]{1} - Rebaixa um líder para membro
-0.setbanner.1.set.clan.banner=/{0} defestandarte{1} - Defina o estandarte do clã
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} clanff permitir/bloquear{1} - Alterna o fogo amigo do clã
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} ff permitir/auto{1} - Alterna o fogo amigo pessoal
-0.toggle.command=/{0} alternar [{2}]{1} - Alterna opções pessoais
-0.resign.1.resign.from.the.clan=/{0} abandonar{1} - Abandona o seu clã
-0.disband.1.disband.your.clan=/{0} debandar{1} - Debanda o seu cl
-0.create.1.purchase.a.new.clan=/{0} criar{1} - Comprar um novo clã
-0.create.1.create.a.new.clan=/{0} criar{1} - Criar um novo clã
-0.kills=/{0} mortes{1} - Mostra a sua contagem de mortes
-0.killsplayer=/{0} mortes [jogador]{1} - Mostra a contagem de mortes de um jogador
-0.fee.check=/{0} taxa check {1}- Verifica se a taxa está ativada e quanto é
-0.fee.set=/{0} taxa set [valor]{1} - Define a taxa de membros do clã
-0.mostkilled=/{0} maismatou{1} - Mostra a contagem de mortes do servidor inteiro
+acf-core.parameter.member=membro
+acf-core.parameter.rank=cargo
+acf-core.parameter.leader=líder
+acf-core.parameter.displayname=nome de exibição
+acf-core.parameter.permission=permissão
+acf-core.parameter.message=mensagem
+acf-core.parameter.tag=tag
+acf-core.parameter.fee=taxa
+acf-core.parameter.description=descrição
+acf-core.parameter.player=jogador
+acf-core.parameter.clan=clã
+acf-core.parameter.type=tipo
+acf-core.parameter.order=ordem
+acf-core.parameter.help=página ou palavras-chave
+command.description.stats=Mostra as estatísticas dos membros do seu clã
+command.description.rivalries=Mostra todas as rivalidades
+command.description.mostkilled=Mostra o total de mortes de uma vítima para o mesmo assassino
+command.description.kills=Mostra a sua contagem de mortes ou de outro jogador
+command.description.lookup=Mostra as suas informações
+command.description.lookup.other=Mostra as informações de um jogador
+command.description.leaderboard=Mostra o ranking
+command.description.roster.other=Lista os membros de outro clã
+command.description.roster=Lista os membros do seu clã
+command.description.profile.other=Mostra o perfil de outro clã
+command.description.profile=Mostra o perfil do seu clã
+command.description.vitals=Mostra os sinais vitais do seu clã e de aliados
+command.description.list=Lista todos os clãs
+command.description.chat=Fala no chat do clã
+command.description.ally=Fala no chat dos aliados
+command.description.deny=Nega um pedido
+command.description.accept=Aceita um pedido
+command.description.more=Mostra mais informações
+command.description.create=Cria um clã
+command.description.ff.allow=Define o seu fogo amigo pessoal como permitido
+command.description.ff.auto=Define o seu fogo amigo pessoal como automático
+command.description.globalff.allow=Define o fogo amigo global como permitido
+command.description.globalff.auto=Define o fogo amigo global como automático
+command.description.clanff.allow=Define o fogo amigo do seu clã como permitido
+command.description.clanff.block=Define o fogo amigo do seu clã como bloqueado
+command.description.description=Define a descrição do seu clã
+command.description.ban=Bane um jogador de comandos de clã
+command.description.unban=Desbane um jogador de comandos de clã
+command.description.regroup.me=Reagrupa os membros do clã na sua localização
+command.description.regroup.home=Reagrupa os membros do clã na sua base
+command.description.home.tp=Teleporta para a base do seu clã
+command.description.home.clear=Limpa a base do seu clã
+command.description.home.set=Define a base do seu clã
+command.description.mod.home.set=Define a base de um clã
+command.description.mod.home.tp=Teleporta para a base de um clã
+command.description.rival.remove=Remove um rival
+command.description.rival.add=Adiciona um rival
+command.description.ally.remove=Remove um aliado
+command.description.kick=Expulsa um membro do seu clã
+command.description.bb.display=Mostra o quadro de avisos do seu clã
+command.description.bb.clear=Limpa o quadro de avisos do seu clã
+command.description.bb.post=Posta uma mensagem no quadro de avisos do seu clã
+command.description.place=Coloca um jogador em um clã
+command.description.reload=Recarrega o plugin e a sua configuração
+command.description.trust=Confia em um membro
+command.description.untrust=Marca um jogador como não-confiável
+command.description.resign=Abandona o seu clã
+command.description.help=Mostra esta ajuda ou pesquisa na ajuda
+command.description.ally.add=Adiciona um aliado
+command.description.clan=Abre a GUI
+command.description.disband=Debanda o seu clã
+command.description.mod.disband=Debanda um clã
+command.description.modtag=Modifica a tag do seu clã
+command.description.purge=Apaga os dados de um jogador
+command.description.setbanner=Define o estandarte do seu clã
+command.description.verify=Verifica o seu clã
+command.description.mod.verify=Verifica um clã
+command.description.invite=Convida um jogador para o seu clã
+command.description.fee.check=Verifica o valor da taxa do clã e se está ativada
+command.description.fee.set=Define a taxa do seu clã
+command.description.bank.status=Verifica o saldo do banco do seu clã
+command.description.bank.withdraw.all=Saca tudo do banco do seu clã
+command.description.bank.withdraw.amount=Saca uma quantia do banco do seu clã
+command.description.bank.deposit.all=Deposita todo o seu dinheiro no banco do seu clã
+command.description.bank.deposit.amount=Deposita uma quantia no banco do seu clã
+command.description.war.start=Inicia uma guerra
+command.description.war.end=Termina uma guerra
+command.description.resetkdr.everyone=Redefine o KDR de todos os jogadores
+command.description.resetkdr.player=Redefine o KDR de um jogador
+command.description.resetkdr=Redefine o seu KDR
+command.description.admin.demote=Rebaixa qualquer líder de qualquer clã
+command.description.demote=Rebaixa um líder
+command.description.admin.promote=Promove qualquer membro de qualquer clã
+command.description.promote=Promove um membro para líder
+command.description.toggle.bb=Alterna se o quadro de avisos deve ser exibido quando você entra no servidor
+command.description.toggle.tag=Alterna se a tag do seu clã deve ser exibida ao lado do seu nome
+command.description.toggle.deposit=Alterna se os depósitos são permitidos em seu clã
+command.description.toggle.withdraw=Alterna se os saques são permitidos em seu clã
+command.description.toggle.fee=Alterna se a taxa do clã está habilitada
+command.description.alliances=Lista todas as alianças de clãs
+command.description.coords=Mostra as coordenadas dos membros do clã
+command.description.rank.assign=Atribui um cargo a um membro
+command.description.rank.unassign=Remove o cargo de um membro
+command.description.rank.create=Cria um cargo
+command.description.rank.delete=Apaga um cargo
+command.description.rank.list=Lista os cargos do clã
+command.description.rank.setdisplayname=Define o nome de exibição de um cargo
+command.description.rank.permissions.available=Lista as permissões de cargo disponíveis
+command.description.rank.permissions.rank=Lista as permissões de um cargo
+command.description.rank.permissions.add=Adiciona uma permissão a um cargo
+command.description.rank.permissions.remove=Remove uma permissão de um cargo
 home-menu=/{0} base{1} - Teleporta para a base do clã
 home-set-menu=/{0} base set{1} - Define a base do clã
 home-clear-menu=/{0} base clear{1} - Apaga a base do clã
-home-regroup-menu=/{0} base regroup [me]{1} - Reagrupa todos os membros do clã para a base ou para você
-example.clan.modtag.4kfo.4l=Exemplo\: /clan mudartag &4C&fd&4L
 clan=Clã
 allies=Aliados
 alliances=aliancas
@@ -216,11 +268,10 @@ clan.players=Jogadores\: {0}
 clans=Clãs\: {0}
 banned=Você foi banido de usar comandos de clã
 nothing.more.to.see=Nada mais para ver
-nothing.to.deny=Nada para negar
+nothing.to.vote=&cNada para aceitar ou negar
 no.leader.permissions=Você não tem permissões de líder
 you.have.already.voted=Você já votou
 has.voted.to.deny={0} votou para negar
-nothing.to.accept=Nada para aceitar
 view.next.page=Digite /{0} para ver a próxima página.
 voted.to.accept={0} votou para aceitar
 bulletin.board.header={0}* {1}{2} quadro de avisos
@@ -229,14 +280,13 @@ has.been.disbanded.alliance.ended={0} foi debandado. A aliança terminou.
 clan.disbanded=Clã debandado
 1.color.day=1 {0}dia
 many.color.days={0}{1} dias
-does.not.match=Não é um comando de clã
-simpleclans.command.failure=Falha no comando do SimpleClans\: {0}
 insufficient.permissions=Permissões insuficientes
 clan.is.not.verified=Clã não é verificado
+player.not.a.member.of.any.clan=&cO jogador não é membro de nenhum clã
 not.a.member.of.any.clan=Você não é membro de nenhum clã
 minimum.to.make.alliance=Seu clã deve ter pelo menos {0} membros para fazer alianças
-no.clan.matched=Nenhum clã encontrado
-cannot.ally.with.an.unverified.clan=Você não pode fazer aliança com um clã não verificado
+cannot.be.same.clan=&cVocê deve inserir um clã diferente do seu\!
+other.clan.not.verified=&cO outro clã não é verificado\!
 your.clans.are.not.allies=Seus clãs não são aliados
 has.broken.the.alliance={0} quebrou a aliança com {1}
 at.least.one.leader.accept.the.alliance=Pelo menos um líder do outro clã precisa estar online para aceitar a aliança
@@ -276,7 +326,6 @@ global.friendy.fire.is.now.managed.by.each.clan=Fogo amigo global é agora geren
 global.friendy.fire.is.already.being.managed.by.each.clan=Fogo amigo global já está sendo gerenciado por cada clã
 global.friendly.fire.is.set.to.allowed=Fogo amigo global foi definido como permitido
 global.friendly.fire.is.already.being.allowed=Fogo amigo global já está permitido
-no.player.matched=Nenhum jogador encontrado
 the.player.doesn.t.not.have.the.permissions.to.join.clans=O jogador não tem permissão para entrar em clãs
 you.cannot.invite.yourself=Você não pode se convidar
 this.player.is.banned.from.using.clan.commands=Este jogador foi banido de usar comandos de clãs
@@ -291,30 +340,20 @@ total.clans=Total de clãs\:
 legend=Legenda\:
 kill.type.civilian=Tipo de morte\: {0}Civil
 no.player.data.found=Nenhum dado de jogador encontrado
-kill.type.0=Tipo de morte\: {0}
-s.player.info=Detalhes de {0}
 clan.0=Clã\: {0}
 status.0=Estado\: {0}
 rank.0=Cargo\: {0}
 kdr.0=KDR\: {0}
-deaths.0=Morreu\: {0}
-fee.0.value.1=Taxa\: {0}, {1} $
-join.date.0=Entrou\: {0}
-last.seen.0=Visto por último\: {0}
-past.clans.0=Clãs anteriores\: {0}
 inactive.0=Inativo\: {0}
-kill.totals=Matou\:
 clan.commands=comandos de clã
 you.can.only.modify.the.color.and.case.of.the.tag=Você pode modificar apenas a cor ou a caixa (maiúsculo ou minúsculo) da tag
 tag.changed.to.0=Tag modificada para {0}
 name.0=Nome\: {0}
 description.0=Descrição\: {0}
 leaders.0=Líderes\: {0}
-members.online.0=Membros Online\: {0}
 allies.0=Aliados\: {0}
 rivals.0=Rivais\: {0}
-founded.0=Fundado\: {0}
-the.member.to.be.promoted.must.be.online=O membro a ser promovido precisa estar online
+other.player.must.be.online=&cO jogador deve estar online\!
 the.player.does.not.have.the.permissions.to.lead.a.clan=O jogador não tem permissões para liderar um clã
 you.cannot.promote.yourself=Você não pode se promover
 the.player.is.already.a.leader=O jogador já é um líder
@@ -349,7 +388,6 @@ denied.war.req={0} negou o pedido de guerra enviado por {1}
 you.are.no.longer.at.war={0} não está mais em guerra com {1}
 end.war.denied=Pedido para finalizar a guerra foi negado por {0}
 denied.war.end={0} negou o pedido de {1} para finalizar a guerra
-0.war=/{0} war{1} iniciar/finalizar [tag] - Inicia ou finaliza uma guerra
 has.initiated.a.rivalry={0} iniciou uma rivalidade com {1}
 start=iniciar
 end=finalizar
@@ -378,8 +416,6 @@ hunger=Fome
 stone=pedra
 iron=ferro
 the.clan.cannot.be.rivaled=O clã não pdoe ser rivalizado
-capeoff=Cape ativado
-capeon=Capa ativada
 bboff=BB desativado
 bbon=BB ativado
 tagoff=Tag desativada
@@ -417,7 +453,6 @@ bb.clan.withdraw={0} $ foram sacados
 player.clan.withdraw=Você sacou {0}
 clan.bank.not.enough.money=O banco do seu clã não tem saldo suficiente
 your.clans.are.not.rivals=Seus clãs não são rivais
-you.cannot.rival.your.own.clan=Você não pode fazer rivalidade com seu próprio clã
 the.clan.members.reached.limit=Seu clã atingiu o limite de membros
 you.have.reseted.your.kdr=Você redefiniu o seu KDR
 you.have.reseted.0.kdr=Você redefiniu o KDR de {0}
@@ -426,7 +461,6 @@ resign.yes=Sim
 resign.no=Não
 resign.confirmation=Tem certeza de que quer abandonar o clã? {0}
 resign.success=Você abandonou seu clã com sucesso
-player.is.not.a.leader.of.any.clan=O jogador não é líder de nenhum clã
 you.cannot.demote.the.last.leader=Você não pode rebaixar o último líder
 player.successfully.demoted=O jogador foi rebaixado com sucesso
 bb.ago= atrás 
@@ -444,7 +478,6 @@ fee.disabled=desativada
 fee.set=A taxa foi definida com sucesso
 max.fee.allowed.is.0=A taxa máxima permitida é {0}
 fee.collected={0} $ foram sacados para a taxa do clã
-invalid.fee=O valor que você inseriu não é válido
 player.purged=Os dados do jogador foram apagados com sucesso
 upkeep.collected={0} $ foram sacados para a taxa de manutenção
 balance.is.not.enough.for.upkeep=O saldo do clã não é suficiente para pagar a taxa de manutenção ({0} $), deposite a quantidade para evitar que seu clã seja debandado
@@ -460,43 +493,19 @@ available.rank.permissions=Permissões disponíveis para cargos\:
 rank.already.exists=O cargo já existe
 rank.0.does.not.exist=O cargo {0} não existe
 rank.created=Cargo criado
-invalid.permission={0} não é uma permissão válida\! Use uma destas\: {1}
 permission.0.added.to.rank.1=Permissão {0} adicionada ao cargo {1}
 permission.0.removed.from.rank.1=Permissão {0} removida do cargo {1}
 rank.0.deleted=Cargo {0} deletado
-usage.0.rank.create=Uso\: /{0} cargo create [nome]
-usage.0.rank.create.noargs=Uso\: /{0} cargo create
-usage.0.rank.setdisplayname=Uso\: /{0} cargo setdisplayname [cargo] [nome de exibição], o nome do exibição pode ter múltiplas palavras e conter cores
-usage.0.rank.delete=Uso\: /{0} cargo delete [cargo]
-usage.0.rank.permissions=Uso\: /{0} cargo permissions [cargo] [add/remove] [permissão]
-usage.0.rank.assign=Uso\: /{0} cargo assign [jogador] [cargo]
-usage.0.rank.unassign=Uso\: /{0} cargo unassign [jogador]
-usage.0.rank=Uso\: /{0} cargo [create/assign/unassign/delete/list/setdisplayname/permissions]
 clans.ranks=Cargos do clã\:
 ranks.list.item={0}\# {1} ({2})
 no.ranks=Nenhum cargo foi criado
 rank.no.permissions=O cargo não tem nenhuma permissão
 player.unassigned.from.rank=Jogador removido do cargo
-rank.command=cargo
-0.rank.create.1.create.rank=/{0} cargo create{1} - Criar um cargo
-0.rank.assign.player.rank.1.assign.rank.to.player=/{0} cargo assign [jogador] [cargo]{1} - Dá um cargo a um membro
-0.rank.unassign.player.1.unassign.player.from.rank=/{0} cargo unassign [jogador]{1} - Remove o membro de um cargo
-0.rank.delete.rank.1.delete.rank=/{0} cargo delete [cargo]{1} - Deleta um cargo
-0.rank.list.1.list.ranks=/{0} cargo list{1} - Lista os cargos
-0.rank.setdisplayname.rank.displayname.1.set.rank.displayname=/{0} cargo setdisplayname [cargo] [nome de exibição]{1} - Defina o nome de exibição de um cargo
-0.rank.permissions.1.list.available.permissions=/{0} cargo permissions{1} - Lista as permissões disponíveis
-0.rank.permissions.rank.1.list.rank.permissions=/{0} cargo permissions [cargo]{1} - Lista as permissões do cargo
-0.rank.permissions.rank.add.permission.1.add.a.permission.to.rank=/{0} cargo permissions [cargo] add [permissão]{1} - Adiciona uma permissão ao cargo
-0.rank.permissions.rank.remove.permission.1.remove.a.permission.from.rank=/{0} cargo permissions [cargo] remove [permissão]{1} - Remove uma permissão do cargo
 you.must.be.0.or.have.the.permission.1.to.use.this=Você deve ser {0} ou o seu líder deve dar ao seu cargo a permissão {1} para usar isso
-deposit.not.allowed=Depósito não é permitido
-withdraw.not.allowed=Saque não é permitido
+deposit.not.allowed=Depósito não é permitido, use /%clan %toggle %deposit para permitir
+withdraw.not.allowed=Saque não é permitido, use /%clan %toggle %withdraw para permitir
 resign.request.cancelled=Pedido para abandonar clã cancelado
 promotion.vote.has.been.requested.from.all.leaders=Um voto de promoção foi pedido a todos os líderes
-0.message.1.send.a.message.to.clan.chat=/{0} [mensagem]{1} - Envia uma mensagem para o chat do seu clã
-0.join.leave.3.join.leave.the.clan.chat=/{0} {1}/{2}{3} - Entrar/Sair do chat do seu clã
-0.message.1.send.a.message.to.ally.chat=/{0} [mensagem]{1} - Envia uma mensagem no chat dos aliados
-0.join.leave.3.join.leave.the.ally.chat=/{0} {1}/{2}{3} - Entrar/Sair do chat dos aliados
 allowed=permitido
 blocked=bloqueado
 chat.joined=entrou
@@ -506,7 +515,7 @@ gui.back.title=&fVoltar
 gui.previous.page.title=&fPágina anterior
 gui.next.page.title=&fPróxima página
 gui.lore.no.permission=&cVocê não tem permissão para ver isso\!
-gui.main.title=SimpleClans
+gui.main.title={0} - menu de clãs
 gui.main.languageselector.title=&fSelecione seu idioma
 gui.main.languageselector.lore.left.click=&7Clique com o botão esquerdo para selecionar seu idioma
 gui.main.languageselector.lore.right.click=&7Clique com o botão direito para ajudar a traduzir
@@ -520,6 +529,7 @@ gui.main.reset.kdr.lore=&7Clique com o botão esquerdo para redefinir o seu KDR
 gui.main.leaderboard.title=&fRanking
 gui.main.leaderboard.lore=&7Clique com o botão esquerdo para ver o ranking
 gui.main.staff.title=&fEquipe
+gui.main.staff.lore=&7Clique com o botão esquerdo para abrir o menu da Staff
 gui.staff.title=Equipe
 gui.staff.clan.list.lore.left.click=&7Clique com o botão esquerdo para ver todos os clãs
 gui.staff.clan.list.lore.right.click=&7Clique com o botão direito para ver todos os clãs não verificados
@@ -598,7 +608,9 @@ gui.clandetails.clan.lore.kdr=&7KDR\: &b{0}
 gui.clandetails.clan.lore.kill.totals=&7Matou\: &b[Rival\:{0} Neutro\:{1} Civil\:{2}]
 gui.clandetails.clan.lore.deaths=&7Mortes\: &b{0}
 gui.clandetails.clan.lore.fee=&7Taxa\: &b{0}, {1} $
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.allies.separator=&b, 
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.rivals.separator=&b, 
 gui.clandetails.clan.lore.allies=&7Aliados\: &b{0}
 gui.clandetails.clan.lore.rivals=&7Rivais\: &b{0}
@@ -663,18 +675,19 @@ gui.clandetails.chat.clan.toggle.lore=&7Clique com o botão esquerdo para altern
 gui.clandetails.chat.ally.toggle.lore=&7Clique com o botão direito para alternar o estado do chat dos aliados
 gui.playerdetails.title={0}
 gui.playerdetails.player.title=&f{0}
-gui.playerdetails.player.lore.noclan=&fClã\: Nenhum
-gui.playerdetails.player.lore.clan=&fClã\: [{0}&f] {1}
-gui.playerdetails.player.lore.rank=&fCargo\: {0}
-gui.playerdetails.player.lore.status=&fEstado\: {0}
-gui.playerdetails.player.lore.kdr=&fKDR\: {0}
-gui.playerdetails.player.lore.kill.totals=&fMatou\: [Rival\:{0} Neutro\:{1} Civil\:{2}]
-gui.playerdetails.player.lore.deaths=&fMorreu\: {0}
-gui.playerdetails.player.lore.join.date=&fEntrou\: {0}
-gui.playerdetails.player.lore.last.seen=&fVisto por último\: {0}
+gui.playerdetails.player.lore.noclan=&7Clã\: &bNenhum
+gui.playerdetails.player.lore.clan=&7Clã\: &b[{0}&f] {1}
+gui.playerdetails.player.lore.rank=&7Cargo\: &b{0}
+gui.playerdetails.player.lore.status=&7Estado\: &b{0}
+gui.playerdetails.player.lore.kdr=&7KDR\: &b{0}
+gui.playerdetails.player.lore.kill.totals=&7Matou\: &b[Rival\:{0} Neutro\:{1} Civil\:{2}]
+gui.playerdetails.player.lore.deaths=&7Morreu\: &b{0}
+gui.playerdetails.player.lore.join.date=&7Entrou\: &b{0}
+gui.playerdetails.player.lore.last.seen=&7Visto por último\: &b{0}
+# suppress inspection "TrailingSpacesInProperty"
 gui.playerdetails.player.lore.past.clans.separator=&b, 
-gui.playerdetails.player.lore.past.clans=&7Clãs anteriores\: {0}
-gui.playerdetails.player.lore.inactive=&7Inativo\: {0}/{1} dias
+gui.playerdetails.player.lore.past.clans=&7Clãs anteriores\: &b{0}
+gui.playerdetails.player.lore.inactive=&7Inativo\: &b{0}/{1} dias
 gui.playerdetails.kick.title=&fExpulsar
 gui.playerdetails.promote.demote.title=&fPromover/Rebaixar
 gui.playerdetails.promote.lore.left.click=&7Clique com o botão esquerdo para promover
@@ -704,14 +717,10 @@ gui.confirmation.return=&7Clique aqui para voltar
 gui.not.supported=&cOcorreu um erro ao abrir a GUI\! Desabilitando... Você fez o download da versão correta?
 staff.member.verify.clan=&cUm membro da equipe deve verificar o seu clã\!
 player.already.has.that.rank=&cO jogador já possui este cargo\!
-enabled.clan.chat=&bVocê ativou o chat do clã
-disabled.clan.chat=&bVocê desativou o chat do clã
 joined.clan.chat=&bVocê entrou no chat do clã
 left.clan.chat=&bVocê saiu do chat do clã
 muted.clan.chat=&bVocê silenciou o chat do clã
 unmuted.clan.chat=&bVocê desmutou o chat do clã
-enabled.ally.chat=&bVocê ativou o chat dos aliados
-disabled.ally.chat=&bVocê desativou o chat dos aliados
 joined.ally.chat=&bVocê se juntou ao chat dos aliados
 left.ally.chat=&bVocê saiu do chat dos aliados
 muted.ally.chat=&bVocê silenciou o chat dos aliados
@@ -725,4 +734,23 @@ insert.rank.name=&bInsira o nome do cargo\:
 click.to.help.translating=&bClique neste link para ajudar a traduzir\:\n&r{0}
 your.clan.must.have.members.to.verify=&cSeu clã deve ter pelo menos {0} membros para ser verificado\!
 you.must.hold.a.banner=&cVocê precisa ter um estandarte em sua mão\!
-you.changed.clan.banner=&bVocê mudou o estandarte do seu clã\!
+you.changed.clan.banner=&bVocê mudou o estandarte do seu clã\!
+your.clan.already.verified=&cSeu clã já está verificado\!
+# suppress inspection "TrailingSpacesInProperty"
+clan.profile=\n&b%clan_name%&7 perfil &8-------------------------------------------\n \n  &7Nome\: &e[&8%clan_color_tag%&e] &b%clan_name%\n  &7Descrição\: &f%clan_description%\n  &7Estado\: &f%clan_verified%\n  &7Líderes\: %clan_leaders%\n  &7Membros Online\: &f%clan_online_count%&7/&f%clan_size%\n  &7KDR\: &e%clan_kdr%\n  &7Total de Kills\: &8[Rival\:&f%clan_rival_kills% &8Neutro\:&f%clan_neutral_kills% &8Civil\:&f%clan_civilian_kills%&8]\n  &7Mortes\: &f%clan_deaths%\n  &7Taxa\: &f%clan_fee_enabled%&7, &f%clan_fee_value% $\n  &7Aliados\: &f%clan_allies%\n  &7Rivais\: &f%clan_rivals%\n  &7Fundado em\: &f%clan_founded%\n  &7Inativo\: &f%clan_inactive_days%&7/&f%clan_max_inactive_days% dias\n  
+player.lookup.clanname=&e[&8%clan_color_tag%&e] &b%clan_name%
+# suppress inspection "TrailingSpacesInProperty"
+player.lookup.killtype=&7Tipo de Morte\: %player_kill_type%\n  
+player.lookup=\n&bInformações de %player_name%&7 &8-------------------------------------------\n \n  &7Clã\: &f%clan_name%\n  &7Cargo\: &f%player_rank%\n  &7Estado\: &f%player_status%\n  &7KDR\: &e%player_kdr%\n  &7Total de Kills\: &8[Rival\:&f%player_rival_kills% &8Neutro\:&f%player_neutral_kills% &8Civil\:&f%player_civilian_kills%&8]\n  &7Mortes\: &f%player_deaths%\n  &7Data de entrada\: &f%player_join_date%\n  &7Visto por último\: &f%player_last_seen%\n  &7Clãs passados\: &f%player_past_clans%\n  &7Inativo\: &f%player_inactive_days%&7/&f%player_max_inactive_days% dias\n  %kill_type_line%
+economy.disabled=&cEconomia desativada\!
+has.been.purged=Os dados de {0} foram apagados
+accepted.invitation=&bVocê aceitou o convite de {0}
+denied.invitation=&cVocê negou o convite de {0}
+must.be.in.clan.to.pvp=&cVocê e {0} devem ser membros de clã para poder lutar\!
+clans.not.at.war.pvp.denied=&cSeu clã não está em guerra com {0}\!
+cannot.attack.civilians=&cVocê não pode atacar civis\!
+cannot.attack.clan.member=&cVocê não pode atacar um membro do clã\!
+cannot.attack.ally=&cVocê não pode atacar um aliado\!
+cannot.change.member.fee.now=&cVocê não pode modificar a taxa perto do horário de coleta. 
+cannot.change.member.fee.hours=&cTente novamente em {0} horas...
+cannot.change.member.fee.minutes=&cTente novamente em {0} minuto(s)...

src/main/resources/messages_ro_RO.properties

@@ -0,0 +1,76 @@
+description.command=descriere
+create.command=creeaza
+delete.command=sterge
+rank.command=grad
+setdisplayname.command=afiseaza numele
+permissions.command=permisii
+list.command=lista
+list.order.asc=ascendent
+list.order.desc=descendent
+list.type.name=nume
+list.type.kdr=kdr
+list.type.size=dimensiune
+list.type.founded=gasit
+list.type.active=activ
+profile.command=profil
+roster.command=lista
+lookup.command=cautare
+leaderboard.command=clasament
+alliances.command=aliante
+rivalries.command=rivali
+vitals.command=viata
+coords.command=coordonate
+stats.command=status
+ally.command=aliat
+add.command=adauga
+remove.command=elimina
+allow.command=permite
+block.command=blocheaza
+auto.command=auto
+check.command=verifica
+assign.command=repartizeaza
+unassign.command=anuleaza
+rival.command=rival
+bb.command=bb
+clear.command=sterge
+modtag.command=modtag
+toggle.command=comuta
+tag.command=eticheta
+deposit.command=depozit
+all.command=tot
+withdraw.command=retrage
+invite.command=invita
+kick.command=exclude
+bank.command=banca
+status.command=stare
+fee.command=tarif
+set.command=seteaza
+purge.command=sterge
+trust.command=incredere
+untrust.command=neincredere
+command.description.profile.other=Arata profilul altui clan
+command.description.profile=Arata profilul clanului tau
+command.description.vitals=Arata viata membrilor clanului tau si aliatilor
+command.description.list=Lista cu clanuri
+command.description.chat=Vorbeste in conversatia clanului
+command.description.ally=Vorbeste in conversatia aliatilor
+command.description.deny=Refuza o solicitare
+command.description.accept=Accepta o solicitare
+command.description.more=Arata mai multe informatii
+command.description.create=Creeaza un clan
+command.description.ff.allow=Seteaza daunele tale personale pe permis
+command.description.ff.auto=Seteaza daunele tale personale pe auto
+command.description.globalff.allow=Seteaza daunele intre coechipieri pe global
+command.description.globalff.auto=Seteaza daunele intre coechipieri global pe auto
+command.description.clanff.allow=Seteaza daunele intre coechipieri pe permis
+command.description.clanff.block=Seteaza daunele intre coechipieri pe inchis
+command.description.description=Seteaza descriere la clan
+command.description.ban=Interzice comenzile unui membru din clan
+command.description.unban=Dezinterzice comenzile unui membru din clan
+command.description.regroup.me=Adu' membri clanului la locatia ta
+command.description.regroup.home=Adu' membri clanului la casa ta
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_sv_SE.properties

@@ -0,0 +1,39 @@
+description.command=beskrivning
+create.command=skapa
+list.command=lista
+profile.command=profil
+roster.command=deltagarlista
+lookup.command=slå upp
+leaderboard.command=ledartavla
+alliances.command=allianser
+rivalries.command=fiender
+vitals.command=livsstatus
+coords.command=kordinater
+stats.command=status
+ally.command=allierade
+rival.command=fiende
+bb.command=bb
+modtag.command=modtag
+toggle.command=toggla
+invite.command=bjud in
+kick.command=sparka
+bank.command=bank
+fee.command=avgift
+purge.command=slakta
+trust.command=betro
+untrust.command=avbetro
+promote.command=befodra
+demote.command=nerbefodra
+clanff.command=klanff
+ff.command=ff
+resign.command=avgå
+disband.command=upplösa
+verify.command=verifiera
+ban.command=ban
+unban.command=avbanna
+reload.command=omladda
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_tr_TR.properties

@@ -1,7 +1,12 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=Açıklama
 create.command=oluştur
+delete.command=sil
+rank.command=rütbe
+permissions.command=izin
 list.command=liste
+list.type.name=isim
+list.type.size=Boyut
+list.type.active=Etkin
 profile.command=profil
 roster.command=klanbilgi
 lookup.command=oyuncubilgi
@@ -12,8 +17,14 @@ vitals.command=klandurumu
 coords.command=koordinat
 stats.command=İstatistik
 ally.command=müttefik
+add.command=ekle
+remove.command=Kaldır
+allow.command=izin ver
+auto.command=Otomatik
+check.command=kontrol
 rival.command=rakip
 bb.command=klanmesajı
+clear.command=temizle
 modtag.command=modetiketi
 toggle.command=geçiş
 invite.command=davet
@@ -23,6 +34,7 @@ fee.command=para
 purge.command=sil
 trust.command=güven
 untrust.command=güvenme
+admin.command=Yönetici
 promote.command=destekle
 demote.command=düşür
 clanff.command=klandostateşi
@@ -37,98 +49,25 @@ globalff.command=geneldostateşi
 kills.command=öldürme
 mostkilled.command=ençoköldürülen
 war.command=savaş
+start.command=Başla
+end.command=Son
 home.command=ev
+tp.command=Işınlanma
 setrank.command=rütbeayarla
 place.command=yer
 resetkdr.command=kdsıfırla
+everyone.command=herkes
 help.command=yardım
-usage.description=Kullanımı\: /{0} açıklama [Açıklama]
-usage.resetkdr=Kullanımı\: /{0} kdsıfırla [hepsi/oyuncu]
-usage.clan.alliances=Kullanımı\:\: /{0} ittifaklar
-usage.ally=Kullanımı\: /{0} müttefik ekle/kaldır [etiket]
-usage.ban.unban=Kullanımı\: /{0} yasakla/yasakkaldır [oyuncu]
-usage.rival=Kullanımı\: /{0} rakip ekle/kaldır [Klan İsmi]
-usage.war=Kullanımı\: /{0} savaş başlat/bitir [etiket]
-usage.clanff=Kullanımı\: /{0} klandostateşi aktif/kapalı
-usage.0.coords=Kullanımı\: /{0} koordinat
-usage.create=Kullanım\: /{0} oluştur
-usage.demote.leader=Kullanımı\: /{0} düşür [lider]
-usage.0.disband=Kullanımı\: /{0} dağıt
-usage.0.ff.allow.auto=Kullanımı\: /{0} dostateşi aktif/otomatik
-usage.0.globalff.allow.auto=Kullanımı\: /{0} geneldostateşi aktif/otomatik
-usage.0.permissions.player=Kullanımı\: /{0} yetki [klan] ekle/kaldır [yetki]
-usage.0.invite.player=Kullanımı\: /{0} davet [oyuncu]
-usage.kick.player=Kullanımı\: /{0} at [oyuncu]
-usage.bank=Kullanımı\: /{0} banka paraçekme/depozito/durum [miktar]
-usage.fee=Kullanımı\: /{0} para kontol/ekle [miktar]
-usage.purge=Kullanımı\: /{0} sil [oyuncu]
-usage.0.modtag.tag=Kullanımı\: /{0} modetiketi [etiket]
-usage.list=Kullanımı\: /{0} liste [isim/büyüklük/kd/kuruluş/aktif] [artan/azalan]
-usage.lookup.tag=Kullanımı\: /{0} oyuncubilgi [etiket]
-usage.0.profile.tag=Kullanımı\: /{0} profil [etiket]
-usage.0.promote.member=Kullanımı\: /{0} destekle <üye>
-usage.0.rivalries=Kullanımı\: /{0} rekabet
-usage.0.roster.tag=Kullanımı\: /{0} klanbilgi [etiket]
-usage.0.stats=Kullanımı\: /{0} İstatistik
-usage.0.trust.player=Kullanımı\: /{0} güven [oyuncu]
-usage.0.untrust.player=Kullanımı\: /{0} güvenme [oyuncu]
-usage.0.verify.tag=Kullanımı\: /{0} doğrula [etiket]
-usage.0.vitals=Kullanımı\: /{0} klandurumu
-usage.0.place=Kullanımı\: /{0} yer [oyuncu] [etiket]
-usage.0.leaderboard=Kullanımı\: /{0} lidersıralaması
-0.reload.1.reload.configuration=/{0} yenile{1} - Yapılandırmayı yeniden yükle
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} geneldostateşi aktif/otomatik {1} - Genel dost ateşi oluştur
-0.place=/{0} yer [oyuncu] [etiket]{1} - Bir oyuncuyu klana yerleştir
-0.ban.unban.player.1.ban.unban.a.player=/{0} yasakla/yasakkaldır [oyuncu]{1} - Oyuncu Yasakla/Yasakkaldır
-0.hometp.clan.1.tp.home.a.clan=/{0} eve ışınlan [klan]{1} - Tüm klanların evlerine ışınlanma
-0.disband.tag.1.disband.a.clan=/{0} dağıt [etiket]{1} - Klanı dağıt
-0.resetkdr.1.resets.kdr=/{0} kdsıfırla oyuncu/herkes{1} - Tüm oyuncuların veya sadece bir tanesinin KD''sini sıfırla
-0.resetkdr.1.resets.your.kdr=/{0} kdsıfırla{1} - KD Sıfırla
-0.purge.player.1.purge.a.player=/{0} sil [oyuncu]{1} - Bir oyuncuyu sil
-0.verify.tag.1.verify.an.unverified.clan=/{0} doğrula [klanismi]{1} - Doğrulanmamış bir klanı doğrulayın
-0.verify.1.purchase.verification.of.your.clan=/{0} doğrula{1} - Klanınızın satın alma doğrulaması
-0.list.1.lists.all.clans=/{0} listele [değer] [artan/azalan]{1} - Tüm klanları listele - (değer\: isim/büyüklük/kd/kuruluş/aktif)
-0.profile.1.view.your.clan.s.profile=/{0} profil{1} - Klan profilini görüntüle
-0.profile.tag.1.view.a.clan.s.profile=/{0} profil [etiket]{1} - Bir klanın profilini görüntüle
-0.lookup.1.lookup.your.info=/{0} oyuncubilgi{1} - Oyuncu Bilgisi
-0.lookup.player.1.lookup.a.player.s.info=/{0} oyuncubilgi [oyuncu]{1} - Başka bir oyuncunun bilgisini görüntüle
-0.leaderboard.1.view.leaderboard=/{0} lidersıralaması{1} - Lider sıralamasını görüntüle
-0.alliances.1.view.all.clan.alliances=/{0} ittifaklar{1} - Klanının ittifaklarını görüntüle
-0.rivalries.1.view.all.clan.rivalries=/{0} rekabet{1} - Rekabet içinde olduğun klanlar
-0.roster.1.view.your.clan.s.member.list=/{0} klanbilgi{1} - Klan üye listeni görüntüle
-0.roster.tag.1.view.a.clan.s.member.list=/{0} klanbilgi [etiket]{1} - Bir klanın üye listesini görüntüle
-0.vitals.1.view.your.clan.member.s.vitals=/{0} klandurumu{1} - Klan oyuncu durumunu görüntüle
-0.coords.1.view.your.clan.member.s.coordinates=/{0} koordinat{1} - Klan üyelerinin koordinatlarını görüntüle
-0.stats.1.view.your.clan.member.s.stats=/{0} İstatistik{1} - Klan üyelerinin istatistiklerini görüntüle
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} müttefik ekle/kaldır [etiket]{1} - Müttefik ekler veya kaldırır
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rakip ekle/kaldır [etiket]{1} - Klanına rakip ekler veya kaldırır
-0.bb.1.display.bulletin.board=/{0} klanmesajı{1} - Klan mesajlarını görüntüle
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} klanmesajı [mesaj]{1} - Klan mesajı ekle
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modetiketi [etiket]{1} - Klanın etiketini değiştir
-0.description.description.1.modify.the.clan.s.description=/{0} Açıklama [Açıklama]{1} - Klan açıklamasını düzenleme
-0.invite.player.1.invite.a.player=/{0} davet [oyuncu]{1} - Oyuncu davet et
-0.kick.player.1.kick.a.player.from.the.clan=/{0} at [oyuncu]{1} - Klandan bir oyuncu at
-0.trust.untrust.player.1.set.trust.level1=/{0} güven [oyuncu]{1} - Oyuncuyu güvenilir olarak ayarla
-0.trust.untrust.player.1.set.trust.level2=/{0} güvenme [oyuncu]{1} - Oyuncuyu güvenilmez olarak ayarla
-0.promote.member.1.promote.a.member.to.leader=/{0} yükselt [oyuncu]{1} - Bir üyeyi lider yap
-0.demote.leader.1.demote.a.leader.to.member=/{0} düşür [lider]{1} - Bir liderin rütbesini düşür
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} klandostateşi Aktif/Kapalı{1} - Klanın dost ateşini aç / kapat
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} dostateşi aktif/otomatik{1} - Kişisel dost ateşini aç/kapat
-0.toggle.command=/{0} değiştir [{2}]{1} - Kişisel ayarları değiştir
-0.resign.1.resign.from.the.clan=/{0} ayrıl{1} - Klandan ayrıl
-0.disband.1.disband.your.clan=/{0} dağıt{1} - Klanı dağıt
-0.create.1.purchase.a.new.clan=/{0} oluştur{1} - Yeni klan satın al
-0.create.1.create.a.new.clan=/{0} oluştur{1} - Yeni klan oluştur
-0.kills=/{0} öldürme{1} - Öldürme sayınızı görüntüleyin
-0.killsplayer=/{0} öldürme [oyuncu]{1} - Bir oyuncunun öldürme sayısını görüntüle
-0.fee.check=/{0} para kontrol {1}- Paranın etkin olup olmadığını ve ne kadar olduğunu kontrol edin
-0.fee.set=/{0} para ekle [miktar]{1} - Klan üye ücretini belirle
-0.mostkilled=/{0} ençoköldürülen{1} - Sunucu genelinde en çok öldürülenlerin sayısını görüntüleme
+acf-core.parameter.rank=Rütbe
+acf-core.parameter.leader=Lider
+acf-core.parameter.message=Mesaj
+acf-core.parameter.player=oyuncu
+acf-core.parameter.clan=klan
+acf-core.parameter.order=sıra
+command.description.accept=İsteği kabul et
 home-menu=/{0} ev{1} - Klan evine ışınlanma
 home-set-menu=/{0} ev ayarla{1} - Klan evi ayarla
 home-clear-menu=/{0} evi sil{1} - Klan evini sil
-home-regroup-menu=/{0} ev yenidengruplandır [ben]{1} - Tüm üyeleri klan ana üssünde veya size yeniden gruplandırın
-example.clan.modtag.4kfo.4l=Örnek\: /klan modetiketi &6S&eN
 clan=Klan
 allies=Müttefik
 alliances=ittifaklar
@@ -214,11 +153,9 @@ clan.players=Klan Oyuncuları\: {0}
 clans=Klanlar\: {0}
 banned=Klan komutları kullanmanız yasaklandı
 nothing.more.to.see=Görecek başka bir şey yok
-nothing.to.deny=İnkar edecek bir şey yok
 no.leader.permissions=Liderlik izniniz yok
 you.have.already.voted=Zaten oy verdiniz
 has.voted.to.deny={0} reddetmek için oy verdi
-nothing.to.accept=Kabul edilecek bir şey yok
 view.next.page=Type /{0} sonraki sayfayı görüntülemek için.
 voted.to.accept={0} kabul etmek için oy verdi
 bulletin.board.header={0}* {1}{2} Klan mesajları
@@ -227,14 +164,10 @@ has.been.disbanded.alliance.ended={0} dağıtıldı. İttifak sona erdi.
 clan.disbanded=Klan dağıtıldı
 1.color.day=1 {0}Gün
 many.color.days={0}{1} Gün
-does.not.match=Bir klan komutuyla eşleşmiyor
-simpleclans.command.failure=Klan komut hatası\: {0}
 insufficient.permissions=Yetkin yetersiz \:(
 clan.is.not.verified=Klan doğrulanmadı
 not.a.member.of.any.clan=Herhangi bir klanın üyesi değilsiniz
 minimum.to.make.alliance=İttifak kurabilmek için klanınızda en az {0} oyuncu olmalı.
-no.clan.matched=Eşleşen hiçbir klan yok
-cannot.ally.with.an.unverified.clan=Doğrulanmamış bir klanla müttefik olamazsınız.
 your.clans.are.not.allies=Klanların müttefik değil
 has.broken.the.alliance={1} {0} ittifakı dağıttı
 at.least.one.leader.accept.the.alliance=İttifakı kabul etmek için müttefiklerinden en az bir lideri çevrimiçi olmalı
@@ -274,7 +207,6 @@ global.friendy.fire.is.now.managed.by.each.clan=Genel dost ateşi artık tüm kl
 global.friendy.fire.is.already.being.managed.by.each.clan=Genel dost ateşi zaten tüm klanlar tarafından yönetiliyor
 global.friendly.fire.is.set.to.allowed=Genel dost ateşine izin verildi
 global.friendly.fire.is.already.being.allowed=Genel dost ateşine zaten izin veriliyor
-no.player.matched=Eşleşen oyuncu yok
 the.player.doesn.t.not.have.the.permissions.to.join.clans=Oyuncunun klanlara katılma izni yok
 you.cannot.invite.yourself=Kendini davet edemezsin
 this.player.is.banned.from.using.clan.commands=Bu oyuncunun klan komutlarını kullanması yasaklandı
@@ -289,30 +221,19 @@ total.clans=Tüm Klan\:
 legend=Efsane\:
 kill.type.civilian=Öldürme Türü\: {0}Sivil
 no.player.data.found=Oyuncu verisi bulunamadı
-kill.type.0=Öldürme Türü\: {0}
-s.player.info={0} Oyuncu Bilgi
 clan.0=Clan\: {0}
 status.0=Durumu\: {0}
 rank.0=Rütbe\: {0}
 kdr.0=KD\: {0}
-deaths.0=Ölme\: {0}
-fee.0.value.1=Ücret\: {0}, {1} $
-join.date.0=Katılma Tarihi\: {0}
-last.seen.0=Durum\: {0}
-past.clans.0=Eski Klanı\: {0}
 inactive.0=İnaktif\: {0}
-kill.totals=Toplam öldürme\:
 clan.commands=Klan komutları
 you.can.only.modify.the.color.and.case.of.the.tag=Yalnızca etiketin rengini ve büyüklüğünü değiştirebilirsiniz.
 tag.changed.to.0=Etiket {0} olarak değiştirildi.
 name.0=İsim\: {0}
 description.0=Açıklama\: {0}
 leaders.0=Leaders\: {0}
-members.online.0=Aktif Üyeler\: {0}
 allies.0=Müttefikler\: {0}
 rivals.0=Rakipler\: {0}
-founded.0=Kuruluş\: {0}
-the.member.to.be.promoted.must.be.online=Terfi edilecek üye çevrimiçi olmalı
 the.player.does.not.have.the.permissions.to.lead.a.clan=Oyuncu bir klana liderlik etme iznine sahip değil
 you.cannot.promote.yourself=Kendinizi tanımlayamazsınız
 the.player.is.already.a.leader=Oyuncu zaten lider
@@ -347,7 +268,6 @@ denied.war.req={0} tarafından gönderilen savaş talebini reddetti {1}
 you.are.no.longer.at.war={0} Artık savaşta değil {1}
 end.war.denied={0} Tarafından savaşın sona ermesi talebi reddedildi.
 denied.war.end={0} {1} savaşı sona erdirme talebini reddetti
-0.war=/{0} savaş{1} başlat/bitir [etiket] - Savaş başlatır veya bitirir.
 has.initiated.a.rivalry={0}, {1} ile bir rekabet başlattı
 start=Başla
 end=Son
@@ -376,8 +296,6 @@ hunger=Açlık
 stone=Taş
 iron=Demir
 the.clan.cannot.be.rivaled=Bu klan rakip olamaz.
-capeoff=Cape kapatıldı
-capeon=Cape açıldı
 bboff=Klan log mesajları kapalı
 bbon=Klan log mesajları açık
 tagoff=Etiket Kapatıldı
@@ -415,7 +333,6 @@ bb.clan.withdraw={0} ₺ Geri çekildi
 player.clan.withdraw={0} ₺ Geri çekildi
 clan.bank.not.enough.money=Klan bankanızda yeterli para yok
 your.clans.are.not.rivals=Klanlarınız rakip değil
-you.cannot.rival.your.own.clan=Kendi klanına rakip olamazsın
 the.clan.members.reached.limit=Klan üye sınırına ulaştınız
 you.have.reseted.your.kdr=KD'nizi sıfırladınız.
 you.have.reseted.0.kdr={0} ''ın KD''sini sıfırladınız.
@@ -424,7 +341,6 @@ resign.yes=Evet
 resign.no=Hayır
 resign.confirmation=Ayrılmak istediğinden emin misin? {0}
 resign.success=Klanından başarıyla ayrıldın.
-player.is.not.a.leader.of.any.clan=Oyuncu hiçbir klanın lideri değil
 you.cannot.demote.the.last.leader=Son liderin yetkisni düşüremezsin
 player.successfully.demoted=Oyuncunun rütbesi başarıyla indirildi
 bb.ago= Önce
@@ -442,7 +358,6 @@ fee.disabled=Kapalı
 fee.set=Ücret başarıyla ayarlandı
 max.fee.allowed.is.0=İzin verilen maksimum ücret {0}
 fee.collected={0}₺ klan ücreti için geri çekildi
-invalid.fee=Girdiğiniz değer geçerli değil.
 player.purged=Oyuncu başarıyla silindi
 upkeep.collected={0}₺ bakım için geri çekildi
 balance.is.not.enough.for.upkeep=Klan bakiyesi bakımın ödenmesi için yeterli değil ({0} ₺), dağılmamak için tutarı yatırın.
@@ -458,43 +373,17 @@ available.rank.permissions=Rütbeler için kullanılabilir izinler\:
 rank.already.exists=Rütben zaten var
 rank.0.does.not.exist={0} Rütbesi mevcut değil
 rank.created=Rütbe oluşturuldu.
-invalid.permission={0} geçerli bir izin değil\! Bunlardan birini kullanın\: {1}
 permission.0.added.to.rank.1={0} rütbesine yeni bir yetki eklendi {1}.
 permission.0.removed.from.rank.1={0} izni {1} rütbesinden kaldırıldı.
 rank.0.deleted={0} rütbesi silindi.
-usage.0.rank.create=Kullanımı\: /{0} rütbe oluştur [rütbeismi]
-usage.0.rank.create.noargs=Kullanım\: /{0} rütbe oluştur
-usage.0.rank.setdisplayname=Kullanımı\: /{0} rütbe görünenisim [rütbe] [görünenisim], görünen isim birden çok kelime olabilir ve renk kodları içerebilir.
-usage.0.rank.delete=Kullanımı\: /{0} rütbe sil [rütbe]
-usage.0.rank.permissions=Kullanımı\: /{0} rütbe yetki [rütbe] [ekle/kaldır] [yetki]
-usage.0.rank.assign=Kullanımı\: /{0} rütbe ata [oyuncu] [rütbe]
-usage.0.rank.unassign=Kullanımı\: /{0} rütbe düşür [oyuncu]
-usage.0.rank=Kullanımı\: /{0} rütbe [oluştur/rütbeata/rütbeyial/sil/listele/isimdeğiştir/yetkiver]
 clans.ranks=Klan Rütbeleri\:
 ranks.list.item={0}\# {1} ({2})
 no.ranks=Hiçbir rütbe oluşturulmadı
 rank.no.permissions=Bu rütbenin izni yok
 player.unassigned.from.rank=Oyuncu rütbeden atanmamış
-rank.command=rütbe
-0.rank.create.1.create.rank=/{0} rütbe oluştur{1} - Rütbe oluştur
-0.rank.assign.player.rank.1.assign.rank.to.player=/{0} rütbe ata [oyuncu] [rütbe]{1} - Bir üyeye rütbe ata
-0.rank.unassign.player.1.unassign.player.from.rank=/{0} rütbe düşür [oyuncu]{1} - Bir üyenin rütbesini düşür
-0.rank.delete.rank.1.delete.rank=/{0} rütbe sil [rütbe]{1} - Rütbe sil
-0.rank.list.1.list.ranks=/{0} rütbe listesi {1} - Rütbe listesi
-0.rank.setdisplayname.rank.displayname.1.set.rank.displayname=/{0} rütbe görünenisimayarla [rütbe] [görünenisim]{1} - Bir rütbenin görünen adı belirleme
-0.rank.permissions.1.list.available.permissions=/{0} rütbe yetkileri{1} - Kullanılabilir rütbe yetkileri
-0.rank.permissions.rank.1.list.rank.permissions=/{0} rütbe yetkisi [rütbe] {1} - Rütbenin izinlerini listeleyin
-0.rank.permissions.rank.add.permission.1.add.a.permission.to.rank=/{0} rütbe izinleri [rütbe] ekle [izin] {1} - Rütbeye izin ekle
-0.rank.permissions.rank.remove.permission.1.remove.a.permission.from.rank=/{0} rütbe izinleri [rütbe] kaldır [izin] {1} - Bir izni rütbeden kaldır
 you.must.be.0.or.have.the.permission.1.to.use.this={0} olmanız veya lideriniz bunu kullanabilmek için rütbenize {1} izin vermelidir
-deposit.not.allowed=Depozitoya izin verilmiyor
-withdraw.not.allowed=Para çekmeye izin verilmiyor
 resign.request.cancelled=Ayrılma isteği iptal edildi
 promotion.vote.has.been.requested.from.all.leaders=Tüm liderlerden terfi oyu istendi
-0.message.1.send.a.message.to.clan.chat=/{0} [message]{1} - Klanınızın sohbetine bir mesaj gönderin
-0.join.leave.3.join.leave.the.clan.chat=/{0} {1}/{2}{3} - Klan sohbetine Katıl / Ayrıl\n
-0.message.1.send.a.message.to.ally.chat=/{0} [message]{1} - Müttefik sohbetine bir mesaj  yolla\n
-0.join.leave.3.join.leave.the.ally.chat=/{0} {1}/{2}{3} - Müttefik sohbetine Katıl/Ayrıl
 allowed=Aktif
 blocked=Bloke edilmiş
 chat.joined=Katılmış
@@ -504,7 +393,6 @@ gui.back.title=&fGeri
 gui.previous.page.title=&fÖnceki Sayfa
 gui.next.page.title=&fSonraki Sayfa
 gui.lore.no.permission=&cBunu görme izniniz yok\!
-gui.main.title=Klan Sistemi
 gui.main.languageselector.title=&fBir dil seç
 gui.main.languageselector.lore.left.click=&7Dil seçmek için sol tıklayın.
 gui.main.languageselector.lore.right.click=\n&7Çeviri kolaylaştırmak için sağ tıklayın
@@ -595,7 +483,9 @@ gui.clandetails.clan.lore.kdr=&7KD\: &b{0}
 gui.clandetails.clan.lore.kill.totals=&7Toplam Öldürme\: &b[Rakip\:{0} Tarafsız\:{1} Sivil\:{2}]
 gui.clandetails.clan.lore.deaths=&7Ölme\: &b{0}
 gui.clandetails.clan.lore.fee=&7Para\: &b{0}, {1} $
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.allies.separator=&b, 
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.rivals.separator=&b, 
 gui.clandetails.clan.lore.allies=&7Müttefikler\: &b{0}
 gui.clandetails.clan.lore.rivals=&7Rakipler\: &b{0}
@@ -669,6 +559,7 @@ gui.playerdetails.player.lore.kill.totals=&7Toplam Öldürme\: &b[Rakip\:{0} Tar
 gui.playerdetails.player.lore.deaths=&7Öldürme\: &b{0}
 gui.playerdetails.player.lore.join.date=&7Katılma Tarihi\: &b{0}
 gui.playerdetails.player.lore.last.seen=&7Durum\: &b{0}
+# suppress inspection "TrailingSpacesInProperty"
 gui.playerdetails.player.lore.past.clans.separator=&b,
 gui.playerdetails.player.lore.past.clans=&7Eski Klanı\: &b{0}
 gui.playerdetails.player.lore.inactive=&7İnaktif\: &b{0}/{1} Gün
@@ -701,14 +592,10 @@ gui.confirmation.return=&7Geri dönmek için buraya tıklayın
 gui.not.supported=&cMenü açılırken bir hata oluştu\! Devre dışı bırakılıyor ... Doğru sürümü indirdiniz mi?
 staff.member.verify.clan=&cBir yetkili klanınızı doğrulamalı\!
 player.already.has.that.rank=&cOyuncu zaten bu rütbeye sahip\!
-enabled.clan.chat=&bKlan sohbetini açtın
-disabled.clan.chat=&bKlan sohbetini kapattın
 joined.clan.chat=&bKlan sohbetine katıldın
 left.clan.chat=&bKlan sohbetinden ayrıldın
 muted.clan.chat=&bKlan sohbetinde susturuldun
 unmuted.clan.chat=&bKlan sohbetindeki susturman kaldırıldı
-enabled.ally.chat=&bMüttefik sohbetini açtın
-disabled.ally.chat=&bMüttefik sohbetini kapattın
 joined.ally.chat=&bMüttefik sohbetine katıldın
 left.ally.chat=&bMüttefik sohbetinden ayrıldın
 muted.ally.chat=&bMüttefik sohbetinde susturuldun
@@ -720,4 +607,6 @@ insert.clan.tag=&bKlan etiketini ekleyin\:
 insert.clan.name=&bKlan adını ekleyin\:
 insert.rank.name=&bRütbe adını ekleyin\:
 click.to.help.translating=&bÇeviriye yardımcı olmak için bu bağlantıyı tıklayın\:\n&r{0}
-your.clan.must.have.members.to.verify=&cKlanınızın doğrulanması için en az {0} üyesi olmalı\!
+your.clan.must.have.members.to.verify=&cKlanınızın doğrulanması için en az {0} üyesi olmalı\!
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_uk_UA.properties

@@ -1,4 +1,3 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=описання
 create.command=створити
 list.command=список
@@ -40,39 +39,8 @@ setrank.command=\nвстановити ранг
 place.command=місце
 resetkdr.command=РесетКДР
 help.command=допомогу
-usage.description=Використання\: /{0} description [опис]
-usage.resetkdr=Використання\: /{0} resetkdr [all/player]
-usage.clan.alliances=Використання\: /{0} alliances
-usage.ally=Використання\: /{0} ally add/remove [тег]
-usage.ban.unban=Використання\: /{0} ban/unban [player]
-usage.rival=Використання\: /{0} rival add/remove [tag]
-usage.war=Використання\: /{0} war start/end [tag]
-usage.clanff=Використання\: /{0} clanff allow/auto
-usage.0.coords=Використання\: /{0} coords
-usage.demote.leader=Використання\: /{0} demote [лідер]
-usage.0.disband=Використання\: /{0} disband
-usage.0.ff.allow.auto=Використання\: /{0} ff allow/auto
-usage.0.globalff.allow.auto=Використання\: /{0} globalff allow/auto
-usage.0.permissions.player=Використання\: /{0} permissions [clan] add/remove [permission]
-usage.0.invite.player=Використання\: /{0} invite [player]
-usage.kick.player=Використання\: /{0} kick [player]
-usage.bank=Використання\: /{0} bank withdraw/deposit/status [amount]
-usage.fee=Використання\: /{0} fee check/set [amount]
-usage.purge=Використання\: /{0} purge [player]
-usage.0.modtag.tag=Використання\: /{0} modtag [tag]
-usage.list=Використання\: /{0} list [name/size/kdr/founded/active] [asc/desc]
-usage.lookup.tag=Використання\: /{0} lookup [tag]
-usage.0.profile.tag=Використання\: /{0} profile [tag]
-usage.0.promote.member=Використання\: /{0} promote <член>
-usage.0.rivalries=Використання\: /{0} rivalries
-usage.0.roster.tag=Використання\: /{0} roster [tag]
-usage.0.stats=Використання\: /{0} stats
-usage.0.trust.player=Використання\: /{0} trust [гравець]
-usage.0.untrust.player=Використання\: /{0} untrust [гравець]
-usage.0.verify.tag=Використання\: /{0} verify [тег]
-usage.0.vitals=Використання\: /{0} vitals
-usage.0.place=Використання\: /{0} place [гравець] [тер]
-usage.0.leaderboard=Використання\: /{0} leaderboard
-0.reload.1.reload.configuration=/{0} reload{1} - Оновити конфігурацію
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} globalff allow/auto {1} - Встановити глобальний дружній вогонь
-0.place=/{0} place [гравець] [тег]{1} - помістіть гравця в клан
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_zh_CN.properties

@@ -1,4 +1,3 @@
-# suppress inspection "TrailingSpacesInProperty" for whole file
 description.command=描述
 create.command=创建
 list.command=列表
@@ -42,88 +41,9 @@ setrank.command=设置称号
 place.command=移动
 resetkdr.command=重置死亡比值
 help.command=用户指南
-usage.description=用法： /{0} 描述 [description]
-usage.resetkdr=用法\: /{0} 重置死亡比值[all/player]
-usage.clan.alliances=使用\: /{0} alliances
-usage.ally=使用\: /{0} ally add/remove [标签]
-usage.ban.unban=使用\: /{0} ban/unban [玩家]
-usage.rival=使用\: /{0} rival add/remove [标签]
-usage.war=使用\: /{0} war start/end [标签]
-usage.clanff=使用\: /{0} clanff allow/block
-usage.0.coords=使用\: /{0} coords
-usage.demote.leader=使用\: /{0} demote [老大]
-usage.0.disband=使用\: /{0} disband
-usage.0.ff.allow.auto=使用\: /{0} ff allow/auto
-usage.0.globalff.allow.auto=使用\: /{0} globalff allow/auto
-usage.0.permissions.player=使用\: /{0} permissions [帮派] add/remove [权限]
-usage.0.invite.player=使用\: /{0} invite [玩家]
-usage.kick.player=使用\: /{0} kick [玩家]
-usage.bank=使用\: /{0} bank withdraw/deposit/status [数量]
-usage.fee=用法：/{0} fee check/set [amount]
-usage.purge=用法：/{0} purge [player]
-usage.0.modtag.tag=使用\: /{0} modtag [标签]
-usage.list=用法\: /{0} list [name/size/kdr/founded/active] [asc/desc]
-usage.lookup.tag=使用\: /{0} lookup [标签]
-usage.0.profile.tag=使用\: /{0} profile [标签]
-usage.0.promote.member=使用\: /{0} promote <成员>
-usage.0.rivalries=使用\: /{0} rivalries
-usage.0.roster.tag=使用\: /{0} roster [标签]
-usage.0.stats=使用\: /{0} stats
-usage.0.trust.player=使用\: /{0} trust [玩家]
-usage.0.untrust.player=使用\: /{0} untrust [玩家]
-usage.0.verify.tag=使用\: /{0} verify [标签]
-usage.0.vitals=使用\: /{0} vitals
-usage.0.place=使用\: /{0} place [玩家] [标签]
-usage.0.leaderboard=使用\: /{0} leaderboard
-0.reload.1.reload.configuration=/{0} reload{1} - 重载配置
-0.globalff.allow.auto.1.set.global.friendly.fire=/{0} globalff allow/auto {1} - 设置全局友军伤害
-0.place=/{0} place [玩家] [标签]{1} - 将玩家加入帮派
-0.ban.unban.player.1.ban.unban.a.player=/{0} ban/unban [玩家]{1} - 封禁/解封一个玩家
-0.hometp.clan.1.tp.home.a.clan=/{0} home tp [帮派]{1} - 传送至帮派基地
-0.disband.tag.1.disband.a.clan=/{0} disband [标签]{1} - 解禁帮派
-0.resetkdr.1.resets.kdr=/{0} resetkdr player/all{1} - 重置所有玩家或单一玩家的 KD 比
-0.resetkdr.1.resets.your.kdr=/{0} resetkdr{1} - 重置你的 KD 比
-0.verify.tag.1.verify.an.unverified.clan=/{0} verify [标签]{1} - 验证一个帮派
-0.verify.1.purchase.verification.of.your.clan=/{0} verify{1} - 付费验证你的帮派
-0.list.1.lists.all.clans=/{0} list [order by] [asc/desc]{1} - 列出全部帮派 (order by\: name/size/kdr/founded/active)
-0.profile.1.view.your.clan.s.profile=/{0} profile{1} - 查看你的帮派的信息
-0.profile.tag.1.view.a.clan.s.profile=/{0} profile [标签]{1} - 查看帮派信息
-0.lookup.1.lookup.your.info=/{0} lookup{1} - 查询你的信息
-0.lookup.player.1.lookup.a.player.s.info=/{0} lookup [玩家]{1} - 查看玩家信息
-0.leaderboard.1.view.leaderboard=/{0} leaderboard{1} - 查看排行榜
-0.alliances.1.view.all.clan.alliances=/{0} alliances{1} - 查看帮派联盟
-0.rivalries.1.view.all.clan.rivalries=/{0} rivalries{1} - 查看帮派敌对
-0.roster.1.view.your.clan.s.member.list=/{0} roster{1} - 查看你的帮派的成员列表
-0.roster.tag.1.view.a.clan.s.member.list=/{0} roster [标签]{1} - 查看帮派的成员列表
-0.vitals.1.view.your.clan.member.s.vitals=/{0} vitals{1} - 查看你的帮派玩家的生命
-0.coords.1.view.your.clan.member.s.coordinates=/{0} coords{1} - 查看你的帮派玩家的坐标
-0.stats.1.view.your.clan.member.s.stats=/{0} stats{1} - 查看你的帮派玩家的统计
-0.ally.add.remove.tag.1.add.remove.an.ally.clan=/{0} ally add/remove [标签]{1} - 添加/移除一个联盟帮派
-0.rival.add.remove.tag.1.add.remove.a.rival.clan=/{0} rival add/remove [标签]{1} - 添加/移除一个敌对帮派
-0.bb.1.display.bulletin.board=/{0} bb{1} - 显示公告板
-0.bb.msg.1.add.a.message.to.the.bulletin.board=/{0} bb [msg]{1} - 添加信息到公告板
-0.modtag.tag.1.modify.the.clan.s.tag=/{0} modtag [标签]{1} - 更改帮派标签
-0.description.description.1.modify.the.clan.s.description=/{0} description [description]{1} - 修改帮派描述
-0.invite.player.1.invite.a.player=/{0} invite [玩家]{1} - 邀请玩家
-0.kick.player.1.kick.a.player.from.the.clan=/{0} kick [玩家]{1} - 将玩家踢出帮派
-0.trust.untrust.player.1.set.trust.level1=/{0} trust [玩家]{1} - 设置成员为信任
-0.trust.untrust.player.1.set.trust.level2=/{0} untrust [玩家]{1} - 取消成员信任
-0.promote.member.1.promote.a.member.to.leader=/{0} promote [member]{1} - 提升一个成员为老大
-0.demote.leader.1.demote.a.leader.to.member=/{0} demote [leader]{1} - 降级一个老大为成员
-0.clanff.allow.block.1.toggle.clan.s.friendly.fire=/{0} clanff allow/block{1} - 切换帮派的友军伤害
-0.ff.allow.auto.1.toggle.personal.friendly.fire=/{0} ff allow/auto{1} - 切换个人的友军伤害
-0.toggle.command=/{0} toggle [{2}]{1} - 切换个人设置
-0.resign.1.resign.from.the.clan=/{0} resign{1} - 离开目前的帮派
-0.disband.1.disband.your.clan=/{0} disband{1} - 解散你的帮派
-0.kills=/{0} kills{1} - 查看你的击杀量
-0.killsplayer=/{0} kills [玩家]{1} - 查看玩家的击杀量
-0.fee.check=/{0} fee check {1}- 查询费用
-0.fee.set=/{0} fee set [amount]{1} - 设置帮派会员费
-0.mostkilled=/{0} mostkilled{1} - 查看全服死亡排名
 home-menu=/{0} home{1} - 传送至帮派基地
 home-set-menu=/{0} home set{1} - 设置帮派基地
 home-clear-menu=/{0} home clear{1} - 清除帮派基地
-example.clan.modtag.4kfo.4l=示例\: /clan modtag &4帅
 clan=帮派
 allies=联盟
 alliances=联盟
@@ -208,11 +128,9 @@ clan.players=帮派玩家\: {0}
 clans=帮派\: {0}
 banned=你被禁止使用帮派命令
 nothing.more.to.see=没有更多
-nothing.to.deny=没有拒绝的事务
 no.leader.permissions=你没有老大权限
 you.have.already.voted=你已经投票了
 has.voted.to.deny={0} 投了拒绝票
-nothing.to.accept=没有可接受的事务
 view.next.page=输入 /{0} 查看下一页.
 voted.to.accept={0} 投了接受票
 bulletin.board.header={0}* {1}{2} 公告板
@@ -221,14 +139,10 @@ has.been.disbanded.alliance.ended={0} 解散了. 联盟终结了.
 clan.disbanded=帮派已解散
 1.color.day=1 {0}天
 many.color.days={0}{1} 天
-does.not.match=没有匹配的帮派命令
-simpleclans.command.failure=SimpleClans 命令失败\: {0}
 insufficient.permissions=权限不足
 clan.is.not.verified=帮派未验证
 not.a.member.of.any.clan=你不是任何帮派的成员
 minimum.to.make.alliance=你的帮派至少要有 {0} 名玩家才能建立联盟
-no.clan.matched=没有匹配的帮派
-cannot.ally.with.an.unverified.clan=你不能和未验证的帮派建立联盟
 your.clans.are.not.allies=你的帮派不是联盟
 has.broken.the.alliance={0} 停止了与 {1} 的联盟
 at.least.one.leader.accept.the.alliance=至少一个老大在线才能接受联盟
@@ -264,7 +178,6 @@ global.friendy.fire.is.now.managed.by.each.clan=全局的友军伤害现在由
 global.friendy.fire.is.already.being.managed.by.each.clan=全局的友军伤害已经由各个帮派管理了
 global.friendly.fire.is.set.to.allowed=全局的友军伤害已经启用
 global.friendly.fire.is.already.being.allowed=全局的友军伤害已经启用了
-no.player.matched=没有匹配的玩家
 the.player.doesn.t.not.have.the.permissions.to.join.clans=玩家没有加入此帮派的权限
 you.cannot.invite.yourself=你不能邀请你自己
 this.player.is.banned.from.using.clan.commands=此玩家被禁止使用此命令
@@ -278,30 +191,19 @@ no.clans.have.been.created=没有帮派被创建
 total.clans=总帮派\:
 kill.type.civilian=击杀种类\: {0}平民
 no.player.data.found=没有找到玩家数据
-kill.type.0=击杀种类\: {0}
-s.player.info={0} 的玩家信息
 clan.0=帮派\: {0}
 status.0=状态\: {0}
 rank.0=称号\: {0}
 kdr.0=KD\: {0}
-deaths.0=死亡\: {0}
-fee.0.value.1=费用：{0}, {1} $
-join.date.0=加入日期\: {0}
-last.seen.0=最后上线\: {0}
-past.clans.0=曾经的帮派\: {0}
 inactive.0=不活跃\: {0}
-kill.totals=总击杀\:
 clan.commands=帮派命令
 you.can.only.modify.the.color.and.case.of.the.tag=你只能更改标签的颜色和大小写
 tag.changed.to.0=标签更改为 {0}
 name.0=名称\: {0}
 description.0=描述：{0}
 leaders.0=老大\: {0}
-members.online.0=在线成员\: {0}
 allies.0=联盟\: {0}
 rivals.0=敌对\: {0}
-founded.0=成立\: {0}
-the.member.to.be.promoted.must.be.online=提升的成员必须在线
 the.player.does.not.have.the.permissions.to.lead.a.clan=玩家没有做老大的权限
 you.cannot.promote.yourself=你不能提升你自己
 the.player.is.already.a.leader=玩家已经是老大了
@@ -336,7 +238,6 @@ denied.war.req={0} 拒绝了 {1} 发送的开战请求
 you.are.no.longer.at.war={0} 不再与 {1} 战争了
 end.war.denied=停战请求被 {0} 拒绝了
 denied.war.end={0} 拒绝了 {1} 的停战请求
-0.war=/{0} war{1} start/end [标签] - 开始或停止一场战争
 has.initiated.a.rivalry={0} 已经将 {1} 设置为敌对
 start=开始
 end=停止
@@ -358,8 +259,6 @@ clan.announce=帮派公告
 leader.announce=老大公告
 hunger=饥饿
 the.clan.cannot.be.rivaled=这个帮派不能敌对
-capeoff=披风已关闭
-capeon=披风已开启
 bboff=公告板已关闭
 bbon=公告板已开启
 tagoff=标签已关闭
@@ -411,5 +310,10 @@ gui.main.reset.kdr.title=&f重置 KD 比
 gui.warning.title=警告
 gui.warning.no.permission.title=&f没有权限
 gui.warning.no.permission.plugin.lore=&7你没有这样做的权限！
+# suppress inspection "TrailingSpacesInProperty"
 gui.clandetails.clan.lore.allies.separator=&b、 
-gui.clandetails.clan.lore.rivals.separator=&b、 
+# suppress inspection "TrailingSpacesInProperty"
+gui.clandetails.clan.lore.rivals.separator=&b、 
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/messages_zh_TW.properties

@@ -1,2 +1,65 @@
 description.command=說明
 create.command=創建於
+delete.command=刪除
+rank.command=階級
+setdisplayname.command=設置顯示名稱
+permissions.command=權限
+list.command=列表
+list.order.asc=升冪
+list.order.desc=描述
+list.type.name=類別名稱
+list.type.size=大小
+list.type.founded=公會行事曆：
+list.type.active=活躍中
+profile.command=個人資料
+roster.command=成員列表
+lookup.command=查詢
+leaderboard.command=排行榜
+alliances.command=聯盟
+rivalries.command=對手
+vitals.command=命脈
+coords.command=座標
+stats.command=統計
+ally.command=盟友
+add.command=加入
+remove.command=移除
+allow.command=允許
+block.command=黑名單
+auto.command=自動
+check.command=檢查
+assign.command=分配
+unassign.command=取消分配
+rival.command=敵對者
+bb.command=公布欄
+clear.command=清除
+toggle.command=切換
+deposit.command=存款
+all.command=所有
+withdraw.command=提款
+invite.command=邀請
+kick.command=踢出
+bank.command=銀行
+status.command=狀態
+fee.command=費用
+set.command=設置
+purge.command=清除
+trust.command=信任
+untrust.command=不信任
+admin.command=管理員
+promote.command=升級
+demote.command=降級
+resign.command=放棄
+disband.command=解散
+verify.command=驗證
+ban.command=封鎖
+unban.command=解除封鎖
+reload.command=重新載入
+kills.command=殺敵數
+help.command=幫助
+command.description.deny=拒絕請求
+command.description.accept=接受請求
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"
+# suppress inspection "TrailingSpacesInProperty"

src/main/resources/plugin.yml

@@ -206,7 +206,7 @@ permissions:
       simpleclans.mod.staffgui: true
   simpleclans.anyone.*:
     description: Permissions for anyone
-    default: false
+    default: true
     children:
       simpleclans.anyone.list: true
       simpleclans.anyone.profile: true
@@ -217,7 +217,7 @@ permissions:
       simpleclans.anyone.rivalries: true
   simpleclans.member.*:
     description: Permissions for those who can be clan members
-    default: false
+    default: true
     children:
       simpleclans.member.can-join: true
       simpleclans.member.profile: true
@@ -241,7 +241,7 @@ permissions:
       simpleclans.member.fee-check: true
   simpleclans.leader.*:
     description: Permissions for those who can be clan leaders
-    default: false
+    default: true
     children:
       simpleclans.leader.create: true
       simpleclans.leader.verify: true

src/test/java/net/sacredlabyrinth/phaed/simpleclans/language/ResourceControlTest.java

@@ -0,0 +1,52 @@
+package net.sacredlabyrinth.phaed.simpleclans.language;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Locale;
+
+import static org.junit.Assert.*;
+
+class ResourceControlTest {
+
+    @Test
+    void getFallbackLocaleAcf() {
+        LanguageResource.ResourceControl resourceControl = new LanguageResource.ResourceControl(Locale.ENGLISH,
+                true);
+        String acfBaseName = "acf";
+        Locale locale = resourceControl.getFallbackLocale(acfBaseName, Locale.ENGLISH);
+        assertNull(locale);
+        locale = resourceControl.getFallbackLocale(acfBaseName, new Locale("es", "ES"));
+        assertEquals(Locale.ENGLISH, locale);
+
+        Locale ptBR = new Locale("pt", "BR");
+        resourceControl = new LanguageResource.ResourceControl(ptBR, true);
+        locale = resourceControl.getFallbackLocale(acfBaseName, Locale.ENGLISH);
+        assertNull(locale);
+        locale = resourceControl.getFallbackLocale(acfBaseName, ptBR);
+        assertEquals(Locale.ENGLISH, locale);
+    }
+
+    @Test
+    void getFallbackLocale() {
+        LanguageResource.ResourceControl resourceControl = new LanguageResource.ResourceControl(Locale.ENGLISH,
+                true);
+        String pluginBaseName = "messages";
+        Locale locale = resourceControl.getFallbackLocale(pluginBaseName, Locale.ENGLISH);
+        assertEquals(Locale.ROOT, locale);
+        locale = resourceControl.getFallbackLocale(pluginBaseName, Locale.ROOT);
+        assertNull(locale);
+        locale = resourceControl.getFallbackLocale(pluginBaseName, Locale.CANADA);
+        assertNotSame(Locale.CANADA, locale);
+
+        Locale ptBR = new Locale("pt", "BR");
+        resourceControl = new LanguageResource.ResourceControl(ptBR, true);
+        locale = resourceControl.getFallbackLocale(pluginBaseName, ptBR);
+        assertEquals(Locale.ROOT, locale);
+        locale = resourceControl.getFallbackLocale(pluginBaseName, Locale.ROOT);
+        assertNull(locale);
+        locale = resourceControl.getFallbackLocale(pluginBaseName, Locale.CANADA);
+        assertNotSame(Locale.CANADA, locale);
+        locale = resourceControl.getFallbackLocale(pluginBaseName, Locale.ENGLISH);
+        assertEquals(ptBR, locale);
+    }
+}