diff options
36 files changed, 533 insertions, 491 deletions
diff --git a/Essentials/po/en.po b/Essentials/po/en.po index 2bc0427a9..443426b31 100644 --- a/Essentials/po/en.po +++ b/Essentials/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-06 04:18+0200\n" +"POT-Creation-Date: 2013-04-06 05:43+0200\n" "PO-Revision-Date: 2013-04-01 23:17+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -103,12 +103,6 @@ msgstr "" msgid " Big tree spawned." msgstr "" -#: Essentials/src/net/ess3/commands/Commandenchant.java:95 -#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:34 -#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:79 -msgid " Enchantment not found" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandenchant.java:40 #, java-format msgid " Enchantments: {0}" @@ -161,11 +155,6 @@ msgstr "" msgid " [HIDDEN]" msgstr "" -#: Essentials/src/net/ess3/commands/Commandsuicide.java:17 -#, java-format -msgid " {0} took their own life" -msgstr "" - #: Essentials/src/net/ess3/settings/Settings.java:22 msgid "" "##########################################################\n" @@ -289,6 +278,11 @@ msgstr "" msgid "Amount of homes a player can have" msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:33 +#, java-format +msgid "Author of the book set to {0}." +msgstr "" + #: Essentials/src/net/ess3/settings/commands/Afk.java:18 msgid "" "Auto-AFK Kick\n" @@ -360,6 +354,11 @@ msgstr "" msgid "Chapter {0}, page {1} of {2}:" msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:160 +#, java-format +msgid "Combine {0}" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandpowertool.java:34 msgid "Command can't be attached to air." msgstr "" @@ -408,7 +407,7 @@ msgid "Commands to listen for in socialspy" msgstr "" #: Essentials/src/net/ess3/commands/Commandlist.java:133 -msgid "Connected players: " +msgid "Connected players " msgstr "" #: Essentials/src/net/ess3/ranks/RankOptions.java:25 @@ -431,7 +430,7 @@ msgid "Could not find template {0}" msgstr "" #: Essentials/src/net/ess3/storage/ManagedFile.java:50 -msgid "Could not load items.csv." +msgid "Could not load items.csv!" msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:93 @@ -465,7 +464,7 @@ msgid "Delay to wait before people can cause attack damage after logging in " msgstr "" #: Essentials/src/net/ess3/utils/LocationUtil.java:121 -msgid "Destination not set." +msgid "Destination not set!" msgstr "" #: Essentials/src/net/ess3/settings/Chat.java:16 @@ -498,7 +497,7 @@ msgstr "" #: EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java:159 msgid "" -"Downloading GeoIP database ... this might take a while (country: 0.6 MB, " +"Downloading GeoIP database... this might take a while (country: 0.6 MB, " "city: 20MB)" msgstr "" @@ -516,6 +515,12 @@ msgid "" "command" msgstr "" +#: Essentials/src/net/ess3/commands/Commandenchant.java:95 +#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:34 +#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:79 +msgid "Enchantment not found!" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandhat.java:47 msgid "Enjoy your new hat!" msgstr "" @@ -527,7 +532,7 @@ msgstr "" #: Essentials/src/net/ess3/utils/textreader/HelpInput.java:150 #, java-format -msgid "Error getting help for: {0}" +msgid "Error getting help for plugin: {0}" msgstr "" #: Essentials/src/net/ess3/Jails.java:177 @@ -537,17 +542,13 @@ msgstr "" #: Essentials/src/net/ess3/Jails.java:230 #: Essentials/src/net/ess3/Jails.java:234 #, java-format -msgid "Error occurred when trying to return player {0} to jail: {1}." +msgid "Error occurred when trying to return player {0} to jail: {1}!" msgstr "" #: Essentials/src/net/ess3/commands/Commandspawner.java:65 msgid "Error while changing mob spawner." msgstr "" -#: Essentials/src/net/ess3/commands/Commandhat.java:51 -msgid "Error, you cannot use this item as a hat!" -msgstr "" - #: Essentials/src/net/ess3/commands/EssentialsCommandHandler.java:290 #, java-format msgid "Error: {0}" @@ -564,14 +565,14 @@ msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:217 #, java-format -msgid "Failed to close config {0}" +msgid "Failed to close config {0}." msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:50 #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:103 #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:108 #, java-format -msgid "Failed to create config {0}" +msgid "Failed to create config {0}." msgstr "" #: EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java:186 @@ -585,12 +586,20 @@ msgid "Failed to read GeoIP database!" msgstr "" #: Essentials/src/net/ess3/settings/SpawnsHolder.java:265 -msgid "Failed to teleport new player." +msgid "Failed to teleport new player!" msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:193 #, java-format -msgid "Failed to write config {0}" +msgid "Failed to write config {0}." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandfirework.java:121 +#: Essentials/src/net/ess3/commands/Commandfirework.java:139 +msgid "" +"Firework parameters: color:<color> [fade:<color>] [shape:<shape>] [effect:" +"<effect>]nTo use multiple colors/effects, seperate values with commas: red," +"blue,pinknShapes: star, ball, large, creeper, burst Effects: trail, twinkle." msgstr "" #: Essentials/src/net/ess3/settings/antibuild/Alert.java:27 @@ -607,7 +616,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandsudo.java:36 #, java-format -msgid "Forcing {0} to run: /{1} {2}." +msgid "Forcing {0} to run: /{1} {2}" msgstr "" #: Essentials/src/net/ess3/commands/Commandgc.java:35 @@ -670,7 +679,7 @@ msgid "" msgstr "" #: Essentials/src/net/ess3/utils/LocationUtil.java:176 -msgid "Hole in floor" +msgid "Hole in floor!" msgstr "" #: Essentials/src/net/ess3/commands/Commanddelhome.java:57 @@ -727,12 +736,26 @@ msgstr "" msgid "InvFull" msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:37 +msgid "Invalid Number." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:373 +#: Essentials/src/net/ess3/MetaItemStack.java:389 +#: Essentials/src/net/ess3/MetaItemStack.java:401 +msgid "Invalid Potion.Meta" +msgstr "" + #: EssentialsSigns/src/net/ess3/signs/EssentialsSign.java:402 msgid "Invalid charge." msgstr "" +#: Essentials/src/net/ess3/commands/Commandfirework.java:140 +msgid "Invalid firework charge parameters inserted, must set a color first." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandsethome.java:66 -msgid "Invalid home name" +msgid "Invalid home name!" msgstr "" #: Essentials/src/net/ess3/commands/Commandkillall.java:81 @@ -742,7 +765,7 @@ msgid "Invalid mob type." msgstr "" #: Essentials/src/net/ess3/commands/Commandsetwarp.java:23 -msgid "Invalid warp name" +msgid "Invalid warp name!" msgstr "" #: Essentials/src/net/ess3/commands/Commandremove.java:71 @@ -752,7 +775,7 @@ msgid "Invalid world." msgstr "" #: Essentials/src/net/ess3/commands/Commandclearinventory.java:33 -msgid "Inventory Cleared." +msgid "Inventory cleared." msgstr "" #: Essentials/src/net/ess3/commands/Commandclearinventory.java:23 @@ -789,7 +812,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandkick.java:27 #: Essentials/src/net/ess3/commands/Commandkickall.java:15 -msgid "Kicked from server" +msgid "Kicked from server." msgstr "" #: Essentials/src/net/ess3/commands/Commandkill.java:34 @@ -803,6 +826,10 @@ msgstr "" msgid "Kits: {0}" msgstr "" +#: Essentials/src/net/ess3/MetaItemStack.java:232 +msgid "Leather Color Syntax: color:<red>,<green>,<blue> eg: color:255,0,0." +msgstr "" + #: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:29 #: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:74 #: EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java:42 @@ -885,8 +912,13 @@ msgstr "" msgid "No permission for unlimited item {0}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:44 +#, java-format +msgid "No recipes exist for {0}." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandwarp.java:78 -msgid "No warps defined" +msgid "No warps defined." msgstr "" #: Essentials/src/net/ess3/commands/Commandmail.java:78 @@ -899,7 +931,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandbalancetop.java:80 #: Essentials/src/net/ess3/commands/Commandbalancetop.java:93 #, java-format -msgid "Ordering balances of {0} users, please wait ..." +msgid "Ordering balances of {0} users, please wait..." msgstr "" #: Essentials/src/net/ess3/settings/General.java:30 @@ -950,7 +982,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandptime.java:161 #, java-format -msgid "Player time has been reset for: {0}." +msgid "Player time has been reset for: {0}" msgstr "" #: Essentials/src/net/ess3/commands/Commandptime.java:168 @@ -971,7 +1003,7 @@ msgstr "" #: EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java:97 #, java-format -msgid "Player {0} comes from {1}" +msgid "Player {0} comes from {1}." msgstr "" #: Essentials/src/net/ess3/commands/Commandseen.java:57 @@ -1057,6 +1089,15 @@ msgstr "" msgid "Radius of the near command, if no number is given." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:53 +#, java-format +msgid "Recipe for {0} ({1} of {2})" +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandfirework.java:55 +msgid "Removed all effects from held stack." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandremove.java:152 #, java-format msgid "Removed {0} entities." @@ -1103,7 +1144,7 @@ msgid "Server Total: {0}" msgstr "" #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:396 -msgid "Server is full." +msgid "Server is full!" msgstr "" #: Essentials/src/net/ess3/commands/Commandfly.java:34 @@ -1250,6 +1291,11 @@ msgstr "" msgid "Show other plugins commands in help" msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:76 +#, java-format +msgid "Smelt {0}" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandlightning.java:50 #, java-format msgid "Smiting {0}" @@ -1322,7 +1368,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandtempban.java:52 #, java-format -msgid "Temporarily banned from server for {0}" +msgid "Temporarily banned from server for {0}." msgstr "" #: Essentials/src/net/ess3/commands/Commandsell.java:91 @@ -1411,6 +1457,15 @@ msgid "" "more than one stack." msgstr "" +#: Essentials/src/net/ess3/commands/Commandfirework.java:67 +#: Essentials/src/net/ess3/MetaItemStack.java:282 +#: Essentials/src/net/ess3/MetaItemStack.java:297 +#: Essentials/src/net/ess3/MetaItemStack.java:316 +#: Essentials/src/net/ess3/MetaItemStack.java:339 +#, java-format +msgid "The option {0} is not a valid value for {1}." +msgstr "" + #: Essentials/src/net/ess3/ranks/Ranks.java:21 msgid "" "The order of the ranks matters, the ranks are checked from top to bottom.\n" @@ -1452,6 +1507,10 @@ msgstr "" msgid "There are {0} warps. Showing page {1} of {2}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:49 +msgid "There is no recipe by that number." +msgstr "" + #: EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java:52 msgid "There is nothing to collect from this trade sign." msgstr "" @@ -1464,6 +1523,10 @@ msgstr "" msgid "These players have their own time:" msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:78 +msgid "This book is now locked." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandrepair.java:31 #: Essentials/src/net/ess3/commands/Commandrepair.java:84 msgid "This item cannot be repaired." @@ -1494,6 +1557,11 @@ msgstr "" msgid "Time before next teleport: {0}" msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:46 +#, java-format +msgid "Title of the book set to {0}." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandtpa.java:41 #: Essentials/src/net/ess3/commands/Commandtpahere.java:40 msgid "To deny this request, type /tpdeny." @@ -1537,6 +1605,11 @@ msgid "" "wrong." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:70 +#, java-format +msgid "Type /{0} {1} <number> to see other recipes for {2}." +msgstr "" + #: Essentials/src/net/ess3/utils/textreader/TextPager.java:77 #: Essentials/src/net/ess3/utils/textreader/TextPager.java:144 #: Essentials/src/net/ess3/utils/textreader/TextPager.java:196 @@ -1684,6 +1757,11 @@ msgid "" "Set to none if you want to use the spawn point of the world." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:131 +#, java-format +msgid "Where: {0}" +msgstr "" + #: Essentials/src/net/ess3/settings/antibuild/BlackList.java:32 msgid "Which blocks should not be pushed by pistons" msgstr "" @@ -1736,6 +1814,10 @@ msgstr "" msgid "You are not authorized to set the time." msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:82 +msgid "You are not holding a writable book." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandignore.java:38 #, java-format msgid "You are not ignoring player {0} anymore." @@ -1781,6 +1863,12 @@ msgid "You are not wearing a hat." msgstr "" #: Essentials/src/net/ess3/commands/Commandvanish.java:39 +msgid "" +"You are now completely invisible to normal users, and hidden from in-game " +"commands." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandvanish.java:39 msgid "You are once again visible." msgstr "" @@ -1812,13 +1900,35 @@ msgid "You can not kick that person." msgstr "" #: Essentials/src/net/ess3/user/User.java:354 -msgid "You can talk again." +msgid "You can now talk again." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:164 +msgid "You can only set the owner of player skulls (397:3)." msgstr "" #: Essentials/src/net/ess3/Kits.java:101 msgid "You can't use that kit again for another {0}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandfirework.java:132 +#: Essentials/src/net/ess3/MetaItemStack.java:121 +#: Essentials/src/net/ess3/MetaItemStack.java:265 +msgid "You cannot apply more than one charge to this firework." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:411 +msgid "You cannot apply more than one effect to this potion." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandbook.java:37 +msgid "You cannot change the author of this book." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandbook.java:50 +msgid "You cannot change the title of this book." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandsetwarp.java:45 msgid "You cannot overwrite that warp." msgstr "" @@ -1837,6 +1947,14 @@ msgstr "" msgid "You cannot sudo this user." msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:64 +msgid "You cannot unlock this book." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandhat.java:51 +msgid "You cannot use this item as a hat!" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandwarp.java:28 msgid "You do not have Permission to list warps." msgstr "" @@ -1871,8 +1989,27 @@ msgstr "" msgid "You do not have enough of that item to sell." msgstr "" +#: Essentials/src/net/ess3/MetaItemStack.java:114 +#: Essentials/src/net/ess3/MetaItemStack.java:258 +msgid "You do not have permission to apply firework meta." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:368 +#, java-format +msgid "You do not have permission to apply potion effect {0} to this potion." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:528 +#, java-format +msgid "You do not have permission to apply {0} meta to this item." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandnick.java:32 -msgid "You do not have permission to change the nickname of others." +msgid "You do not have permission to change the nickname of others!" +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:181 +msgid "You do not have permission to create dynamic books." msgstr "" #: Essentials/src/net/ess3/commands/Commandeco.java:81 @@ -1937,7 +2074,7 @@ msgid "You have been healed." msgstr "" #: Essentials/src/net/ess3/commands/Commandtogglejail.java:51 -msgid "You have been jailed." +msgid "You have been jailed!" msgstr "" #: Essentials/src/net/ess3/user/User.java:400 @@ -1950,8 +2087,11 @@ msgstr "" msgid "You have been muted for {0}." msgstr "" -#: Essentials/src/net/ess3/commands/Commandmute.java:45 #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:74 +msgid "You have been muted!" +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandmute.java:45 msgid "You have been muted." msgstr "" @@ -1964,7 +2104,7 @@ msgid "You have been released." msgstr "" #: Essentials/src/net/ess3/commands/Commandmute.java:45 -msgid "You have been unmuted" +msgid "You have been unmuted." msgstr "" #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:322 @@ -1988,10 +2128,6 @@ msgstr "" msgid "You have nothing in your hand." msgstr "" -#: Essentials/src/net/ess3/commands/Commandvanish.java:39 -msgid "You have now been vanished." -msgstr "" - #: Essentials/src/net/ess3/commands/Commandrepair.java:48 #: Essentials/src/net/ess3/commands/Commandrepair.java:68 #, java-format @@ -2016,7 +2152,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandtogglejail.java:29 #: Essentials/src/net/ess3/commands/Commandtogglejail.java:37 -msgid "You may not jail that person." +msgid "You may not jail that person!" msgstr "" #: Essentials/src/net/ess3/commands/Commandmute.java:24 @@ -2028,6 +2164,14 @@ msgstr "" msgid "You may not tempban that player." msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:60 +msgid "You may now edit the contents of this book." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandfirework.java:151 +msgid "You must be holding a firework to add effects." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandhat.java:56 msgid "You must have something to wear in your hand." msgstr "" @@ -2105,7 +2249,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandme.java:16 #: Essentials/src/net/ess3/commands/Commandmsg.java:30 -msgid "Your voice has been silenced." +msgid "Your voice has been silenced!" msgstr "" #: Essentials/src/net/ess3/commands/Commandbroadcast.java:17 @@ -2155,18 +2299,6 @@ msgstr "" msgid "baltopShown" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:33 -msgid "bookAuthorSet" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:78 -msgid "bookLocked" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:46 -msgid "bookTitleSet" -msgstr "" - #: EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java:102 msgid "broke:" msgstr "" @@ -2187,18 +2319,6 @@ msgstr "" msgid "deniedWorldAccess" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:64 -msgid "denyBookEdit" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:37 -msgid "denyChangeAuthor" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:50 -msgid "denyChangeTitle" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandthunder.java:25 #: Essentials/src/net/ess3/commands/Commandthunder.java:31 msgid "disabled" @@ -2212,10 +2332,6 @@ msgstr "" msgid "ecoResetAllOnline" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:60 -msgid "editBookContents" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandessentials.java:49 #: Essentials/src/net/ess3/commands/Commandfly.java:34 #: Essentials/src/net/ess3/commands/Commandfly.java:45 @@ -2241,19 +2357,6 @@ msgstr "" msgid "false" msgstr "" -#: Essentials/src/net/ess3/commands/Commandfirework.java:140 -msgid "fireworkColor" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandfirework.java:55 -msgid "fireworkEffectsCleared" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandfirework.java:121 -#: Essentials/src/net/ess3/commands/Commandfirework.java:139 -msgid "fireworkSyntax" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandfly.java:38 msgid "flyFailed" msgstr "" @@ -2316,14 +2419,6 @@ msgstr "" msgid "godFailed" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:82 -msgid "holdBook" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandfirework.java:151 -msgid "holdFirework" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandsethome.java:81 msgid "homeSet" msgstr "" @@ -2340,28 +2435,10 @@ msgstr "" msgid "invalidAmount" msgstr "" -#: Essentials/src/net/ess3/commands/Commandfirework.java:67 -#: Essentials/src/net/ess3/MetaItemStack.java:282 -#: Essentials/src/net/ess3/MetaItemStack.java:297 -#: Essentials/src/net/ess3/MetaItemStack.java:316 -#: Essentials/src/net/ess3/MetaItemStack.java:339 -msgid "invalidFireworkFormat" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandbanip.java:29 msgid "invalidIpAddress" msgstr "" -#: Essentials/src/net/ess3/commands/Commandrecipe.java:37 -msgid "invalidNumber" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:373 -#: Essentials/src/net/ess3/MetaItemStack.java:389 -#: Essentials/src/net/ess3/MetaItemStack.java:401 -msgid "invalidPotionMeta" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandrealname.java:37 msgid "is" msgstr "" @@ -2374,10 +2451,6 @@ msgstr "" msgid "itemSoldConsole" msgstr "" -#: Essentials/src/net/ess3/MetaItemStack.java:232 -msgid "leatherSyntax" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandmsg.java:46 #: Essentials/src/net/ess3/commands/Commandr.java:54 #: Essentials/src/net/ess3/commands/Commandr.java:62 @@ -2418,16 +2491,6 @@ msgstr "" msgid "months" msgstr "" -#: Essentials/src/net/ess3/commands/Commandfirework.java:132 -#: Essentials/src/net/ess3/MetaItemStack.java:121 -#: Essentials/src/net/ess3/MetaItemStack.java:265 -msgid "multipleCharges" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:411 -msgid "multiplePotionEffects" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandmute.java:42 msgid "mutedPlayer" msgstr "" @@ -2436,23 +2499,6 @@ msgstr "" msgid "needTpohere" msgstr "" -#: Essentials/src/net/ess3/MetaItemStack.java:181 -msgid "noChapterMeta" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:114 -#: Essentials/src/net/ess3/MetaItemStack.java:258 -msgid "noMetaFirework" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:528 -msgid "noMetaPerm" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:368 -msgid "noPotionEffectPerm" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandnear.java:109 #: Essentials/src/net/ess3/commands/Commandunlimited.java:60 #: Essentials/src/net/ess3/SpawnMob.java:44 @@ -2463,59 +2509,17 @@ msgstr "" msgid "not flying" msgstr "" -#: Essentials/src/net/ess3/utils/DateUtil.java:25 -msgid "now" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:164 -msgid "onlyPlayerSkulls" -msgstr "" - -#: EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java:68 -msgid "placed:" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:53 -msgid "recipe" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:49 -msgid "recipeBadIndex" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:76 -msgid "recipeFurnace" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:122 -#: Essentials/src/net/ess3/commands/Commandrecipe.java:123 -#: Essentials/src/net/ess3/commands/Commandrecipe.java:124 -msgid "recipeGrid" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:129 -msgid "recipeGridItem" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:70 -msgid "recipeMore" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:44 -msgid "recipeNone" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandrecipe.java:168 #: Essentials/src/net/ess3/commands/Commandrecipe.java:177 -msgid "recipeNothing" +msgid "nothing" msgstr "" -#: Essentials/src/net/ess3/commands/Commandrecipe.java:160 -msgid "recipeShapeless" +#: Essentials/src/net/ess3/utils/DateUtil.java:25 +msgid "now" msgstr "" -#: Essentials/src/net/ess3/commands/Commandrecipe.java:131 -msgid "recipeWhere" +#: EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java:68 +msgid "placed:" msgstr "" #: Essentials/src/net/ess3/utils/DateUtil.java:37 @@ -2693,12 +2697,12 @@ msgstr "" #: Essentials/src/net/ess3/user/User.java:143 #, java-format -msgid "{0} has been received from {1}" +msgid "{0} has been received from {1}." msgstr "" #: Essentials/src/net/ess3/user/User.java:142 #, java-format -msgid "{0} has been sent to {1}" +msgid "{0} has been sent to {1}." msgstr "" #: Essentials/src/net/ess3/user/User.java:165 @@ -2772,6 +2776,11 @@ msgstr "" msgid "{0} teleported you to {1}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandsuicide.java:17 +#, java-format +msgid "{0} took their own life." +msgstr "" + #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:75 #, java-format msgid "{0} tried to speak, but is muted." @@ -2813,5 +2822,17 @@ msgstr "" msgid "{0}{1}" msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:129 +#, java-format +msgid "§{0}X is {1}" +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandrecipe.java:122 +#: Essentials/src/net/ess3/commands/Commandrecipe.java:123 +#: Essentials/src/net/ess3/commands/Commandrecipe.java:124 +#, java-format +msgid "§{0}X | §{1}X | §{2}X" +msgstr "" + #~ msgid "negativeBalanceError" #~ msgstr "§4User is not allowed to have a negative balance." diff --git a/Essentials/po/keys.pot b/Essentials/po/keys.pot index 32f0a0633..423652961 100644 --- a/Essentials/po/keys.pot +++ b/Essentials/po/keys.pot @@ -8,13 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: Essentials 3.0-SNAPSHOT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-06 04:18+0200\n" +"POT-Creation-Date: 2013-04-06 05:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: Essentials/src/net/ess3/commands/Commandwhois.java:58 @@ -103,12 +103,6 @@ msgstr "" msgid " Big tree spawned." msgstr "" -#: Essentials/src/net/ess3/commands/Commandenchant.java:95 -#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:34 -#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:79 -msgid " Enchantment not found" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandenchant.java:40 #, java-format msgid " Enchantments: {0}" @@ -161,11 +155,6 @@ msgstr "" msgid " [HIDDEN]" msgstr "" -#: Essentials/src/net/ess3/commands/Commandsuicide.java:17 -#, java-format -msgid " {0} took their own life" -msgstr "" - #: Essentials/src/net/ess3/settings/Settings.java:22 msgid "" "##########################################################\n" @@ -289,6 +278,11 @@ msgstr "" msgid "Amount of homes a player can have" msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:33 +#, java-format +msgid "Author of the book set to {0}." +msgstr "" + #: Essentials/src/net/ess3/settings/commands/Afk.java:18 msgid "" "Auto-AFK Kick\n" @@ -360,6 +354,11 @@ msgstr "" msgid "Chapter {0}, page {1} of {2}:" msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:160 +#, java-format +msgid "Combine {0}" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandpowertool.java:34 msgid "Command can't be attached to air." msgstr "" @@ -408,7 +407,7 @@ msgid "Commands to listen for in socialspy" msgstr "" #: Essentials/src/net/ess3/commands/Commandlist.java:133 -msgid "Connected players: " +msgid "Connected players " msgstr "" #: Essentials/src/net/ess3/ranks/RankOptions.java:25 @@ -431,7 +430,7 @@ msgid "Could not find template {0}" msgstr "" #: Essentials/src/net/ess3/storage/ManagedFile.java:50 -msgid "Could not load items.csv." +msgid "Could not load items.csv!" msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:93 @@ -465,7 +464,7 @@ msgid "Delay to wait before people can cause attack damage after logging in " msgstr "" #: Essentials/src/net/ess3/utils/LocationUtil.java:121 -msgid "Destination not set." +msgid "Destination not set!" msgstr "" #: Essentials/src/net/ess3/settings/Chat.java:16 @@ -498,7 +497,7 @@ msgstr "" #: EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java:159 msgid "" -"Downloading GeoIP database ... this might take a while (country: 0.6 MB, " +"Downloading GeoIP database... this might take a while (country: 0.6 MB, " "city: 20MB)" msgstr "" @@ -516,6 +515,12 @@ msgid "" "command" msgstr "" +#: Essentials/src/net/ess3/commands/Commandenchant.java:95 +#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:34 +#: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:79 +msgid "Enchantment not found!" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandhat.java:47 msgid "Enjoy your new hat!" msgstr "" @@ -527,7 +532,7 @@ msgstr "" #: Essentials/src/net/ess3/utils/textreader/HelpInput.java:150 #, java-format -msgid "Error getting help for: {0}" +msgid "Error getting help for plugin: {0}" msgstr "" #: Essentials/src/net/ess3/Jails.java:177 @@ -537,17 +542,13 @@ msgstr "" #: Essentials/src/net/ess3/Jails.java:230 #: Essentials/src/net/ess3/Jails.java:234 #, java-format -msgid "Error occurred when trying to return player {0} to jail: {1}." +msgid "Error occurred when trying to return player {0} to jail: {1}!" msgstr "" #: Essentials/src/net/ess3/commands/Commandspawner.java:65 msgid "Error while changing mob spawner." msgstr "" -#: Essentials/src/net/ess3/commands/Commandhat.java:51 -msgid "Error, you cannot use this item as a hat!" -msgstr "" - #: Essentials/src/net/ess3/commands/EssentialsCommandHandler.java:290 #, java-format msgid "Error: {0}" @@ -564,14 +565,14 @@ msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:217 #, java-format -msgid "Failed to close config {0}" +msgid "Failed to close config {0}." msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:50 #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:103 #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:108 #, java-format -msgid "Failed to create config {0}" +msgid "Failed to create config {0}." msgstr "" #: EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java:186 @@ -585,12 +586,20 @@ msgid "Failed to read GeoIP database!" msgstr "" #: Essentials/src/net/ess3/settings/SpawnsHolder.java:265 -msgid "Failed to teleport new player." +msgid "Failed to teleport new player!" msgstr "" #: Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java:193 #, java-format -msgid "Failed to write config {0}" +msgid "Failed to write config {0}." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandfirework.java:121 +#: Essentials/src/net/ess3/commands/Commandfirework.java:139 +msgid "" +"Firework parameters: color:<color> [fade:<color>] [shape:<shape>] [effect:" +"<effect>]nTo use multiple colors/effects, seperate values with commas: red," +"blue,pinknShapes: star, ball, large, creeper, burst Effects: trail, twinkle." msgstr "" #: Essentials/src/net/ess3/settings/antibuild/Alert.java:27 @@ -607,7 +616,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandsudo.java:36 #, java-format -msgid "Forcing {0} to run: /{1} {2}." +msgid "Forcing {0} to run: /{1} {2}" msgstr "" #: Essentials/src/net/ess3/commands/Commandgc.java:35 @@ -670,7 +679,7 @@ msgid "" msgstr "" #: Essentials/src/net/ess3/utils/LocationUtil.java:176 -msgid "Hole in floor" +msgid "Hole in floor!" msgstr "" #: Essentials/src/net/ess3/commands/Commanddelhome.java:57 @@ -727,12 +736,26 @@ msgstr "" msgid "InvFull" msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:37 +msgid "Invalid Number." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:373 +#: Essentials/src/net/ess3/MetaItemStack.java:389 +#: Essentials/src/net/ess3/MetaItemStack.java:401 +msgid "Invalid Potion.Meta" +msgstr "" + #: EssentialsSigns/src/net/ess3/signs/EssentialsSign.java:402 msgid "Invalid charge." msgstr "" +#: Essentials/src/net/ess3/commands/Commandfirework.java:140 +msgid "Invalid firework charge parameters inserted, must set a color first." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandsethome.java:66 -msgid "Invalid home name" +msgid "Invalid home name!" msgstr "" #: Essentials/src/net/ess3/commands/Commandkillall.java:81 @@ -742,7 +765,7 @@ msgid "Invalid mob type." msgstr "" #: Essentials/src/net/ess3/commands/Commandsetwarp.java:23 -msgid "Invalid warp name" +msgid "Invalid warp name!" msgstr "" #: Essentials/src/net/ess3/commands/Commandremove.java:71 @@ -752,7 +775,7 @@ msgid "Invalid world." msgstr "" #: Essentials/src/net/ess3/commands/Commandclearinventory.java:33 -msgid "Inventory Cleared." +msgid "Inventory cleared." msgstr "" #: Essentials/src/net/ess3/commands/Commandclearinventory.java:23 @@ -789,7 +812,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandkick.java:27 #: Essentials/src/net/ess3/commands/Commandkickall.java:15 -msgid "Kicked from server" +msgid "Kicked from server." msgstr "" #: Essentials/src/net/ess3/commands/Commandkill.java:34 @@ -803,6 +826,10 @@ msgstr "" msgid "Kits: {0}" msgstr "" +#: Essentials/src/net/ess3/MetaItemStack.java:232 +msgid "Leather Color Syntax: color:<red>,<green>,<blue> eg: color:255,0,0." +msgstr "" + #: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:29 #: EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java:74 #: EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java:42 @@ -885,8 +912,13 @@ msgstr "" msgid "No permission for unlimited item {0}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:44 +#, java-format +msgid "No recipes exist for {0}." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandwarp.java:78 -msgid "No warps defined" +msgid "No warps defined." msgstr "" #: Essentials/src/net/ess3/commands/Commandmail.java:78 @@ -899,7 +931,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandbalancetop.java:80 #: Essentials/src/net/ess3/commands/Commandbalancetop.java:93 #, java-format -msgid "Ordering balances of {0} users, please wait ..." +msgid "Ordering balances of {0} users, please wait..." msgstr "" #: Essentials/src/net/ess3/settings/General.java:30 @@ -950,7 +982,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandptime.java:161 #, java-format -msgid "Player time has been reset for: {0}." +msgid "Player time has been reset for: {0}" msgstr "" #: Essentials/src/net/ess3/commands/Commandptime.java:168 @@ -971,7 +1003,7 @@ msgstr "" #: EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java:97 #, java-format -msgid "Player {0} comes from {1}" +msgid "Player {0} comes from {1}." msgstr "" #: Essentials/src/net/ess3/commands/Commandseen.java:57 @@ -1057,6 +1089,15 @@ msgstr "" msgid "Radius of the near command, if no number is given." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:53 +#, java-format +msgid "Recipe for {0} ({1} of {2})" +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandfirework.java:55 +msgid "Removed all effects from held stack." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandremove.java:152 #, java-format msgid "Removed {0} entities." @@ -1103,7 +1144,7 @@ msgid "Server Total: {0}" msgstr "" #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:396 -msgid "Server is full." +msgid "Server is full!" msgstr "" #: Essentials/src/net/ess3/commands/Commandfly.java:34 @@ -1250,6 +1291,11 @@ msgstr "" msgid "Show other plugins commands in help" msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:76 +#, java-format +msgid "Smelt {0}" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandlightning.java:50 #, java-format msgid "Smiting {0}" @@ -1322,7 +1368,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandtempban.java:52 #, java-format -msgid "Temporarily banned from server for {0}" +msgid "Temporarily banned from server for {0}." msgstr "" #: Essentials/src/net/ess3/commands/Commandsell.java:91 @@ -1411,6 +1457,15 @@ msgid "" "more than one stack." msgstr "" +#: Essentials/src/net/ess3/commands/Commandfirework.java:67 +#: Essentials/src/net/ess3/MetaItemStack.java:282 +#: Essentials/src/net/ess3/MetaItemStack.java:297 +#: Essentials/src/net/ess3/MetaItemStack.java:316 +#: Essentials/src/net/ess3/MetaItemStack.java:339 +#, java-format +msgid "The option {0} is not a valid value for {1}." +msgstr "" + #: Essentials/src/net/ess3/ranks/Ranks.java:21 msgid "" "The order of the ranks matters, the ranks are checked from top to bottom.\n" @@ -1452,6 +1507,10 @@ msgstr "" msgid "There are {0} warps. Showing page {1} of {2}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:49 +msgid "There is no recipe by that number." +msgstr "" + #: EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java:52 msgid "There is nothing to collect from this trade sign." msgstr "" @@ -1464,6 +1523,10 @@ msgstr "" msgid "These players have their own time:" msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:78 +msgid "This book is now locked." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandrepair.java:31 #: Essentials/src/net/ess3/commands/Commandrepair.java:84 msgid "This item cannot be repaired." @@ -1494,6 +1557,11 @@ msgstr "" msgid "Time before next teleport: {0}" msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:46 +#, java-format +msgid "Title of the book set to {0}." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandtpa.java:41 #: Essentials/src/net/ess3/commands/Commandtpahere.java:40 msgid "To deny this request, type /tpdeny." @@ -1537,6 +1605,11 @@ msgid "" "wrong." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:70 +#, java-format +msgid "Type /{0} {1} <number> to see other recipes for {2}." +msgstr "" + #: Essentials/src/net/ess3/utils/textreader/TextPager.java:77 #: Essentials/src/net/ess3/utils/textreader/TextPager.java:144 #: Essentials/src/net/ess3/utils/textreader/TextPager.java:196 @@ -1684,6 +1757,11 @@ msgid "" "Set to none if you want to use the spawn point of the world." msgstr "" +#: Essentials/src/net/ess3/commands/Commandrecipe.java:131 +#, java-format +msgid "Where: {0}" +msgstr "" + #: Essentials/src/net/ess3/settings/antibuild/BlackList.java:32 msgid "Which blocks should not be pushed by pistons" msgstr "" @@ -1736,6 +1814,10 @@ msgstr "" msgid "You are not authorized to set the time." msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:82 +msgid "You are not holding a writable book." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandignore.java:38 #, java-format msgid "You are not ignoring player {0} anymore." @@ -1781,6 +1863,12 @@ msgid "You are not wearing a hat." msgstr "" #: Essentials/src/net/ess3/commands/Commandvanish.java:39 +msgid "" +"You are now completely invisible to normal users, and hidden from in-game " +"commands." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandvanish.java:39 msgid "You are once again visible." msgstr "" @@ -1812,13 +1900,35 @@ msgid "You can not kick that person." msgstr "" #: Essentials/src/net/ess3/user/User.java:354 -msgid "You can talk again." +msgid "You can now talk again." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:164 +msgid "You can only set the owner of player skulls (397:3)." msgstr "" #: Essentials/src/net/ess3/Kits.java:101 msgid "You can't use that kit again for another {0}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandfirework.java:132 +#: Essentials/src/net/ess3/MetaItemStack.java:121 +#: Essentials/src/net/ess3/MetaItemStack.java:265 +msgid "You cannot apply more than one charge to this firework." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:411 +msgid "You cannot apply more than one effect to this potion." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandbook.java:37 +msgid "You cannot change the author of this book." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandbook.java:50 +msgid "You cannot change the title of this book." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandsetwarp.java:45 msgid "You cannot overwrite that warp." msgstr "" @@ -1837,6 +1947,14 @@ msgstr "" msgid "You cannot sudo this user." msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:64 +msgid "You cannot unlock this book." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandhat.java:51 +msgid "You cannot use this item as a hat!" +msgstr "" + #: Essentials/src/net/ess3/commands/Commandwarp.java:28 msgid "You do not have Permission to list warps." msgstr "" @@ -1871,8 +1989,27 @@ msgstr "" msgid "You do not have enough of that item to sell." msgstr "" +#: Essentials/src/net/ess3/MetaItemStack.java:114 +#: Essentials/src/net/ess3/MetaItemStack.java:258 +msgid "You do not have permission to apply firework meta." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:368 +#, java-format +msgid "You do not have permission to apply potion effect {0} to this potion." +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:528 +#, java-format +msgid "You do not have permission to apply {0} meta to this item." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandnick.java:32 -msgid "You do not have permission to change the nickname of others." +msgid "You do not have permission to change the nickname of others!" +msgstr "" + +#: Essentials/src/net/ess3/MetaItemStack.java:181 +msgid "You do not have permission to create dynamic books." msgstr "" #: Essentials/src/net/ess3/commands/Commandeco.java:81 @@ -1937,7 +2074,7 @@ msgid "You have been healed." msgstr "" #: Essentials/src/net/ess3/commands/Commandtogglejail.java:51 -msgid "You have been jailed." +msgid "You have been jailed!" msgstr "" #: Essentials/src/net/ess3/user/User.java:400 @@ -1950,8 +2087,11 @@ msgstr "" msgid "You have been muted for {0}." msgstr "" -#: Essentials/src/net/ess3/commands/Commandmute.java:45 #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:74 +msgid "You have been muted!" +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandmute.java:45 msgid "You have been muted." msgstr "" @@ -1964,7 +2104,7 @@ msgid "You have been released." msgstr "" #: Essentials/src/net/ess3/commands/Commandmute.java:45 -msgid "You have been unmuted" +msgid "You have been unmuted." msgstr "" #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:322 @@ -1988,10 +2128,6 @@ msgstr "" msgid "You have nothing in your hand." msgstr "" -#: Essentials/src/net/ess3/commands/Commandvanish.java:39 -msgid "You have now been vanished." -msgstr "" - #: Essentials/src/net/ess3/commands/Commandrepair.java:48 #: Essentials/src/net/ess3/commands/Commandrepair.java:68 #, java-format @@ -2016,7 +2152,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandtogglejail.java:29 #: Essentials/src/net/ess3/commands/Commandtogglejail.java:37 -msgid "You may not jail that person." +msgid "You may not jail that person!" msgstr "" #: Essentials/src/net/ess3/commands/Commandmute.java:24 @@ -2028,6 +2164,14 @@ msgstr "" msgid "You may not tempban that player." msgstr "" +#: Essentials/src/net/ess3/commands/Commandbook.java:60 +msgid "You may now edit the contents of this book." +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandfirework.java:151 +msgid "You must be holding a firework to add effects." +msgstr "" + #: Essentials/src/net/ess3/commands/Commandhat.java:56 msgid "You must have something to wear in your hand." msgstr "" @@ -2105,7 +2249,7 @@ msgstr "" #: Essentials/src/net/ess3/commands/Commandme.java:16 #: Essentials/src/net/ess3/commands/Commandmsg.java:30 -msgid "Your voice has been silenced." +msgid "Your voice has been silenced!" msgstr "" #: Essentials/src/net/ess3/commands/Commandbroadcast.java:17 @@ -2155,18 +2299,6 @@ msgstr "" msgid "baltopShown" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:33 -msgid "bookAuthorSet" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:78 -msgid "bookLocked" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:46 -msgid "bookTitleSet" -msgstr "" - #: EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java:102 msgid "broke:" msgstr "" @@ -2187,18 +2319,6 @@ msgstr "" msgid "deniedWorldAccess" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:64 -msgid "denyBookEdit" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:37 -msgid "denyChangeAuthor" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandbook.java:50 -msgid "denyChangeTitle" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandthunder.java:25 #: Essentials/src/net/ess3/commands/Commandthunder.java:31 msgid "disabled" @@ -2212,10 +2332,6 @@ msgstr "" msgid "ecoResetAllOnline" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:60 -msgid "editBookContents" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandessentials.java:49 #: Essentials/src/net/ess3/commands/Commandfly.java:34 #: Essentials/src/net/ess3/commands/Commandfly.java:45 @@ -2241,19 +2357,6 @@ msgstr "" msgid "false" msgstr "" -#: Essentials/src/net/ess3/commands/Commandfirework.java:140 -msgid "fireworkColor" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandfirework.java:55 -msgid "fireworkEffectsCleared" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandfirework.java:121 -#: Essentials/src/net/ess3/commands/Commandfirework.java:139 -msgid "fireworkSyntax" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandfly.java:38 msgid "flyFailed" msgstr "" @@ -2316,14 +2419,6 @@ msgstr "" msgid "godFailed" msgstr "" -#: Essentials/src/net/ess3/commands/Commandbook.java:82 -msgid "holdBook" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandfirework.java:151 -msgid "holdFirework" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandsethome.java:81 msgid "homeSet" msgstr "" @@ -2340,28 +2435,10 @@ msgstr "" msgid "invalidAmount" msgstr "" -#: Essentials/src/net/ess3/commands/Commandfirework.java:67 -#: Essentials/src/net/ess3/MetaItemStack.java:282 -#: Essentials/src/net/ess3/MetaItemStack.java:297 -#: Essentials/src/net/ess3/MetaItemStack.java:316 -#: Essentials/src/net/ess3/MetaItemStack.java:339 -msgid "invalidFireworkFormat" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandbanip.java:29 msgid "invalidIpAddress" msgstr "" -#: Essentials/src/net/ess3/commands/Commandrecipe.java:37 -msgid "invalidNumber" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:373 -#: Essentials/src/net/ess3/MetaItemStack.java:389 -#: Essentials/src/net/ess3/MetaItemStack.java:401 -msgid "invalidPotionMeta" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandrealname.java:37 msgid "is" msgstr "" @@ -2374,10 +2451,6 @@ msgstr "" msgid "itemSoldConsole" msgstr "" -#: Essentials/src/net/ess3/MetaItemStack.java:232 -msgid "leatherSyntax" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandmsg.java:46 #: Essentials/src/net/ess3/commands/Commandr.java:54 #: Essentials/src/net/ess3/commands/Commandr.java:62 @@ -2418,16 +2491,6 @@ msgstr "" msgid "months" msgstr "" -#: Essentials/src/net/ess3/commands/Commandfirework.java:132 -#: Essentials/src/net/ess3/MetaItemStack.java:121 -#: Essentials/src/net/ess3/MetaItemStack.java:265 -msgid "multipleCharges" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:411 -msgid "multiplePotionEffects" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandmute.java:42 msgid "mutedPlayer" msgstr "" @@ -2436,23 +2499,6 @@ msgstr "" msgid "needTpohere" msgstr "" -#: Essentials/src/net/ess3/MetaItemStack.java:181 -msgid "noChapterMeta" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:114 -#: Essentials/src/net/ess3/MetaItemStack.java:258 -msgid "noMetaFirework" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:528 -msgid "noMetaPerm" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:368 -msgid "noPotionEffectPerm" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandnear.java:109 #: Essentials/src/net/ess3/commands/Commandunlimited.java:60 #: Essentials/src/net/ess3/SpawnMob.java:44 @@ -2463,59 +2509,17 @@ msgstr "" msgid "not flying" msgstr "" -#: Essentials/src/net/ess3/utils/DateUtil.java:25 -msgid "now" -msgstr "" - -#: Essentials/src/net/ess3/MetaItemStack.java:164 -msgid "onlyPlayerSkulls" -msgstr "" - -#: EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java:68 -msgid "placed:" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:53 -msgid "recipe" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:49 -msgid "recipeBadIndex" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:76 -msgid "recipeFurnace" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:122 -#: Essentials/src/net/ess3/commands/Commandrecipe.java:123 -#: Essentials/src/net/ess3/commands/Commandrecipe.java:124 -msgid "recipeGrid" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:129 -msgid "recipeGridItem" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:70 -msgid "recipeMore" -msgstr "" - -#: Essentials/src/net/ess3/commands/Commandrecipe.java:44 -msgid "recipeNone" -msgstr "" - #: Essentials/src/net/ess3/commands/Commandrecipe.java:168 #: Essentials/src/net/ess3/commands/Commandrecipe.java:177 -msgid "recipeNothing" +msgid "nothing" msgstr "" -#: Essentials/src/net/ess3/commands/Commandrecipe.java:160 -msgid "recipeShapeless" +#: Essentials/src/net/ess3/utils/DateUtil.java:25 +msgid "now" msgstr "" -#: Essentials/src/net/ess3/commands/Commandrecipe.java:131 -msgid "recipeWhere" +#: EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java:68 +msgid "placed:" msgstr "" #: Essentials/src/net/ess3/utils/DateUtil.java:37 @@ -2693,12 +2697,12 @@ msgstr "" #: Essentials/src/net/ess3/user/User.java:143 #, java-format -msgid "{0} has been received from {1}" +msgid "{0} has been received from {1}." msgstr "" #: Essentials/src/net/ess3/user/User.java:142 #, java-format -msgid "{0} has been sent to {1}" +msgid "{0} has been sent to {1}." msgstr "" #: Essentials/src/net/ess3/user/User.java:165 @@ -2772,6 +2776,11 @@ msgstr "" msgid "{0} teleported you to {1}." msgstr "" +#: Essentials/src/net/ess3/commands/Commandsuicide.java:17 +#, java-format +msgid "{0} took their own life." +msgstr "" + #: Essentials/src/net/ess3/listener/EssentialsPlayerListener.java:75 #, java-format msgid "{0} tried to speak, but is muted." @@ -2812,3 +2821,15 @@ msgstr "" #, java-format msgid "{0}{1}" msgstr "" + +#: Essentials/src/net/ess3/commands/Commandrecipe.java:129 +#, java-format +msgid "§{0}X is {1}" +msgstr "" + +#: Essentials/src/net/ess3/commands/Commandrecipe.java:122 +#: Essentials/src/net/ess3/commands/Commandrecipe.java:123 +#: Essentials/src/net/ess3/commands/Commandrecipe.java:124 +#, java-format +msgid "§{0}X | §{1}X | §{2}X" +msgstr "" diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java index 1360d6962..d8bfbf24e 100644 --- a/Essentials/src/net/ess3/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -174,11 +174,11 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp { if (ess.getSettings().isDebug()) { - LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}.", user.getName(), ex.getLocalizedMessage()), ex); + LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); } else { - LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}.", user.getName(), ex.getLocalizedMessage())); + LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage())); } } } @@ -200,11 +200,11 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp { if (ess.getSettings().isDebug()) { - LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}.", user.getName(), ex.getLocalizedMessage()), ex); + LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); } else { - LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}.", user.getName(), ex.getLocalizedMessage())); + LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage())); } } user.sendMessage(_("You do the crime, you do the time.")); @@ -227,11 +227,11 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp { if (ess.getSettings().isDebug()) { - LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}.", user.getName(), ex.getLocalizedMessage()), ex); + LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage()), ex); } else { - LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}.", user.getName(), ex.getLocalizedMessage())); + LOGGER.log(Level.INFO, _("Error occurred when trying to return player {0} to jail: {1}!", user.getName(), ex.getLocalizedMessage())); } } user.sendMessage(_("You do the crime, you do the time.")); diff --git a/Essentials/src/net/ess3/MetaItemStack.java b/Essentials/src/net/ess3/MetaItemStack.java index c53202b5b..5c9d97cb5 100644 --- a/Essentials/src/net/ess3/MetaItemStack.java +++ b/Essentials/src/net/ess3/MetaItemStack.java @@ -111,14 +111,14 @@ public class MetaItemStack { if (!hasMetaPermission(sender, "firework", true, true, ess)) { - throw new Exception(_("noMetaFirework")); + throw new Exception(_("You do not have permission to apply firework meta.")); } FireworkEffect effect = builder.build(); FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); fmeta.addEffect(effect); if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess)) { - throw new Exception(_("multipleCharges")); + throw new Exception(_("You cannot apply more than one charge to this firework.")); } stack.setItemMeta(fmeta); } @@ -161,7 +161,7 @@ public class MetaItemStack } else { - throw new Exception(_("onlyPlayerSkulls")); + throw new Exception(_("You can only set the owner of player skulls (397:3).")); } } else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "book", false, true, ess)) @@ -178,7 +178,7 @@ public class MetaItemStack } else { - throw new Exception(_("noChapterMeta")); + throw new Exception(_("You do not have permission to create dynamic books.")); } } @@ -207,7 +207,7 @@ public class MetaItemStack { addFireworkMeta(sender, false, string, ess); } - else if (stack.getType() == Material.POTION) //WARNING - Meta for potions will be ignored after this point. + else if (stack.getType() == Material.POTION) //WARNING - Meta for Potions: {0}. will be ignored after this point. { addPotionMeta(sender, false, string, ess); } @@ -229,7 +229,7 @@ public class MetaItemStack } else { - throw new Exception(_("leatherSyntax")); + throw new Exception(_("Leather Color Syntax: color:<red>,<green>,<blue> eg: color:255,0,0.")); } } else @@ -255,14 +255,14 @@ public class MetaItemStack { if (!hasMetaPermission(sender, "firework", true, true, ess)) { - throw new Exception(_("noMetaFirework")); + throw new Exception(_("You do not have permission to apply firework meta.")); } FireworkEffect effect = builder.build(); FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); fmeta.addEffect(effect); if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess)) { - throw new Exception(_("multipleCharges")); + throw new Exception(_("You cannot apply more than one charge to this firework.")); } stack.setItemMeta(fmeta); builder = FireworkEffect.builder(); @@ -279,7 +279,7 @@ public class MetaItemStack } else { - throw new Exception(_("invalidFireworkFormat", split[1], split[0])); + throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0])); } } builder.withColor(primaryColors); @@ -294,7 +294,7 @@ public class MetaItemStack } else { - throw new Exception(_("invalidFireworkFormat", split[1], split[0])); + throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0])); } if (finalEffect != null) { @@ -313,7 +313,7 @@ public class MetaItemStack } else { - throw new Exception(_("invalidFireworkFormat", split[1], split[0])); + throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0])); } } if (!fadeColors.isEmpty()) @@ -336,7 +336,7 @@ public class MetaItemStack } else { - throw new Exception(_("invalidFireworkFormat", split[1], split[0])); + throw new Exception(_("The option {0} is not a valid value for {1}.", split[1], split[0])); } } } @@ -359,18 +359,18 @@ public class MetaItemStack pEffectType = Potions.getByName(split[1]); if (pEffectType != null && pEffectType.getName() != null) { - if (hasMetaPermission(sender, "potions." + pEffectType.getName().toLowerCase(Locale.ENGLISH), true, false, ess)) + if (hasMetaPermission(sender, "Potions: {0}.." + pEffectType.getName().toLowerCase(Locale.ENGLISH), true, false, ess)) { validPotionEffect = true; } else { - throw new Exception(_("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH))); + throw new Exception(_("You do not have permission to apply potion effect {0} to this potion.", pEffectType.getName().toLowerCase(Locale.ENGLISH))); } } else { - throw new Exception(_("invalidPotionMeta", split[1])); + throw new Exception(_("Invalid Potion.Meta", split[1])); } } else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p"))) @@ -386,7 +386,7 @@ public class MetaItemStack } else { - throw new Exception(_("invalidPotionMeta", split[1])); + throw new Exception(_("Invalid Potion.Meta", split[1])); } } else if (split[0].equalsIgnoreCase("duration") || (allowShortName && split[0].equalsIgnoreCase("d"))) @@ -398,7 +398,7 @@ public class MetaItemStack } else { - throw new Exception(_("invalidPotionMeta", split[1])); + throw new Exception(_("Invalid Potion.Meta", split[1])); } } @@ -406,9 +406,9 @@ public class MetaItemStack { PotionMeta pmeta = (PotionMeta)stack.getItemMeta(); pEffect = pEffectType.createEffect(duration, power); - if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "potions.multiple", true, false, ess)) + if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "Potions: {0}..multiple", true, false, ess)) { - throw new Exception(_("multiplePotionEffects")); + throw new Exception(_("You cannot apply more than one effect to this potion.")); } pmeta.addCustomEffect(pEffect, true); stack.setItemMeta(pmeta); @@ -525,7 +525,7 @@ public class MetaItemStack } else { - throw new Exception(_("noMetaPerm", metaPerm)); + throw new Exception(_("You do not have permission to apply {0} meta to this item.", metaPerm)); } } } diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index 4181e6e13..b42f933f9 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -77,7 +77,7 @@ public class Commandbalancetop extends EssentialsCommand } if (ess.getUserMap().getUniqueUsers() > MINUSERS) { - sender.sendMessage(_("Ordering balances of {0} users, please wait ...", ess.getUserMap().getUniqueUsers())); + sender.sendMessage(_("Ordering balances of {0} users, please wait...", ess.getUserMap().getUniqueUsers())); } } finally @@ -90,7 +90,7 @@ public class Commandbalancetop extends EssentialsCommand { if (ess.getUserMap().getUniqueUsers() > MINUSERS) { - sender.sendMessage(_("Ordering balances of {0} users, please wait ...", ess.getUserMap().getUniqueUsers())); + sender.sendMessage(_("Ordering balances of {0} users, please wait...", ess.getUserMap().getUniqueUsers())); } ess.getPlugin().runTaskAsynchronously(new Viewer(sender, page, force)); } diff --git a/Essentials/src/net/ess3/commands/Commandbook.java b/Essentials/src/net/ess3/commands/Commandbook.java index cddc24694..4c7b42f92 100644 --- a/Essentials/src/net/ess3/commands/Commandbook.java +++ b/Essentials/src/net/ess3/commands/Commandbook.java @@ -30,11 +30,11 @@ public class Commandbook extends EssentialsCommand { bmeta.setAuthor(args[1]); item.setItemMeta(bmeta); - user.sendMessage(_("bookAuthorSet", getFinalArg(args, 1))); + user.sendMessage(_("Author of the book set to {0}.", getFinalArg(args, 1))); } else { - throw new Exception(_("denyChangeAuthor")); + throw new Exception(_("You cannot change the author of this book.")); } } else if (args.length > 1 && args[0].equalsIgnoreCase("title")) @@ -43,11 +43,11 @@ public class Commandbook extends EssentialsCommand { bmeta.setTitle(args[1]); item.setItemMeta(bmeta); - user.sendMessage(_("bookTitleSet", getFinalArg(args, 1))); + user.sendMessage(_("Title of the book set to {0}.", getFinalArg(args, 1))); } else { - throw new Exception(_("denyChangeTitle")); + throw new Exception(_("You cannot change the title of this book.")); } } else @@ -57,11 +57,11 @@ public class Commandbook extends EssentialsCommand ItemStack newItem = new ItemStack(Material.BOOK_AND_QUILL, item.getAmount()); newItem.setItemMeta(bmeta); user.getPlayer().setItemInHand(newItem); - user.sendMessage(_("editBookContents")); + user.sendMessage(_("You may now edit the contents of this book.")); } else { - throw new Exception(_("denyBookEdit")); + throw new Exception(_("You cannot unlock this book.")); } } } @@ -75,11 +75,11 @@ public class Commandbook extends EssentialsCommand ItemStack newItem = new ItemStack(Material.WRITTEN_BOOK, item.getAmount()); newItem.setItemMeta(bmeta); player.setItemInHand(newItem); - user.sendMessage(_("bookLocked")); + user.sendMessage(_("This book is now locked.")); } else { - throw new Exception(_("holdBook")); + throw new Exception(_("You are not holding a writable book.")); } } diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java index 7b33e7f71..5e267d6a7 100644 --- a/Essentials/src/net/ess3/commands/Commandclearinventory.java +++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java @@ -30,7 +30,7 @@ public class Commandclearinventory extends EssentialsCommand else { user.getPlayer().getInventory().clear(); - user.sendMessage(_("Inventory Cleared.")); + user.sendMessage(_("Inventory cleared.")); } } diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java index c6457bf42..e5d8f76de 100644 --- a/Essentials/src/net/ess3/commands/Commandenchant.java +++ b/Essentials/src/net/ess3/commands/Commandenchant.java @@ -92,7 +92,7 @@ public class Commandenchant extends EssentialsCommand final Enchantment enchantment = Enchantments.getByName(name); if (enchantment == null) { - throw new Exception(_(" Enchantment not found")); + throw new Exception(_("Enchantment not found!")); } final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); if (user != null && !Permissions.ENCHANT.isAuthorized(user, enchantmentName)) diff --git a/Essentials/src/net/ess3/commands/Commandfirework.java b/Essentials/src/net/ess3/commands/Commandfirework.java index 26a082b43..46944a6cc 100644 --- a/Essentials/src/net/ess3/commands/Commandfirework.java +++ b/Essentials/src/net/ess3/commands/Commandfirework.java @@ -52,7 +52,7 @@ public class Commandfirework extends EssentialsCommand FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); fmeta.clearEffects(); stack.setItemMeta(fmeta); - user.sendMessage(_("fireworkEffectsCleared")); + user.sendMessage(_("Removed all effects from held stack.")); } else if (args.length > 1 && (args[0].equalsIgnoreCase("power") || (args[0].equalsIgnoreCase("p")))) { @@ -64,7 +64,7 @@ public class Commandfirework extends EssentialsCommand } catch (NumberFormatException e) { - throw new Exception(_("invalidFireworkFormat", args[1], args[0])); + throw new Exception(_("The option {0} is not a valid value for {1}.", args[1], args[0])); } stack.setItemMeta(fmeta); } @@ -118,7 +118,7 @@ public class Commandfirework extends EssentialsCommand } catch (Exception e) { - user.sendMessage(_("fireworkSyntax")); + user.sendMessage(_("Firework parameters: color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]nTo use multiple colors/effects, seperate values with commas: red,blue,pinknShapes: star, ball, large, creeper, burst Effects: trail, twinkle.")); throw e; } } @@ -129,15 +129,15 @@ public class Commandfirework extends EssentialsCommand FireworkEffect effect = mStack.getFireworkBuilder().build(); if (fmeta.getEffects().size() > 0 && !Permissions.FIREWORK_MULTIPLE.isAuthorized(user)) { - throw new Exception(_("multipleCharges")); + throw new Exception(_("You cannot apply more than one charge to this firework.")); } fmeta.addEffect(effect); stack.setItemMeta(fmeta); } else { - user.sendMessage(_("fireworkSyntax")); - throw new Exception(_("fireworkColor")); + user.sendMessage(_("Firework parameters: color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]nTo use multiple colors/effects, seperate values with commas: red,blue,pinknShapes: star, ball, large, creeper, burst Effects: trail, twinkle.")); + throw new Exception(_("Invalid firework charge parameters inserted, must set a color first.")); } } } @@ -148,7 +148,7 @@ public class Commandfirework extends EssentialsCommand } else { - throw new Exception(_("holdFirework")); + throw new Exception(_("You must be holding a firework to add effects.")); } } } diff --git a/Essentials/src/net/ess3/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java index a091049d2..cc8cf23a3 100644 --- a/Essentials/src/net/ess3/commands/Commandhat.java +++ b/Essentials/src/net/ess3/commands/Commandhat.java @@ -48,7 +48,7 @@ public class Commandhat extends EssentialsCommand } else { - user.sendMessage(_("Error, you cannot use this item as a hat!")); + user.sendMessage(_("You cannot use this item as a hat!")); } } else diff --git a/Essentials/src/net/ess3/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java index 481c9a9b2..0e79f2450 100644 --- a/Essentials/src/net/ess3/commands/Commandkick.java +++ b/Essentials/src/net/ess3/commands/Commandkick.java @@ -24,7 +24,7 @@ public class Commandkick extends EssentialsCommand { throw new Exception(_("You can not kick that person.")); } - String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("Kicked from server"); + String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("Kicked from server."); kickReason = FormatUtil.replaceFormat(kickReason.replace("\\n", "\n").replace("|", "\n")); user.getPlayer().kickPlayer(kickReason); final String senderName = sender instanceof IUser ? ((IUser)sender).getPlayer().getDisplayName() : Console.NAME; diff --git a/Essentials/src/net/ess3/commands/Commandkickall.java b/Essentials/src/net/ess3/commands/Commandkickall.java index 8cc600f39..552c95b2c 100644 --- a/Essentials/src/net/ess3/commands/Commandkickall.java +++ b/Essentials/src/net/ess3/commands/Commandkickall.java @@ -12,7 +12,7 @@ public class Commandkickall extends EssentialsCommand @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { - String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("Kicked from server"); + String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("Kicked from server."); kickReason = FormatUtil.replaceFormat(kickReason.replace("\\n", "\n").replace("|", "\n")); for (Player onlinePlayer : server.getOnlinePlayers()) { diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index c55348702..4746826d1 100644 --- a/Essentials/src/net/ess3/commands/Commandlist.java +++ b/Essentials/src/net/ess3/commands/Commandlist.java @@ -130,7 +130,7 @@ public class Commandlist extends EssentialsCommand Collections.sort(users); final StringBuilder onlineUsers = new StringBuilder(); - onlineUsers.append(_("Connected players: ")); + onlineUsers.append(_("Connected players ")); boolean first = true; for (IUser user : users) { diff --git a/Essentials/src/net/ess3/commands/Commandme.java b/Essentials/src/net/ess3/commands/Commandme.java index 1cec9e6b0..73a50865c 100644 --- a/Essentials/src/net/ess3/commands/Commandme.java +++ b/Essentials/src/net/ess3/commands/Commandme.java @@ -13,7 +13,7 @@ public class Commandme extends EssentialsCommand { if (user.getData().isMuted()) { - throw new Exception(_("Your voice has been silenced.")); + throw new Exception(_("Your voice has been silenced!")); } if (args.length < 1) diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java index b0b30bf93..766abf241 100644 --- a/Essentials/src/net/ess3/commands/Commandmsg.java +++ b/Essentials/src/net/ess3/commands/Commandmsg.java @@ -27,7 +27,7 @@ public class Commandmsg extends EssentialsCommand final IUser user = getUser(sender); if (user.getData().isMuted()) { - throw new Exception(_("Your voice has been silenced.")); + throw new Exception(_("Your voice has been silenced!")); } if (Permissions.MSG_COLOR.isAuthorized(user)) { diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index 59d38167b..3ac4171ea 100644 --- a/Essentials/src/net/ess3/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -42,6 +42,6 @@ public class Commandmute extends EssentialsCommand "mutedPlayer", player.getPlayer().getDisplayName())) : _( "unmutedPlayer", player.getPlayer().getDisplayName())); player.sendMessage( - muted ? (muteTimestamp > 0 ? _("You have been muted for {0}.", DateUtil.formatDateDiff(muteTimestamp)) : _("You have been muted.")) : _("You have been unmuted")); + muted ? (muteTimestamp > 0 ? _("You have been muted for {0}.", DateUtil.formatDateDiff(muteTimestamp)) : _("You have been muted.")) : _("You have been unmuted.")); } } diff --git a/Essentials/src/net/ess3/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java index 79bdd3c39..796798827 100644 --- a/Essentials/src/net/ess3/commands/Commandnick.java +++ b/Essentials/src/net/ess3/commands/Commandnick.java @@ -29,7 +29,7 @@ public class Commandnick extends EssentialsCommand { if (!Permissions.NICK_OTHERS.isAuthorized(user)) { - throw new Exception(_("You do not have permission to change the nickname of others.")); + throw new Exception(_("You do not have permission to change the nickname of others!")); } setNickname(ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer()), formatNickname(user, args[1])); user.sendMessage(_("Nickname changed.")); diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java index b13e33596..3a8357788 100644 --- a/Essentials/src/net/ess3/commands/Commandptime.java +++ b/Essentials/src/net/ess3/commands/Commandptime.java @@ -158,7 +158,7 @@ public class Commandptime extends EssentialsCommand // Inform the sender of the change if (ticks == null) { - sender.sendMessage(_("Player time has been reset for: {0}.", msg.toString())); + sender.sendMessage(_("Player time has been reset for: {0}", msg.toString())); } else { diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java index 50221c932..d7c42564e 100644 --- a/Essentials/src/net/ess3/commands/Commandrecipe.java +++ b/Essentials/src/net/ess3/commands/Commandrecipe.java @@ -34,23 +34,23 @@ public class Commandrecipe extends EssentialsCommand } else { - throw new Exception(_("invalidNumber")); + throw new Exception(_("Invalid Number.")); } } final List<Recipe> recipesOfType = ess.getServer().getRecipesFor(itemType); - if (recipesOfType.size() < 1) + if (recipesOfType.size() < 1) { - throw new Exception(_("recipeNone", getMaterialName(itemType))); + throw new Exception(_("No recipes exist for {0}.", getMaterialName(itemType))); } if (recipeNo < 0 || recipeNo >= recipesOfType.size()) { - throw new Exception(_("recipeBadIndex")); + throw new Exception(_("There is no recipe by that number.")); } final Recipe selectedRecipe = recipesOfType.get(recipeNo); - sender.sendMessage(_("recipe", getMaterialName(itemType), recipeNo + 1, recipesOfType.size())); + sender.sendMessage(_("Recipe for {0} ({1} of {2})", getMaterialName(itemType), recipeNo + 1, recipesOfType.size())); if (selectedRecipe instanceof FurnaceRecipe) { @@ -67,13 +67,13 @@ public class Commandrecipe extends EssentialsCommand if (recipesOfType.size() > 1 && args.length == 1) { - sender.sendMessage(_("recipeMore", commandLabel, args[0], getMaterialName(itemType))); + sender.sendMessage(_("Type /{0} {1} <number> to see other recipes for {2}.", commandLabel, args[0], getMaterialName(itemType))); } } public void furnaceRecipe(final CommandSender sender, final FurnaceRecipe recipe) { - sender.sendMessage(_("recipeFurnace", getMaterialName(recipe.getInput()))); + sender.sendMessage(_("Smelt {0}", getMaterialName(recipe.getInput()))); } public void shapedRecipe(final CommandSender sender, final ShapedRecipe recipe) @@ -119,16 +119,16 @@ public class Commandrecipe extends EssentialsCommand materials[j][k] = item == null ? null : item.getType(); } } - sender.sendMessage(_("recipeGrid", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2]))); - sender.sendMessage(_("recipeGrid", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2]))); - sender.sendMessage(_("recipeGrid", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2]))); + sender.sendMessage(_("\u00a7{0}X | \u00a7{1}X | \u00a7{2}X", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2]))); + sender.sendMessage(_("\u00a7{0}X | \u00a7{1}X | \u00a7{2}X", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2]))); + sender.sendMessage(_("\u00a7{0}X | \u00a7{1}X | \u00a7{2}X", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2]))); final StringBuilder s = new StringBuilder(); for (Material items : colorMap.keySet().toArray(new Material[colorMap.size()])) { - s.append(_("recipeGridItem", colorMap.get(items), getMaterialName(items))); + s.append(_("\u00a7{0}X is {1}", colorMap.get(items), getMaterialName(items))); } - sender.sendMessage(_("recipeWhere", s.toString())); + sender.sendMessage(_("Where: {0}", s.toString())); } } @@ -157,7 +157,7 @@ public class Commandrecipe extends EssentialsCommand } s.append(" "); } - sender.sendMessage(_("recipeShapeless", s.toString())); + sender.sendMessage(_("Combine {0}", s.toString())); } } @@ -165,7 +165,7 @@ public class Commandrecipe extends EssentialsCommand { if (stack == null) { - return _("recipeNothing"); + return _("nothing"); } return getMaterialName(stack.getType()); } @@ -174,7 +174,7 @@ public class Commandrecipe extends EssentialsCommand { if (type == null) { - return _("recipeNothing"); + return _("nothing"); } return type.toString().replace("_", " ").toLowerCase(Locale.ENGLISH); } diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index fc53dfd99..4f9f95db5 100644 --- a/Essentials/src/net/ess3/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -63,7 +63,7 @@ public class Commandsethome extends EssentialsCommand } if ("bed".equals(name.toLowerCase(Locale.ENGLISH))) { - throw new NoSuchFieldException(_("Invalid home name")); + throw new NoSuchFieldException(_("Invalid home name!")); } usersHome.getData().addHome(name, user.getPlayer().getLocation()); diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java index 928234569..68d178381 100644 --- a/Essentials/src/net/ess3/commands/Commandsetwarp.java +++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java @@ -20,7 +20,7 @@ public class Commandsetwarp extends EssentialsCommand if (Util.isInt(args[0])) { - throw new NoSuchFieldException(_("Invalid warp name")); + throw new NoSuchFieldException(_("Invalid warp name!")); } final Location loc = user.getPlayer().getLocation(); diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java index f725e8fe0..04803c543 100644 --- a/Essentials/src/net/ess3/commands/Commandsudo.java +++ b/Essentials/src/net/ess3/commands/Commandsudo.java @@ -33,7 +33,7 @@ public class Commandsudo extends EssentialsCommand } final Player player = user.getPlayer(); - sender.sendMessage(_("Forcing {0} to run: /{1} {2}.", player.getDisplayName(), command, getFinalArg(arguments, 0))); + sender.sendMessage(_("Forcing {0} to run: /{1} {2}", player.getDisplayName(), command, getFinalArg(arguments, 0))); final Server server = ess.getServer(); server.dispatchCommand(user, command); diff --git a/Essentials/src/net/ess3/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java index a65b9871b..42ba57fe6 100644 --- a/Essentials/src/net/ess3/commands/Commandsuicide.java +++ b/Essentials/src/net/ess3/commands/Commandsuicide.java @@ -14,6 +14,6 @@ public class Commandsuicide extends EssentialsCommand ess.getPlugin().callSuicideEvent(player); user.getPlayer().damage(player.getHealth()); user.sendMessage(_("Goodbye cruel world...")); - ess.broadcastMessage(user, _(" {0} took their own life", player.getDisplayName())); + ess.broadcastMessage(user, _("{0} took their own life.", player.getDisplayName())); } } diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java index 297f73296..049a164b8 100644 --- a/Essentials/src/net/ess3/commands/Commandtempban.java +++ b/Essentials/src/net/ess3/commands/Commandtempban.java @@ -49,7 +49,7 @@ public class Commandtempban extends EssentialsCommand return; } - final String banReason = _("Temporarily banned from server for {0}", DateUtil.formatDateDiff(banTimestamp)); + final String banReason = _("Temporarily banned from server for {0}.", DateUtil.formatDateDiff(banTimestamp)); final Ban ban = new Ban(); final UserData userData = user.getData(); ban.setReason(banReason); diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index d3d9918dd..cc24c508a 100644 --- a/Essentials/src/net/ess3/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -26,7 +26,7 @@ public class Commandtogglejail extends EssentialsCommand { if (Permissions.TOGGLEJAIL_OFFLINE.isAuthorized(sender)) { - sender.sendMessage(_("You may not jail that person.")); + sender.sendMessage(_("You may not jail that person!")); return; } } @@ -34,7 +34,7 @@ public class Commandtogglejail extends EssentialsCommand { if (Permissions.JAIL_EXEMPT.isAuthorized(player)) { - sender.sendMessage(_("You may not jail that person.")); + sender.sendMessage(_("You may not jail that person!")); return; } } @@ -48,7 +48,7 @@ public class Commandtogglejail extends EssentialsCommand ess.getJails().getJail(args[1]); } player.getData().setJailed(true); - player.sendMessage(_("You have been jailed.")); + player.sendMessage(_("You have been jailed!")); player.getData().setJail(args[1]); long timeDiff = 0; if (args.length > 2) diff --git a/Essentials/src/net/ess3/commands/Commandvanish.java b/Essentials/src/net/ess3/commands/Commandvanish.java index ee6738ae9..7b9279e41 100644 --- a/Essentials/src/net/ess3/commands/Commandvanish.java +++ b/Essentials/src/net/ess3/commands/Commandvanish.java @@ -36,7 +36,7 @@ public class Commandvanish extends EssentialsToggleCommand @Override protected void informPlayer(final IUser player) { - player.sendMessage(getValue(player) ? _("You have now been vanished.") : _("You are once again visible.")); + player.sendMessage(getValue(player) ? _("You are now completely invisible to normal users, and hidden from in-game commands.") : _("You are once again visible.")); } @Override diff --git a/Essentials/src/net/ess3/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java index d74e587fa..1d9f64f86 100644 --- a/Essentials/src/net/ess3/commands/Commandwarp.java +++ b/Essentials/src/net/ess3/commands/Commandwarp.java @@ -75,7 +75,7 @@ public class Commandwarp extends EssentialsCommand final IWarps warps = ess.getWarps(); if (warps.isEmpty()) { - throw new Exception(_("No warps defined")); + throw new Exception(_("No warps defined.")); } final List<String> warpNameList = new ArrayList<String>(warps.getList()); diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 9a3990b49..0931ce96d 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -71,7 +71,7 @@ public class EssentialsPlayerListener implements Listener if (user.getData().isMuted()) { event.setCancelled(true); - user.sendMessage(_("You have been muted.")); + user.sendMessage(_("You have been muted!")); LOGGER.info(_("{0} tried to speak, but is muted.", user.getName())); } final Iterator<Player> it = event.getRecipients().iterator(); @@ -393,7 +393,7 @@ public class EssentialsPlayerListener implements Listener if (server.getOnlinePlayers().length >= server.getMaxPlayers() && !Permissions.JOINFULLSERVER.isAuthorized(user)) { - event.disallow(Result.KICK_FULL, _("Server is full.")); + event.disallow(Result.KICK_FULL, _("Server is full!")); return; } event.allow(); diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index 308b32f68..9be12ca9f 100644 --- a/Essentials/src/net/ess3/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -262,7 +262,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> } catch (Exception ex) { - Bukkit.getLogger().log(Level.WARNING, _("Failed to teleport new player."), ex); + Bukkit.getLogger().log(Level.WARNING, _("Failed to teleport new player!"), ex); } } } diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index ead25793e..9e13bbc3b 100644 --- a/Essentials/src/net/ess3/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -47,7 +47,7 @@ public class ManagedFile } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, _("Could not load items.csv."), ex); + Bukkit.getLogger().log(Level.SEVERE, _("Could not load items.csv!"), ex); } } } diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index 065691f13..1cc309a0f 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -139,8 +139,8 @@ public class User extends UserBase implements IUser { setMoney(getMoney() - value); reciever.setMoney(reciever.getMoney() + value); - sendMessage(_("{0} has been sent to {1}", FormatUtil.displayCurrency(value, ess), reciever.getPlayer().getDisplayName())); - reciever.sendMessage(_("{0} has been received from {1}", FormatUtil.displayCurrency(value, ess), getPlayer().getDisplayName())); + sendMessage(_("{0} has been sent to {1}.", FormatUtil.displayCurrency(value, ess), reciever.getPlayer().getDisplayName())); + reciever.sendMessage(_("{0} has been received from {1}.", FormatUtil.displayCurrency(value, ess), getPlayer().getDisplayName())); } else { @@ -351,7 +351,7 @@ public class User extends UserBase implements IUser if (getTimestamp(UserData.TimestampType.MUTE) > 0 && getTimestamp(UserData.TimestampType.MUTE) < currentTime && getData().isMuted()) { setTimestamp(UserData.TimestampType.MUTE, 0); - sendMessage(_("You can talk again.")); + sendMessage(_("You can now talk again.")); getData().setMuted(false); queueSave(); return true; diff --git a/Essentials/src/net/ess3/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java index b8daab530..65b08a127 100644 --- a/Essentials/src/net/ess3/utils/LocationUtil.java +++ b/Essentials/src/net/ess3/utils/LocationUtil.java @@ -118,7 +118,7 @@ public class LocationUtil { if (loc == null || loc.getWorld() == null) { - throw new Exception(_("Destination not set.")); + throw new Exception(_("Destination not set!")); } final World world = loc.getWorld(); int x = loc.getBlockX(); @@ -173,7 +173,7 @@ public class LocationUtil y = world.getHighestBlockYAt(x, z); if (x - 48 > loc.getBlockX()) { - throw new Exception(_("Hole in floor")); + throw new Exception(_("Hole in floor!")); } } } diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java index 80c0181e2..b3e4f9887 100644 --- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -147,7 +147,7 @@ public class HelpInput implements IText { if (!reported) { - logger.log(Level.WARNING, _("Error getting help for: {0}", pluginNameLow), ex); + logger.log(Level.WARNING, _("Error getting help for plugin: {0}", pluginNameLow), ex); } reported = true; continue; diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java index 936c790ae..ea43127d8 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java @@ -47,7 +47,7 @@ public class EssentialsConf extends YamlConfiguration { if (!configFile.getParentFile().mkdirs()) { - LOGGER.log(Level.SEVERE, _("Failed to create config {0}", configFile.toString())); + LOGGER.log(Level.SEVERE, _("Failed to create config {0}.", configFile.toString())); } } // This will delete files where the first character is 0. In most cases they are broken. @@ -100,12 +100,12 @@ public class EssentialsConf extends YamlConfiguration LOGGER.log(Level.INFO, _("Creating empty config: {0}", configFile.toString())); if (!configFile.createNewFile()) { - LOGGER.log(Level.SEVERE, _("Failed to create config {0}", configFile.toString())); + LOGGER.log(Level.SEVERE, _("Failed to create config {0}.", configFile.toString())); } } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("Failed to create config {0}", configFile.toString()), ex); + LOGGER.log(Level.SEVERE, _("Failed to create config {0}.", configFile.toString()), ex); } } } @@ -190,7 +190,7 @@ public class EssentialsConf extends YamlConfiguration } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("Failed to write config {0}", configFile.toString()), ex); + LOGGER.log(Level.SEVERE, _("Failed to write config {0}.", configFile.toString()), ex); } finally { @@ -214,7 +214,7 @@ public class EssentialsConf extends YamlConfiguration } catch (IOException ex) { - LOGGER.log(Level.SEVERE, _("Failed to close config {0}", configFile.toString()), ex); + LOGGER.log(Level.SEVERE, _("Failed to close config {0}.", configFile.toString()), ex); } } } diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java index 582c0f95a..857b170a0 100644 --- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java @@ -94,7 +94,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload } if (Permissions.GEOIP_SHOW.isAuthorized(player)) { - player.sendMessage(_("Player {0} comes from {1}", player.getDisplayName(), builder.toString())); + player.sendMessage(_("Player {0} comes from {1}.", player.getDisplayName(), builder.toString())); } } } @@ -156,7 +156,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload OutputStream output = null; try { - LOGGER.log(Level.INFO, _("Downloading GeoIP database ... this might take a while (country: 0.6 MB, city: 20MB)")); + LOGGER.log(Level.INFO, _("Downloading GeoIP database... this might take a while (country: 0.6 MB, city: 20MB)")); final URL downloadUrl = new URL(url); final URLConnection conn = downloadUrl.openConnection(); conn.setConnectTimeout(10000); diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java index 8709245b8..5b169551c 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java @@ -31,7 +31,7 @@ public class SignEnchant extends EssentialsSign final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]); if (enchantment == null) { - throw new SignException(_(" Enchantment not found")); + throw new SignException(_("Enchantment not found!")); } int level; try @@ -76,7 +76,7 @@ public class SignEnchant extends EssentialsSign final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]); if (enchantment == null) { - throw new SignException(_(" Enchantment not found")); + throw new SignException(_("Enchantment not found!")); } int level; try |