Disable /nick if change-displayname is disabled

Some translations

8 files changed, 88 insertions, 66 deletions

diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 3af6a5a4e..d160a6f07 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -423,7 +423,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		if (autoafkkick > 0 && lastActivity + autoafkkick * 1000 < System.currentTimeMillis()
 			&& !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
 		{
-			final String kickReason = Util.i18n("autoAfkKickReason");
+			final String kickReason = Util.format("autoAfkKickReason", autoafkkick/60.0);
 			kickPlayer(kickReason);
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
index 3731b24c5..99c779ba4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
@@ -21,6 +21,11 @@ public class Commandnick extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
+		
+		if (!ess.getSettings().changeDisplayName()) {
+			user.sendMessage(Util.i18n("nickDisplayName"));
+			return;
+		}
 
 		if (args.length > 1)
 		{
@@ -80,6 +85,11 @@ public class Commandnick extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		
+		if (!ess.getSettings().changeDisplayName()) {
+			sender.sendMessage(Util.i18n("nickDisplayName"));
+			return;
+		}
+		
 		setOthersNickname(server, sender, args);
 		
 	}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 52cefd453..5190c6968 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -8,6 +8,7 @@ alertBroke = broke:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3}
 alertPlaced = placed:
 alertUsed = used:
+autoAfkKickReason=You have been kicked for idling more than {0} minutes.
 backAfterDeath = \u00a77Use the /back command to return to your death point.
 backUsageMsg = \u00a77Returning to previous location.
 backupFinished = Backup finished
@@ -96,9 +97,9 @@ helpConsole = To view help from the console, type ?.
 helpOp = \u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages = Page \u00a7c{0}\u00a7f of \u00a7c{1}\u00a7f:
 holeInFloor = Hole in floor
-homes = Homes: {0}
 homeSet = \u00a77Home set.
 homeSetToBed = \u00a77Your home is now set to this bed.
+homes = Homes: {0}
 hour = hour
 hours = hours
 ignorePlayer = You ignore player {0} from now on.
@@ -179,6 +180,7 @@ mutedUserSpeaks = {0} tried to speak, but is muted.
 needTpohere = You need access to /tpohere to teleport other players.
 negativeBalanceError = User is not allowed to have a negative balance.
 nickChanged = Nickname changed.
+nickDisplayName=\u00a77You have to enable change-displayname in Essentials config.
 nickInUse = \u00a7cThat name is already in use.
 nickNamesAlpha = \u00a7cNicknames must be alphanumeric.
 nickNoMore = \u00a77You no longer have a nickname.
@@ -211,6 +213,14 @@ numberRequired = A number goes there, silly.
 onlyDayNight = /time only supports day/night.
 onlyPlayers = Only in-game players can use {0}.
 onlySunStorm = /weather only supports sun/storm.
+pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
+pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
+pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
+pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
+pTimePlayers = These players have their own time:
+pTimeReset = Player time has been reset for: \u00a7e{0}
+pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
+pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 parseError = Error parsing {0} on line {1}
 pendingTeleportCancelled = \u00a7cPending teleportation request cancelled.
 permissionsError = Missing Permissions/GroupManager; chat prefixes/suffixes will be disabled.
@@ -235,14 +245,6 @@ powerToolNoSuchCommandAssigned = Command \u00a7c{0}\u00a7f has not been assigned
 powerToolRemove = Command \u00a7c{0}\u00a7f removed from {1}.
 powerToolRemoveAll = All commands removed from {0}.
 protectionOwner = \u00a76[EssentialsProtect] Protection owner: {0}
-pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
-pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
-pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
-pTimePlayers = These players have their own time:
-pTimeReset = Player time has been reset for: \u00a7e{0}
-pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
-pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Question]\u00a7f {0}
 reloadAllPlugins = \u00a77Reloaded all plugins.
 repair = You have successfully repaired your: \u00a7e{0}.
@@ -332,10 +334,10 @@ voiceSilenced = \u00a77Your voice has been silenced
 warpDeleteError = Problem deleting the warp file.
 warpListPermission = \u00a7cYou do not have Permission to list that warps.
 warpNotExist = That warp does not exist.
-warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 warpSet = \u00a77Warp {0} set.
 warpUsePermission = \u00a7cYou do not have Permission to use that warp.
 warpingTo = \u00a77Warping to {0}.
+warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 weatherStorm = \u00a77You set the weather to storm in your world
 weatherStormFor = \u00a77You set the weather to storm in your world for {0} seconds
 weatherSun = \u00a77You set the weather to sun in your world
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 2000c0c3b..b27154190 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -8,14 +8,15 @@ alertBroke = \u00f8delagde:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} ved: {3}
 alertPlaced = placerede:
 alertUsed = brugte:
+autoAfkKickReason=You have been kicked for idling more than {0} minutes.
 backAfterDeath = \u00a77Brug /back kommandoen for at retunere til dit d\u00f8ds punkt.
 backUsageMsg = \u00a77Returnere til tidligere placering.
 backupFinished = Backup sluttede
 backupStarted = Backup startede
 balance = \u00a77Balance: {0}
 balanceTop = \u00a77 Top {0} saldi
-banIpAddress = \u00a77Bannede IP addresse
 banExempt = \u00a7cDu kan ikke forbyde den p\u00e5g\u00e6ldende spiller.
+banIpAddress = \u00a77Bannede IP addresse
 bannedIpsFileError = Fejl i l\u00e6sning af banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt ikke fundet
 bannedPlayersFileError = Fejl i l\u00e6sning af banned-players.txt
@@ -96,9 +97,9 @@ helpConsole = For at se hj\u00e6lp fra konsolen, skriv ?.
 helpOp = \u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages = Side \u00a7c{0}\u00a7f af \u00a7c{1}\u00a7f:
 holeInFloor = Hul i gulv
-homes = Homes: {0}
 homeSet = \u00a77Hjem sat.
 homeSetToBed = \u00a77Dit hjem er nu sat til denne seng.
+homes = Homes: {0}
 hour = time
 hours = timer
 ignorePlayer = Du ignorere spiller {0} fra nu af.
@@ -179,6 +180,7 @@ mutedUserSpeaks = {0} pr\u00f8vede at snakke, men er muted.
 needTpohere = Du skal have adgang til /tpohere for at teleporter andre spillere.
 negativeBalanceError = Brugeren er ikke tilladt at have en negativ saldo.
 nickChanged = Kaldenavn \u00e6ndret.
+nickDisplayName=\u00a77You have to enable change-displayname in Essentials config.
 nickInUse = \u00a7cDet navn er allerede i brug.
 nickNamesAlpha = \u00a7cKaldenavne skal v\u00e6re alfanumeriske.
 nickNoMore = \u00a7Du har ikke l\u00e6ngere et kaldenavn.
@@ -211,6 +213,14 @@ numberRequired = Der skal v\u00e6re et nummer, fjolle.
 onlyDayNight = /time underst\u00f8tter kun day/night.
 onlyPlayers = Kun in-game spillere kan bruge {0}.
 onlySunStorm = /weather only supports sun/storm.
+pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
+pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
+pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
+pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
+pTimePlayers = These players have their own time:
+pTimeReset = Player time has been reset for: \u00a7e{0}
+pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
+pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 parseError = Fejl ved parsing {0} p\u00e5 linje {1}
 pendingTeleportCancelled = \u00a7cVentende teleportations anmodning aflyst.
 permissionsError = Mangler Permissions/GroupManager; chat pr\u00e6fikser/suffikser vil v\u00e6re sl\u00e5et fra.
@@ -235,14 +245,6 @@ powerToolNoSuchCommandAssigned = Command \u00a7c{0}\u00a7f has not been assigned
 powerToolRemove = Command \u00a7c{0}\u00a7f removed from {1}.
 powerToolRemoveAll = All commands removed from {0}.
 protectionOwner = \u00a76[EssentialsProtect] Beskyttelses ejer: {0}
-pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
-pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
-pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
-pTimePlayers = These players have their own time:
-pTimeReset = Player time has been reset for: \u00a7e{0}
-pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
-pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Sp\u00f8rgsm\u00e5l]\u00a7f {0}
 reloadAllPlugins = \u00a77Genindl\u00e6ste alle tilf\u00f8jelser.
 repair = You have successfully repaired your: \u00a7e{0}.
@@ -332,10 +334,10 @@ voiceSilenced = \u00a77Din stemme er blevet d\u00e6mpet
 warpDeleteError = Problem ved sletning af warp filen.
 warpListPermission = \u00a7cDu har ikke tilladelse til at liste de warps.
 warpNotExist = Den warp eksisterer ikke.
-warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 warpSet = \u00a77Warp {0} sat.
 warpUsePermission = \u00a7cDu har ikke tilladelse til at benytte den warp.
 warpingTo = \u00a77Warper til {0}.
+warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 weatherStorm = \u00a77Du har sat vejret til storm i din verden
 weatherStormFor = \u00a77Du har sat vejret til storm i din verden i {0} sekunder
 weatherSun = \u00a77Du har sat vejret til sol
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 02e015b15..a38ba3d6e 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -8,14 +8,15 @@ alertBroke = zerst\u00f6rt:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} bei: {3}
 alertPlaced = platziert:
 alertUsed = benutzt:
+autoAfkKickReason=You have been kicked for idling more than {0} minutes.
 backAfterDeath = \u00a77Benutze den Befehl /back um zu deinem Todespunkt zur\u00fcck zu kehren.
 backUsageMsg = \u00a77Kehre zur letzten Position zur\u00fcck.
 backupFinished = Backup beendet
 backupStarted = Backup gestartet
 balance = \u00a77Geldb\u00f6rse: {0}
 balanceTop = \u00a77 Top {0} Guthaben
-banIpAddress = \u00a77IP-Adresse gesperrt.
 banExempt = \u00a7cDu kannst diesen Spieler nicht sperren.
+banIpAddress = \u00a77IP-Adresse gesperrt.
 bannedIpsFileError = Fehler beim Lesen von banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt nicht gefunden
 bannedPlayersFileError = Fehler beim Lesen von banned-players.txt
@@ -96,9 +97,9 @@ helpConsole = Um die Hilfe der Konsole zu sehen, schreibe ?.
 helpOp = \u00a7c[Hilfe]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages = Seite \u00a7c{0}\u00a7f von \u00a7c{1}\u00a7f:
 holeInFloor = Loch im Boden
-homes = Homes: {0}
 homeSet = \u00a77Zuhause gesetzt.
 homeSetToBed = \u00a77Dein Zuhause ist nun an diesem Bett.
+homes = Homes: {0}
 hour = Stunde
 hours = Stunden
 ignorePlayer = Du ignorierst ab jetzt Spieler {0}.
@@ -179,6 +180,7 @@ mutedUserSpeaks = {0} versuchte zu sprechen, aber ist stumm geschalt.
 needTpohere = Du brauchst Zugriff auf /tpohere um andere Spieler teleportieren zu k\u00f6nnen.
 negativeBalanceError = Spieler darf keine Schulden machen.
 nickChanged = Nickname ge\u00e4ndert.
+nickDisplayName=\u00a77You have to enable change-displayname in Essentials config.
 nickInUse = \u00a7cDieser Name wird bereits verwendet.
 nickNamesAlpha = \u00a7cNicknamen d\u00fcrfen nur alphanumerische Zeichen enthalten.
 nickNoMore = \u00a7Du hast keinen Nicknamen mehr.
@@ -211,6 +213,14 @@ numberRequired = Ein Zahl wird ben\u00f6tigt.
 onlyDayNight = /time unterst\u00fctzt nur day und night.
 onlyPlayers = Nur Spieler k\u00f6nnen {0} benutzen.
 onlySunStorm = /weather unterst\u00fctzt nur sun und storm.
+pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
+pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
+pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
+pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
+pTimePlayers = These players have their own time:
+pTimeReset = Player time has been reset for: \u00a7e{0}
+pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
+pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 parseError = Fehler beim Parsen von {0} in Zeile {1}
 pendingTeleportCancelled = \u00a7cLaufende Teleportierung abgebrochen.
 permissionsError = Permissions/GroupManager fehlt; Chat-Prefixe/-Suffixe sind ausgeschaltet.
@@ -235,14 +245,6 @@ powerToolNoSuchCommandAssigned = Command \u00a7c{0}\u00a7f has not been assigned
 powerToolRemove = Command \u00a7c{0}\u00a7f removed from {1}.
 powerToolRemoveAll = All commands removed from {0}.
 protectionOwner = \u00a76[EssentialsProtect] Besitzer dieses Blocks: {0}
-pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
-pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
-pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
-pTimePlayers = These players have their own time:
-pTimeReset = Player time has been reset for: \u00a7e{0}
-pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
-pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Frage]\u00a7f {0}
 reloadAllPlugins = \u00a77Alle plugins neu geladen.
 repair = You have successfully repaired your: \u00a7e{0}.
@@ -332,10 +334,10 @@ voiceSilenced = \u00a77Du bist stumm
 warpDeleteError = Fehler beim L\u00f6schen der Warp-Datei.
 warpListPermission = \u00a7cDu hast keine Berechtigung, die Warp-Punkte anzuzeigen.
 warpNotExist = Warp-Punkt existiert nicht.
-warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 warpSet = \u00a77Warp-Punkt {0} wurde erstellt.
 warpUsePermission = \u00a7cDu hast keinen Zugriff f\u00fcr diesen Warp-Punkt.
 warpingTo = \u00a77Teleportiere zu Warp-Punkt {0}.
+warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 weatherStorm = \u00a77In deiner Welt st\u00fcrmt es nun.
 weatherStormFor = \u00a77In deiner Welt st\u00fcrmt es nun f\u00fcr {0} Sekunden.
 weatherSun = \u00a77In deiner Welt scheint nun die Sonne.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index c96c9ecb7..6f1809c05 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -8,14 +8,15 @@ alertBroke = broke:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3}
 alertPlaced = placed:
 alertUsed = used:
+autoAfkKickReason=You have been kicked for idling more than {0} minutes.
 backAfterDeath = \u00a77Use the /back command to return to your death point.
 backUsageMsg = \u00a77Returning to previous location.
 backupFinished = Backup finished
 backupStarted = Backup started
 balance = \u00a77Balance: {0}
 balanceTop = \u00a77 Top {0} balances
-banIpAddress = \u00a77Banned IP address
 banExempt = \u00a7cYou can not ban that player.
+banIpAddress = \u00a77Banned IP address
 bannedIpsFileError = Error reading banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt not found
 bannedPlayersFileError = Error reading banned-players.txt
@@ -96,9 +97,9 @@ helpConsole = To view help from the console, type ?.
 helpOp = \u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages = Page \u00a7c{0}\u00a7f of \u00a7c{1}\u00a7f:
 holeInFloor = Hole in floor
-homes = Homes: {0}
 homeSet = \u00a77Home set.
 homeSetToBed = \u00a77Your home is now set to this bed.
+homes = Homes: {0}
 hour = hour
 hours = hours
 ignorePlayer = You ignore player {0} from now on.
@@ -179,6 +180,7 @@ mutedUserSpeaks = {0} tried to speak, but is muted.
 needTpohere = You need access to /tpohere to teleport other players.
 negativeBalanceError = User is not allowed to have a negative balance.
 nickChanged = Nickname changed.
+nickDisplayName=\u00a77You have to enable change-displayname in Essentials config.
 nickInUse = \u00a7cThat name is already in use.
 nickNamesAlpha = \u00a7cNicknames must be alphanumeric.
 nickNoMore = \u00a77You no longer have a nickname.
@@ -211,6 +213,14 @@ numberRequired = A number goes there, silly.
 onlyDayNight = /time only supports day/night.
 onlyPlayers = Only in-game players can use {0}.
 onlySunStorm = /weather only supports sun/storm.
+pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
+pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
+pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
+pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
+pTimePlayers = These players have their own time:
+pTimeReset = Player time has been reset for: \u00a7e{0}
+pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
+pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 parseError = Error parsing {0} on line {1}
 pendingTeleportCancelled = \u00a7cPending teleportation request cancelled.
 permissionsError = Missing Permissions/GroupManager; chat prefixes/suffixes will be disabled.
@@ -235,14 +245,6 @@ powerToolNoSuchCommandAssigned = Command \u00a7c{0}\u00a7f has not been assigned
 powerToolRemove = Command \u00a7c{0}\u00a7f removed from {1}.
 powerToolRemoveAll = All commands removed from {0}.
 protectionOwner = \u00a76[EssentialsProtect] Protection owner: {0}
-pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
-pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
-pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
-pTimePlayers = These players have their own time:
-pTimeReset = Player time has been reset for: \u00a7e{0}
-pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
-pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Question]\u00a7f {0}
 reloadAllPlugins = \u00a77Reloaded all plugins.
 repair = You have successfully repaired your: \u00a7e{0}.
@@ -332,10 +334,10 @@ voiceSilenced = \u00a77Your voice has been silenced
 warpDeleteError = Problem deleting the warp file.
 warpListPermission = \u00a7cYou do not have Permission to list that warps.
 warpNotExist = That warp does not exist.
-warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 warpSet = \u00a77Warp {0} set.
 warpUsePermission = \u00a7cYou do not have Permission to use that warp.
 warpingTo = \u00a77Warping to {0}.
+warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 weatherStorm = \u00a77You set the weather to storm in your world
 weatherStormFor = \u00a77You set the weather to storm in your world for {0} seconds
 weatherSun = \u00a77You set the weather to sun in your world
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 79016f02d..c564d0d76 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -8,14 +8,15 @@ alertBroke = a cass\u00e9:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} \u00e0:{3}
 alertPlaced = a plac\u00e9: 
 alertUsed = a utilis\u00e9: 
+autoAfkKickReason=You have been kicked for idling more than {0} minutes.
 backAfterDeath = \u00a77Utilisez la commande /back pour retourner \u00e0 l''endroit ou vous \u00eates mort.
 backUsageMsg = \u00a77Retour a votre emplacement pr\u00e9c\u00e8dent.
 backupFinished = Backup termin\u00e9
 backupStarted = D\u00e9but du backup
 balance = \u00a77Solde: {0}
 balanceTop = \u00a77 Top {0} soldes
-banIpAddress = \u00a77Adresse IP banni
 banExempt = \u00a77Vous ne pouvez pas interdire ce joueur.
+banIpAddress = \u00a77Adresse IP banni
 bannedIpsFileError = Erreur de lecture de banned-ips.txt
 bannedIpsFileNotFound = Fichier banned-ips.txt introuvable
 bannedPlayersFileError = Erreur lors de la lecture de banned-players.txt
@@ -96,9 +97,9 @@ helpConsole = Pour voir l''aide tapez ?
 helpOp = \u00a7c[Aide Admin]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages = Page \u00a7c{0}\u00a7f sur \u00a7c{1}\u00a7f.
 holeInFloor = Trou dans le Sol.
-homes = Homes: {0}
 homeSet = \u00a77Home d\u00e9fini.
 homeSetToBed = \u00a77Votre home est d\u00e9sormais d\u00e9fini sur ce lit.
+homes = Homes: {0}
 hour = heure
 hours = heures
 ignorePlayer = Vous ignorez d\u00e9sormais {0}.
@@ -179,6 +180,7 @@ mutedUserSpeaks = {0} a essay\u00e9 de parler mais est muet.
 needTpohere = Vous avez besoin de l''acc\u00e8s \u00e0 /tpohere pour t\u00e9l\u00e9porter d''autres joueurs.
 negativeBalanceError = L''utilisateur n''est pas autoris\u00e9 \u00e0 avoir un solde n\u00e9gatif.
 nickChanged = Pseudo modifi\u00e9.
+nickDisplayName=\u00a77You have to enable change-displayname in Essentials config.
 nickInUse = \u00a7cCe nom est d\u00e9j\u00e0 utilis\u00e9.
 nickNamesAlpha = \u00a7cLes pseudos doivent \u00eatre alphanum\u00e9riques.
 nickNoMore = \u00a7Vous n''avez plus de surnom.
@@ -211,6 +213,14 @@ numberRequired = On a besoin d''un nombre ici, idiot.
 onlyDayNight = /time ne supporte que (jour) day/night (nuit).
 onlyPlayers = Seulement les joueurs en jeu peuvent utiliser {0}.
 onlySunStorm = /weather only supports sun/storm.
+pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
+pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
+pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
+pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
+pTimePlayers = These players have their own time:
+pTimeReset = Player time has been reset for: \u00a7e{0}
+pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
+pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 parseError = Erreur de conversion {0} \u00e0 la ligne {1}
 pendingTeleportCancelled = \u00a7cRequete de t\u00e9l\u00e9portation annul\u00e9e.
 permissionsError = Permissions/GroupManager manquant,  les pr\u00e9fixes et suffixes ne seront pas affich\u00e9s.
@@ -235,14 +245,6 @@ powerToolNoSuchCommandAssigned = Command \u00a7c{0}\u00a7f has not been assigned
 powerToolRemove = Command \u00a7c{0}\u00a7f removed from {1}.
 powerToolRemoveAll = All commands removed from {0}.
 protectionOwner = \u00a76[EssentialsProtect] Propri\u00e9taire de la protection : {0}
-pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
-pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
-pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
-pTimePlayers = These players have their own time:
-pTimeReset = Player time has been reset for: \u00a7e{0}
-pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
-pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Question]\u00a7f {0}
 reloadAllPlugins = \u00a77Tous les plugins ont \u00e9t\u00e9 recharg\u00e9s.
 repair = You have successfully repaired your: \u00a7e{0}.
@@ -332,10 +334,10 @@ voiceSilenced = \u00a77Votre voix a \u00e9t\u00e9 r\u00e9duite au silence
 warpDeleteError = Probl\u00e8me concernant la suppression du fichier warp.
 warpListPermission = \u00a7cVous n''avez pas la permission d''afficher la liste des warps.
 warpNotExist = Ce warp n''existe pas.
-warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 warpSet = \u00a77Le warp {0} a \u00e9t\u00e9 cr\u00e9\u00e9.
 warpUsePermission = \u00a7cVous n''avez pas la permission d''utiliser ce warp.
 warpingTo = \u00a77T\u00e9l\u00e9portation au warp {0}.
+warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 weatherStorm = \u00a77Vous avez d\u00e9fini l''orage dans votre monde
 weatherStormFor = \u00a77Vous avez d\u00e9fini l''orage dans votre monde pour {0} secondes.
 weatherSun = \u00a77Vous avez mis le beau temps dans votre monde
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index c9fa21273..cd214b5d4 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -8,14 +8,15 @@ alertBroke = gebroken:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3}
 alertPlaced = geplaatst:
 alertUsed = gebruikt:
+autoAfkKickReason=You have been kicked for idling more than {0} minutes.
 backAfterDeath = \u00a77Gebruik het /back command om terug te keren naar je sterfplaats.
 backUsageMsg = \u00a77Naar de vorige locatie aan het gaan.
 backupFinished = Backup voltooid
 backupStarted = Backup gestart
 balance = \u00a77Saldo: {0}
 balanceTop = \u00a77 Top {0} saldi
-banIpAddress = \u00a77Verbannen IP-adres
 banExempt = \u00a77Je kunt deze speler niet verbannen.
+banIpAddress = \u00a77Verbannen IP-adres
 bannedIpsFileError = Fout bij het lezen van banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt werd niet gevonden
 bannedPlayersFileError = Fout bij het lezen van banned-players.txt
@@ -96,9 +97,9 @@ helpConsole = type ? om de consolehelp weer te geven.
 helpOp = \u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages = Pagina \u00a7c{0}\u00a7f van de \u00a7c{1}\u00a7f:
 holeInFloor = Gat in de vloer
-homes = Homes: {0}
 homeSet = \u00a77Home ingesteld.
 homeSetToBed = \u00a77Je home is is nu verplaatst naar dit bed.
+homes = Homes: {0}
 hour = uur
 hours = uren
 ignorePlayer = Je negeert {0} vanaf nu.
@@ -179,6 +180,7 @@ mutedUserSpeaks = {0} probeerde te praten, maar is gemute.
 needTpohere = Je moet toegang krijgen tot /tpohere om naar andere spelers te teleporteren.
 negativeBalanceError = Speler is niet toegestaan om een negatief saldo te hebben.
 nickChanged = Nickname veranderd.
+nickDisplayName=\u00a77You have to enable change-displayname in Essentials config.
 nickInUse = \u00a7cDie naam is al in gebruik.
 nickNamesAlpha = \u00a7cNicknames moeten alfanumeriek zijn.
 nickNoMore = \u00a7Je hebt geen nickname meer.
@@ -211,6 +213,14 @@ numberRequired = Er moet daar een nummer, grapjas.
 onlyDayNight = /time ondersteund alleen day/night.
 onlyPlayers = Alleen in-game spelers kunnen {0} gebruiken.
 onlySunStorm = /weather only supports sun/storm.
+pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
+pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
+pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
+pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
+pTimePlayers = These players have their own time:
+pTimeReset = Player time has been reset for: \u00a7e{0}
+pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
+pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 parseError = Fout bij ontleding {0} op regel {1}
 pendingTeleportCancelled = \u00a7cAangevraagde teleportatie afgelast.
 permissionsError = Permissions/GroupManager ontbreekt; chat prefixes/suffixes worden uitgeschakeld.
@@ -235,14 +245,6 @@ powerToolNoSuchCommandAssigned = Command \u00a7c{0}\u00a7f has not been assigned
 powerToolRemove = Command \u00a7c{0}\u00a7f removed from {1}.
 powerToolRemoveAll = All commands removed from {0}.
 protectionOwner = \u00a76[EssentialsProtect] Beschermingeigenaar: {0}
-pTimeCurrent = \u00a7e{0}''s\u00a7f time is {1}.
-pTimeCurrentFixed = \u00a7e{0}''s\u00a7f time is fixed to {1}.
-pTimeNormal = \u00a7e{0}''s\u00a7f time is normal and matches the server.
-pTimeOthersPermission = \u00a7cYou are not authorized to set other players'' time.
-pTimePlayers = These players have their own time:
-pTimeReset = Player time has been reset for: \u00a7e{0}
-pTimeSet = Player time is set to \u00a73{0}\u00a7f for: \u00a7e{1}
-pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Vraag]\u00a7f {0}
 reloadAllPlugins = \u00a77Alle plugins zijn herladen.
 repair = You have successfully repaired your: \u00a7e{0}.
@@ -332,10 +334,10 @@ voiceSilenced = \u00a77Je kan niet meer praten
 warpDeleteError = Fout bij het verwijderen van het warp bestand.
 warpListPermission = \u00a7cJe hebt geen toegang om die warp te maken.
 warpNotExist = Die warp bestaat niet.
-warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 warpSet = \u00a77Warp {0} ingesteld.
 warpUsePermission = \u00a7cOnbevoegd om die warp te gebruiken.
 warpingTo = \u00a77Aan het warpen naar {0}.
+warpsCount = \u00a77There are {0} warps. Showing page {1} of {2}.
 weatherStorm = \u00a77Je hebt het weer naar storm gezet in de wereld
 weatherStormFor = \u00a77Je hebt het weer in de wereld naar storm gezet voor {0} seconde
 weatherSun = \u00a77Je hebt het weer naar zon gezet in de wereld