Messages Cleanup

8 files changed, 28 insertions, 29 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 070743bbc..dc9c9471e 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -309,7 +309,6 @@ public class Settings implements ISettings
 			format = format.replace("{WORLDNAME}", "{1}");
 			format = format.replace("{SHORTWORLDNAME}", "{2}");
 			format = format.replaceAll("\\{(\\D*)\\}", "\\[$1\\]");
-			logger.log(Level.INFO, "debug-format: " + format);
 			mFormat = new MessageFormat(format);
 			chatFormats.put(group, mFormat);
 		}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 2768df0bd..bf029fc2b 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -33,6 +33,8 @@ canTalkAgain=\u00a77You can talk again
 cantFindGeoIpDB=Can''t find GeoIP database!
 cantReadGeoIpDB=Failed to read GeoIP database!
 cantSpawnItem=\u00a7cYou are not allowed to spawn the item {0}
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
 commandFailed=Command {0} failed:
 commandHelpFailedForPlugin=Error getting help for: {0}
 commandNotLoaded=\u00a7cCommand {0} is improperly loaded.
@@ -290,6 +292,7 @@ requestAcceptedFrom=\u00a77{0} accepted your teleport request.
 requestDenied=\u00a77Teleport request denied.
 requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Request sent to {0}\u00a77.
+requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit= * ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Error occurred when trying to return player to jail.
 second=second
@@ -321,6 +324,7 @@ teleportDisabled={0} has teleportation disabled.
 teleportHereRequest=\u00a7c{0}\u00a7c has requested that you teleport to them.
 teleportNewPlayerError=Failed to teleport new player
 teleportRequest=\u00a7c{0}\u00a7c has requested to teleport to you.
+teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
 teleportTop=\u00a77Teleporting to top.
 teleportationCommencing=\u00a77Teleportation commencing...
 teleportationDisabled=\u00a77Teleportation disabled.
@@ -401,7 +405,3 @@ year=year
 years=years
 youAreHealed=\u00a77You have been healed.
 youHaveNewMail=\u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
-requestTimedOut=\u00a7cTeleport request has timed out
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-chatTypeLocal=[L]
-chatTypeSpy=[Spy]
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 6ec1556be..73004e01f 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -33,6 +33,8 @@ canTalkAgain=\u00a77Du kan nu snakke igen.
 cantFindGeoIpDB=Kan ikke finde GeoIP database!
 cantReadGeoIpDB=Fejl ved afl\u00e6sning af GeoIP database!
 cantSpawnItem=\u00a7cDu har ikke tilladelse til at skabe tingen.{0}
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
 commandFailed=Kommandoen {0} fejlede:
 commandHelpFailedForPlugin=Fejl ved hentning af hj\u00e6lp til: {0}
 commandNotLoaded=\u00a7cKommando {0} er ikke indl\u00e6st korrekt.
@@ -290,6 +292,7 @@ requestAcceptedFrom=\u00a77{0} accepterede din anmodning om teleport.
 requestDenied=\u00a77Anmodning om teleport afvist.
 requestDeniedFrom=\u00a77{0} afviste din anmodning om teleport.
 requestSent=\u00a77Anmodning sendt til {0}\u00a77.
+requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=En fejl opstod ved fors\u00f8g p\u00e5 at returnere spilleren til f\u00e6ngsel.
 second=sekund
@@ -321,6 +324,7 @@ teleportDisabled={0} har ikke teleportation aktiveret.
 teleportHereRequest=\u00a7c{0}\u00a7c har anmodet om, at du teleporterer dig til ham/hende.
 teleportNewPlayerError=Fejlede ved teleportering af ny spiller
 teleportRequest=\u00a7c{0}\u00a7c har anmodet om at teleportere til dig.
+teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
 teleportTop=\u00a77Teleporterer til toppen.
 teleportationCommencing=\u00a77Teleport begynder...
 teleportationDisabled=\u00a77Teleport deaktiveret.
@@ -401,7 +405,3 @@ year=\u00e5r
 years=\u00e5r
 youAreHealed=\u00a77Du er blevet healed. Halleluja!
 youHaveNewMail=\u00a7cDu har {0} flaskeposter!\u00a7f Type \u00a77/mail read for at se din flaskepost.
-requestTimedOut=\u00a7cTeleport request has timed out
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-chatTypeLocal=[L]
-chatTypeSpy=[Spy]
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index b011a7e24..90c1c0f01 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -33,6 +33,8 @@ canTalkAgain=\u00a77Du kannst wieder sprechen.
 cantFindGeoIpDB=Kann GeoIP-Datenbank nicht finden!
 cantReadGeoIpDB=Fehler beim Einlesen der GeoIP-Datenbank!
 cantSpawnItem=\u00a7cDu darfst {0} nicht erzeugen.
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
 commandFailed=Befehl {0} scheiterte:
 commandHelpFailedForPlugin=Fehler beim Abrufen der Hilfe f\u00fcr: {0}
 commandNotLoaded=\u00a7cBefehl {0} ist nicht richtig geladen.
@@ -290,6 +292,7 @@ requestAcceptedFrom=\u00a77{0} hat deine Teleportierungsanfrage angenommen.
 requestDenied=\u00a77Teleportierungsanfrage verweigert.
 requestDeniedFrom=\u00a77{0} hat deine Teleportierungsanfrage abgelehnt.
 requestSent=\u00a77Anfrage gesendet an {0}\u00a77.
+requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Fehler beim Versuch, den Spieler ins Gef\u00e4ngnis zu teleportieren.
 second=Sekunde
@@ -321,6 +324,7 @@ teleportDisabled={0} verweigert die Teleportierung.
 teleportHereRequest=\u00a7c{0}\u00a7c fragt, ob du dich zu ihm teleportierst.
 teleportNewPlayerError=Fehler beim Teleportieren eines neuen Spielers
 teleportRequest=\u00a7c{0}\u00a7c fragt, ob er sich zu dir teleportieren darf.
+teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
 teleportTop=\u00a77Teleportiere nach oben.
 teleportationCommencing=\u00a77Teleportierung gestartet...
 teleportationDisabled=\u00a77Teleportierung deaktiviert.
@@ -401,7 +405,3 @@ year=Jahr
 years=Jahre
 youAreHealed=\u00a77Du wurdest geheilt.
 youHaveNewMail=\u00a7cDu hast {0} Nachrichten!\u00a7f Schreibe \u00a77/mail read\u00a7f um deine Nachrichten anzuzeigen.
-requestTimedOut=\u00a7cTeleport request has timed out
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-chatTypeLocal=[L]
-chatTypeSpy=[Spy]
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 93425fdf7..8eea25f5c 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -33,6 +33,8 @@ canTalkAgain=\u00a77You can talk again
 cantFindGeoIpDB=Can''t find GeoIP database!
 cantReadGeoIpDB=Failed to read GeoIP database!
 cantSpawnItem=\u00a7cYou are not allowed to spawn the item {0}
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
 commandFailed=Command {0} failed:
 commandHelpFailedForPlugin=Error getting help for: {0}
 commandNotLoaded=\u00a7cCommand {0} is improperly loaded.
@@ -290,6 +292,7 @@ requestAcceptedFrom=\u00a77{0} accepted your teleport request.
 requestDenied=\u00a77Teleport request denied.
 requestDeniedFrom=\u00a77{0} denied your teleport request
 requestSent=\u00a77Request sent to {0}\u00a77.
+requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Error occurred when trying to return player to jail.
 second=second
@@ -321,6 +324,7 @@ teleportDisabled={0} has teleportation disabled.
 teleportHereRequest=\u00a7c{0}\u00a7c has requested that you teleport to them.
 teleportNewPlayerError=Failed to teleport new player
 teleportRequest=\u00a7c{0}\u00a7c has requested to teleport to you.
+teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
 teleportTop=\u00a77Teleporting to top.
 teleportationCommencing=\u00a77Teleportation commencing...
 teleportationDisabled=\u00a77Teleportation disabled.
@@ -401,7 +405,3 @@ year=year
 years=years
 youAreHealed=\u00a77You have been healed.
 youHaveNewMail=\u00a7cYou have {0} messages!\u00a7f Type \u00a77/mail read\u00a7f to view your mail.
-requestTimedOut=\u00a7cTeleport request has timed out
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-chatTypeLocal=[L]
-chatTypeSpy=[Spy]
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 2d6133002..23d2dbf0e 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -33,6 +33,8 @@ canTalkAgain=\u00a77Ya puedes hablar de nuevo
 cantFindGeoIpDB=No se puede encontrar la bases de datos del Geo IP
 cantReadGeoIpDB=Error al intentar leer la base de datos del Geo IP
 cantSpawnItem=\u00a7cNo tienes acceso para producir este objeto {0}
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
 commandFailed=Command {0} fallado:
 commandHelpFailedForPlugin=Error obteniendo ayuda para: {0}
 commandNotLoaded=\u00a7cCommand {0} esta cargado incorrectamente.
@@ -290,6 +292,7 @@ requestAcceptedFrom=\u00a77{0} acepto tu peticion de teletransporte.
 requestDenied=\u00a77Peticion de teletransporte denegada.
 requestDeniedFrom=\u00a77{0} ha denegado tu peticion de teletransporte.
 requestSent=\u00a77Peticion enviada a {0}\u00a77.
+requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Error al intentar quitar al jugador de la carcel.
 second=segundo
@@ -321,6 +324,7 @@ teleportDisabled={0} tiene desactivado los teletransportes.
 teleportHereRequest=\u00a7c{0}\u00a7c ha pedido que te teletransportes con el.
 teleportNewPlayerError=Error al teletransportar al nuevo jugador
 teleportRequest=\u00a7c{0}\u00a7c te ha pedido teletransportarse contigo.
+teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
 teleportTop=\u00a77Teletransportandote a la cima.
 teleportationCommencing=\u00a77Comenzando teletransporte...
 teleportationDisabled=\u00a77Teletransporte desactivado.
@@ -401,7 +405,3 @@ year=año
 years=años
 youAreHealed=\u00a77Has sido curado.
 youHaveNewMail=\u00a7cTienes {0} mensajes!\u00a7f Pon \u00a77/mail read\u00a7f para ver tus emails no leidos!.
-requestTimedOut=\u00a7cTeleport request has timed out
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-chatTypeLocal=[L]
-chatTypeSpy=[Spy]
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 08d19f6ea..5f96bd678 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -33,6 +33,8 @@ canTalkAgain=\u00a77Vous pouvez de nouveau parler.
 cantFindGeoIpDB=N''arrive pas \u00e0 trouver la base de donn\u00e9es GeoIP!
 cantReadGeoIpDB=Echec de la lecture de la base de donn\u00e9es GeoIP!
 cantSpawnItem=\u00a7cVous n''avez pas le droit de faire appara\u00c3\u00aetre {0}
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
 commandFailed=\u00c9chec de la commande {0} :
 commandHelpFailedForPlugin=Erreur d''obtention d''aide pour : {0}
 commandNotLoaded=\u00a7cLa commande {0} a \u00e9t\u00e9 mal charg\u00e9e.
@@ -290,6 +292,7 @@ requestAcceptedFrom=\u00a77{0} a accept\u00e9 votre demande de t\u00e9l\u00e9por
 requestDenied=\u00a77Demande de t\u00e9l\u00e9portation refus\u00e9e.
 requestDeniedFrom=\u00a77{0} a refus\u00e9 votre demande de t\u00e9l\u00e9portation.
 requestSent=\u00a77Requ\u00eate envoy\u00e9e \u00e0 {0}\u00a77.
+requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Erreur survenue lors de la tentative d''emprisonner de nouveau un joueur.
 second=seconde
@@ -321,6 +324,7 @@ teleportDisabled={0} a la t\u00e9l\u00e9portation d\u00e9sactiv\u00e9.
 teleportHereRequest=\u00a7c{0}\u00a7c Vous a demand\u00e9 de vous t\u00e9l\u00e9porter \u00e0 lui/elle.
 teleportNewPlayerError=\u00c9chec de la t\u00e9l\u00e9portation du nouveau joueur.
 teleportRequest=\u00a7c{0}\u00a7c vous demande s''il peut se t\u00e9l\u00e9porter vers vous.
+teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
 teleportTop=\u00a77T\u00e9l\u00e9portation vers le haut.
 teleportationCommencing=\u00a77D\u00e9but de la t\u00e9l\u00e9portation...
 teleportationDisabled=\u00a77T\u00e9l\u00e9poration d\u00e9sactiv\u00e9.
@@ -401,7 +405,3 @@ year=ann\u00e9e
 years=ann\u00e9es
 youAreHealed=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9.
 youHaveNewMail=\u00a7cVous avez {0} messages ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier.
-requestTimedOut=\u00a7cTeleport request has timed out
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-chatTypeLocal=[L]
-chatTypeSpy=[Spy]
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 65b25cd6e..ae43f75f2 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -33,6 +33,8 @@ canTalkAgain=\u00a77Je kan weer praten.
 cantFindGeoIpDB=De GeoIP database kon niet gevonden worden!
 cantReadGeoIpDB=Fout bij het lezen van de GeoIP database!
 cantSpawnItem=\u00a7cJe bent niet bevoegd om {0} te spawnen.
+chatTypeLocal=[L]
+chatTypeSpy=[Spy]
 commandFailed=Opdracht {0} mislukt:
 commandHelpFailedForPlugin=Fout bij het \u200b\u200bkrijgen van hulp voor: {0}
 commandNotLoaded=\u00a7cOpdracht {0} is fout geladen.
@@ -290,6 +292,7 @@ requestAcceptedFrom=\u00a77{0} accepted your teleport request.
 requestDenied=\u00a77Teleporteer aanvraag geweigerd.
 requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Aanvraag verstuurd naar {0}\u00a77.
+requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Fout opgetreden bij terugzetten van speler in gevangenis.
 second=seconde
@@ -321,6 +324,7 @@ teleportDisabled={0} heeft teleporteren uit gezet.
 teleportHereRequest=\u00a7c{0}\u00a7c Heeft gevraagd of hij/zij naar jou mag teleporteren.
 teleportNewPlayerError=Fout bij het teleporteren van nieuwe speler.
 teleportRequest=\u00a7c{0}\u00a7c vraagt of hij jou kan teleporteren.
+teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
 teleportTop=\u00a77Bezig met teleporteren naar de top.
 teleportationCommencing=\u00a77Aan het beginnen met teleporteren...
 teleportationDisabled=\u00a77Teleportatie uitgeschakeld.
@@ -401,7 +405,3 @@ year=jaar
 years=jaren
 youAreHealed=\u00a77Je bent genezen.
 youHaveNewMail=\u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
-requestTimedOut=\u00a7cTeleport request has timed out
-teleportRequestTimeoutInfo=\u00a77This request will timeout after {0} seconds.
-chatTypeLocal=[L]
-chatTypeSpy=[Spy]