[trunk] translations

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1399 e251c2fe-e539-e718-e476-b85c1f46cddb

9 files changed, 45 insertions, 25 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
index f43dd5e51..d88d35169 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
@@ -20,6 +21,6 @@ public class Commandbroadcast extends EssentialsCommand
 		}
 
 		charge(sender);
-		server.broadcastMessage("[§cBroadcast§f]§a " + getFinalArg(args, 0));
+		server.broadcastMessage(Util.format("broadcast", getFinalArg(args, 0)));
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java b/Essentials/src/com/earth2me/essentials/commands/Commandburn.java
index 190bef032..e63331203 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandburn.java
@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -24,7 +25,7 @@ public class Commandburn extends EssentialsCommand
 		for (Player p : server.matchPlayer(args[0]))
 		{
 			p.setFireTicks(Integer.parseInt(args[1]) * 20);
-			sender.sendMessage("§cYou set " + p.getDisplayName() + " on fire for " + Integer.parseInt(args[1]) + "seconds.");
+			sender.sendMessage(Util.format("burnMsg", p.getDisplayName(), Integer.parseInt(args[1])));
 		}
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
index c466f60d1..9f5a5f6b6 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
@@ -4,6 +4,7 @@ import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 import java.util.List;
 import org.bukkit.ChatColor;
 
@@ -34,7 +35,7 @@ public class Commandclearinventory extends EssentialsCommand
 					}
 					return;
 				}
-				throw new Exception("Player not found");
+				throw new Exception(Util.i18n("playerNotFound"));
 			}
 			else
 			{
@@ -43,11 +44,11 @@ public class Commandclearinventory extends EssentialsCommand
 				{
 					charge(user);
 					p.getInventory().clear();
-					user.sendMessage("§7Inventory of §c" + p.getDisplayName() + "§7 cleared.");
+					user.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
 				}
 				else
 				{
-					throw new Exception("Player not found");
+					throw new Exception(Util.i18n("playerNotFound"));
 				}
 			}
 		}
@@ -55,7 +56,7 @@ public class Commandclearinventory extends EssentialsCommand
 		{
 			charge(user);
 			user.getInventory().clear();
-			user.sendMessage("§7Inventory cleared.");
+			user.sendMessage(Util.i18n("inventoryCleared"));
 		}
 	}
 
@@ -64,8 +65,7 @@ public class Commandclearinventory extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			sender.sendMessage(ChatColor.RED + "Usage: " + commandLabel + " [player]");
-			return;
+			throw new NotEnoughArgumentsException();
 		}
 
 		if (args[0].length() >= 3)
@@ -77,11 +77,11 @@ public class Commandclearinventory extends EssentialsCommand
 				for (Player p : online)
 				{
 					p.getInventory().clear();
-					sender.sendMessage("§7Inventory of §c" + p.getDisplayName() + "§7 cleared.");
+					sender.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
 				}
 				return;
 			}
-			throw new Exception("Player not found");
+			throw new Exception(Util.i18n("playerNotFound"));
 		}
 		else
 		{
@@ -89,11 +89,11 @@ public class Commandclearinventory extends EssentialsCommand
 			if (u != null)
 			{
 				u.getInventory().clear();
-				sender.sendMessage("§7Inventory of §c" + u.getDisplayName() + "§7 cleared.");
+				sender.sendMessage(Util.format("inventoryClearedOthers", u.getDisplayName()));
 			}
 			else
 			{
-				throw new Exception("Player not found");
+				throw new Exception(Util.i18n("playerNotFound"));
 			}
 		}
 	}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java b/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java
index 816f385c3..0386485f4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java
@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
 
 import org.bukkit.Server;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 
 
 public class Commandcompass extends EssentialsCommand
@@ -26,6 +27,6 @@ public class Commandcompass extends EssentialsCommand
 		else if (r < 293) dir = "W";
 		else if (r < 338) dir = "NW";
 		else dir = "N";
-		user.sendMessage("§7Bearing: " + dir + " (" + r + " degrees)");
+		user.sendMessage(Util.format("compassBearing", dir, r));
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java b/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java
index 315860db8..63857ade8 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java
@@ -1,6 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
@@ -18,6 +19,6 @@ public class Commanddeljail extends EssentialsCommand {
 		}
 		charge(sender);
 		Essentials.getJail().delJail(args[0]);
-		sender.sendMessage("§7Jail " + args[0] + " has been removed");
+		sender.sendMessage(Util.format("deleteJail", args[0]));
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java
index ff8547827..0c1cee421 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java
@@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.Util;
 
 
 public class Commanddelwarp extends EssentialsCommand
@@ -21,6 +22,6 @@ public class Commanddelwarp extends EssentialsCommand
 		}
 		charge(sender);
 		Essentials.getWarps().delWarp(args[0]);
-		sender.sendMessage("§7Warp removed.");
+		sender.sendMessage(Util.format("deleteWarp", args[0]));
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java b/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java
index fb991f572..9a719335e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java
@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
 
 import org.bukkit.Server;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 
 
 public class Commanddepth extends EssentialsCommand
@@ -18,15 +19,15 @@ public class Commanddepth extends EssentialsCommand
 		int y = user.getLocation().getBlockY() - 63;
 		if (y > 0)
 		{
-			user.sendMessage("§7You are " + y + " block(s) above sea level.");
+			user.sendMessage(Util.format("depthAboveSea", y));
 		}
 		else if (y < 0)
 		{
-			user.sendMessage("§7You are " + (-y) + " block(s) below sea level.");
+			user.sendMessage(Util.format("depthBelowSea", (-y)));
 		}
 		else
 		{
-			user.sendMessage("§7You are at sea level.");
+			user.sendMessage(Util.i18n("depth"));
 		}
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandext.java b/Essentials/src/com/earth2me/essentials/commands/Commandext.java
index 34b60cd46..339351ef1 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandext.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandext.java
@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
 
 import org.bukkit.Server;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -31,7 +32,7 @@ public class Commandext extends EssentialsCommand
 		{
 			charge(user);
 			user.setFireTicks(0);
-			user.sendMessage("§7You extinguished yourself.");
+			user.sendMessage(Util.i18n("extinguish"));
 			return;
 		}
 
@@ -44,7 +45,7 @@ public class Commandext extends EssentialsCommand
 		{
 			charge(sender);
 			p.setFireTicks(0);
-			sender.sendMessage("§7You extinguished " + p.getDisplayName() + ".");
+			sender.sendMessage(Util.format("extinguishOthers", p.getDisplayName()));
 		}
 	}
 }
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 985473dda..9ac22f460 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -37,9 +37,22 @@ notEnoughMoney = You do not have sufficient funds.
 missingItems = You do not have {0}x {1}.
 errorWithMessage = \u00a7cError: {0} 
 backUsageMsg = \u00a77Returning to previous location.
-balance = \u00a77Balance: {0}
-playerBanned = \u00a7cPlayer {0} banned
-defaultBanReason = Banned from server
-banIpAddress = \u00a77Banned IP address
+balance = \u00a77Balance: {0}.
+playerBanned = \u00a7cPlayer {0} banned.
+defaultBanReason = Banned from server.
+banIpAddress = \u00a77Banned IP address.
 bigTreeSuccess =  \u00a77Big tree spawned.
-bigTreeFailure = \u00a7cBig tree generation failure. Try again on grass or dirt.
\ No newline at end of file
+bigTreeFailure = \u00a7cBig tree generation failure. Try again on grass or dirt.
+broadcast = [\u00a7cBroadcast\u00a7f]\u00a7a {0}
+burnMsg = \u00a77You set {0} on fire for {1} seconds.
+playerNotFound = \u00a7cPlayer not found.
+inventoryCleared = \u00a77Inventory Cleared.
+inventoryClearedOthers = \u00a77Inventory of \u00a7c {0} \u00a77 cleared.
+compassBearing = \u00a77Bearing:  {0} ({1} degrees).
+deleteJail = \u00a77Jail {0} has been removed.
+deleteWarp = \u00a77Warp {0} has been removed.
+depth = \u00a77You are at sea level.
+depthAboveSea = \u00a77You are {0} block(s) above sea level.
+depthBelowSea = \u00a77You are {0} block(s) below sea level.
+extinguish = \u00a77You extinguished yourself.
+extinguishOthers = \u00a77 You extinguished {0}.
\ No newline at end of file