Author: sebb
Date: Fri Apr 3 13:14:01 2009
New Revision: 761663
URL: http://svn.apache.org/viewvc?rev=761663&view=rev
Log:
Bug 46844 - "Library" label in test plan are not I18N
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=761663&r1=761662&r2=761663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
Fri Apr 3 13:14:01 2009
@@ -45,12 +45,17 @@
import org.apache.jorphan.reflect.Functor;
public class FileListPanel extends JPanel implements ActionListener {
+
+ private static final long serialVersionUID = 1L;
+
private JTable files = null;
private transient ObjectTableModel tableModel = null;
private static final String ACTION_BROWSE = "browse"; // $NON-NLS-1$
+ private static final String LABEL_LIBRARY = "library"; // $NON-NLS-1$
+
private JButton browse = new
JButton(JMeterUtils.getResString(ACTION_BROWSE));
private JButton clear = new JButton(JMeterUtils.getResString("clear")); //
$NON-NLS-1$
@@ -183,7 +188,7 @@
}
protected void initializeTableModel() {
- tableModel = new ObjectTableModel(new String[] { "Library" },
+ tableModel = new ObjectTableModel(new String[] {
JMeterUtils.getResString(LABEL_LIBRARY) },
new Functor[0] , new Functor[0] , // i.e. bypass the Functors
new Class[] { String.class });
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=761663&r1=761662&r2=761663&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Fri Apr 3 13:14:01 2009
@@ -17,6 +17,9 @@
# and converts keys to lowercase before lookup
# => All keys in this file must also be lower case or they won't match
#
+
+# Please add new entries in alphabetical order
+
about=About Apache JMeter
add=Add
add_as_child=Add as Child
@@ -102,17 +105,17 @@
bsh_function_expression=Expression to evaluate
bsh_sampler_title=BeanShell Sampler
bsh_script=Script (see below for variables that are defined)
-bsh_script_variables=The following variables are defined for the
script:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label,
FileName, ctx, vars, props, log
bsh_script_file=Script file
bsh_script_parameters=Parameters (-> String Parameters and String []bsh.args)
bsh_script_reset_interpreter=Reset bsh.Interpreter before each call
+bsh_script_variables=The following variables are defined for the
script\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label,
FileName, ctx, vars, props, log
busy_testing=I'm busy testing, please stop the test before changing settings
cache_manager_title=HTTP Cache Manager
cache_session_id=Cache Session Id?
cancel=Cancel
-cancel_revert_project=There are test items that have not been saved. Do you
wish to revert to the previously saved test plan?
cancel_exit_to_save=There are test items that have not been saved. Do you
wish to save before exiting?
cancel_new_to_save=There are test items that have not been saved. Do you wish
to save before clearing the test plan?
+cancel_revert_project=There are test items that have not been saved. Do you
wish to revert to the previously saved test plan?
char_value=Unicode character number (decimal or 0xhex)
choose_function=Choose a function
choose_language=Choose Language
@@ -235,11 +238,11 @@
ftp_get=get(RETR)
ftp_local_file=Local File:
ftp_local_file_contents=Local File Contents:
+ftp_put=put(STOR)
ftp_remote_file=Remote File:
ftp_sample_title=FTP Request Defaults
ftp_save_response_data=Save File in Response ?
ftp_testing_title=FTP Request
-ftp_put=put(STOR)
function_dialog_menu_item=Function Helper Dialog
function_helper_title=Function Helper
function_name_param=Name of variable in which to store the result (required)
@@ -294,8 +297,8 @@
httpmirror_title=HTTP Mirror Server
id_prefix=ID Prefix
id_suffix=ID Suffix
-if_controller_expression=Interpret Condition as Variable Expression?
if_controller_evaluate_all=Evaluate for all children?
+if_controller_expression=Interpret Condition as Variable Expression?
if_controller_label=Condition (default Javascript)
if_controller_title=If Controller
ignore_subcontrollers=Ignore sub-controller blocks
@@ -356,12 +359,12 @@
jms_receive_queue=JNDI name Receive queue
jms_request=Request Only
jms_requestreply=Request Response
-jms_sample_title= JMS Default Request
+jms_sample_title=JMS Default Request
jms_send_queue=JNDI name Request queue
jms_subscriber_on_message=Use MessageListener.onMessage()
jms_subscriber_receive=Use TopicSubscriber.receive()
jms_subscriber_title=JMS Subscriber
-jms_testing_title= Messaging Request
+jms_testing_title=Messaging Request
jms_text_message=Text Message
jms_timeout=Timeout (milliseconds)
jms_topic=Topic
@@ -419,7 +422,8 @@
ldap_secure=Use Secure LDAP Protocol ?
ldap_testing_title=LDAP Request
ldapext_sample_title=LDAP Extended Request Defaults
-ldapext_testing_title= LDAP Extended Request
+ldapext_testing_title=LDAP Extended Request
+library=Library
load=Load
load_wsdl=Load WSDL
log_errors_only=Errors
@@ -497,9 +501,9 @@
modification_manager_title=Modification Manager
modify_test=Modify Test
modtest=Modification test
+module_controller_module_to_run=Module To Run
module_controller_title=Module Controller
module_controller_warning=Could not find module:
-module_controller_module_to_run=Module To Run
monitor_equation_active=Active: (busy/max) > 25%
monitor_equation_dead=Dead: no response
monitor_equation_healthy=Healthy: (busy/max) < 25%
@@ -650,8 +654,8 @@
resultaction_title=Result Status Action Handler
resultsaver_errors=Save Failed Responses only
resultsaver_prefix=Filename prefix\:
+resultsaver_skipautonumber=Don't add number to prefix
resultsaver_success=Save Successful Responses only
-resultsaver_skipautonumber=Don\'t add number to prefix
resultsaver_title=Save Responses to a file
resultsaver_variable=Variable Name:
retobj=Return object
@@ -695,10 +699,10 @@
save_requestheaders=Save Request Headers (XML)
save_responsedata=Save Response Data (XML)
save_responseheaders=Save Response Headers (XML)
+save_samplecount=Save Sample and Error Counts
save_samplerdata=Save Sampler Data (XML)
save_subresults=Save Sub Results (XML)
save_success=Save Success
-save_samplecount=Save Sample and Error Counts
save_threadcounts=Save Active Thread Counts
save_threadname=Save Thread Name
save_time=Save Elapsed Time
@@ -750,8 +754,8 @@
spline_visualizer_minimum=Minimum
spline_visualizer_title=Spline Visualizer
spline_visualizer_waitingmessage=Waiting for samples
-split_function_string=String to split
split_function_separator=String to split on. Default is , (comma).
+split_function_string=String to split
ssl_alias_prompt=Please type your preferred alias
ssl_alias_select=Select your alias for the test
ssl_alias_title=Client Alias
@@ -819,8 +823,8 @@
transaction_controller_parent=Generate parent sample
transaction_controller_title=Transaction Controller
unbind=Thread Unbind
-unescape_string=String containing Java escapes
unescape_html_string=String to unescape
+unescape_string=String containing Java escapes
uniform_timer_delay=Constant Delay Offset (in milliseconds)\:
uniform_timer_memo=Adds a random delay with a uniform distribution
uniform_timer_range=Random Delay Maximum (in milliseconds)\:
@@ -859,10 +863,10 @@
view_results_render_json=Render JSON
view_results_render_text=Show Text
view_results_render_xml=Render XML
+view_results_tab_assertion=Assertion result
view_results_tab_request=Request
view_results_tab_response=Response data
view_results_tab_sampler=Sampler result
-view_results_tab_assertion=Assertion result
view_results_title=View Results
view_results_tree_title=View Results Tree
warning=Warning!
@@ -871,10 +875,10 @@
web_server_client=Client implementation:
web_server_domain=Server Name or IP\:
web_server_port=Port Number\:
+web_testing2_title=HTTP Request HTTPClient
web_testing_embedded_url_pattern=Embedded URLs must match\:
web_testing_retrieve_images=Retrieve All Embedded Resources from HTML Files
web_testing_title=HTTP Request
-web_testing2_title=HTTP Request HTTPClient
webservice_proxy_host=Proxy Host
webservice_proxy_note=If Use HTTP Proxy is checked, but no host or port are
provided, the sampler
webservice_proxy_note2=will look at command line options. If no proxy host or
port are provided by
@@ -922,4 +926,3 @@
you_must_enter_a_valid_number=You must enter a valid number
zh_cn=Chinese (Simplified)
zh_tw=Chinese (Traditional)
-# Please add new entries in alphabetical order
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=761663&r1=761662&r2=761663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Apr 3 13:14:01 2009
@@ -197,6 +197,7 @@
Bug 46690 - handling of 302 redirects with invalid relative paths.
JMeter now removes extraneous leading "../" segments (as do many browsers)
</li>
+<li>Bug 46844 - "Library" label in test plan are not I18N</li>
</ul>
<h3>Improvements</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
