diff --git a/Essentials/src/com/earth2me/essentials/IUser.java b/Essentials/src/com/earth2me/essentials/IUser.java
index 0577388225e..7a44a101f83 100644
--- a/Essentials/src/com/earth2me/essentials/IUser.java
+++ b/Essentials/src/com/earth2me/essentials/IUser.java
@@ -157,4 +157,8 @@ public interface IUser {
     CommandSource getSource();
 
     String getName();
+
+    String getAfkMessage();
+
+    void setAfkMessage(final String message);
 }
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 0695b90b77e..d329a41c11d 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -52,6 +52,7 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
     private boolean enderSee = false;
     private transient long teleportInvulnerabilityTimestamp = 0;
     private boolean ignoreMsg = false;
+    private String afkMessage;
 
     public User(final Player base, final IEssentials ess) {
         super(base, ess);
@@ -426,6 +427,7 @@ public void setAfk(final boolean set) {
             afkPosition = this.getLocation();
         } else if (!set && isAfk()) {
             afkPosition = null;
+            this.afkMessage = null;
         }
         if (ess.getSettings().isAfkListName()) {
             if(set) {
@@ -759,4 +761,16 @@ public String getName() {
     @Override public void setReplyRecipient(IMessageRecipient recipient) {
         this.messageRecipient.setReplyRecipient(recipient);
     }
+
+    @Override
+    public String getAfkMessage() {
+        return this.afkMessage;
+    }
+
+    @Override
+    public void setAfkMessage(String message) {
+        if (isAfk()) {
+            this.afkMessage = message;
+        }
+    }
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java
index 3d33f75244f..7c370367286 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java
@@ -15,10 +15,22 @@ public Commandafk() {
     @Override
     public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
         if (args.length > 0 && user.isAuthorized("essentials.afk.others")) {
-            User afkUser = getPlayer(server, user, args, 0);
-            toggleAfk(afkUser);
+            User afkUser = user; // if no player found, but message specified, set command executor to target user
+            String message;
+            try {
+                afkUser = getPlayer(server, user, args, 0);
+                message = args.length > 1 ? getFinalArg(args, 1) : null;
+            } catch (PlayerNotFoundException e) {
+                // If only one arg is passed, assume the command executor is targeting another player.
+                if (args.length == 1) {
+                    throw e;
+                }
+                message = getFinalArg(args, 0);
+            }
+            toggleAfk(user, afkUser, message);
         } else {
-            toggleAfk(user);
+            String message = args.length > 0 ? getFinalArg(args, 0) : null;
+            toggleAfk(user, user, message);
         }
     }
 
@@ -26,13 +38,22 @@ public void run(Server server, User user, String commandLabel, String[] args) th
     public void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception {
         if (args.length > 0) {
             User afkUser = getPlayer(server, args, 0, true, false);
-            toggleAfk(afkUser);
+            String message = args.length > 1 ? getFinalArg(args, 1) : null;
+            toggleAfk(null, afkUser, message);
         } else {
             throw new NotEnoughArgumentsException();
         }
     }
 
-    private void toggleAfk(User user) {
+    private void toggleAfk(User sender, User user, String message) throws Exception {
+        if (message != null && sender != null) {
+            if (sender.isMuted()) {
+                throw new Exception(tl("voiceSilenced"));
+            }
+            if (!sender.isAuthorized("essentials.afk.message")) {
+                throw new Exception(tl("noPermToAFKMessage"));
+            }
+        }
         user.setDisplayNick();
         String msg = "";
         if (!user.toggleAfk()) {
@@ -44,8 +65,13 @@ private void toggleAfk(User user) {
         } else {
             //user.sendMessage(_("markedAsAway"));
             if (!user.isHidden()) {
-                msg = tl("userIsAway", user.getDisplayName());
+                if (message != null) {
+                    msg = tl("userIsAwayWithMessage", user.getDisplayName(), message);
+                } else {
+                    msg = tl("userIsAway", user.getDisplayName());
+                }
             }
+            user.setAfkMessage(message);
         }
         if (!msg.isEmpty()) {
             ess.broadcastMessage(user, msg);
diff --git a/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java b/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
index 2ceeb7e3b2c..9f3654cc050 100644
--- a/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
+++ b/Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
@@ -68,7 +68,12 @@ public String getName() {
                 break;
             // When this recipient is AFK, notify the sender. Then, proceed to send the message.
             case SUCCESS_BUT_AFK:
-                sendMessage(tl("userAFK", recipient.getDisplayName()));
+                // Currently, only IUser can be afk, so we unsafely cast to get the afk message.
+                if (((IUser) recipient).getAfkMessage() != null) {
+                    sendMessage(tl("userAFKWithMessage", recipient.getDisplayName(), ((IUser) recipient).getAfkMessage()));
+                } else {
+                    sendMessage(tl("userAFK", recipient.getDisplayName()));
+                }
             default:
                 sendMessage(tl("msgFormat", tl("me"), recipient.getDisplayName(), message));
         }
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 468de474a47..0bdf10e3421 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -284,6 +284,7 @@ noMetaPerm=\u00a74You do not have permission to apply \u00a7c{0}\u00a74 meta to
 noNewMail=\u00a76You have no new mail.
 noPendingRequest=\u00a74You do not have a pending request.
 noPerm=\u00a74You do not have the \u00a7c{0}\u00a74 permission.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74You don''t have permission to spawn this mob.
 noPlacePermission=\u00a74You do not have permission to place a block near that sign.
 noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
@@ -464,8 +465,10 @@ unvanishedReload=\u00a74A reload has forced you to become visible.
 upgradingFilesError=Error while upgrading the files.
 uptime=\u00a76Uptime\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75is currently AFK and may not respond.
+userAFKWithMessage=\u00a77{0} \u00a75is currently AFK and may not respond: {1}
 userDoesNotExist=\u00a74The user\u00a7c {0} \u00a74does not exist.
 userIsAway=\u00a77* {0} \u00a77is now AFK.
+userIsAwayWithMessage=\u00a77* {0} \u00a77is now AFK.
 userIsNotAway=\u00a77* {0} \u00a77is no longer AFK.
 userJailed=\u00a76You have been jailed\!
 userUnknown=\u00a74Warning\: The user ''\u00a7c{0}\u00a74'' has never joined this server.
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index 85c856620e3..5452443f680 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Nemas opravneni na nastaveni metadat \u00a7c{0}\u00a74 tohoto
 noNewMail=\u00a77Nemas zadny novy mail.
 noPendingRequest=Nemas zadne neuzavrene zadosti.
 noPerm=\u00a7cNemas \u00a7f{0}\u00a7c permici.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a7cNemas povoleni k spawnovani mobu.
 noPlacePermission=\u00a7cNemas povoleni pokladat nebo nicit cokoliv blizko teto cedule.
 noPotionEffectPerm=\u00a74Nemas opravneni k nastaveni efektu \u00a7c{0} \u00a74tohoto lektvaru.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74Probehl reload serveru; jsi zase viditelny.
 upgradingFilesError=Chyba pri updatovani souboru.
 uptime=\u00a76Server je online\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75je nyni AFK a mozna nebude reagovat.
+userAFKWithMessage=\u00a77{0} \u00a75je nyni AFK a mozna nebude reagovat. {1}
 userDoesNotExist=Uzivatel {0} neexistuje.
 userIsAway={0} je AFK.
+userIsAwayWithMessage={0} je AFK.
 userIsNotAway={0} se vratil.
 userJailed=\u00a77Byl jsi uveznen.
 userUnknown=\u00a74Pozor\: Hrac ''\u00a7c{0}\u00a74'' se jeste nikdy nepripojil na tento server.
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index d71561c5dde..e1bd42456be 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Du har ikke tilladelse til at tilf\u00f8je \u00a7c{0}\u00a74 m
 noNewMail=\u00a76Du har ingen nye beskeder.
 noPendingRequest=\u00a74Du har ingen afventende anmodning.
 noPerm=\u00a74Du har ikke tilladelsen\: \u00a7c{0}\u00a74
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74Du har ikke tilladelse til at spawne det mob.
 noPlacePermission=\u00a74Du har ikke tilladelse til at placere en blok i n\u00e6rheden af det skilt.
 noPotionEffectPerm=\u00a74Du har ikke tilladelse til at tilf\u00f8je effekten \u00a7c{0} \u00a74til denne eliksir.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74En reload har tvunget dig til at blive synlig.
 upgradingFilesError=Der opstod en fejl under opgraderingen af filerne.
 uptime=\u00a76Oppetid\:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75er pt. AFK og svarer m\u00e5ske ikke.
+userAFKWithMessage=\u00a75{0} \u00a75er pt. AFK og svarer m\u00e5ske ikke. {1}
 userDoesNotExist=\u00a74Brugeren\u00a7c {0} \u00a74eksisterer ikke.
 userIsAway=\u00a75{0} \u00a75er nu AFK.
+userIsAwayWithMessage=\u00a75{0} \u00a75er nu AFK.
 userIsNotAway=\u00a75{0} \u00a75er ikke l\u00e6ngere AFK.
 userJailed=\u00a76Du er blevet f\u00e6ngslet\!
 userUnknown=\u00a74Advarsel\: Brugerem ''\u00a7c{0}\u00a74'' har aldrig spillet p\u00e5 serveren.
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 99617a55202..90c68530bfd 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -284,6 +284,7 @@ noMetaPerm=\u00a74Du darfst dem Gegenstand \u00a7c{0}\u00a74 keine Metadaten geb
 noNewMail=\u00a76Du hast keine neue Nachrichten.
 noPendingRequest=\u00a74Du hast keine Teleportierungsanfragen.
 noPerm=\u00a74Du hast die Berechtigung \u00a7c{0}\u00a74 nicht.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74Du bis nicht berechtigt, diesen Mob zu spawnen.
 noPlacePermission=\u00a7cDu hast keine Rechte, einen Block in der N\u00e4he des Schildes zu platzieren.
 noPotionEffectPerm=\u00a74Du darfst den Zaubertrankeffekt \u00a7c{0} \u00a74diesem Trank nicht hinzuf\u00fcgen.
@@ -463,8 +464,10 @@ unvanishedReload=\u00a74Ein Neuladen des Servers hat dich sichtbar gemacht.
 upgradingFilesError=Fehler beim Aktualisieren der Dateien
 uptime=\u00a76Laufzeit\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75ist gerade nicht da und antwortet wahrscheinlich nicht.
+userAFKWithMessage=\u00a77{0} \u00a75ist gerade nicht da und antwortet wahrscheinlich nicht. {1}
 userDoesNotExist=\u00a74Spieler\u00a7c {0} \u00a74existiert nicht.
 userIsAway=\u00a77* {0} \u00a77ist nun abwesend.
+userIsAwayWithMessage=\u00a77* {0} \u00a77ist nun abwesend.
 userIsNotAway=\u00a77* {0} \u00a77ist wieder da.
 userJailed=\u00a76Du wurdest eingesperrt.
 userUnknown=\u00a74Warnung\: Der Spieler ''\u00a7c{0}\u00a74'' war nie auf diesem Server.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index cd4e49922d4..f392ea98483 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -283,6 +283,7 @@ noMetaPerm=\u00a74You do not have permission to apply \u00a7c{0}\u00a74 meta to
 noNewMail=\u00a76You have no new mail.
 noPendingRequest=\u00a74You do not have a pending request.
 noPerm=\u00a74You do not have the \u00a7c{0}\u00a74 permission.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74You don''t have permission to spawn this mob.
 noPlacePermission=\u00a74You do not have permission to place a block near that sign.
 noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
@@ -460,8 +461,10 @@ unvanishedReload=\u00a74A reload has forced you to become visible.
 upgradingFilesError=Error while upgrading the files.
 uptime=\u00a76Uptime\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75is currently AFK and may not respond.
+userAFKWithMessage=\u00a77{0} \u00a75is currently AFK and may not respond: {1}
 userDoesNotExist=\u00a74The user\u00a7c {0} \u00a74does not exist.
 userIsAway=\u00a77* {0} \u00a77is now AFK.
+userIsAwayWithMessage=\u00a77* {0} \u00a77is now AFK.
 userIsNotAway=\u00a77* {0} \u00a77is no longer AFK.
 userJailed=\u00a76You have been jailed\!
 userUnknown=\u00a74Warning\: The user ''\u00a7c{0}\u00a74'' has never joined this server.
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 95ae950ecf8..a0a245110dd 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74No tienes permiso para aplicar \u00a7c{0}\u00a74 efectos a est
 noNewMail=\u00a77No tienes correo nuevo.
 noPendingRequest=\u00a74No tienes peticiones pendientes.
 noPerm=\u00a74No tienes el permiso \u00a7c{0}\u00a74.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74No tienes permiso para generar esa criatura.
 noPlacePermission=\u00a74No tienes permiso para colocar un bloque junto a eso.
 noPotionEffectPerm=\u00a74No tienes permiso para aplicar el efecto\u00a7c {0} \u00a74a esta poci\u00f3n.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74Un reinicio o una recarga del servidor te ha forzado a p
 upgradingFilesError=Error mientras se actualizaban los archivos
 uptime=\u00a76Tiempo encendido\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75se encuentra ausente y es probable que no responda.
+userAFKWithMessage=\u00a77{0} \u00a75se encuentra ausente y es probable que no responda. {1}
 userDoesNotExist=El usuario {0} no existe
 userIsAway=\u00a77{0} \u00a77\u00a1est\u00e1 ausente\!
+userIsAwayWithMessage=\u00a77{0} \u00a77\u00a1est\u00e1 ausente\!
 userIsNotAway=\u00a77{0} \u00a77\u00a1ya no est\u00e1 ausente\!
 userJailed=\u00a76\u00a1Has sido encarcelado\!
 userUnknown=\u00a74Aviso\: \u00a7cel jugador \u00a74{0} \u00a7cnunca ha visitado el servidor\!
diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties
index d20e50e9bf4..ddea5ddbe71 100644
--- a/Essentials/src/messages_et.properties
+++ b/Essentials/src/messages_et.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Teil ei ole luba lisada \u00a7c{0}\u00a74 effekte k\u00e4esole
 noNewMail=\u00a76Teil ei ole \u00fchtegi uut kirja.
 noPendingRequest=\u00a74Teil ei ole ootel taotlust.
 noPerm=\u00a74Teil ei ole \u00a7c{0}\u00a74 permissionit.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74Sul ei ole luba tekitada antud elukat.
 noPlacePermission=\u00a74Teil ei ole luba asetada plokki selle m\u00e4rgi l\u00e4heduses.
 noPotionEffectPerm=\u00a74Teil ei ole luba, et lisada n\u00f5iajoogi effekti \u00a7c{0} \u00a74k\u00e4esolevale n\u00f5iajoogile.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74Taaslaadimine sundis sind muutuma n\u00e4htavaks.
 upgradingFilesError=Viga uuendades faile.
 uptime=\u00a76Uptime\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75on hetkel eemal ja ei pruugi vastata.
+userAFKWithMessage=\u00a77{0} \u00a75on hetkel eemal ja ei pruugi vastata. {1}
 userDoesNotExist=\u00a74Kasutaja\u00a7c {0} \u00a74ei ole olemas.
 userIsAway=\u00a77* {0} \u00a77on n\u00fc\u00fcd eemal.
+userIsAwayWithMessage=\u00a77* {0} \u00a77on n\u00fc\u00fcd eemal.
 userIsNotAway=\u00a77* {0} \u00a77on tagasi.
 userJailed=\u00a76Teid on vangistatud\!
 userUnknown=\u00a74Hoiatus\: Kasutaja ''\u00a7c{0}\u00a74'' ei ole kunagi selle serveriga liitunud.
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index 35a5e282589..a0cbfceed7b 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74You do not have permission to apply \u00a7c{0}\u00a74 meta to
 noNewMail=\u00a77Ei viestej\u00e4.
 noPendingRequest=Sinulla ei ole odottavia pyynt\u00f6j\u00e4.
 noPerm=\u00a7cSinulla ei ole \u00a7f{0}\u00a7c oikeuksia.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a7cSinulla ei ole lupaa luoda t\u00e4t\u00e4 mobia.
 noPlacePermission=\u00a7cSinulla ei ole lupaa laittaa palikoita l\u00e4helle tuota kyltti\u00e4.
 noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a7cSinut on pakotettu taas n\u00e4kyv\u00e4ksi uudelleen la
 upgradingFilesError=Virhe p\u00e4ivitett\u00e4ess\u00e4 tiedostoja
 uptime=\u00a76Uptime\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75is currently AFK and may not respond.
+userAFKWithMessage=\u00a77{0} \u00a75is currently AFK and may not respond. {1}
 userDoesNotExist=Pelaajaa {0} ei ole olemassa.
 userIsAway={0} on nyt AFK
+userIsAwayWithMessage={0} on nyt AFK
 userIsNotAway={0} ei ole en\u00e4\u00e4 AFK
 userJailed=\u00a77Sinut on laitettu vankilaan
 userUnknown=\u00a74Warning\: The user ''\u00a7c{0}\u00a74'' has never joined this server.
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index d1811bc9601..8c85e72ee32 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -283,6 +283,7 @@ noMetaPerm=\u00a74Vous n''avez pas la permission d''appliquer la m\u00e9tadata \
 noNewMail=\u00a77Vous n''avez pas de courrier.
 noPendingRequest=Vous n''avez pas de requ\u00eate non lue.
 noPerm=\u00a7cVous n''avez pas la permission \u00a7f{0}\u00a7c.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a7cVous n''avez pas la permission d''invoquer cette cr\u00e9ature.
 noPlacePermission=\u00a7cVous n''avez pas la permission de placer un bloc pr\u00e8s de cette pancarte.
 noPotionEffectPerm=\u00a74Vous n''avez pas la permission d''appliquer l''effet \u00a7c{0} \u00a74\u00e0 cette potion.
@@ -460,8 +461,10 @@ unvanishedReload=\u00a7cUn reload vous a rendu de nouveau visible.
 upgradingFilesError=Erreur durant la mise \u00e0 jour des fichiers.
 uptime=\u00a76Dur\u00e9e de fonctionnement \:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75est actuellement absent/AFK et peut ne pas r\u00e9pondre.
+userAFKWithMessage=\u00a75{0} \u00a75est actuellement absent/AFK et peut ne pas r\u00e9pondre. {1}
 userDoesNotExist=L''utilisateur {0} n''existe pas.
 userIsAway={0} est d\u00e9sormais AFK.
+userIsAwayWithMessage={0} est d\u00e9sormais AFK.
 userIsNotAway={0} n''est plus AFK.
 userJailed=\u00a77Vous avez \u00e9t\u00e9 emprisonn\u00e9.
 userUnknown=\u00a74Attention \: le joueur \u00a7c{0}\u00a74 n''est jamais venu sur ce serveur.
diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties
index 90d649857ad..636d1730da5 100644
--- a/Essentials/src/messages_hu.properties
+++ b/Essentials/src/messages_hu.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74You do not have permission to apply \u00a7c{0}\u00a74 meta to
 noNewMail=\u00a76Nincs \u00faj leveled.
 noPendingRequest=\u00a74You do not have a pending request.
 noPerm=\u00a74You do not have the \u00a7c{0}\u00a74 permission.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74You don''t have permission to spawn this mob.
 noPlacePermission=\u00a74You do not have permission to place a block near that sign.
 noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74A reload k\u00f6vetkezt\u00e9ben mindenki l\u00e1tni fog
 upgradingFilesError=Error while upgrading the files.
 uptime=\u00a76M\u00fbk\u00f6d\u00e9si id\u00f5\:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75most AFK \u00e9s nem bisztos hogy fog v\u00e1laszolni.
+userAFKWithMessage=\u00a75{0} \u00a75most AFK \u00e9s nem bisztos hogy fog v\u00e1laszolni. {1}
 userDoesNotExist=\u00a74The user\u00a7c {0} \u00a74does not exist.
 userIsAway=\u00a77* \u00a75{0}\u00a77 elment a g\u00e9pt\u0151l...
+userIsAwayWithMessage=\u00a77* \u00a75{0}\u00a77 elment a g\u00e9pt\u0151l...
 userIsNotAway=\u00a77* \u00a75{0} \u00a77visszaj\u00f6tt...
 userJailed=\u00a76Beb\u00f6rt\u00f6n\u00f6ztek\!
 userUnknown=\u00a74Figyelem\: ''\u00a7c{0}\u00a74'' m\u00e9g sose j\u00e1rt a szerveren.
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index 898530d5cc0..a248525c573 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Non hai il permesso di applicare \u00a7c{0}\u00a74 meta in que
 noNewMail=\u00a76Non hai ricevuto nuove mail.
 noPendingRequest=\u00a74Non hai richieste in sospeso.
 noPerm=\u00a74Non hai il permesso \u00a7c{0}\u00a74.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74Non hai il permesso di generare questo mob.
 noPlacePermission=\u00a74Non hai il permesso di piazzare un blocco accanto a questo cartello.
 noPotionEffectPerm=\u00a74Non hai il permesso di applicare questo effetto di pozione \u00a7c{0} \u00a74a questa pozione.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74Il server e'' stato ricaricato e cio'' ti ha forzato a t
 upgradingFilesError=Errore durante l''aggiornamento dei file
 uptime=\u00a76Tempo online\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75e'' attualmente AFK e potrebbe non rispondere.
+userAFKWithMessage=\u00a77{0} \u00a75e'' attualmente AFK e potrebbe non rispondere. {1}
 userDoesNotExist=\u00a74L''utente\u00a7c {0} \u00a74non esiste.
 userIsAway=\u00a77* {0} \u00a77e'' AFK.
+userIsAwayWithMessage=\u00a77* {0} \u00a77e'' AFK.
 userIsNotAway=\u00a77* {0} \u00a77non e'' piu'' AFK.
 userJailed=\u00a76Sei stato incarcerato\!
 userUnknown=\u00a74Attenzione\: Il giocatore ''\u00a7c{0}\u00a74'' non e'' mai entrato sul server.
diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties
index 0f4bf3dc1ce..c8ec0f40c80 100644
--- a/Essentials/src/messages_ko.properties
+++ b/Essentials/src/messages_ko.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a7c{0}\u00a74 \uba54\ud0c0\ub97c \uc774 \uc544\uc774\ud15c\uc5d0
 noNewMail=\u00a76\uc0c8 \uba54\uc77c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.
 noPendingRequest=\u00a74\ub300\uae30\uc911\uc778 \uc694\uccad\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.
 noPerm=\u00a74\ub2f9\uc2e0\uc740 \u00a7c{0}\u00a74 \uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74\uc774 \ubaac\uc2a4\ud130\ub97c \uc18c\ud658\ud560 \uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.
 noPlacePermission=\u00a74\uadf8 \ud45c\uc9c0\ud310 \uadfc\ucc98\uc5d0 \ube14\ub7ed\uc744 \ub193\uc744 \uc218 \uc788\ub294 \uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.
 noPotionEffectPerm=\u00a74\ub2f9\uc2e0\uc740 \uc774 \ud3ec\uc158\uc5d0 \u00a7c{0} \u00a74 \ud6a8\uacfc\ub97c \uc801\uc6a9\ud560 \uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74A reload has forced you to become visible.
 upgradingFilesError=\ud30c\uc77c\uc744 \uc5c5\uadf8\ub808\uc774\ub4dc \ud558\ub358 \ub3c4\uc911, \uc624\ub958\uac00 \ubc1c\uc0dd\ud558\uc600\uc2b5\ub2c8\ub2e4. 
 uptime=\u00a76\uac00\ub3d9 \uc2dc\uac04\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75\uc740 \ud604\uc7ac \uc7a0\uc218 \uc0c1\ud0dc\uc774\ubbc0\ub85c \uc751\ub2f5\ud558\uc9c0 \uc54a\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
+userAFKWithMessage=\u00a77{0} \u00a75\uc740 \ud604\uc7ac \uc7a0\uc218 \uc0c1\ud0dc\uc774\ubbc0\ub85c \uc751\ub2f5\ud558\uc9c0 \uc54a\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4. {1}
 userDoesNotExist={0} \uc720\uc800\ub294 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
 userIsAway=\u00a77* {0}\u00a77\ub2d8\uc774 \uc7a0\uc218 \uc0c1\ud0dc \uc785\ub2c8\ub2e4.
+userIsAwayWithMessage=\u00a77* {0}\u00a77\ub2d8\uc774 \uc7a0\uc218 \uc0c1\ud0dc \uc785\ub2c8\ub2e4.
 userIsNotAway=\u00a77* {0}\u00a77\ub2d8\uc758 \uc7a0\uc218 \uc0c1\ud0dc\uac00 \ub05d\ub0ac\uc2b5\ub2c8\ub2e4.
 userJailed=\u00a76\uac10\uc625\uc5d0 \uac10\uae08\ub418\uc5c8\uc2b5\ub2c8\ub2e4\!
 userUnknown=\u00a74\uacbd\uace0 \:  ''\u00a7c{0}\u00a74'' \ub294 \uc11c\ubc84\uc5d0 \ud55c\ubc88\ub3c4 \uc811\uc18d\ud574\ubcf4\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4\!
diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties
index 627776457c7..34133340bf8 100644
--- a/Essentials/src/messages_lt.properties
+++ b/Essentials/src/messages_lt.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74You do not have permission to apply \u00a7c{0}\u00a74 meta to
 noNewMail=\u00a76Tu neturi nauj\u0173 lai\u0161k\u0173.
 noPendingRequest=\u00a74J\u016bs neturite laukian\u010di\u0105 u\u017eklaus\u0105.
 noPerm=\u00a74Tu neturi \u00a7c{0}\u00a74 teis\u0117s.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74You don''t have permission to spawn this mob.
 noPlacePermission=\u00a74Tu neturi teisi\u0173 pad\u0117ti blokus \u0161alia lentel\u0117s.
 noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74A reload has forced you to become visible.
 upgradingFilesError=Error while upgrading the files.
 uptime=\u00a76Uptime\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75is currently AFK and may not respond.
+userAFKWithMessage=\u00a77{0} \u00a75is currently AFK and may not respond. {1}
 userDoesNotExist=\u00a74The user\u00a7c {0} \u00a74does not exist.
 userIsAway=\u00a77* {0} \u00a77dabar yra AFK r\u0117\u017eime.
+userIsAwayWithMessage=\u00a77* {0} \u00a77dabar yra AFK r\u0117\u017eime.
 userIsNotAway=\u00a77* {0} \u00a77nebera AFK r\u0117\u017eime.
 userJailed=\u00a76Tu buvai \u012fkalintas\!
 userUnknown=\u00a74Warning\: The user ''\u00a7c{0}\u00a74'' has never joined this server.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index edabe483742..182892252ad 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74U heeft geen toestemming om de \u00a7c{0}\u00a74 meta toe te p
 noNewMail=\u00a77U heeft geen nieuwe berichten.
 noPendingRequest=\u00a74U heeft geen afwachtende aanvragen.
 noPerm=\u00a74U heeft de \u00a7c{0}\u00a74 toestemming niet.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74U heeft geen toestemming om deze mob te spawnen.
 noPlacePermission=\u00a74U heeft geen toestemming om een blok naast dat bord te plaatsen.
 noPotionEffectPerm=\u00a74U heeft geen toestemming om het \u00a7c{0} \u00a74effect aan deze toverdrank toe te voegen.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74Een herlading heeft u geforceerd om zichtbaar te worden.
 upgradingFilesError=Fout tijdens het upgraden van de bestanden.
 uptime=\u00a76Tijd dat de server aanstaat\:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75is AFK, en zal mogelijk niet reageren.
+userAFKWithMessage=\u00a75{0} \u00a75is AFK, en zal mogelijk niet reageren. {1}
 userDoesNotExist=Speler {0} bestaat niet.
 userIsAway={0} is nu afwezig.
+userIsAwayWithMessage={0} is nu afwezig.
 userIsNotAway={0} is niet meer afwezig.
 userJailed=\u00a76U bent in de gevangenis gezet\!
 userUnknown=\u00a74Waarschuwing\: De gebruiker ''\u00a7c{0}\u00a74'' is nooit op deze server geweest.
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index 0362569fde4..43f14a8d7bf 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Nie masz uprawnien by zastosowac wartosci \u00a7c{0}\u00a74 dl
 noNewMail=\u00a77Nie masz zadnych nowych wiadomosci.
 noPendingRequest=\u00a74Nie masz oczekujacej prosby.
 noPerm=\u00a74Nie masz uprawnien do \u00a7c{0}\u00a74.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74Nie masz uprawnien do tworzenia tego moba..
 noPlacePermission=\u00a74Nie masz uprawnien do stawiania bloku kolo tego znaku..
 noPotionEffectPerm=\u00a74Nie masz uprawnien by dodac efekt \u00a7c{0} \u00a74tej miksturze.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74Przeladowanie spowodowalo ze cie widac.
 upgradingFilesError=Wystapil blad podczas aktualizowaniu plikow.
 uptime=\u00a77Aktywny od\:\u00a7c {0}
 userAFK=\u00a74{0} \u00a7\u00a77jest teraz AFK i nie reaguje.
+userAFKWithMessage=\u00a74{0} \u00a7\u00a77jest teraz AFK i nie reaguje. {1}
 userDoesNotExist=\u00a74Uzytkownik\u00a7c {0} \u00a74nie istnieje w bazie danych.
 userIsAway=\u00a75{0} \u00a75jest teraz AFK.
+userIsAwayWithMessage=\u00a75{0} \u00a75jest teraz AFK.
 userIsNotAway=\u00a7c{0} \u00a75nie jest juz AFK.
 userJailed=\u00a77Zostales zamkniety w wiezieniu.
 userUnknown=\u00a74Ostrzezenie\: Gracz ''\u00a7c{0}\u00a74'' nigdy nie byl na tym serwerze.
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index c09be3e3547..d43ada9dbad 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00A74N\u00E3o tens permiss\u00E3o para aplicar meta (\u00A7c{0})\u0
 noNewMail=\u00A76N\u00E3o tens novos e-mails.
 noPendingRequest=\u00A74N\u00E3o tens nenhum pedido pendente.
 noPerm=\u00A74N\u00E3o tens a permiss\u00E3o \u00A7c{0}\u00A74.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00A74N\u00E3o tens permiss\u00E3o para spawnar esse mob.
 noPlacePermission=\u00A74N\u00E3o tens permiss\u00E3o para colocar um bloco perto dessa placa.
 noPotionEffectPerm=\u00A74N\u00E3o tens permiss\u00E3o para aplicar o efeito \u00A7c{0} \u00A74nessa po\u00E7\u00E3o.
@@ -403,6 +404,78 @@ socialSpy=\u00A76SocialSpy para \u00A7c {0} \u00A76: \u00A7c {1}
 soloMob=\u00A74Esse mob gosta de ficar sozinho.
 spawnSet=\u00A76Ponto de spawn definido para o grupo\u00A7c {0}\u00A76.
 spawned=spawnado
+<<<<<<< HEAD
+sudoExempt=\u00a74Voc\u00c3\u00aa nao pode usar sudo nesse usu\u00c3\u00a1rio.
+sudoRun=\u00a76Forcing\u00a7c {0} \u00a76to run\:\u00a7r /{1}
+suicideMessage=\u00a76Adeus mundo cruel...
+suicideSuccess=\u00a76{0} \u00a76se matou.
+survival=sobreviv\u00c3\u00aancia
+takenFromAccount=\u00a7a{0} foi removido sua conta.
+takenFromOthersAccount=\u00a7a{0} foi removido da conta de {1}\u00a7a. Novo saldo\: {2}.
+teleportAAll=\u00a76Pedido de teleporte enviado para todos os jogadores...
+teleportAll=\u00a76Teleportando todos os jogadores...
+teleportAtoB=\u00a7c{0}\u00a76 teleportou voc\u00ea para \u00a7c{1}\u00a76.
+teleportDisabled=\u00a7c{0} \u00a74est\u00c3\u00a1 com teleporte desativado.
+teleportHereRequest=\u00a7c{0}\u00a76 pediu para que se teleporte at\u00c3\u00a9 ele.
+teleportNewPlayerError=\u00a74Falha ao teleportar novo jogador\!
+teleportRequest=\u00a7c{0}\u00a76 pediu para teleportar at\u00c3\u00a9 voc\u00c3\u00aa.
+teleportRequestTimeoutInfo=\u00a76Esse pedido ir\u00c3\u00a1 se esgotar depois de\u00a7c {0} segundos\u00a76.
+teleportTop=\u00a76Teleportando para o topo.
+teleportationCommencing=\u00a76Teleportando iniciando...
+teleportationDisabled=\u00a76Teleportation \u00a7cdisabled\u00a76.
+teleportationDisabledFor=\u00a76Teleportation \u00a7cdisabled \u00a76for \u00a7c{0}\u00a76.
+teleportationEnabled=\u00a76Teleportation \u00a7cenabled\u00a76.
+teleportationEnabledFor=\u00a76Teleportation \u00a7cenabled \u00a76for \u00a7c{0}\u00a76.
+teleporting=\u00a76Teleportando...
+teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76.
+tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
+tempbanExempt=\u00a74Voc\u00c3\u00aa nao pode banir temporariamente esse jogador.
+thunder=\u00a76Voc\u00c3\u00aa\u00a7c {0} \u00a76trovoada em seu mundo.
+thunderDuration=\u00a76Voc\u00c3\u00aa\u00a7c {0} \u00a76trovoada em seu mundo por\u00a7c {1} \u00a76segundos.
+timeBeforeHeal=\u00a76Tempo antes da pr\u00c3\u00b3xima cura\:\u00a7c {0}\u00a76.
+timeBeforeTeleport=\u00a76Tempo antes do pr\u00c3\u00b3ximo teleporte\:\u00a7c {0}
+timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\u00a76
+timeSetPermission=\u00a74Voc\u00c3\u00aa nao tem permissao para definir o tempo.
+timeWorldCurrent=\u00a76O tempo atual em\u00a7c {0} \u00a76\u00c3\u00a9 \u00a7c{1}\u00a76.
+timeWorldSet=\u00a76O tempo foi definido para\u00a7c {0} \u00a76em\: \u00a7c{1}\u00a76.
+totalWorthAll=\u00a7aTodos os itens e blocos foram vendidos por um total de \u00a7c{1}\u00a7a.
+totalWorthBlocks=\u00a7aTodos os blocos foram vendidos por um total de \u00a7c{1}\u00a7a.
+tps=\u00a76TPS Atual \= {0}
+tradeSignEmpty=\u00a74A placa de troca nao tem nada dispon\u00c3\u00advel para voc\u00c3\u00aa.
+tradeSignEmptyOwner=\u00a74Nao h\u00c3\u00a1 nada para coletar dessa placa de troca.
+treeFailure=\u00a74Erro ao gerar \u00c3\u00a1rvore. Tente novamente na terra ou na grama.
+treeSpawned=\u00a76Arvore gerada.
+true=\u00a7averdadeiro\u00a7r
+typeTpaccept=\u00a76Para teleportar, digite \u00a7c/tpaccept\u00a76.
+typeTpdeny=\u00a76Para recusar o pedido, digite \u00a7c/tpdeny\u00a76.
+typeWorldName=\u00a76Voc\u00c3\u00aa pode tamb\u00c3\u00a9m digitar o nome de um mundo espec\u00c3\u00adfico.
+unableToSpawnMob=\u00a74Incapaz de spawnar o mob.
+unignorePlayer=\u00a76Voc\u00c3\u00aa nao est\u00c3\u00a1 mais ignorando o jogador\u00a7c {0} \u00a76.
+unknownItemId=\u00a74ID do item inv\u00c3\u00a1lido\: \u00a7r {0}\u00a74.
+unknownItemInList=\u00a74Iten desconhecido {0} na lista {1}.
+unknownItemName=\u00a74Nome de item desconhecido\: {0}.
+unlimitedItemPermission=\u00a74Sem permiss\u00e3o para item \u00a7c{0}\u00a74 ilimitado.
+unlimitedItems=\u00a76Itens ilimitados\:\u00a7r
+unmutedPlayer=\u00a76Jogador\u00a7c {0} \u00a76nao est\u00c3\u00a1 mais silenciado.
+unvanishedReload=\u00a74Um reload for\u00c3\u00a7ou-lhe a ficar vis\u00c3\u00advel novamente.
+upgradingFilesError=Erro ao aprimorar os arquivos.
+uptime=\u00a76Uptime\:\u00a7c {0}
+userAFK=\u00a75{0} \u00a75est\u00c3\u00a1 atualmente AFK e pode nao responder.
+userAFKWithMessage=\u00a75{0} \u00a75est\u00c3\u00a1 atualmente AFK e pode nao responder. {1}
+userDoesNotExist=\u00a74O usu\u00c3\u00a1rio\u00a7c {0} \u00a74nao existe.
+userIsAway=\u00a75{0} \u00a75est\u00c3\u00a1 agora AFK.
+userIsAwayWithMessage=\u00a75{0} \u00a75est\u00c3\u00a1 agora AFK.
+userIsNotAway=\u00a75{0} \u00a75nao est\u00c3\u00a1 mais AFK.
+userJailed=\u00a76Voc\u00c3\u00aa foi condenado\!
+userUnknown=\u00a74Aviso\: O usu\u00c3\u00a1rio ''\u00a7c{0}\u00a74'' nunca entrou nesse servidor.
+userdataMoveBackError=Falha ao mover o userdata/{0}.tmp para userdata/{1}\!
+userdataMoveError=Falha ao mover userdata/{0} para userdata/{1}.tmp\!
+usingTempFolderForTesting=Usando pasta tempor\u00c3\u00a1ria para teste\:
+vanished=\u00a76Voc\u00c3\u00aa est\u00c3\u00a1 agora completamente invis\u00c3\u00advel para jogadores normais, e escondido de comandos in-game.
+versionMismatch=\u00a74Versao nao correspondente\! Por favor atualize o {0} para a mesma versao.
+versionMismatchAll=\u00a74Versao nao correspondente\! Por favor atualize todos os jars do Essentials para a mesma versao.
+voiceSilenced=\u00a76Sua voz foi silenciada\!
+=======
 sudoExempt=\u00A74N\u00E3o podes usar sudo nesse usu\u00E1rio.
 sudoRun=\u00A76For\u00E7ando\u00A7c {0} \u00A76a executar:\u00A7r /{1}
 suicideMessage=\u00A76Adeus mundo cruel...
@@ -471,6 +544,7 @@ vanished=\u00A76Est\u00E1 agora completamente invis\u00EDvel para jogadores norm
 versionMismatch=\u00A74Vers\u00E3o n\u00E3o compat\u00EDvel! Por favor atualiza o {0} para a mesma vers\u00E3o.
 versionMismatchAll=\u00A74Vers\u00E3o n\u00E3o compat\u00EDvel! Por favor atualiza todos os jars do Essentials para a mesma versao.
 voiceSilenced=\u00A76A tua voz foi silenciada!
+>>>>>>> 2.x
 walking=caminhando
 warpDeleteError=\u00A74Problema ao apagar o ficheiro do warp.
 warpList={0}
@@ -552,6 +626,17 @@ itemsConverted=\u00A76A converter todos os itens para blocos.
 itemsNotConverted=\u00A74N\u00E3o tens itens que possam ser transformado em blocos.
 mailSentTo=\u00A7c{0}\u00A76 foi enviado para o seguinte email:
 mailMessage={0}
+<<<<<<< HEAD
+
+whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
+playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
+cantGamemode=\u00a74You do not have permission to change to gamemode {0}
+createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2}
+spectator=spectator
+kitContains=\u00a76Kit \u00a7c{0} \u00a76contains:
+kitItem=\u00a76- \u00a7f{0}
+invalidBanner=\u00a74Invalid banner syntax.
 whoisTempBanned=\u00A76 - Banido:\u00A7r {0}
 playerTempBanned=\u00A76Jogador \u00A7c{0}\u00A76 baniu temporariamente \u00A7c{1}\u00A76 por \u00A7c{2}\u00A76: \u00A7c{3}\u00A76.
 mailFormat=\u00A76[\u00A7r{0}\u00A76] \u00A7r{1}
diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties
index 184d32af0d6..349a7be9e3e 100644
--- a/Essentials/src/messages_pt_BR.properties
+++ b/Essentials/src/messages_pt_BR.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00A74Voc\u00EA n\u00E3o tem permiss\u00E3o para aplicar meta (\u00A
 noNewMail=\u00A76Voc\u00EA n\u00E3o tem novos e-mails.
 noPendingRequest=\u00A74Voc\u00EA n\u00E3o tem uma solicitacao.
 noPerm=\u00A74Voc\u00EA n\u00E3o tem a permiss\u00E3o \u00A7c{0}\u00A74.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00A74Voc\u00EA n\u00E3o tem permiss\u00E3o para spawnar esse mob.
 noPlacePermission=\u00A74Voc\u00EA n\u00E3o tem permiss\u00E3o para colocar um bloco perto dessa placa.
 noPotionEffectPerm=\u00A74Voc\u00EA n\u00E3o tem permiss\u00E3o para aplicar o efeito \u00A7c{0} \u00A74para essa po\u00E7\u00E3o.
@@ -457,6 +458,17 @@ unlimitedItems=\u00A76Itens ilimitados\:\u00A7r
 unmutedPlayer=\u00A76Jogador\u00A7c {0} \u00A76n\u00E3o est\u00E1 mais silenciado.
 unvanishedReload=\u00A74Um reload forcou-o a ficar vis\u00EDvel novamente.
 upgradingFilesError=Erro ao aprimorar os arquivos.
+<<<<<<< HEAD
+uptime=\u00a76Tempo online\:\u00a7c {0}
+userAFK=\u00a75{0} \u00a75esta atualmente AFK e pode nao responder.
+userAFKWithMessage=\u00a75{0} \u00a75esta atualmente AFK e pode nao responder. {1}
+userDoesNotExist=\u00a74O usuario\u00a7c {0} \u00a74nao existe.
+userIsAway=\u00a75{0} \u00a75esta agora AFK.
+userIsAwayWithMessage=\u00a75{0} \u00a75esta agora AFK.
+userIsNotAway=\u00a75{0} \u00a75nao esta mais AFK.
+userJailed=\u00a76Voce foi condenado\!
+userUnknown=\u00a74Aviso\: O usuario ''\u00a7c{0}\u00a74'' nunca entrou nesse servidor.
+=======
 uptime=\u00A76Tempo online\:\u00A7c {0}
 userAFK=\u00A75{0} \u00A75est\u00E1 atualmente AFK e pode n\u00E3o responder.
 userDoesNotExist=\u00A74O usu\u00E1rio\u00A7c {0} \u00A74n\u00E3o existe.
@@ -464,6 +476,7 @@ userIsAway=\u00A75{0} \u00A75est\u00E1 agora AFK.
 userIsNotAway=\u00A75{0} \u00A75n\u00E3o est\u00E1 mais AFK.
 userJailed=\u00A76Voc\u00EA foi preso\!
 userUnknown=\u00A74Aviso\: O usu\u00E1rio ''\u00A7c{0}\u00A74'' nunca entrou nesse servidor.
+>>>>>>> 2.x
 userdataMoveBackError=Falha ao mover o userdata/{0}.tmp para userdata/{1}\!
 userdataMoveError=Falha ao mover userdata/{0} para userdata/{1}.tmp\!
 usingTempFolderForTesting=Usando pasta tempor\u00E1ria para teste\:
@@ -552,6 +565,17 @@ itemsConverted=\u00A76Convertendo todos os itens para blocos.
 itemsNotConverted=\u00A74Voc\u00EA n\u00E3o tem itens que possam virar blocos.
 mailSentTo=\u00A7c{0}\u00A76 foi enviado para o seguinte email\:
 mailMessage={0}
+<<<<<<< HEAD
+
+whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
+playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
+mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}
+cantGamemode=\u00a74You do not have permission to change to gamemode {0}
+createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2}
+spectator=spectator
+kitContains=\u00a76Kit \u00a7c{0} \u00a76contains:
+kitItem=\u00a76- \u00a7f{0}
+invalidBanner=\u00a74Invalid banner syntax.
 whoisTempBanned=\u00A76 - Banido:\u00A7r {0}
 playerTempBanned=\u00A76Jogador \u00A7c{0}\u00A76 baniu temporariamente \u00A7c{1}\u00A76 por \u00A7c{2}\u00A76: \u00A7c{3}\u00A76.
 mailFormat=\u00A76[\u00A7r{0}\u00A76] \u00A7r{1}
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index 1f826357310..4d8d87c1bc5 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Nu ai permisiunea sa aplici meta \u00a7c{0}\u00a74 pe acest ob
 noNewMail=\u00a76Nu ai mailuri noi.
 noPendingRequest=\u00a74Nu ai nici o cerere in asteptare.
 noPerm=\u00a74Nu ai permisiunea \u00a7c{0}\u00a74.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74Nu ai permisiunea sa generezi acest mob.
 noPlacePermission=\u00a74Nu ai permisiunea sa plasezi un bloc in apropierea acestui semn.
 noPotionEffectPerm=\u00a74Nu ai permisiunea sa aplici efectul\u00a7c{0} \u00a74pe aceasta potiune.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74O reincarcare te-a fortat sa devii din nou vizibil.
 upgradingFilesError=Eroare urcand fisierele.
 uptime=\u00a76Timp total\:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75este acum AFK si este posibil sa nu raspunda.
+userAFKWithMessage=\u00a75{0} \u00a75este acum AFK si este posibil sa nu raspunda. {1}
 userDoesNotExist=\u00a74Jucatorul\u00a7c {0} \u00a74nu exista.
 userIsAway=\u00a75{0} \u00a75este AFK.
+userIsAwayWithMessage=\u00a75{0} \u00a75este AFK.
 userIsNotAway=\u00a75{0} \u00a75nu mai este AFK.
 userJailed=\u00a76Ai fost inchis\!
 userUnknown=\u00a74Advertisment\: Jucatorul ''\u00a7c{0}\u00a74'' nu a intrat niciodata pe acest server.
diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties
index e02df1eb4b5..0b713908407 100644
--- a/Essentials/src/messages_ru.properties
+++ b/Essentials/src/messages_ru.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u043
 noNewMail=\u00a76\u041d\u0435\u0442 \u043d\u043e\u0432\u044b\u0445 \u043f\u0438\u0441\u0435\u043c.
 noPendingRequest=\u00a74\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043e\u0436\u0438\u0434\u0430\u044e\u0449\u0438\u0445 \u0437\u0430\u044f\u0432\u043e\u043a \u043d\u0430 \u0442\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435.
 noPerm=\u00a74\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u00a7c{0}\u00a74.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u0434\u043b\u044f \u0441\u043f\u0430\u0443\u043d\u0430 \u044d\u0442\u043e\u0433\u043e \u043c\u043e\u0431\u0430.
 noPlacePermission=\u00a74\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0431\u043b\u043e\u043a\u0438 \u043e\u043a\u043e\u043b\u043e \u044d\u0442\u043e\u0439 \u0442\u0430\u0431\u043b\u0438\u0447\u043a\u0438.
 noPotionEffectPerm=\u00a74\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u0434\u043b\u044f \u043f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u044d\u0444\u0444\u0435\u043a\u0442\u0430 \u00a7c{0} \u00a74\u043d\u0430 \u044d\u0442\u043e \u0437\u0435\u043b\u044c\u0435.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u
 upgradingFilesError=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438 \u0444\u0430\u0439\u043b\u043e\u0432.
 uptime=\u00a76\u0410\u043f\u0442\u0430\u0439\u043c\:\u00a7c {0}
 userAFK=\u00a75\u0418\u0433\u0440\u043e\u043a {0} \u00a75\u043e\u0442\u043e\u0448\u0435\u043b \u0438 \u043c\u043e\u0436\u0435\u0442 \u043d\u0435 \u043e\u0442\u0432\u0435\u0447\u0430\u0442\u044c.
+userAFKWithMessage=\u00a75\u0418\u0433\u0440\u043e\u043a {0} \u00a75\u043e\u0442\u043e\u0448\u0435\u043b \u0438 \u043c\u043e\u0436\u0435\u0442 \u043d\u0435 \u043e\u0442\u0432\u0435\u0447\u0430\u0442\u044c. {1}
 userDoesNotExist=\u00a74\u0418\u0433\u0440\u043e\u043a\u0430\u00a7c {0} \u00a74\u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
 userIsAway=\u00a75{0} \u00a75\u043e\u0442\u043e\u0448\u0435\u043b.
+userIsAwayWithMessage=\u00a75{0} \u00a75\u043e\u0442\u043e\u0448\u0435\u043b.
 userIsNotAway=\u00a75{0} \u00a75\u0432\u0435\u0440\u043d\u0443\u043b\u0441\u044f.
 userJailed=\u00a76\u0412\u044b \u043f\u043e\u0441\u0430\u0436\u0435\u043d\u044b \u0432 \u0442\u044e\u0440\u044c\u043c\u0443\!
 userUnknown=\u00a74\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435\: \u0418\u0433\u0440\u043e\u043a\u0430 ''\u00a7c{0}\u00a74'' \u043d\u0438\u043a\u043e\u0433\u0434\u0430 \u043d\u0435\u0431\u044b\u043b\u043e \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435.
diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties
index fbd3aaab584..4baad5aac75 100644
--- a/Essentials/src/messages_sv.properties
+++ b/Essentials/src/messages_sv.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Du har inte beh\u00f6righet att l\u00e4gga till \u00a7c{0}\u00
 noNewMail=\u00a77Du har inget nytt meddelande.
 noPendingRequest=Du har inga v\u00e4ntande f\u00f6rfr\u00e5gan.
 noPerm=\u00a7cDu har inte \u00a7f{0}\u00a7c till\u00e5telse.
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a7cDu har inte till\u00e5telse att spawna den h\u00e4r moben.
 noPlacePermission=\u00a7cDu har inte till\u00e5telse att placera ett block n\u00e4ra den skylten.
 noPotionEffectPerm=\u00a74Du har inte till\u00e5telse att l\u00e4gga till brygd-effekten \u00a7c{0} \u00a74till denna brygden.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a7cEn omladdning har tvingat dig att bli synlig.
 upgradingFilesError=Fel vid uppgradering av filerna
 uptime=\u00a76Upptid\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75\u00e4r f\u00f6r n\u00e4rvarande AFK och kanske inte svarar.
+userAFKWithMessage=\u00a77{0} \u00a75\u00e4r f\u00f6r n\u00e4rvarande AFK och kanske inte svarar. {1}
 userDoesNotExist=Anv\u00e4ndaren {0} existerar inte.
 userIsAway={0} \u00e4r nu AFK
+userIsAwayWithMessage={0} \u00e4r nu AFK
 userIsNotAway={0} \u00e4r inte l\u00e4ngre AFK
 userJailed=\u00a77Du har blivit f\u00e4ngslad
 userUnknown=\u00a74Varning\: Anv\u00e4ndaren ''\u00a7c{0}\u00a74'' har aldrig varit inne p\u00e5 denna server tidigare.
diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties
index 44b63206246..4bfdebebffb 100644
--- a/Essentials/src/messages_tr.properties
+++ b/Essentials/src/messages_tr.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74Bunun Icin Gerekli Izine Sahip Degilsin\!
 noNewMail=\u00a76Size Gelen Yeni Bir Mail Yok
 noPendingRequest=\u00a74Size Gelen Herhangi Bir Istek Yok
 noPerm=\u00a74Bunun Icin Gerekli Izine Sahip Degilsiniz\!
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74Bu Mobu Olusturmak Icin Gerekli Yektiniz Yok\!
 noPlacePermission=\u00a74Bu Tabelanin Yanina Herhangi Bir Blok Yerlestiremezsin\!
 noPotionEffectPerm=\u00a74Bunun Icin Gerekli Izine Sahip Degilsin\!
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74Sunucu Yeniden Yukleme Sirasinda Gorunmezligini Elinden
 upgradingFilesError=Dosyalari Yenilerken Bir Sorun Olustu.
 uptime=\u00a76Acik kalma Suresi\:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75AFK
+userAFKWithMessage=\u00a75{0} \u00a75AFK {1}
 userDoesNotExist=\u00a74Boyle Bir Oyuncu Yok\!
 userIsAway=\u00a75{0} \u00a75Uzun Sure Hareket Etmedigi Ic\u0131n AFK Moduna Gecti\!
+userIsAwayWithMessage=\u00a75{0} \u00a75Uzun Sure Hareket Etmedigi Ic\u0131n AFK Moduna Gecti\!
 userIsNotAway=\u00a75{0} \u00a75Artik AFK Degil.
 userJailed=\u00a76Hapse Mahkum Edildin\!
 userUnknown=\u00a74Bu Oyuncu Sunucuya Hic Girmemis\!
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
index 75da8adad21..18b02417fb1 100644
--- a/Essentials/src/messages_zh.properties
+++ b/Essentials/src/messages_zh.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74\u4f60\u6ca1\u6709\u6743\u9650\u5e94\u7528 \u00a7c{0}\u00a74 \
 noNewMail=\u00a76\u4f60\u6ca1\u6709\u65b0\u7684\u90ae\u4ef6
 noPendingRequest=\u00a74\u4f60\u6ca1\u6709\u5f85\u89e3\u51b3\u7684\u8bf7\u6c42
 noPerm=\u00a74\u4f60\u6ca1\u6709 \u00a7c{0}\u00a74 \u6743\u9650
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74\u4f60\u6ca1\u6709\u751f\u6210\u8be5\u751f\u7269\u7684\u6743\u9650
 noPlacePermission=\u00a74\u4f60\u6ca1\u6709\u5728\u90a3\u4e2a\u724c\u5b50\u65c1\u8fb9\u653e\u65b9\u5757\u7684\u6743\u5229
 noPotionEffectPerm=\u00a74\u4f60\u6ca1\u6709\u6743\u9650\u5e94\u7528\u7279\u6548 \u00a7c{0} \u00a74\u5230\u8fd9\u4e2a\u836f\u6c34.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74\u63d2\u4ef6\u91cd\u8f7d\u8feb\u4f7f\u4f60\u7684\u9690\u
 upgradingFilesError=\u5347\u7ea7\u6587\u4ef6\u65f6\u53d1\u751f\u9519\u8bef
 uptime=\u00a76\u8fd0\u884c\u65f6\u95f4\:\u00a7c {0}
 userAFK=\u00a77{0} \u00a75\u73b0\u5728\u5904\u4e8e\u79bb\u5f00\u72b6\u6001, \u53ef\u80fd\u6682\u65f6\u6ca1\u529e\u6cd5\u56de\u5e94.
+userAFKWithMessage=\u00a77{0} \u00a75\u73b0\u5728\u5904\u4e8e\u79bb\u5f00\u72b6\u6001, \u53ef\u80fd\u6682\u65f6\u6ca1\u529e\u6cd5\u56de\u5e94. {1}
 userDoesNotExist=\u00a74\u73a9\u5bb6 \u00a7c{0} \u00a74\u4e0d\u5b58\u5728.
 userIsAway=\u00a77*{0} \u00a77\u6682\u65f6\u79bb\u5f00\u4e86.
+userIsAwayWithMessage=\u00a77*{0} \u00a77\u6682\u65f6\u79bb\u5f00\u4e86.
 userIsNotAway=\u00a77*{0} \u00a77\u56de\u6765\u4e86.
 userJailed=\u00a76\u4f60\u5df2\u88ab\u76d1\u7981
 userUnknown=\u00a74\u8b66\u544a\: \u8fd9\u4e2a\u73a9\u5bb6 ''\u00a7c{0}\u00a74'' \u4ece\u6765\u6ca1\u6709\u52a0\u5165\u8fc7\u670d\u52a1\u5668.
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index 41fee37e63d..b0272ce35a3 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74\u4f60\u6c92\u6709\u6b0a\u9650\u61c9\u7528 \u00a7c{0}\u00a74 \
 noNewMail=\u00a76\u4f60\u6c92\u6709\u65b0\u7684\u90f5\u4ef6
 noPendingRequest=\u00a74\u4f60\u6c92\u6709\u5f85\u89e3\u6c7a\u7684\u8acb\u6c42
 noPerm=\u00a74\u4f60\u6c92\u6709 \u00a7c{0}\u00a74 \u6b0a\u9650
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74\u4f60\u6c92\u6709\u751f\u6210\u8a72\u751f\u7269\u7684\u6b0a\u9650
 noPlacePermission=\u00a74\u00a74\u4f60\u6c92\u6709\u5728\u90a3\u500b\u724c\u5b50\u65c1\u908a\u653e\u65b9\u584a\u7684\u6b0a\u5229
 noPotionEffectPerm=\u00a74\u4f60\u6c92\u6709\u6b0a\u9650\u61c9\u7528\u7279\u6548 \u00a7c{0} \u00a74\u5230\u9019\u500b\u85e5\u6c34.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74\u5916\u639b\u7a0b\u5f0f\u91cd\u8f09\u8feb\u4f7f\u4f60\u
 upgradingFilesError=\u5347\u7d1a\u6587\u4ef6\u6642\u767c\u751f\u932f\u8aa4
 uptime=\u00a76\u904b\u884c\u6642\u9593\:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75\u73fe\u5728\u96e2\u958b, \u53ef\u80fd\u66ab\u6642\u6c92\u8fa6\u6cd5\u56de\u61c9.
+userAFKWithMessage=\u00a75{0} \u00a75\u73fe\u5728\u96e2\u958b, \u53ef\u80fd\u66ab\u6642\u6c92\u8fa6\u6cd5\u56de\u61c9. {1}
 userDoesNotExist=\u00a74\u73a9\u5bb6 \u00a7c{0} \u00a74\u4e0d\u5b58\u5728.
 userIsAway=\u00a7d{0} \u00a7d\u66ab\u6642\u96e2\u958b\u4e86
+userIsAwayWithMessage=\u00a7d{0} \u00a7d\u66ab\u6642\u96e2\u958b\u4e86
 userIsNotAway=\u00a7d{0} \u00a7d\u56de\u4f86\u4e86
 userJailed=\u00a76\u4f60\u5df2\u88ab\u76e3\u7981
 userUnknown=\u00a74\u8b66\u544a\: \u9019\u500b\u73a9\u5bb6 \u00a7c{0}\u00a74 \u5f9e\u4f86\u6c92\u6709\u52a0\u5165\u904e\u670d\u52d9\u5668.
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index edfdc927db8..88fa4f5f668 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -282,6 +282,7 @@ noMetaPerm=\u00a74\u4f60\u6c92\u6709\u8a31\u53ef\u6b0a\u61c9\u7528 \u00a7c{0}\u0
 noNewMail=\u00a76\u4f60\u6c92\u6709\u65b0\u7684\u90f5\u4ef6
 noPendingRequest=\u00a74\u4f60\u6c92\u6709\u5f85\u89e3\u6c7a\u7684\u8acb\u6c42
 noPerm=\u00a74\u4f60\u6c92\u6709 \u00a7c{0}\u00a74 \u8a31\u53ef\u6b0a
+noPermToAFKMessage=\u00a74You don''t have permission to set an AFK message.
 noPermToSpawnMob=\u00a74\u4f60\u6c92\u6709\u751f\u6210\u8a72\u751f\u7269\u7684\u8a31\u53ef\u6b0a
 noPlacePermission=\u00a74\u00a74\u4f60\u6c92\u6709\u5728\u90a3\u500b\u724c\u5b50\u65c1\u908a\u653e\u65b9\u584a\u7684\u6b0a\u5229
 noPotionEffectPerm=\u00a74\u4f60\u6c92\u6709\u8a31\u53ef\u6b0a\u61c9\u7528\u7279\u6548 \u00a7c{0} \u00a74\u5230\u9019\u500b\u85e5\u6c34.
@@ -459,8 +460,10 @@ unvanishedReload=\u00a74\u5916\u639b\u7a0b\u5f0f\u91cd\u8f09\u8feb\u4f7f\u4f60\u
 upgradingFilesError=\u5347\u7d1a\u6587\u4ef6\u6642\u767c\u751f\u932f\u8aa4
 uptime=\u00a76\u904b\u884c\u6642\u9593\:\u00a7c {0}
 userAFK=\u00a75{0} \u00a75\u73fe\u5728\u96e2\u958b, \u53ef\u80fd\u66ab\u6642\u6c92\u8fa6\u6cd5\u56de\u61c9.
+userAFKWithMessage=\u00a75{0} \u00a75\u73fe\u5728\u96e2\u958b, \u53ef\u80fd\u66ab\u6642\u6c92\u8fa6\u6cd5\u56de\u61c9. {1}
 userDoesNotExist=\u00a74\u73a9\u5bb6 \u00a7c{0} \u00a74\u4e0d\u5b58\u5728.
 userIsAway=\u00a7d{0} \u00a7d\u66ab\u6642\u96e2\u958b\u4e86
+userIsAwayWithMessage=\u00a7d{0} \u00a7d\u66ab\u6642\u96e2\u958b\u4e86
 userIsNotAway=\u00a7d{0} \u00a7d\u56de\u4f86\u4e86
 userJailed=\u00a76\u4f60\u5df2\u88ab\u76e3\u7981
 userUnknown=\u00a74\u8b66\u544a\: \u9019\u500b\u73a9\u5bb6 \u00a7c{0}\u00a74 \u5f9e\u4f86\u6c92\u6709\u52a0\u5165\u904e\u4f3a\u670d\u5668.
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 6db1d96001d..d3578f6ac2a 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -10,7 +10,7 @@ authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xe
 commands:
   afk:
     description: Marks you as away-from-keyboard.
-    usage: /<command> [player]
+    usage: /<command> [player/message...]
     aliases: [eafk,away,eaway]
   antioch:
     description: 'A little surprise for operators.'