Merge remote-tracking branch 'origin/master'

SpigotCore_Main/src/SpigotCore.properties

@@ -69,32 +69,32 @@ SCHEM_SELECTOR_SCHEMATIC_NODE=Schematic/Directory
 
 MATERIAL_SELECTOR_TITLE=Select material
 
-BAN_TEAM={0} §e{1} §7was §e§lbanned§7 by §e{2} {3}§8. §7Reason§8: §f{4}
-BAN_PERMA=§7You are §e§lbanned §7permanently. Reason§8: §e{0}
-BAN_UNTIL=§7You are §e§lbanned §euntil {0} §8. §7Reason§8: §e{1}
+BAN_TEAM={0} §e{1} §7was §e§lbanned§7 by §e{2} {3}§8: §f{4}
+BAN_PERMA=§7You are §e§lbanned §epermanently§8: §e{0}
+BAN_UNTIL=§7You are §e§lbanned §euntil {0}§8: §e{1}
 UNBAN_ERROR=§cThe player isn't banned.
 UNBAN=§7You have §e§lunbanned §e{0}.
 
-MUTE_TEAM={0} §e{1} §7was §e§lmuted§7 by §e{2} {3}§8. §7Reason§8: §f{4}
-MUTE_PERMA=§7You are §epermanently §e§lmuted§8. §7Reason§8: §e{0}
-MUTE_UNTIL=§7You are §e§lmuted §euntil {0}§8. §7Grund§8: §e{1}
+MUTE_TEAM={0} §e{1} §7was §e§lmuted§7 by §e{2} {3}§8: §f{4}
+MUTE_PERMA=§7You are §epermanently §e§lmuted§8: §e{0}
+MUTE_UNTIL=§7You are §e§lmuted §euntil {0}§8: §e{1}
 UNMUTE_ERROR=§cThe player isn't muted.
-UNMUTE=§7You have §e§lmuted §e{0}.
+UNMUTE=§7You have §e§lunmuted §e{0}.
 
-NOSCHEMRECEIVING_TEAM={0} §e{1} §7was excluded from §e{2} {3} §7from §e§lrecieving schematics§8. §7Reason§8: §f{4}
-NOSCHEMRECEIVING_PERMA=§7You are §epermanently §7excluded from receiving §e§lschematics§8. §7Reason§8: §e{0}
-NOSCHEMRECEIVING_UNTIL=§7You are excluded from receiving §e§lschematics §euntil {0}§8. §7Reason§8: §e{1}
+NOSCHEMRECEIVING_TEAM={0} §e{1} §7was excluded from §e{2} {3} §7from §e§lrecieving schematics§8: §f{4}
+NOSCHEMRECEIVING_PERMA=§7You are §epermanently§7 excluded from receiving §e§lschematics§8: §e{0}
+NOSCHEMRECEIVING_UNTIL=§7You are excluded from receiving §e§lschematics §euntil {0}§8: §e{1}
 UNNOSCHEMRECEIVING_ERROR=§cThe player is not excluded from receiving schematics.
 UNNOSCHEMRECEIVING=§e{0} §7may now receive §e§lschematics§7 again§8.
 
-NOSCHEMSHARING_TEAM={0} §e{1} §7was excluded from §e{2} {3} §7from §e§lsharing schematics§8. §7Reason§8: §f{4}
-NOSCHEMSHARING_PERMA=§7You are §epermanently $7excluded from sharing §e§lschematics§8. §7Reason§8: §e{0}
-NOSCHEMSHARING_UNTIL=§7You are excluded from sharing §e§lschematics §euntil {0}§8. §7Reason§8: §e{1}
+NOSCHEMSHARING_TEAM={0} §e{1} §7was excluded from §e{2} {3} §7from §e§lsharing schematics§8: §f{4}
+NOSCHEMSHARING_PERMA=§7You are §epermanently§7 excluded from sharing §e§lschematics§8: §e{0}
+NOSCHEMSHARING_UNTIL=§7You are excluded from sharing §e§lschematics §euntil {0}§8: §e{1}
 UNNOSCHEMSHARING_ERROR=§cThe player is not excluded from sharing schematics.
 UNNOSCHEMSHARING=§e{0} §7may now share §e§lschematics§7 again§8.
 
-NOSCHEMSUBMITTING_TEAM={0} §e{1} §7was excluded from §e{2} {3} §7from §e§lsubmitting schematics§8. §7Reason§8: §f{4}
-NOSCHEMSUBMITTING_PERMA=§7You are §epermanently §7excluded from submitting §e§lschematics§8. §7Reason§8: §e{0}
-NOSCHEMSUBMITTING_UNTIL=§7You are excluded from submitting §e§lschematics §euntil {0}§8. §7Reason§8: §e{1}
+NOSCHEMSUBMITTING_TEAM={0} §e{1} §7was excluded from §e{2} {3} §7from §e§lsubmitting schematics§8: §f{4}
+NOSCHEMSUBMITTING_PERMA=§7You are §epermanently§7 excluded from submitting §e§lschematics§8: §e{0}
+NOSCHEMSUBMITTING_UNTIL=§7You are excluded from submitting §e§lschematics §euntil {0}§8: §e{1}
 UNNOSCHEMSUBMITTING_ERROR=§cThe player is not excluded from submitting schematics.
 UNNOSCHEMSUBMITTING=§e{0} §7may now submit §e§lschematics§7 again§8.

SpigotCore_Main/src/SpigotCore_de.properties

@@ -64,38 +64,32 @@ SCHEM_SELECTOR_SCHEMATIC_NODE=Schematic/Ordner
 
 MATERIAL_SELECTOR_TITLE=Material auswählen
 
-BAN_TEAM={0} §e{1} §7wurde von §e{2} {3} §e§lgebannt§8. §7Grund§8: §f{4}
-BAN_PERMA=§7Du bist §epermanent §e§lgebannt§8. §7Grund§8: §e{0}
-BAN_UNTIL=§7Du bist §ebis zum {0} §e§lgebannt§8. §7Grund§8: §e{1}
+BAN_TEAM={0} §e{1} §7wurde von §e{2} {3} §e§lgebannt§8: §f{4}
+BAN_PERMA=§7Du bist §epermanent §e§lgebannt§8: §e{0}
+BAN_UNTIL=§7Du bist §ebis zum {0} §e§lgebannt§8: §e{1}
 UNBAN_ERROR=§cDer Spieler ist nicht gebannt.
 UNBAN=§7Du hast §e{0} §e§lentbannt.
 
-MUTE_TEAM={0} §e{1} §7wurde von §e{2} {3} §e§lgemuted§8. §7Grund§8: §f{4}
-MUTE_PERMA=§7Du bist §epermanent §e§lgemuted§8. §7Grund§8: §e{0}
-MUTE_UNTIL=§7Du bist §ebis zum {0} §e§lgemuted§8. §7Grund§8: §e{1}
+MUTE_TEAM={0} §e{1} §7wurde von §e{2} {3} §e§lgemuted§8: §f{4}
+MUTE_PERMA=§7Du bist §epermanent §e§lgemuted§8: §e{0}
+MUTE_UNTIL=§7Du bist §ebis zum {0} §e§lgemuted§8: §e{1}
 UNMUTE_ERROR=§cDer Spieler ist nicht gemuted.
 UNMUTE=§7Du hast §e{0} §e§lentmuted.
 
-NOSCHEMRECEIVING_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lSchematicerhalten ausgeschlossen§8. §7Grund§8: §f{4}
-NOSCHEMRECEIVING_PERMA=§7Du bist §epermanent §7vom Erhalten von §e§lSchematics ausgeschlossen§8. §7Grund§8: §e{0}
-NOSCHEMRECEIVING_UNTIL=§7Du bist §ebis zum {0} §7vom Erhalten von §e§lSchematics ausgeschlossen§8. §7Grund§8: §e{1}
+NOSCHEMRECEIVING_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lSchematicerhalten§7 ausgeschlossen§8: §f{4}
+NOSCHEMRECEIVING_PERMA=§7Du bist §epermanent §7vom Erhalten von §e§lSchematics§7 ausgeschlossen§8: §e{0}
+NOSCHEMRECEIVING_UNTIL=§7Du bist §ebis zum {0} §7vom Erhalten von §e§lSchematics§7 ausgeschlossen§8: §e{1}
 UNNOSCHEMRECEIVING_ERROR=§cDer Spieler ist nicht vom Erhalten von Schematics ausgeschlossen.
-UNNOSCHEMRECEIVING=§e{0} §7darf nun wieder §e§lSchematics erhalten§8.
+UNNOSCHEMRECEIVING=§e{0} §7darf nun wieder §e§lSchematics§7 erhalten§8.
 
-NOSCHEMSHARING_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lSchematicverteilen ausgeschlossen§8. §7Grund§8: §f{4}
-NOSCHEMSHARING_PERMA=§7Du bist §epermanent §7vom §e§lVerteilen von Schematics§7 ausgeschlossen§8. §7Grund§8: §e{0}
-NOSCHEMSHARING_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lVerteilen von Schematics§7 ausgeschlossen§8. §7Grund§8: §e{1}
+NOSCHEMSHARING_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lSchematicverteilen§7 ausgeschlossen§8: §f{4}
+NOSCHEMSHARING_PERMA=§7Du bist §epermanent §7vom §e§lVerteilen von Schematics§7 ausgeschlossen§8: §e{0}
+NOSCHEMSHARING_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lVerteilen von Schematics§7 ausgeschlossen§8: §e{1}
 UNNOSCHEMSHARING_ERROR=§cDer Spieler ist nicht vom Verteilen von Schematics ausgeschlossen.
-UNNOSCHEMSHARING=§e{0} §7darf nun wieder §e§lSchematics verteilen§8.
+UNNOSCHEMSHARING=§e{0} §7darf nun wieder §e§lSchematics§7 verteilen§8.
 
-NOSCHEMSUBMITTING_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lSchematiceinsenden ausgeschlossen§8. §7Grund§8: §f{4}
-NOSCHEMSUBMITTING_PERMA=§7Du bist §epermanent §7vom §e§lEinsenden von Schematics§7 ausgeschlossen§8. §7Grund§8: §e{0}
-NOSCHEMSUBMITTING_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lEinsenden von Schematics§7 ausgeschlossen§8. §7Grund§8: §e{1}
+NOSCHEMSUBMITTING_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lSchematiceinsenden§7 ausgeschlossen§8: §f{4}
+NOSCHEMSUBMITTING_PERMA=§7Du bist §epermanent §7vom §e§lEinsenden von Schematics§7 ausgeschlossen§8: §e{0}
+NOSCHEMSUBMITTING_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lEinsenden von Schematics§7 ausgeschlossen§8: §e{1}
 UNNOSCHEMSUBMITTING_ERROR=§cDer Spieler ist nicht vom Einsenden von Schematics ausgeschlossen.
-UNNOSCHEMSUBMITTING=§e{0} §7darf nun wieder §e§lSchematis einsenden§8.
-
-NODEVSERVER_TEAM={0} §e{1} §7hat §e{2} §7mit Grund §f{4}§7 zu generft und hat daher §e§lDevserververbot §7erhalten§8, §e{3}
-NODEVSERVER_PERMA=§7Du bist §epermanent §7vom §e§lDevserver §7ausgeschlossen§8. §7Grund§8: §e{0}
-NODEVSERVER_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lDevserver §7ausgeschlossen§8. §7Grund§8: §e{1}
-UNNODEVSERVER_ERROR=§cDer Spieler ist nicht vom Devserver ausgeschlossen.
-UNNODEVSERVER=§e{0} §7darf nun wieder dem §e§lDevserver beitreten§8.
+UNNOSCHEMSUBMITTING=§e{0} §7darf nun wieder §e§lSchematis§7 einsenden§8.