Merge branch 'master' of github.com:khobbits/Essentials

8 files changed, 71 insertions, 61 deletions

diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 519fdd180..b84d05994 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -1,6 +1,7 @@
 #version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
+# by:
 addedToAccount = \u00a7a{0} has been added to your account.
 addedToOthersAccount = \u00a7a{0} has been added to {1} account.
 alertBroke = broke:
@@ -293,7 +294,6 @@ typeTpaccept = \u00a77To teleport, type \u00a7c/tpaccept\u00a77.
 typeTpdeny = \u00a77To deny this request, type \u00a7c/tpdeny\u00a77.
 typeWorldName = \u00a77You can also type the name of a specific world.
 unableToSpawnMob = Unable to spawn mob.
-unableToSpawnMob = Unable to spawn mob.
 unbannedIP = Unbanned IP address.
 unbannedPlayer = Unbanned player.
 unignorePlayer = You are not ignoring player {0} anymore.
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index c497ff893..fe45b375f 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -1,8 +1,7 @@
 #version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
-#Danish Translation by papand13, papand13@gmail.com
-#Danish Translation Version: 1.0
+# by: papand13, papand13@gmail.com
 addedToAccount = \u00a7a{0} er tilf\u00f8jet til din konto.
 addedToOthersAccount = \u00a7a{0} er blevet tilf\u00f8jet til {1} konto.
 alertBroke = \u00f8delagde:
@@ -240,7 +239,9 @@ 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.
 requestAccepted = \u00a77Teleporterings anmodning n\u00e6gtet.
+requestAcceptedFrom = \u00a77{0} accepted your teleport request.
 requestDenied = \u00a77Teleporterings anmodning n\u00e6gtet.
+requestDeniedFrom = \u00a77{0} denied your teleport request.
 requestSent = \u00a77Anmodning sendt til {0}\u00a77.
 returnPlayerToJailError = En fejl opstod ved fors\u00f8g p\u00e5 at returnere spiller til f\u00e6ngsel.
 second = sekunde
@@ -260,6 +261,7 @@ suicideMessage = \u00a77Farvel grusomme verden...
 suicideSuccess =  \u00a77{0} tog sit eget liv
 takenFromAccount = \u00a7c{0} er taget fra din konto.
 takenFromOthersAccount = \u00a7c{0} er blevet taget fra {1} konto.
+teleportAAll = \u00a77Teleporting request sent to all players...
 teleportAll = \u00a77Teleportere alle spillere...
 teleportAtoB = \u00a77{0}\u00a77 teleporterede dig til {1}\u00a77.
 teleportDisabled = {0} har teleportation deaktiveret.
@@ -291,7 +293,6 @@ treeSpawned = \u00a77Tr\u00e6 fremkaldt.
 typeTpaccept = \u00a77For at teleportere, skriv \u00a7c/tpaccept\u00a77.
 typeTpdeny = \u00a77For at n\u00e6gte denne anmodning, skriv \u00a7c/tpdeny\u00a77.
 typeWorldName = \u00a77Du kan ogs\u00e5 skrive nanvet p\u00e5 en specifik verden.
-unableToSpawnMob = Kan ikke spawne mob.
 unableToSpawnMob = Kunne ikke fremkalde mob.
 unbannedIP = Tilgav IP addresse, ikke l\u00e6ngere bannet.
 unbannedPlayer = Tilgav spiller, ikke l\u00e6ngere bannet.
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index a562fed14..a429d1aa6 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -1,6 +1,7 @@
 #version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
+# by:
 addedToAccount = \u00a7a{0} wurden zu deiner Geldb\u00f6rse hinzugef\u00fcgt.
 addedToOthersAccount = \u00a7a{0} wurden zu {1}s Konto hinzugef\u00fcgt.
 alertBroke = zerst\u00f6rt:
@@ -238,7 +239,9 @@ pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Frage]\u00a7f {0}
 reloadAllPlugins = \u00a77Alle plugins neu geladen.
 requestAccepted = \u00a77Teleportierungsanfrage akzeptiert.
+requestAcceptedFrom = \u00a77{0} accepted your teleport request.
 requestDenied = \u00a77Teleportierungsanfrage verweigert.
+requestDeniedFrom = \u00a77{0} denied your teleport request.
 requestSent = \u00a77Anfrage gesendet an {0}\u00a77.
 returnPlayerToJailError = Fehler beim Versuch, den Spieler ins Gef\u00e4ngnis zu teleportieren.
 second = Sekunde
@@ -258,6 +261,7 @@ suicideMessage = \u00a77Lebewohl grausame Welt...
 suicideSuccess =  \u00a77{0} hat sich das Leben genommen.
 takenFromAccount = \u00a7c{0} wurden aus deiner Geldb\u00f6rse genommen.
 takenFromOthersAccount = \u00a7c{0} wurde von {1} wurde Rechnung getragen.
+teleportAAll = \u00a77Teleporting request sent to all players...
 teleportAll = \u00a77Teleportiere alle Spieler...
 teleportAtoB = \u00a77{0}\u00a77 teleportiert dich zu {1}\u00a77.
 teleportDisabled = {0} verweigert die Teleportierung.
@@ -289,7 +293,6 @@ treeSpawned = \u00a77Baum gepflanzt.
 typeTpaccept = \u00a77Um zu teleportieren, schreibe \u00a7c/tpaccept\u00a77.
 typeTpdeny = \u00a77Um diese Anfrage abzulehnen, schreibe \u00a7c/tpdeny\u00a77.
 typeWorldName = \u00a77Du kannst auch den Namen der Welt eingeben.
-unableToSpawnMob = Erzeugen eines Monsters gescheitert
 unableToSpawnMob = Fehler beim Erzeugen eines Monster.
 unbannedIP = Verbannung von IP-Adresse r\u00fcckg\u00e4ngig gemacht.
 unbannedPlayer = Verbannung von Spieler r\u00fcckg\u00e4ngig gemacht.
@@ -339,4 +342,3 @@ year = Jahr
 years = Jahre
 youAreHealed = \u00a77Du wurdest geheilt.
 youHaveNewMail = \u00a7cDu hast {0} Nachrichten!\u00a7f Schreibe \u00a77/mail read\u00a7f um deine Nachrichten anzuzeigen.
-invalidCharge = \u00a7cUng\u00fcltige Verf\u00fcgung.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 36987b99b..e2aa6793c 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -1,6 +1,7 @@
 #version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
+# by:
 addedToAccount = \u00a7a{0} has been added to your account.
 addedToOthersAccount = \u00a7a{0} has been added to {1} account.
 alertBroke = broke:
@@ -260,6 +261,7 @@ suicideMessage = \u00a77Goodbye Cruel World...
 suicideSuccess =  \u00a77{0} took their own life
 takenFromAccount = \u00a7c{0} has been taken from your account.
 takenFromOthersAccount = \u00a7c{0} has been taken from {1} account.
+teleportAAll = \u00a77Teleporting request sent to all players...
 teleportAll = \u00a77Teleporting all players...
 teleportAtoB = \u00a77{0}\u00a77 teleported you to {1}\u00a77.
 teleportDisabled = {0} has teleportation disabled.
@@ -292,7 +294,6 @@ typeTpaccept = \u00a77To teleport, type \u00a7c/tpaccept\u00a77.
 typeTpdeny = \u00a77To deny this request, type \u00a7c/tpdeny\u00a77.
 typeWorldName = \u00a77You can also type the name of a specific world.
 unableToSpawnMob = Unable to spawn mob.
-unableToSpawnMob = Unable to spawn mob.
 unbannedIP = Unbanned IP address.
 unbannedPlayer = Unbanned player.
 unignorePlayer = You are not ignoring player {0} anymore.
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 2d46c1d1a..9d9dd23fc 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -1,6 +1,7 @@
 #version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
+# by:
 addedToAccount = \u00a7a{0} a \u00e9t\u00e9 rajout\u00e9 a votre compte.
 addedToOthersAccount = \u00a7a{0} a \u00e9t\u00e9 ajout\u00e9 \u00e0 {1} compte.
 alertBroke = a cass\u00e9: 
@@ -238,7 +239,9 @@ 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.
 requestAccepted = \u00a77Demande de t\u00e9l\u00e9portation accept\u00e9e.
+requestAcceptedFrom = \u00a77{0} accepted your teleport request.
 requestDenied = \u00a77Demande de t\u00e9l\u00e9portation refus\u00e9e.
+requestDeniedFrom = \u00a77{0} denied your teleport request.
 requestSent = \u00a77Requ\u00eate envoy\u00e9e \u00e0 {0}\u00a77.
 returnPlayerToJailError = Erreur survenue lors de la tentative d''emprisonner de nouveau un joueur.
 second = seconde
@@ -258,6 +261,7 @@ suicideMessage = \u00a77Au revoir monde cruel...
 suicideSuccess = \u00a77{0} a pris sa propre vie.
 takenFromAccount = \u00a7c{0} ont \u00e9t\u00e9 pris de votre compte.
 takenFromOthersAccount = \u00a7c{0} a \u00e9t\u00e9 prise de {1} compte.
+teleportAAll = \u00a77Teleporting request sent to all players...
 teleportAll = \u00a77T\u00e9l\u00e9poration de tous les joueurs.
 teleportAtoB = \u00a77{0}\u00a77 vous a t\u00e9l\u00e9port\u00e9 \u00e0 {1}\u00a77.
 teleportDisabled = {0} a la t\u00e9l\u00e9portation d\u00e9sactiv\u00e9.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 91feb519a..1d086ee34 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -1,7 +1,7 @@
 #version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
-# by Geertje123
+# by: Geertje123
 addedToAccount = \u00a7a{0} is gestort op je account.
 addedToOthersAccount = \u00a7a{0} is overgemaakt naar {1}''s rekening
 alertBroke = gebroken:
@@ -239,7 +239,9 @@ pTimeSetFixed = Player time is fixed to \u00a73{0}\u00a7f for: \u00a7e{1}
 questionFormat = \u00a77[Vraag]\u00a7f {0}
 reloadAllPlugins = \u00a77Alle plugins zijn herladen.
 requestAccepted = \u00a77Teleporteer aanvraag geaccepteerd.
+requestAcceptedFrom = \u00a77{0} accepted your teleport request.
 requestDenied = \u00a77Teleporteer aanvraag geweigerd.
+requestDeniedFrom = \u00a77{0} denied your teleport request.
 requestSent = \u00a77Aanvraag verstuurd naar {0}\u00a77.
 returnPlayerToJailError = Fout opgetreden bij terugzetten van speler in gevangenis.
 second = seconde
@@ -259,6 +261,7 @@ suicideMessage = \u00a77Vaarwel vreedzame wereld...
 suicideSuccess =  \u00a77{0} pleegde zelfmoord
 takenFromAccount = \u00a7c{0} is van je bank rekening afgehaald.
 takenFromOthersAccount = \u00a7c{0} is overgenomen uit {1} account.
+teleportAAll = \u00a77Teleporting request sent to all players...
 teleportAll = \u00a77Bezig met teleporteren van alle spelers...
 teleportAtoB = \u00a77{0}\u00a77 is naar {1}\u00a77 geteleporteerd.
 teleportDisabled = {0} heeft teleporteren uit gezet.
@@ -291,7 +294,6 @@ typeTpaccept = \u00a77Om te teleporten, type \u00a7c/tpaccept\u00a77.
 typeTpdeny = \u00a77Om te weigeren, type \u00a7c/tpdeny\u00a77.
 typeWorldName = \u00a77Je kan ook de exacte naam van de wereld typen.
 unableToSpawnMob = De mob kan niet gespawned worden.
-unableToSpawnMob = Mob kon niet gespawnd worden.
 unbannedIP = IP adres ontbannen.
 unbannedPlayer = Speler ontbannen.
 unignorePlayer = Je negeert {0} niet meer.
@@ -339,4 +341,4 @@ worthSet = Waarde ingesteld
 year = jaar
 years = jaren
 youAreHealed = \u00a77Je bent genezen.
-youHaveNewMail = \u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
\ No newline at end of file
+youHaveNewMail = \u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
diff --git a/EssentialsGroupManager/src/groups.yml b/EssentialsGroupManager/src/groups.yml
index 87033cdc9..371c169dd 100644
--- a/EssentialsGroupManager/src/groups.yml
+++ b/EssentialsGroupManager/src/groups.yml
@@ -13,43 +13,6 @@ groups:
       prefix: '&e'
       build: false
       suffix: ''
-  SemiAdmin:
-    default: false
-    permissions:
-    - -groupmanager.mantogglesave
-    - essentials
-    - essentials.antioch
-    - essentials.burn
-    - essentials.clearinventory
-    - essentials.cooldown.bypass
-    - essentials.deljail
-    - essentials.fireball
-    - essentials.gc
-    - essentials.give
-    - essentials.god
-    - essentials.heal
-    - essentials.heal.others
-    - essentials.lightning
-    - essentials.invsee
-    - essentials.item
-    - essentials.jails
-    - essentials.kickall
-    - essentials.kit.*
-    - essentials.mute
-    - essentials.sell
-    - essentials.setjail
-    - essentials.signs.*
-    - essentials.spawnmob
-    - essentials.teleport.cooldown.bypass
-    - essentials.teleport.timer.bypass
-    - essentials.togglejail
-    - groupmanager.*
-    inheritance:
-    - moderator
-    info:
-      prefix: '&c'
-      build: true
-      suffix: ''
   Builder:
     default: false
     permissions:
@@ -57,10 +20,15 @@ groups:
     - essentials.back
     - essentials.back.ondeath
     - essentials.balance
+    - essentials.balance.others
+    - essentials.balancetop
+    - essentials.chat.color
     - essentials.chat.shout
+    - essentials.chat.question
     - essentials.compass
-    - essentials.home
     - essentials.depth
+    - essentials.home
+    - essentials.ignore
     - essentials.kit
     - essentials.kit.tools
     - essentials.mail
@@ -69,6 +37,7 @@ groups:
     - essentials.msg
     - essentials.nick
     - essentials.pay
+    - essentials.ping
     - essentials.portal
     - essentials.powertool
     - essentials.protect
@@ -83,6 +52,7 @@ groups:
     - essentials.signs.break.protection
     - essentials.signs.break.trade
     - essentials.suicide
+    - essentials.time
     - essentials.tpa
     - essentials.tpaccept
     - essentials.tpahere
@@ -100,28 +70,41 @@ groups:
     default: false
     permissions:
     - essentials.ban
+    - essentials.ban.notify
     - essentials.banip
     - essentials.broadcast
+    - essentials.clearinventory
     - essentials.delwarp
-    - essentials.eco
+    - essentials.eco.loan
     - essentials.ext
     - essentials.getpos
+    - essentials.helpop.recieve
+    - essentials.home.others
+    - essentials.invsee
+    - essentials.jails
     - essentials.jump
     - essentials.kick
+    - essentials.kick.notify
     - essentials.kill
+    - essentials.mute
+    - essentials.nick.others
+    - essentials.realname
     - essentials.setwarp
     - essentials.signs.create.*
     - essentials.signs.break.*
     - essentials.spawner
     - essentials.thunder
     - essentials.time
-    - essentials.time.world
+    - essentials.time.set
+    - essentials.protect.alerts
+    - essentials.protect.admin
+    - essentials.protect.ownerinfo
+    - essentials.ptime
+    - essentials.ptime.others
     - essentials.togglejail
     - essentials.top
     - essentials.tp
     - essentials.tphere
-    - essentials.tpo
-    - essentials.tpohere
     - essentials.tppos
     - essentials.tptoggle
     - essentials.unban
@@ -131,12 +114,11 @@ groups:
     - essentials.world
     - groupmanager.listgroups
     - groupmanager.mandemote
-    - groupmanager.manload
     - groupmanager.manpromote
-    - groupmanager.mansave
     - groupmanager.manselect
     - groupmanager.manuadd
     - groupmanager.manudel
+    - groupmanager.manwhois
     inheritance:
     - builder
     info:
@@ -146,9 +128,30 @@ groups:
   Admin:
     default: false
     permissions:
+    - -essentials.backup
+    - -essentials.essentials
+    - -essentials.setspawn
+    - -essentials.reloadall
+    - -essentials.plugin
+    - essentials.*
+    - groupmanager.mantogglevalidate
+    - groupmanager.mansave
+    - groupmanager.mangcheckp
+    - groupmanager.manglistp
+    - groupmanager.manucheckp
+    - groupmanager.manulistp
+    inheritance:
+    - moderator
+    info:
+      prefix: '&c'
+      build: true
+      suffix: ''
+  Owner:
+    default: false
+    permissions:
     - '*'
     inheritance:
-    - semiadmin
+    - admin
     info:
       prefix: '&4'
       build: true
diff --git a/EssentialsGroupManager/src/users.yml b/EssentialsGroupManager/src/users.yml
index c3324f0c0..5eb841c97 100644
--- a/EssentialsGroupManager/src/users.yml
+++ b/EssentialsGroupManager/src/users.yml
@@ -1,14 +1,11 @@
 # "For a more advanced configuration example utilizing the advanced features of GroupManager, see http://pastebin.com/a8ZA0j5G"
+# "You will want to remove these users and replace them with your own"
 users:
-  kimkandor:
+  snowleo:
     subgroups: []
     permissions: []
     group: Admin
-  mudzereli:
-    subgroups: []
-    permissions: []
-    group: Builder
-  zenexer:
+  khobbits:
     subgroups: []
     permissions: []
     group: Admin