Index: jakarta-jmeter/src/org/apache/jmeter/control/InterleaveControl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/control/InterleaveControl.java,v
retrieving revision 1.7
diff -u -r1.7 InterleaveControl.java
--- jakarta-jmeter/src/org/apache/jmeter/control/InterleaveControl.java	9 Nov 2001 18:53:42 -0000	1.7
+++ jakarta-jmeter/src/org/apache/jmeter/control/InterleaveControl.java	3 Mar 2002 15:34:39 -0000
@@ -59,6 +59,7 @@
 
 import org.apache.jmeter.config.ConfigElement;
 import org.apache.jmeter.samplers.*;
+import org.apache.jmeter.util.JMeterUtils;
 
 /************************************************************
  *  Title: Description: Copyright: Copyright (c) 2001 Company:
@@ -94,7 +95,7 @@
 	 ***********************************************************/
 	public String getClassLabel()
 	{
-		return "Interleave Controller";
+		return JMeterUtils.getResString("interleave_control_title");
 	}
 
 	/************************************************************
Index: jakarta-jmeter/src/org/apache/jmeter/control/LogicController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/control/LogicController.java,v
retrieving revision 1.3
diff -u -r1.3 LogicController.java
--- jakarta-jmeter/src/org/apache/jmeter/control/LogicController.java	28 Sep 2001 04:39:13 -0000	1.3
+++ jakarta-jmeter/src/org/apache/jmeter/control/LogicController.java	3 Mar 2002 15:34:39 -0000
@@ -57,6 +57,8 @@
 
 import java.io.*;
 
+import org.apache.jmeter.util.JMeterUtils;
+
 /**
  * Title:        Jakarta-JMeter
  * Description:
@@ -70,7 +72,7 @@
 {
 	public String getClassLabel()
 	{
-		return "Simple Controller";
+		return JMeterUtils.getResString("logic_controller_title");
 	}
 
 	/************************************************************
Index: jakarta-jmeter/src/org/apache/jmeter/control/LoopController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/control/LoopController.java,v
retrieving revision 1.8
diff -u -r1.8 LoopController.java
--- jakarta-jmeter/src/org/apache/jmeter/control/LoopController.java	16 Feb 2002 03:21:40 -0000	1.8
+++ jakarta-jmeter/src/org/apache/jmeter/control/LoopController.java	3 Mar 2002 15:34:40 -0000
@@ -56,6 +56,7 @@
 
 import org.apache.jmeter.samplers.Entry;
 import org.apache.jmeter.samplers.CycleEntry;
+import org.apache.jmeter.util.JMeterUtils;
 import java.io.Serializable;
 /************************************************************
  *  Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -107,7 +108,7 @@
 	 ***********************************************************/
 	public String getClassLabel()
 	{
-		return "Loop Controller";
+		return JMeterUtils.getResString("loop_controller_title");
 	}
 
 	/************************************************************
Index: jakarta-jmeter/src/org/apache/jmeter/control/ModifyController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/control/ModifyController.java,v
retrieving revision 1.7
diff -u -r1.7 ModifyController.java
--- jakarta-jmeter/src/org/apache/jmeter/control/ModifyController.java	28 Sep 2001 04:08:46 -0000	1.7
+++ jakarta-jmeter/src/org/apache/jmeter/control/ModifyController.java	3 Mar 2002 15:34:42 -0000
@@ -60,6 +60,7 @@
 
 import org.apache.jmeter.samplers.*;
 import org.apache.jmeter.util.ClassFinder;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.gui.MenuFactory;
 import org.apache.jmeter.config.Modifier;
 import org.apache.jmeter.config.ResponseBasedModifier;
@@ -98,7 +99,7 @@
 	 ***********************************************************/
 	public String getClassLabel()
 	{
-		return "Modification Manager";
+		return JMeterUtils.getResString("modification_controller_title");
 	}
 
 	/************************************************************
Index: jakarta-jmeter/src/org/apache/jmeter/control/OnceOnlyController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/control/OnceOnlyController.java,v
retrieving revision 1.9
diff -u -r1.9 OnceOnlyController.java
--- jakarta-jmeter/src/org/apache/jmeter/control/OnceOnlyController.java	9 Nov 2001 18:55:27 -0000	1.9
+++ jakarta-jmeter/src/org/apache/jmeter/control/OnceOnlyController.java	3 Mar 2002 15:34:42 -0000
@@ -59,6 +59,7 @@
 
 import org.apache.jmeter.config.ConfigElement;
 import org.apache.jmeter.samplers.*;
+import org.apache.jmeter.util.JMeterUtils;
 
 /************************************************************
  *  Title: Apache JMeter Description: Copyright: Copyright (c) 2000 Company:
@@ -86,7 +87,7 @@
 	 ***********************************************************/
 	public String getClassLabel()
 	{
-		return "Once Only Controller";
+		return JMeterUtils.getResString("once_only_controller_title");
 	}
 
 	/************************************************************
Index: jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java,v
retrieving revision 1.10
diff -u -r1.10 TestPlan.java
--- jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java	23 Feb 2002 01:21:06 -0000	1.10
+++ jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java	3 Mar 2002 15:34:44 -0000
@@ -86,7 +86,7 @@
 		// WARNING! This String value must be identical to the String value returned
 		// in org.apache.jmeter.threads.ThreadGroup.getClassLabel() method.
 		// If it's not you will not be able to add a Thread Group element to a Test Plan.
-		itemsCanAdd.add("Thread Group");
+		itemsCanAdd.add(JMeterUtils.getResString("threadgroup"));
 	}
 
 	private TestPlan()
Index: jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java,v
retrieving revision 1.14
diff -u -r1.14 MenuFactory.java
--- jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java	30 Aug 2001 17:19:01 -0000	1.14
+++ jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java	3 Mar 2002 15:34:47 -0000
@@ -113,7 +113,7 @@
 		if (timerMenu == null)
 		{
 			timerMenu = createMenu(
-					new Class[]{org.apache.jmeter.timers.Timer.class},"Timer",null);
+					new Class[]{org.apache.jmeter.timers.Timer.class},JMeterUtils.getResString("menu_timer"),null);
 			setEnabled(timerMenu);
 		}
 		return timerMenu;
@@ -124,7 +124,9 @@
 		if (ModifierMenu == null)
 		{
 			ModifierMenu = createMenu(
-					new Class[]{org.apache.jmeter.config.Modifier.class},"Modifiers",null);
+					new Class[]{org.apache.jmeter.config.Modifier.class},
+                                        JMeterUtils.getResString("menu_modifiers"),
+                                        null);
 			setEnabled(ModifierMenu);
 		}
 		return ModifierMenu;
@@ -135,7 +137,9 @@
 		if (ResponseBasedModifierMenu == null)
 		{
 			ResponseBasedModifierMenu = createMenu(
-					new Class[]{org.apache.jmeter.config.ResponseBasedModifier.class},"Response Based Modifiers",null);
+					new Class[]{org.apache.jmeter.config.ResponseBasedModifier.class},
+                                        JMeterUtils.getResString("menu_response_based_modifiers"),
+                                        null);
 			setEnabled(ResponseBasedModifierMenu);
 		}
 		return ResponseBasedModifierMenu;
@@ -146,7 +150,9 @@
 		if (assertionMenu == null)
 		{
 			assertionMenu = createMenu(
-					new Class[]{org.apache.jmeter.assertions.Assertion.class},"Assertions",null);
+					new Class[]{org.apache.jmeter.assertions.Assertion.class},
+                                        JMeterUtils.getResString("menu_assertions"),
+                                        null);
 			setEnabled(assertionMenu);
 		}
 		return assertionMenu;
@@ -170,7 +176,8 @@
 			Set skip = new HashSet();
 			skip.add("org.apache.jmeter.threads.ThreadGroup");
 			listenerMenu = createMenu(
-					new Class[]{org.apache.jmeter.samplers.SampleListener.class},"Listener",
+					new Class[]{org.apache.jmeter.samplers.SampleListener.class},
+                                        JMeterUtils.getResString("menu_listener"),
 					skip);
 			setEnabled(listenerMenu);
 		}
@@ -188,7 +195,8 @@
 		{
 			Set skip = new HashSet();
 			controllerMenu = createMenu(
-					new Class[]{org.apache.jmeter.control.LogicController.class},"Logic Controller",
+					new Class[]{org.apache.jmeter.control.LogicController.class},
+                                        JMeterUtils.getResString("menu_logic_controller"),
 					null);
 			setEnabled(controllerMenu);
 		}
@@ -206,7 +214,8 @@
 		{
 			Set skip = new HashSet();
 			generativeControllerMenu = createMenu(
-					new Class[]{org.apache.jmeter.control.AbstractGenerativeController.class},"Generative Controller",
+					new Class[]{org.apache.jmeter.control.AbstractGenerativeController.class},
+                                        JMeterUtils.getResString("menu_generative_controller"),
 					null);
 			setEnabled(generativeControllerMenu);
 		}
@@ -224,7 +233,8 @@
 		{
 			Set skip = new HashSet();
 			configMenu = createMenu(new Class[]{org.apache.jmeter.config.ConfigElement.class},
-							 "Config Element",null);
+                                                JMeterUtils.getResString("menu_config_element"),
+                                                null);
 			setEnabled(configMenu);
 		}
 		return configMenu;
Index: jakarta-jmeter/src/org/apache/jmeter/reporters/AssertionReporter.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/reporters/AssertionReporter.java,v
retrieving revision 1.2
diff -u -r1.2 AssertionReporter.java
--- jakarta-jmeter/src/org/apache/jmeter/reporters/AssertionReporter.java	28 Aug 2001 21:28:33 -0000	1.2
+++ jakarta-jmeter/src/org/apache/jmeter/reporters/AssertionReporter.java	3 Mar 2002 15:34:49 -0000
@@ -6,6 +6,7 @@
 import org.apache.jmeter.samplers.*;
 import org.apache.jmeter.assertions.*;
 import org.apache.jmeter.gui.ModelSupported;
+import org.apache.jmeter.util.JMeterUtils;
 
 /**
  * Title:        Jakarta-JMeter
@@ -27,7 +28,7 @@
 
 	public String getClassLabel()
 	{
-		return "Assertion Results";
+                return JMeterUtils.getResString("assertion_visualizer_title");
 	}
 
 	public String getAssertionResult()
Index: jakarta-jmeter/src/org/apache/jmeter/reporters/Filer.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/reporters/Filer.java,v
retrieving revision 1.11
diff -u -r1.11 Filer.java
--- jakarta-jmeter/src/org/apache/jmeter/reporters/Filer.java	28 Aug 2001 21:28:33 -0000	1.11
+++ jakarta-jmeter/src/org/apache/jmeter/reporters/Filer.java	3 Mar 2002 15:34:50 -0000
@@ -140,7 +140,7 @@
   }
   public String getClassLabel()
   {
-			 return "File Reporter";
+			 return JMeterUtils.getResString("file_visualizer_title");
   }
 
   public void uncompile()
Index: jakarta-jmeter/src/org/apache/jmeter/reporters/MailerResultCollector.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/reporters/MailerResultCollector.java,v
retrieving revision 1.3
diff -u -r1.3 MailerResultCollector.java
--- jakarta-jmeter/src/org/apache/jmeter/reporters/MailerResultCollector.java	28 Aug 2001 21:28:33 -0000	1.3
+++ jakarta-jmeter/src/org/apache/jmeter/reporters/MailerResultCollector.java	3 Mar 2002 15:34:51 -0000
@@ -71,7 +71,7 @@
 	 */
 	public String getClassLabel()
 	{
-		return "Email Results";
+                return JMeterUtils.getResString("email_results_title");
 	}
 
 	public long getFailureLimit()
Index: jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollector.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.21
diff -u -r1.21 ResultCollector.java
--- jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollector.java	21 Feb 2002 14:09:26 -0000	1.21
+++ jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollector.java	3 Mar 2002 15:34:52 -0000
@@ -61,6 +61,7 @@
 import org.apache.jmeter.samplers.*;
 import org.apache.jmeter.visualizers.ViewResultsVisualizer;
 import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
 
 /**
  * Title:
@@ -121,7 +122,7 @@
 
 	 public String getClassLabel()
 	 {
-		  return "View Results";
+                  return JMeterUtils.getResString("view_results_title");
 	 }
 
 	 public void uncompile()
Index: jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorFull.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorFull.java,v
retrieving revision 1.4
diff -u -r1.4 ResultCollectorFull.java
--- jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorFull.java	13 Sep 2001 14:43:02 -0000	1.4
+++ jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorFull.java	3 Mar 2002 15:34:53 -0000
@@ -58,6 +58,7 @@
 import java.util.*;
 import org.apache.jmeter.samplers.*;
 import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
 import java.io.*;
 
 import org.apache.log4j.*;
@@ -106,7 +107,8 @@
    */
   public String getClassLabel()
   {
-	 String classLabel = "View Result Tree";
+		
+	 String classLabel = JMeterUtils.getResString("view_results_tree_title");
 	 if(catClass.isDebugEnabled())
 	 {
 		catClass.debug("getClassLabel1 : Returning class label - " + classLabel);
Index: jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java,v
retrieving revision 1.1
diff -u -r1.1 ResultCollectorIndGraph.java
--- jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java	13 Sep 2001 14:57:01 -0000	1.1
+++ jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java	3 Mar 2002 15:34:54 -0000
@@ -58,6 +58,7 @@
 import java.util.*;
 import org.apache.jmeter.samplers.*;
 import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
 
 import org.apache.log4j.*;
 import junit.framework.*;
@@ -105,7 +106,7 @@
    */
   public String getClassLabel()
   {
-	 String classLabel = "View Graph Tree";
+	 String classLabel = JMeterUtils.getResString("view_graph_tree_title");
 	 if(catClass.isDebugEnabled())
 	 {
 		catClass.debug("getClassLabel1 : Returning class label - " + classLabel);
Index: jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.43
diff -u -r1.43 messages.properties
--- jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties	23 Feb 2002 01:21:07 -0000	1.43
+++ jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties	3 Mar 2002 15:34:55 -0000
@@ -14,6 +14,14 @@
 analyze=Analyze Data File...
 option=Options
 appearance=Look and Feel
+menu_timer=Timer
+menu_assertions=Assersions
+menu_listener=Listener
+menu_logic_controller=Logic Controller
+menu_generative_controller=Generative Controller
+menu_config_element=Config Element
+menu_response_based_modifiers=Response Based Modifiers
+menu_modifiers=Modifiers
 sslManager=SSL Manager
 pkcs12_desc=PKCS 12 Key (*.p12)
 ssl_error_title=Key Store Problem
@@ -56,6 +64,10 @@
 field_name=Field name
 looping_control=Looping Control
 browse=Browse
+constant_timer_memo=Add a constant delay between sampling
+gaussian_timer_memo=Adds a random delay with a gaussian distribution
+uniform_timer_memo=Adds a random delay with a uniform distribution
+modification_controller_title=Modification Manager
 mimetype=Mimetype
 patterns_to_include=Patterns to Include
 patterns_to_exclude=Patterns to Exclude
@@ -76,6 +88,7 @@
 interleave_control_title=Interleave Controller
 logic_controller_title=Simple Controller
 once_only_controller_title=Once Only Controller
+modification_controller_title=Modification Controller
 workbench_title=WorkBench
 root_title=Root
 menu_edit=Edit
@@ -151,6 +164,8 @@
 proxy_title=HTTP Proxy Server
 view_results_title=View Results
 view_results_tree_title=View Results Tree
+view_graph_tree_title=View Graph Tree
+email_results_title=Email Results
 cookie_manager_title=HTTP Cookie Manager
 cookies_stored=Cookies Stored in the Cookie Manager
 header_manager_title=HTTP Header Manager
Index: jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.4
diff -u -r1.4 messages_ja.properties
--- jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties	23 Feb 2002 01:21:07 -0000	1.4
+++ jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties	3 Mar 2002 15:34:56 -0000
@@ -56,30 +56,42 @@
 field_name=\u30d5\u30a3\u30fc\u30eb\u30c9\u540d
 looping_control=\u30eb\u30fc\u30d7\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb
 browse=\u53c2\u7167
+view_graph_tree_title=\u7D50\u679C\u3092\u30B0\u30E9\u30D5\u3068\u30C4\u30EA\u30FC\u3067\u8868\u793A
+menu_assertions=\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3
+menu_config_element=\u5404\u7A2E\u8A2D\u5B9A
+menu_listener=\u30EA\u30B9\u30CA\u30FC
+menu_response_based_modifiers=\u30EC\u30B9\u30DD\u30F3\u30B9\u30D9\u30FC\u30B9\u306E\u4FEE\u98FE
+menu_timer=\u30BF\u30A4\u30DE
+menu_logic_controller=\u30ED\u30B8\u30C3\u30AF\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+email_results_title=\u7D50\u679C\u3092\u30E1\u30FC\u30EB\u3067\u9001\u4FE1
+menu_generative_controller=\u4E3B\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+modification_controller_title=\u4FEE\u98FE\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+constant_timer_memo=\u30B5\u30F3\u30D7\u30EA\u30F3\u30B0\u9593\u306B\u4E00\u5B9A\u306E\u9045\u5EF6\u3092\u8FFD\u52A0
+gaussian_timer_memo=\u30AC\u30A6\u30B7\u30A2\u30F3\u306B\u3088\u308B\u30E9\u30F3\u30C0\u30E0\u306A\u9045\u5EF6\u3092\u8FFD\u52A0
 mimetype=Mime\u30bf\u30a4\u30d7
 patterns_to_include=\u633f\u5165\u3059\u308b\u30d1\u30bf\u30fc\u30f3
 patterns_to_exclude=\u9664\u5916\u3059\u308b\u30d1\u30bf\u30fc\u30f3
 add_pattern=\u30d1\u30bf\u30fc\u30f3\u8ffd\u52a0
 ramp_up=Ramp-Up \u671f\u9593 (\u79d2): 
-constant_timer_title=Constant Timer
+constant_timer_title=\u5B9A\u6570\u30BF\u30A4\u30DE
 constant_timer_delay=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593 (\u30df\u30ea\u79d2):
-gaussian_timer_title=Gaussian Random Timer
+gaussian_timer_title=\u30AC\u30A6\u30B7\u30A2\u30F3\u4E71\u6570\u30BF\u30A4\u30DE
 gaussian_timer_delay=\u9045\u5ef6\u6642\u9593\u306e\u5b9a\u6570\u30aa\u30d5\u30bb\u30c3\u30c8 (\u30df\u30ea\u79d2):
 gaussian_timer_range=\u504f\u5dee (\u30df\u30ea\u79d2):
-uniform_timer_title=Uniform Random Timer
+uniform_timer_title=\u4E00\u69D8\u4E71\u6570\u30BF\u30A4\u30DE
 uniform_timer_delay=\u9045\u5ef6\u6642\u9593\u306e\u5b9a\u6570\u30aa\u30d5\u30bb\u30c3\u30c8 (\u30df\u30ea\u79d2):
 uniform_timer_range=\u6700\u5927\u9045\u5ef6\u6642\u9593 (\u30df\u30ea\u79d2):
 thread_delay_properties=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593\u30d7\u30ed\u30d1\u30c6\u30a3
 thread_group_title=\u30b9\u30ec\u30c3\u30c9\u30b0\u30eb\u30fc\u30d7
 loop_controller_title=\u30eb\u30fc\u30d7\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9
 modification_manager_title=\u4fee\u6b63\u30de\u30cd\u30fc\u30b8\u30e3
-interleave_control_title=Interleave Controller
-logic_controller_title=Simple Controller
-once_only_controller_title=Once Only Controller
+interleave_control_title=\u30A4\u30F3\u30BF\u30EA\u30FC\u30D6\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+logic_controller_title=\u30B7\u30F3\u30D7\u30EB\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+once_only_controller_title=\u4E00\u5EA6\u3060\u3051\u5B9F\u884C\u3055\u308C\u308B\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
 workbench_title=\u30ef\u30fc\u30af\u30d9\u30f3\u30c1
 root_title=\u30eb\u30fc\u30c8
 menu_edit=\u7de8\u96c6
-graph_full_results_title=GraphFull Results
+graph_full_results_title=\u7D50\u679C\u3092\u30B0\u30E9\u30D5\u8868\u793A(\u8A73\u7D30)
 graph_results_title=\u30b0\u30e9\u30d5\u8868\u793a
 graph_results_data=\u30c7\u30fc\u30bf
 graph_results_average=\u5e73\u5747
@@ -172,4 +184,4 @@
 
 
 
-
+uniform_timer_memo=\u4E00\u69D8\u306B\u30E9\u30F3\u30C0\u30E0\u306A\u9045\u5EF6\u3092\u8FFD\u52A0
Index: jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties,v
retrieving revision 1.3
diff -u -r1.3 messages_ja_JP.eucJP.properties
--- jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties	24 Sep 2001 13:17:01 -0000	1.3
+++ jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties	3 Mar 2002 15:34:56 -0000
@@ -1,55 +1,42 @@
-file=ファイル-run=実行
+file=ファイ?run=実行
 save=保存
 save_all=全て保存
-load=読込
-open=開く
+load=読?open=開く
 edit=編集
 exit=終了
 start=開始
 stop=停止
-clear=消去-report=レポート
+clear=消?report=?檗璽
 analyze=データ分析
-option=オプション-appearance=外観
-help=ヘルプ
+option=オプショ?appearance=外観
+help=ヘ?
 about=このソフトについて
-remote_start=開始(リモート)
-remote_start=停止(リモート)
-#root=ルート
-#test_plan=テストプラン-#workbench=ワークベンチ
+remote_start=開始(?癲璽)
+remote_start=停止(?癲璽)
+#root=?璽
+#test_plan=テストプラ?#workbench=?璽ベンチ
 add=追加
-remove=削除-delete=削除-threadgroup=スレッドグループ
-controller=コントローラ-config_element=コンフィグエレメント
-protocol=プロトコル-domain=ドメイン-port=ポート
+remove=??delete=??threadgroup=ス?奪疋哀?璽
+controller=コント充?config_element=コンフィグエ?瓮鵐
+protocol=プ組コ?domain=ドメイ?port=ポート
 path=パス
 method=メソッド
-default_parameters=デフォルトパラメータ
+default_parameters=デフォ?肇僖薀瓠璽
 name=名前
 value=値
-domain=ドメイン-path=パス
-expiration=期限
+domain=ドメイ?path=パス
+expiration=?
 username=ユーザ名
-password=パスワード
-number_of_threads=スレッド数-infinite=無限ループ
-iterator_num=イテレータ数-add_value=値の追加
+password=パス?璽
+number_of_threads=ス?奪豹?infinite=無限?璽
+iterator_num=イテ?璽真?add_value=値の追加
 paramtable=パラメータ名
-upload=ファイルアップロード
-field_name=フィールド名
-looping_control=ループコントロール-browse=表示
+upload=ファイ?▲奪廛充ド
+field_name=フィー?斌field_name=\?\??\????
+constant_timer_memo=Add a constant delay between sampling
+gaussian_timer_memo=Adds a random delay with a gaussian distribution
+uniform_timer_memo=Adds a random delay with a uniform distribution
+灰鵐肇充?browse=表示
 mimetype=Mimeタイプ
-patterns_to_include=挿入パターン-patterns_to_exclude=除外パターン-add_pattern=パターン追加
+patterns_to_include=挿?僖拭璽?patterns_to_exclude=?哀僖拭璽?add_pattern=パターン追加
 amp_up=Ramp-Up Period (sec
Index: jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java,v
retrieving revision 1.14
diff -u -r1.14 ThreadGroupHandler.java
--- jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java	16 Feb 2002 03:21:42 -0000	1.14
+++ jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java	3 Mar 2002 15:34:58 -0000
@@ -58,6 +58,7 @@
 import java.util.*;
 
 import org.apache.jmeter.threads.ThreadGroup;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.save.Saveable;
 import java.io.Writer;
 import org.apache.jmeter.save.xml.*;
@@ -113,7 +114,7 @@
 	  ***********************************************************/
 	 public String getPrimaryTagName()
 	 {
-		  return "ThreadGroup";
+		  return JMeterUtils.getResString("threadgroup");
 	 }
 
 	 /************************************************************
Index: jakarta-jmeter/src/org/apache/jmeter/threads/ThreadGroup.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/threads/ThreadGroup.java,v
retrieving revision 1.18
diff -u -r1.18 ThreadGroup.java
--- jakarta-jmeter/src/org/apache/jmeter/threads/ThreadGroup.java	9 Nov 2001 19:21:02 -0000	1.18
+++ jakarta-jmeter/src/org/apache/jmeter/threads/ThreadGroup.java	3 Mar 2002 15:35:00 -0000
@@ -66,6 +66,7 @@
 import org.apache.jmeter.gui.*;
 import org.apache.jmeter.config.ConfigElement;
 import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
 
 
 /************************************************************
@@ -423,7 +424,7 @@
 		// WARNING! This String value must be identical to the String value in
 		// org.apache.jmeter.control.TestPlan static initializer. If it's not
 		// you will not be able to add a Thread Group element to a Test Plan.
-		return "Thread Group";
+		return JMeterUtils.getResString("threadgroup");
 	}
 
 	/**
Index: jakarta-jmeter/src/org/apache/jmeter/timers/ConstantTimer.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/timers/ConstantTimer.java,v
retrieving revision 1.17
diff -u -r1.17 ConstantTimer.java
--- jakarta-jmeter/src/org/apache/jmeter/timers/ConstantTimer.java	27 Sep 2001 05:17:07 -0000	1.17
+++ jakarta-jmeter/src/org/apache/jmeter/timers/ConstantTimer.java	3 Mar 2002 15:35:01 -0000
@@ -61,6 +61,7 @@
 import org.apache.jmeter.gui.popup.*;
 import org.apache.jmeter.gui.JMeterComponentModel;
 import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
 
 /************************************************************
  *  This class implements a constant timer with its own panel and fields for
@@ -206,7 +207,7 @@
 	 ***********************************************************/
 	public String getClassLabel()
 	{
-		return "Constant Timer";
+		return JMeterUtils.getResString("constant_timer_title");
 	}
 
 	/************************************************************
@@ -233,6 +234,6 @@
 	 ***********************************************************/
 	public String toString()
 	{
-		return "Add a constant delay between sampling";
+		return JMeterUtils.getResString("constant_timer_memo");
 	}
 }
Index: jakarta-jmeter/src/org/apache/jmeter/timers/GaussianRandomTimer.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/timers/GaussianRandomTimer.java,v
retrieving revision 1.12
diff -u -r1.12 GaussianRandomTimer.java
--- jakarta-jmeter/src/org/apache/jmeter/timers/GaussianRandomTimer.java	30 Aug 2001 17:19:03 -0000	1.12
+++ jakarta-jmeter/src/org/apache/jmeter/timers/GaussianRandomTimer.java	3 Mar 2002 15:35:02 -0000
@@ -59,6 +59,7 @@
 import java.io.*;
 
 import org.apache.jmeter.gui.JMeterComponentModel;
+import org.apache.jmeter.util.JMeterUtils;
 
 /**
  * This class implements those methods needed by RandomTimer
@@ -77,12 +78,12 @@
 	 }
 
 	 public String toString() {
-		  return "Adds a random delay with a gaussian distribution";
+		  return JMeterUtils.getResString("gaussian_timer_memo");
 	 }
 
 	 public String getClassLabel()
 	 {
-		return "Gaussian Random Timer";
+		return JMeterUtils.getResString("gaussian_timer_title");
 	 }
 
 	 public void uncompile()
Index: jakarta-jmeter/src/org/apache/jmeter/timers/UniformRandomTimer.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/timers/UniformRandomTimer.java,v
retrieving revision 1.13
diff -u -r1.13 UniformRandomTimer.java
--- jakarta-jmeter/src/org/apache/jmeter/timers/UniformRandomTimer.java	27 Sep 2001 05:36:13 -0000	1.13
+++ jakarta-jmeter/src/org/apache/jmeter/timers/UniformRandomTimer.java	3 Mar 2002 15:35:02 -0000
@@ -59,6 +59,7 @@
 import java.io.*;
 
 import org.apache.jmeter.gui.JMeterComponentModel;
+import org.apache.jmeter.util.JMeterUtils;
 
 /**
  * This class implements those methods needed by RandomTimer
@@ -78,7 +79,7 @@
 
 	public String toString()
 	{
-		return "Adds a random delay with a uniform distribution";
+		return JMeterUtils.getResString("uniform_timer_memo");
 	}
 
 	public void uncompile()
@@ -87,7 +88,7 @@
 
 	public String getClassLabel()
 	{
-		return "Uniform Random Timer";
+		return JMeterUtils.getResString("uniform_timer_title");
 	}
 
 	public Class getGuiClass()
Index: jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphAccumModel.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphAccumModel.java,v
retrieving revision 1.2
diff -u -r1.2 GraphAccumModel.java
--- jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphAccumModel.java	23 Dec 2001 04:27:57 -0000	1.2
+++ jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphAccumModel.java	3 Mar 2002 15:35:07 -0000
@@ -59,7 +59,7 @@
 
 import org.apache.jmeter.samplers.*;
 import org.apache.jmeter.save.Saveable;
-
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFull;
 
 import org.apache.log4j.*;
@@ -248,7 +248,7 @@
   */
   public String getClassLabel()
   {
-    return "GraphFull Results";
+     return JMeterUtils.getResString("graph_full_results_title");
   }
 
   /**
Index: jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphModel.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphModel.java,v
retrieving revision 1.8
diff -u -r1.8 GraphModel.java
--- jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphModel.java	5 Aug 2001 13:22:08 -0000	1.8
+++ jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphModel.java	3 Mar 2002 15:35:08 -0000
@@ -118,7 +118,7 @@
 
 import org.apache.jmeter.samplers.*;
 import org.apache.jmeter.save.Saveable;
-
+import org.apache.jmeter.util.JMeterUtils;
 
 
 /**
@@ -431,7 +431,7 @@
 
 	{
 
-		return "Graph Results";
+		return JMeterUtils.getResString("graph_results_title");
 
 	}
 
Index: jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineModel.java
===================================================================
RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineModel.java,v
retrieving revision 1.12
diff -u -r1.12 SplineModel.java
--- jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineModel.java	31 Aug 2001 00:46:45 -0000	1.12
+++ jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineModel.java	3 Mar 2002 15:35:10 -0000
@@ -62,7 +62,7 @@
 
 import org.apache.jmeter.gui.*;
 import org.apache.jmeter.save.Saveable;
-
+import org.apache.jmeter.util.JMeterUtils;
 
 /************************************************************
  *  Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -217,7 +217,7 @@
 	public String getClassLabel()
 	{
 
-		return "Spline Visualizer";
+		return JMeterUtils.getResString("spline_visualizer_title");
 	}
 
 
