summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandban.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandmute.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtempban.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java2
-rw-r--r--Essentials/src/messages.properties4
-rw-r--r--Essentials/src/messages_cs.properties4
-rw-r--r--Essentials/src/messages_da.properties4
-rw-r--r--Essentials/src/messages_de.properties4
-rw-r--r--Essentials/src/messages_en.properties4
-rw-r--r--Essentials/src/messages_es.properties4
-rw-r--r--Essentials/src/messages_fi.properties4
-rw-r--r--Essentials/src/messages_fr.properties4
-rw-r--r--Essentials/src/messages_it.properties4
-rw-r--r--Essentials/src/messages_nl.properties4
-rw-r--r--Essentials/src/messages_pl.properties4
-rw-r--r--Essentials/src/messages_pt.properties4
-rw-r--r--Essentials/src/messages_ro.properties4
-rw-r--r--Essentials/src/messages_ru.properties4
-rw-r--r--Essentials/src/messages_sv.properties4
-rw-r--r--Essentials/src/messages_zh.properties7
-rw-r--r--Essentials/src/messages_zh_HK.properties4
-rw-r--r--Essentials/src/messages_zh_TW.properties4
22 files changed, 79 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
index d839cf445..bd3a25aa3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
@@ -40,7 +40,7 @@ public class Commandban extends EssentialsCommand
{
if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline"))
{
- throw new Exception(_("banExempt"));
+ throw new Exception(_("banExemptOffline"));
}
}
else
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
index 5d7895d55..88b3f719e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
@@ -38,7 +38,7 @@ public class Commandmute extends EssentialsCommand
{
if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.mute.offline"))
{
- throw new Exception(_("muteExempt"));
+ throw new Exception(_("muteExemptOffline"));
}
}
else
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
index f32967757..5ac2de186 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
@@ -30,7 +30,7 @@ public class Commandtempban extends EssentialsCommand
if (sender.isPlayer()
&& !ess.getUser(sender.getPlayer()).isAuthorized("essentials.tempban.offline"))
{
- sender.sendMessage(_("tempbanExempt"));
+ sender.sendMessage(_("tempbanExemptOffline"));
return;
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
index ba1f0f3a2..4a223387c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
@@ -31,7 +31,7 @@ public class Commandtogglejail extends EssentialsCommand
if (sender.isPlayer()
&& !ess.getUser(sender.getPlayer()).isAuthorized("essentials.togglejail.offline"))
{
- sender.sendMessage(_("mayNotJail"));
+ sender.sendMessage(_("mayNotJailOffline"));
return;
}
}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 4dece7404..ed0c08914 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players\!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index 5287c5b75..ea2fe8bb9 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -532,4 +532,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index f1ddc2cd8..a78f07446 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index abd5ec750..0d7520245 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 4dece7404..4427c04c3 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index b4ab85a7e..0b36ba488 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index c106dad10..b469f804d 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index f99b87c5d..19878fa5d 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index d9d7fa2eb..7a966b933 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 7c4f53beb..45b5adc63 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index 094e57f80..58beeefd5 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index 96e296d57..bbcaafa52 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index 0ada0380f..baed7019a 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties
index e0ae77f42..99eaae1c8 100644
--- a/Essentials/src/messages_ru.properties
+++ b/Essentials/src/messages_ru.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties
index 4ab070c54..ea73e85cd 100644
--- a/Essentials/src/messages_sv.properties
+++ b/Essentials/src/messages_sv.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
index 633ef22a7..d8fd4d781 100644
--- a/Essentials/src/messages_zh.properties
+++ b/Essentials/src/messages_zh.properties
@@ -527,4 +527,11 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+<<<<<<< HEAD
ignoreExempt=\u00a74You can not ignore that player.
+=======
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
+>>>>>>> Clarify no perm msgs for missing .offline perms
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index 9843c7cd5..3e5a7c215 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index c1caffc08..572018111 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -527,4 +527,8 @@ mobDataList=\u00a76Valid mob data\:\u00a7r {0}
vanish=\u00a76Vanish for {0}\u00a76\: {1}
noLocationFound=\u00a74No valid location found.
coordsKeyword={0}, {1}, {2}
+banExemptOffline=\u00a74You may not ban offline players.
+tempbanExemptOffline=\u00a74You may not tempban offline players.
+mayNotJailOffline=\u00a74You may not jail offline players!
+muteExemptOffline=\u00a74You may not mute offline players.
ignoreExempt=\u00a74You can not ignore that player.